Merge branch 'develop' into eagarwal-cg-10796-lsp-progress-reporting-support

Author: bagel897

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
       matrix:
         os: [
           ubuntu-latest,
-          ubuntu-24.04-arm, # https://github.com/actions/partner-runner-images/issues/37
+          ubuntu-22.04-arm, # https://github.com/actions/partner-runner-images/issues/37 https://github.com/orgs/community/discussions/148648#discussioncomment-12099554
           macos-latest,
           macos-14-large
         ]

.pre-commit-config.yaml

@@ -75,11 +75,11 @@ repos:
         entry: bash -c "uv run --frozen --all-extras --dev deptry src --ignore DEP001 --extend-exclude 'codegen-examples/.*'"
 
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 39.169.1
+    rev: 39.169.2
     hooks:
       - id: renovate-config-validator
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: "0.5.30"
+    rev: "0.5.31"
     hooks:
       - id: uv-sync
         args: ["--frozen", "--all-packages", "--all-extras"]

codegen-examples/examples/unittest_to_pytest/input_repo/jj_classes/__init__.py

@@ -1,4 +0,0 @@
-# TEST 
-# TEST 
-# TEST 
-# TEST 

src/codegen/extensions/tools/file_operations.py

@@ -25,13 +25,7 @@ def view_file(codebase: Codebase, filepath: str) -> dict[str, Any]:
         pass
 
     if not file:
-        for f in codebase.files:
-            if f.file_path.endswith(filepath):
-                file = f
-                break
-
-    if not file:
-        return {"error": f"File not found: {filepath}"}
+        return {"error": f"File not found: {filepath}. Please use full filepath relative to workspace root."}
 
     return {
         "filepath": file.filepath,
@@ -106,6 +100,8 @@ def edit_file(codebase: Codebase, filepath: str, content: str) -> dict[str, Any]
         file = codebase.get_file(filepath)
     except ValueError:
         return {"error": f"File not found: {filepath}"}
+    if file is None:
+        return {"error": f"File not found: {filepath}"}
 
     file.edit(content)
     codebase.commit()
@@ -144,6 +140,8 @@ def delete_file(codebase: Codebase, filepath: str) -> dict[str, Any]:
         file = codebase.get_file(filepath)
     except ValueError:
         return {"error": f"File not found: {filepath}"}
+    if file is None:
+        return {"error": f"File not found: {filepath}"}
 
     file.remove()
     codebase.commit()
@@ -165,6 +163,8 @@ def rename_file(codebase: Codebase, filepath: str, new_filepath: str) -> dict[st
         file = codebase.get_file(filepath)
     except ValueError:
         return {"error": f"File not found: {filepath}"}
+    if file is None:
+        return {"error": f"File not found: {filepath}"}
 
     if codebase.has_file(new_filepath):
         return {"error": f"Destination file already exists: {new_filepath}"}
@@ -204,6 +204,8 @@ def move_symbol(
         source = codebase.get_file(source_file)
     except ValueError:
         return {"error": f"Source file not found: {source_file}"}
+    if source is None:
+        return {"error": f"Source file not found: {source_file}"}
 
     try:
         target = codebase.get_file(target_file)

src/codegen/git/repo_operator/local_repo_operator.py

@@ -12,7 +12,9 @@
 from codegen.git.repo_operator.repo_operator import RepoOperator
 from codegen.git.schemas.enums import FetchResult
 from codegen.git.schemas.repo_config import RepoConfig
+from codegen.git.utils.clone_url import add_access_token_to_url
 from codegen.git.utils.file_utils import create_files
+from codegen.shared.configs.session_configs import config
 
 logger = logging.getLogger(__name__)
 
@@ -112,6 +114,9 @@ def create_from_repo(cls, repo_path: str, url: str, access_token: str | None = N
             url (str): Git URL of the repository
             access_token (str | None): Optional GitHub API key for operations that need GitHub access
         """
+        access_token = access_token or config.secrets.github_token
+        url = add_access_token_to_url(url=url, token=access_token)
+
         # Check if repo already exists
         if os.path.exists(repo_path):
             try:

src/codegen/sdk/core/codebase.py

@@ -1223,11 +1223,10 @@ def set_session_options(self, **kwargs: Unpack[SessionOptions]) -> None:
     @classmethod
     def from_repo(
         cls,
-        repo_name: str,
+        repo_full_name: str,
         *,
-        tmp_dir: str | None = None,
+        tmp_dir: str | None = "/tmp/codegen",
         commit: str | None = None,
-        shallow: bool = True,
         programming_language: ProgrammingLanguage | None = None,
         config: CodebaseConfig = DefaultConfig,
     ) -> "Codebase":
@@ -1244,23 +1243,21 @@ def from_repo(
         Returns:
             Codebase: A Codebase instance initialized with the cloned repository
         """
-        logger.info(f"Fetching codebase for {repo_name}")
+        logger.info(f"Fetching codebase for {repo_full_name}")
 
         # Parse repo name
-        if "/" not in repo_name:
+        if "/" not in repo_full_name:
             msg = "repo_name must be in format 'owner/repo'"
             raise ValueError(msg)
-        owner, repo = repo_name.split("/")
+        owner, repo = repo_full_name.split("/")
 
         # Setup temp directory
-        if tmp_dir is None:
-            tmp_dir = "/tmp/codegen"
         os.makedirs(tmp_dir, exist_ok=True)
         logger.info(f"Using directory: {tmp_dir}")
 
         # Setup repo path and URL
         repo_path = os.path.join(tmp_dir, repo)
-        repo_url = f"https://github.com/{repo_name}.git"
+        repo_url = f"https://github.com/{repo_full_name}.git"
         logger.info(f"Will clone {repo_url} to {repo_path}")
 
         try:

tests/integration/codegen/git/codebase/conftest.py

@@ -1,36 +1,13 @@
 import os
 
 import pytest
-from git import Repo as GitRepo
 
-from codegen.git.repo_operator.local_repo_operator import LocalRepoOperator
-from codegen.git.schemas.repo_config import RepoConfig
-from codegen.git.utils.clone_url import get_authenticated_clone_url_for_repo_config
-from codegen.sdk.codebase.config import ProjectConfig
 from codegen.sdk.core.codebase import Codebase
-from codegen.shared.configs.session_configs import config
+from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 
 @pytest.fixture
-def repo_config(tmpdir):
-    repo_config = RepoConfig(
-        name="Kevin-s-Adventure-Game",
-        full_name="codegen-sh/Kevin-s-Adventure-Game",
-        base_dir=str(tmpdir),
-    )
-    yield repo_config
-
-
-@pytest.fixture
-def op(repo_config):
-    os.chdir(repo_config.base_dir)
-    GitRepo.clone_from(url=get_authenticated_clone_url_for_repo_config(repo_config, token=config.secrets.github_token), to_path=os.path.join(repo_config.base_dir, repo_config.name), depth=1)
-    op = LocalRepoOperator(repo_config=repo_config)
-    yield op
-
-
-@pytest.fixture
-def codebase(op: LocalRepoOperator):
-    project_config = ProjectConfig(repo_operator=op)
-    codebase = Codebase(projects=[project_config])
+def codebase(tmpdir):
+    os.chdir(tmpdir)
+    codebase = Codebase.from_repo(repo_full_name="codegen-sh/Kevin-s-Adventure-Game", tmp_dir=tmpdir, programming_language=ProgrammingLanguage.PYTHON)
     yield codebase