chore: merge RepoConfig and RepositoryConfig

Author: caroljung-cg

src/codegen/cli/auth/session.py

@@ -7,7 +7,7 @@
 
 from codegen.cli.git.repo import get_git_repo
 from codegen.cli.rich.codeblocks import format_command
-from codegen.configs.constants import CODEGEN_DIR_NAME, ENV_FILENAME
+from codegen.configs.constants import CODEGEN_DIR_NAME
 from codegen.configs.session_manager import session_manager
 from codegen.configs.user_config import UserConfig
 from codegen.git.repo_operator.local_git_repo import LocalGitRepo
@@ -30,7 +30,7 @@ def __init__(self, repo_path: Path, git_token: str | None = None) -> None:
         self.repo_path = repo_path
         self.local_git = LocalGitRepo(repo_path=repo_path)
         self.codegen_dir = repo_path / CODEGEN_DIR_NAME
-        self.config = UserConfig(env_filepath=repo_path / ENV_FILENAME)
+        self.config = UserConfig(root_path=repo_path)
         self.config.secrets.github_token = git_token or self.config.secrets.github_token
         self.existing = session_manager.get_session(repo_path) is not None
 

src/codegen/cli/commands/config/main.py

@@ -4,7 +4,7 @@
 import rich_click as click
 from rich.table import Table
 
-from codegen.configs.constants import ENV_FILENAME, GLOBAL_ENV_FILE
+from codegen.configs.constants import ENV_FILENAME, GLOBAL_CONFIG_DIR
 from codegen.configs.user_config import UserConfig
 from codegen.shared.path import get_git_root_path
 
@@ -117,8 +117,8 @@ def set_command(key: str, value: str):
 
 def _get_user_config() -> UserConfig:
     if (project_root := get_git_root_path()) is None:
-        env_filepath = GLOBAL_ENV_FILE
+        root_path = GLOBAL_CONFIG_DIR
     else:
-        env_filepath = project_root / ENV_FILENAME
+        root_path = project_root
 
-    return UserConfig(env_filepath)
+    return UserConfig(root_path)

src/codegen/cli/commands/run/run_local.py

@@ -6,8 +6,8 @@
 
 from codegen.cli.auth.session import CodegenSession
 from codegen.cli.utils.function_finder import DecoratedFunction
+from codegen.configs.models.repository import RepositoryConfig
 from codegen.git.repo_operator.repo_operator import RepoOperator
-from codegen.git.schemas.repo_config import RepoConfig
 from codegen.git.utils.language import determine_project_language
 from codegen.sdk.codebase.config import ProjectConfig
 from codegen.sdk.core.codebase import Codebase
@@ -30,7 +30,7 @@ def parse_codebase(
     codebase = Codebase(
         projects=[
             ProjectConfig(
-                repo_operator=RepoOperator(repo_config=RepoConfig.from_repo_path(repo_path=repo_path)),
+                repo_operator=RepoOperator(repo_config=RepositoryConfig.from_path(path=repo_path)),
                 subdirectories=subdirectories,
                 programming_language=language or determine_project_language(repo_path),
             )

src/codegen/cli/commands/start/main.py

@@ -10,9 +10,9 @@
 
 from codegen.cli.commands.start.docker_container import DockerContainer
 from codegen.cli.commands.start.docker_fleet import CODEGEN_RUNNER_IMAGE
+from codegen.configs.models.repository import RepositoryConfig
 from codegen.configs.models.secrets import SecretsConfig
 from codegen.git.repo_operator.local_git_repo import LocalGitRepo
-from codegen.git.schemas.repo_config import RepoConfig
 from codegen.shared.network.port import get_free_port
 
 _default_host = "0.0.0.0"
@@ -26,7 +26,7 @@
 def start_command(port: int | None, detached: bool = False, skip_build: bool = False, force: bool = False) -> None:
     """Starts a local codegen server"""
     repo_path = Path.cwd().resolve()
-    repo_config = RepoConfig.from_repo_path(str(repo_path))
+    repo_config = LocalGitRepo(repo_path=repo_path).get_repo_config()
     if (container := DockerContainer.get(repo_config.name)) is not None:
         if force:
             rich.print(f"[yellow]Removing existing runner {repo_config.name} to force restart[/yellow]")
@@ -50,7 +50,7 @@ def start_command(port: int | None, detached: bool = False, skip_build: bool = F
         raise click.Abort()
 
 
-def _handle_existing_container(repo_config: RepoConfig, container: DockerContainer) -> None:
+def _handle_existing_container(repo_config: RepositoryConfig, container: DockerContainer) -> None:
     if container.is_running():
         rich.print(
             Panel(
@@ -122,20 +122,20 @@ def _get_platform() -> str:
         return "linux/amd64"
 
 
-def _run_docker_container(repo_config: RepoConfig, port: int, detached: bool) -> None:
+def _run_docker_container(repo_config: RepositoryConfig, port: int, detached: bool) -> None:
     rich.print("[bold blue]Starting Docker container...[/bold blue]")
     container_repo_path = f"/app/git/{repo_config.name}"
     name_args = ["--name", f"{repo_config.name}"]
     envvars = {
-        "REPOSITORY_LANGUAGE": repo_config.language.value,
-        "REPOSITORY_OWNER": LocalGitRepo(repo_config.repo_path).owner,
+        "REPOSITORY_LANGUAGE": repo_config.language,
+        "REPOSITORY_OWNER": LocalGitRepo(repo_config.path).owner,
         "REPOSITORY_PATH": container_repo_path,
-        "GITHUB_TOKEN": SecretsConfig().github_token,
+        "GITHUB_TOKEN": SecretsConfig(root_path=repo_config.path).github_token,
         "PYTHONUNBUFFERED": "1",  # Ensure Python output is unbuffered
         "CODEBASE_SYNC_ENABLED": "True",
     }
     envvars_args = [arg for k, v in envvars.items() for arg in ("--env", f"{k}={v}")]
-    mount_args = ["-v", f"{repo_config.repo_path}:{container_repo_path}"]
+    mount_args = ["-v", f"{repo_config.path}:{container_repo_path}"]
     entry_point = f"uv run --frozen uvicorn codegen.runner.servers.local_daemon:app --host {_default_host} --port {port}"
     port_args = ["-p", f"{port}:{port}"]
     detached_args = ["-d"] if detached else []

src/codegen/cli/mcp/resources/system_prompt.py

@@ -1417,15 +1417,14 @@ def baz():
 ```python
 from codegen import Codebase
 from codegen.git.repo_operator.repo_operator import RepoOperator
-from codegen.git.schemas.repo_config import RepoConfig
 from codegen.sdk.codebase.config import ProjectConfig
 from codegen.shared.enums.programming_language import ProgrammingLanguage
 
 codebase = Codebase(
     projects = [
         ProjectConfig(
             repo_operator=RepoOperator(
-                repo_config=RepoConfig(name="codegen-sdk"),
+                repo_path="/tmp/codegen-sdk",
                 bot_commit=True
             ),
             programming_language=ProgrammingLanguage.TYPESCRIPT,

src/codegen/configs/models/base_config.py

@@ -16,7 +16,8 @@ class BaseConfig(BaseSettings, ABC):
 
     model_config = SettingsConfigDict(extra="ignore", case_sensitive=False)
 
-    def __init__(self, prefix: str, env_filepath: Path | None = None, *args, **kwargs) -> None:
+    def __init__(self, prefix: str, root_path: Path | None = None, *args, **kwargs) -> None:
+        env_filepath = root_path / ENV_FILENAME if root_path else None
         if env_filepath is None:
             root_path = get_git_root_path()
             if root_path is not None:

src/codegen/configs/models/repository.py

@@ -1,4 +1,5 @@
 import os
+from typing import Self
 
 from codegen.configs.models.base_config import BaseConfig
 
@@ -13,16 +14,14 @@ class RepositoryConfig(BaseConfig):
     language: str | None = None
     user_name: str | None = None
     user_email: str | None = None
+    subdirectories: list[str] | None = None
 
     def __init__(self, prefix: str = "REPOSITORY", *args, **kwargs) -> None:
         super().__init__(prefix=prefix, *args, **kwargs)
 
-    def _initialize(
-        self,
-    ) -> None:
-        """Initialize the repository config"""
-        if self.path is None:
-            self.path = os.getcwd()
+    @classmethod
+    def from_path(cls, path: str) -> Self:
+        return cls(root_path=path, path=path)
 
     @property
     def base_dir(self) -> str:

src/codegen/configs/user_config.py

@@ -3,6 +3,7 @@
 
 from pydantic import Field
 
+from codegen.configs.constants import ENV_FILENAME
 from codegen.configs.models.codebase import CodebaseConfig
 from codegen.configs.models.repository import RepositoryConfig
 from codegen.configs.models.secrets import SecretsConfig
@@ -14,11 +15,11 @@ class UserConfig:
     codebase: CodebaseConfig = Field(default_factory=CodebaseConfig)
     secrets: SecretsConfig = Field(default_factory=SecretsConfig)
 
-    def __init__(self, env_filepath: Path) -> None:
-        self.env_filepath = env_filepath
-        self.secrets = SecretsConfig(env_filepath=env_filepath)
-        self.repository = RepositoryConfig(env_filepath=env_filepath)
-        self.codebase = CodebaseConfig(env_filepath=env_filepath)
+    def __init__(self, root_path: Path) -> None:
+        self.env_filepath = root_path / ENV_FILENAME
+        self.secrets = SecretsConfig(root_path=root_path)
+        self.repository = RepositoryConfig(root_path=root_path)
+        self.codebase = CodebaseConfig(root_path=root_path)
 
     def save(self) -> None:
         """Save configuration to the config file."""

src/codegen/extensions/events/modal/base.py

@@ -8,7 +8,6 @@
 from codegen.extensions.events.codegen_app import CodegenApp
 from codegen.extensions.events.modal.request_util import fastapi_request_adapter
 from codegen.git.clients.git_repo_client import GitRepoClient
-from codegen.git.schemas.repo_config import RepoConfig
 
 logging.basicConfig(level=logging.INFO, force=True)
 logger = logging.getLogger(__name__)
@@ -36,17 +35,11 @@ def get_event_handler_cls(self) -> modal.Cls:
         raise NotImplementedError(msg)
 
     async def handle_event(self, org: str, repo: str, provider: Literal["slack", "github", "linear"], request: Request):
-        repo_config = RepoConfig(
-            name=repo,
-            full_name=f"{org}/{repo}",
-        )
-
         repo_snapshotdict = modal.Dict.from_name(self.snapshot_index_id, {}, create_if_missing=True)
-
         last_snapshot_commit = repo_snapshotdict.get(f"{org}/{repo}", None)
 
         if last_snapshot_commit is None:
-            git_client = GitRepoClient(repo_config=repo_config, access_token=os.environ["GITHUB_ACCESS_TOKEN"])
+            git_client = GitRepoClient(repo_full_name=f"{org}/{repo}", access_token=os.environ["GITHUB_ACCESS_TOKEN"])
             branch = git_client.get_branch_safe(git_client.default_branch)
             last_snapshot_commit = branch.commit.sha if branch and branch.commit else None
 
@@ -76,15 +69,8 @@ def refresh_repository_snapshots(self, snapshot_index_id: str):
             try:
                 # Parse the repository full name to get org and repo
                 org, repo = repo_full_name.split("/")
-
-                # Create a RepoConfig for the repository
-                repo_config = RepoConfig(
-                    name=repo,
-                    full_name=repo_full_name,
-                )
-
                 # Initialize the GitRepoClient to fetch the latest commit
-                git_client = GitRepoClient(repo_config=repo_config, access_token=os.environ["GITHUB_ACCESS_TOKEN"])
+                git_client = GitRepoClient(repo_full_name=repo_full_name, access_token=os.environ["GITHUB_ACCESS_TOKEN"])
 
                 # Get the default branch and its latest commit
                 branch = git_client.get_branch_safe(git_client.default_branch)

src/codegen/git/clients/git_repo_client.py

@@ -16,7 +16,6 @@
 
 from codegen.configs.models.secrets import SecretsConfig
 from codegen.git.clients.github_client import GithubClient
-from codegen.git.schemas.repo_config import RepoConfig
 from codegen.git.utils.format import format_comparison
 from codegen.shared.logging.get_logger import get_logger
 
@@ -26,22 +25,22 @@
 class GitRepoClient:
     """Wrapper around PyGithub's Remote Repository."""
 
-    repo_config: RepoConfig
+    repo_full_name: str
     gh_client: GithubClient
     _repo: Repository
 
-    def __init__(self, repo_config: RepoConfig, access_token: str | None = None) -> None:
-        self.repo_config = repo_config
+    def __init__(self, repo_full_name: str, access_token: str | None = None) -> None:
+        self.repo_full_name = repo_full_name
         self.gh_client = self._create_github_client(token=access_token or SecretsConfig().github_token)
         self._repo = self._create_client()
 
     def _create_github_client(self, token: str) -> GithubClient:
         return GithubClient(token=token)
 
     def _create_client(self) -> Repository:
-        client = self.gh_client.get_repo_by_full_name(self.repo_config.full_name)
+        client = self.gh_client.get_repo_by_full_name(self.repo_full_name)
         if not client:
-            msg = f"Repo {self.repo_config.full_name} not found!"
+            msg = f"Repo {self.repo_full_name} not found!"
             raise ValueError(msg)
         return client