From dbe454178b7eeb4bea564fa08e8a6c46a81ab965 Mon Sep 17 00:00:00 2001 From: Christine Wang Date: Fri, 7 Mar 2025 09:13:43 -0800 Subject: [PATCH 1/3] fix: remote git repo doesn't need token if it's public repo --- src/codegen/git/repo_operator/repo_operator.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/codegen/git/repo_operator/repo_operator.py b/src/codegen/git/repo_operator/repo_operator.py index 24db86ede..a3cc3b16c 100644 --- a/src/codegen/git/repo_operator/repo_operator.py +++ b/src/codegen/git/repo_operator/repo_operator.py @@ -20,7 +20,7 @@ from codegen.git.clients.git_repo_client import GitRepoClient from codegen.git.configs.constants import CODEGEN_BOT_EMAIL, CODEGEN_BOT_NAME from codegen.git.repo_operator.local_git_repo import LocalGitRepo -from codegen.git.schemas.enums import CheckoutResult, FetchResult, SetupOption +from codegen.git.schemas.enums import CheckoutResult, FetchResult, RepoVisibility, SetupOption from codegen.git.schemas.repo_config import RepoConfig from codegen.git.utils.clone import clone_or_pull_repo, clone_repo, pull_repo from codegen.git.utils.clone_url import add_access_token_to_url, get_authenticated_clone_url_for_repo_config, get_clone_url_for_repo_config, url_to_github @@ -89,8 +89,8 @@ def repo_path(self) -> str: @property def remote_git_repo(self) -> GitRepoClient: - if not self.access_token: - msg = "Must initialize with access_token to get remote" + if not self.access_token and self.repo_config.visibility != RepoVisibility.PUBLIC: + msg = "Must initialize with access_token to get remote_git_repo" raise ValueError(msg) if not self._remote_git_repo: @@ -616,7 +616,6 @@ def iter_files( subdirs: list[str] | None = None, extensions: list[str] | None = None, ignore_list: list[str] | None = None, - skip_content: bool = False, ) -> Generator[tuple[str, str]]: """Iterates over all files in the codebase, yielding the filepath and its content. @@ -643,14 +642,8 @@ def iter_files( if extensions is None or any(filepath.endswith(e) for e in extensions): try: - if os.path.isfile(filepath): - if not skip_content: - content = self.get_file(filepath) - yield rel_filepath, content - else: - yield rel_filepath, "" - else: - logger.warning(f"Skipping {filepath} because it does not exist or is not a valid file.") + content = self.get_file(filepath) + yield rel_filepath, content except Exception as e: logger.warning(f"Error reading file {filepath}: {e}") From 3541cec8767cf65934158e08dcb61207495bf0db Mon Sep 17 00:00:00 2001 From: Christine Wang Date: Fri, 7 Mar 2025 09:14:36 -0800 Subject: [PATCH 2/3] revert other changes --- src/codegen/git/repo_operator/repo_operator.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/codegen/git/repo_operator/repo_operator.py b/src/codegen/git/repo_operator/repo_operator.py index a3cc3b16c..b5febfe14 100644 --- a/src/codegen/git/repo_operator/repo_operator.py +++ b/src/codegen/git/repo_operator/repo_operator.py @@ -90,7 +90,7 @@ def repo_path(self) -> str: @property def remote_git_repo(self) -> GitRepoClient: if not self.access_token and self.repo_config.visibility != RepoVisibility.PUBLIC: - msg = "Must initialize with access_token to get remote_git_repo" + msg = "Must initialize with access_token to get remote" raise ValueError(msg) if not self._remote_git_repo: @@ -616,6 +616,7 @@ def iter_files( subdirs: list[str] | None = None, extensions: list[str] | None = None, ignore_list: list[str] | None = None, + skip_content: bool = False, ) -> Generator[tuple[str, str]]: """Iterates over all files in the codebase, yielding the filepath and its content. @@ -642,8 +643,14 @@ def iter_files( if extensions is None or any(filepath.endswith(e) for e in extensions): try: - content = self.get_file(filepath) - yield rel_filepath, content + if os.path.isfile(filepath): + if not skip_content: + content = self.get_file(filepath) + yield rel_filepath, content + else: + yield rel_filepath, "" + else: + logger.warning(f"Skipping {filepath} because it does not exist or is not a valid file.") except Exception as e: logger.warning(f"Error reading file {filepath}: {e}") From 3a0b57676349e45e71275975131f37ecef64fe48 Mon Sep 17 00:00:00 2001 From: Christine Wang Date: Fri, 7 Mar 2025 09:15:42 -0800 Subject: [PATCH 3/3] remvoe generate runer import step --- .pre-commit-config.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7f8f20c68..eeea3f677 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -80,27 +80,13 @@ repos: rev: 39.169.3 hooks: - id: renovate-config-validator + - repo: https://github.com/astral-sh/uv-pre-commit rev: "0.5.31" hooks: - id: uv-sync args: ["--frozen", "--all-packages", "--all-extras"] - - repo: "local" - hooks: - # Disabled as part of LFS removal. - # - id: disallowed-words-check - # name: Check for disallowed words - # entry: scripts/disallowed-words-check.sh - # language: script - # files: '' # Check all files - - id: generate-runner-imports - name: Generate Runner Imports - entry: bash -c "uv run --frozen python -m codegen.gscli.cli generate runner-imports src/codegen/shared/compilation/function_imports.py" - language: system - pass_filenames: false - always_run: true - - repo: https://github.com/hukkin/mdformat rev: 0.7.22 # Use the ref you want to point at hooks: