chore: use from_repo + clean-up from_repo

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__)
 
@@ -39,7 +41,7 @@
         super().__init__(repo_config=repo_config, access_token=access_token, bot_commit=bot_commit)
         os.makedirs(self.repo_path, exist_ok=True)
         GitCLI.init(self.repo_path)
         self._local_git_repo = LocalGitRepo(repo_path=repo_config.repo_path)
         if repo_config.full_name is None:
             repo_config.full_name = self._local_git_repo.full_name
 
@@ -48,7 +50,7 @@
     ####################################################################################################################
 
     @property
     def remote_git_repo(self) -> GitRepoClient | None:
         """Get the remote GitRepoClient object for the current local repo."""
         if not self.access_token:
             msg = "Must initialize with access_token to get remote"
@@ -112,6 +114,9 @@
             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:
@@ -150,11 +155,11 @@
     ####################################################################################################################
 
     @property
     def codeowners_parser(self) -> CodeOwnersParser | None:
         return None
 
     @cached_property
     def base_url(self) -> str | None:
         return self._local_git_repo.base_url
 
     @override

src/codegen/sdk/core/codebase.py

@@ -176,13 +176,13 @@
             main_project = ProjectConfig.from_path(repo_path, programming_language=programming_language)
             projects = [main_project]
         else:
             main_project = projects[0]
 
         # Initialize codebase
         self._op = main_project.repo_operator
         self.viz = VisualizationManager(op=self._op)
         self.repo_path = Path(self._op.repo_path)
         self.ctx = CodebaseContext(projects, config=config, io=io)
         self.console = Console(record=True, soft_wrap=True)
 
     @noapidoc
@@ -198,7 +198,7 @@
         yield "nodes", len(self.ctx.nodes)
         yield "edges", len(self.ctx.edges)
 
     __rich_repr__.angular = ANGULAR_STYLE
 
     @property
     @deprecated("Please do not use the local repo operator directly")
@@ -226,8 +226,8 @@
 
     @noapidoc
     def _symbols(self, symbol_type: SymbolType | None = None) -> list[TSymbol | TClass | TFunction | TGlobalVar]:
         matches: list[Symbol] = self.ctx.get_nodes(NodeType.SYMBOL)
         return [x for x in matches if x.is_top_level and (symbol_type is None or x.symbol_type == symbol_type)]
 
     # =====[ Node Types ]=====
     @overload
@@ -236,7 +236,7 @@
     def files(self, *, extensions: Literal["*"]) -> list[File]: ...
     @overload
     def files(self, *, extensions: None = ...) -> list[TSourceFile]: ...
     @proxy_property
     def files(self, *, extensions: list[str] | Literal["*"] | None = None) -> list[TSourceFile] | list[File]:
         """A list property that returns all files in the codebase.
 
@@ -1219,11 +1219,10 @@
     @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":
@@ -1240,23 +1239,21 @@
         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