Skip to content

Commit 0738b5f

Browse files
committed
chore: merge RepositoryConfig and RepoConfig
1 parent f64f455 commit 0738b5f

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import modal
66
from fastapi import Request
77

8+
from codegen.configs.models.repository import RepositoryConfig
89
from codegen.extensions.events.codegen_app import CodegenApp
910
from codegen.extensions.events.modal.request_util import fastapi_request_adapter
1011
from codegen.git.clients.git_repo_client import GitRepoClient
@@ -36,9 +37,9 @@ def get_event_handler_cls(self) -> modal.Cls:
3637
raise NotImplementedError(msg)
3738

3839
async def handle_event(self, org: str, repo: str, provider: Literal["slack", "github", "linear"], request: Request):
39-
repo_config = RepoConfig(
40+
repo_config = RepositoryConfig(
4041
name=repo,
41-
full_name=f"{org}/{repo}",
42+
owner=org,
4243
)
4344

4445
repo_snapshotdict = modal.Dict.from_name(self.snapshot_index_id, {}, create_if_missing=True)

src/codegen/git/clients/git_repo_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
from github.Tag import Tag
1515
from github.Workflow import Workflow
1616

17+
from codegen.configs.models.repository import RepositoryConfig
1718
from codegen.configs.models.secrets import SecretsConfig
1819
from codegen.git.clients.github_client import GithubClient
19-
from codegen.git.schemas.repo_config import RepoConfig
2020
from codegen.git.utils.format import format_comparison
2121
from codegen.shared.logging.get_logger import get_logger
2222

@@ -26,11 +26,11 @@
2626
class GitRepoClient:
2727
"""Wrapper around PyGithub's Remote Repository."""
2828

29-
repo_config: RepoConfig
29+
repo_config: RepositoryConfig
3030
gh_client: GithubClient
3131
_repo: Repository
3232

33-
def __init__(self, repo_config: RepoConfig, access_token: str | None = None) -> None:
33+
def __init__(self, repo_config: RepositoryConfig, access_token: str | None = None) -> None:
3434
self.repo_config = repo_config
3535
self.gh_client = self._create_github_client(token=access_token or SecretsConfig().github_token)
3636
self._repo = self._create_client()

src/codegen/git/repo_operator/local_git_repo.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from git import Repo
77
from git.remote import Remote
88

9+
from codegen.configs.models.repository import RepositoryConfig
910
from codegen.git.clients.git_repo_client import GitRepoClient
1011
from codegen.git.schemas.repo_config import RepoConfig
1112
from codegen.git.utils.language import determine_project_language
@@ -18,6 +19,16 @@ class LocalGitRepo:
1819
def __init__(self, repo_path: Path):
1920
self.repo_path = repo_path
2021

22+
@staticmethod
23+
def get_repository_config(repo_path: Path) -> RepositoryConfig:
24+
repo_config = RepositoryConfig()
25+
26+
# self.config.repository.path = self.config.repository.path or str(self.local_git.repo_path)
27+
# self.config.repository.owner = self.config.repository.owner or self.local_git.owner
28+
# self.config.repository.user_name = self.config.repository.user_name or self.local_git.user_name
29+
# self.config.repository.user_email = self.config.repository.user_email or self.local_git.user_email
30+
# self.config.repository.language = self.config.repository.language or self.local_git.get_language(access_token=self.config.secrets.github_token).upper()
31+
2132
@cached_property
2233
def git_cli(self) -> Repo:
2334
return Repo(self.repo_path)

0 commit comments

Comments
 (0)