Move codegen-git into codegen.git

.circleci/config.yml

@@ -96,9 +96,6 @@ commands:
     - run:
         command: |
           uv run --frozen cibuildwheel --output-dir dist
-          if [[ "<<parameters.base_packages>>" == "true" ]]; then
-            uv build --package codegen-git --wheel --sdist
-          fi
           rm dist/.gitignore || true
         environment:
           HATCH_BUILD_HOOKS_ENABLE: "true"

.github/codecov.yml

@@ -29,11 +29,6 @@ component_management:
       name: codegen-sdk-core
       paths:
         - src/codegen/sdk/**
-    - component_id: codegen-git
-      name: codegen-git
-      paths:
-        - codegen-git/**
-
 
 flag_management:
   default_rules:

.github/workflows/release.yml

@@ -32,7 +32,6 @@ jobs:
       - name: Build release distributions
         run: |
           uv build --wheel
-          uv build --package codegen-git --wheel
         env:
           HATCH_BUILD_HOOKS_ENABLE: true
       - name: Upload distributions

.pre-commit-config.yaml

@@ -69,7 +69,7 @@ repos:
       - id: deptry
         pass_filenames: false
         always_run: true
-        entry: bash -c "uv run --frozen --all-extras --dev deptry src codegen-git/src --ignore DEP001"
+        entry: bash -c "uv run --frozen --all-extras --dev deptry src --ignore DEP001"
   - repo: "local"
     hooks:
       - id: disallowed-words-check

pyproject.toml

@@ -32,7 +32,6 @@ dependencies = [
     "docstring-parser<1.0,>=0.16",
     "plotly<6.0.0,>=5.24.0",
     "humanize<5.0.0,>=4.10.0",
-    "codegen-git",
     "autoflake>=2.3.1",
     "black>=24.8.0",
     "pytest-snapshot>=0.9.0",
@@ -54,6 +53,8 @@ dependencies = [
     "pyinstrument>=5.0.0",
     "pip>=24.3.1", # This is needed for some NPM/YARN/PNPM post-install scripts to work!
     "emoji>=2.14.0",
+    "PyGithub==2.5.0",
+    "GitPython==3.1.44",
 ]
 license = {file = "LICENSE"}
 classifiers = [
@@ -101,7 +102,7 @@ keyring-provider = "subprocess"
 #extra-index-url = ["https://[email protected]/pypi/codegen/simple/"]
 publish-url = "https://codegen-922078275900.d.codeartifact.us-east-1.amazonaws.com/pypi/codegen/"
 [tool.uv.workspace]
-members = ["codegen-git"]
+members = []
 
 [tool.cython-lint]
 max-line-length = 200
@@ -147,7 +148,7 @@ lint.exclude = [
 ] # disable just linting for notebooks (allow for formatting)
 lint.pydocstyle.convention = "google"
 [tool.ruff.lint.isort]
-known-first-party = ["app", "codegen_git"]
+known-first-party = ["app"]
 known-third-party = ["git"]
 #known-local-folder=[]
 [tool.coverage.run]
@@ -200,9 +201,6 @@ junit_logging = "all"
 requires = ["hatchling>=1.26.3", "hatch-vcs>=0.4.0", "setuptools-scm>=8.0.0"]
 build-backend = "hatchling.build"
 
-[tool.uv.sources]
-codegen-git = { workspace = true }
-
 [tool.deptry]
 extend_exclude = [".*/eval/test_files/.*.py", ".*conftest.py"]
 pep621_dev_dependency_groups = ["types"]
@@ -213,6 +211,7 @@ DEP004 = "pytest"
 
 [tool.deptry.package_module_name_map]
 python-levenshtein = ["Levenshtein"]
+PyGithub = ["github"]
 [tool.cibuildwheel]
 build-frontend = "build[uv]"
 skip = ["*-musllinux_i686", "*-manylinux_i686", "*-musllinux_x86_64"]

codegen-git/src/codegen_git/clients/git_integration_client.py → src/codegen/git/clients/git_integration_client.py

@@ -6,7 +6,7 @@
 from github.Installation import Installation
 from github.InstallationAuthorization import InstallationAuthorization
 
-from codegen_git.schemas.github import GithubType
+from codegen.git.schemas.github import GithubType
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/clients/git_repo_client.py → src/codegen/git/clients/git_repo_client.py

@@ -14,11 +14,11 @@
 from github.Tag import Tag
 from github.Workflow import Workflow
 
-from codegen_git.clients.github_client_factory import GithubClientFactory
-from codegen_git.clients.types import GithubClientType
-from codegen_git.schemas.github import GithubScope, GithubType
-from codegen_git.schemas.repo_config import RepoConfig
-from codegen_git.utils.format import format_comparison
+from codegen.git.clients.github_client_factory import GithubClientFactory
+from codegen.git.clients.types import GithubClientType
+from codegen.git.schemas.github import GithubScope, GithubType
+from codegen.git.schemas.repo_config import RepoConfig
+from codegen.git.utils.format import format_comparison
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/clients/github_client.py → src/codegen/git/clients/github_client.py

@@ -7,9 +7,9 @@
 from github.Organization import Organization
 from github.Repository import Repository
 
-from codegen_git.configs.token import get_token_for_repo_config
-from codegen_git.schemas.github import GithubScope, GithubType
-from codegen_git.schemas.repo_config import RepoConfig
+from codegen.git.configs.token import get_token_for_repo_config
+from codegen.git.schemas.github import GithubScope, GithubType
+from codegen.git.schemas.repo_config import RepoConfig
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/clients/github_client_factory.py → src/codegen/git/clients/github_client_factory.py

@@ -1,8 +1,8 @@
-from codegen_git.clients.github_client import GithubClient
-from codegen_git.clients.github_enterprise_client import GithubEnterpriseClient
-from codegen_git.clients.types import GithubClientType
-from codegen_git.schemas.github import GithubType
-from codegen_git.schemas.repo_config import RepoConfig
+from codegen.git.clients.github_client import GithubClient
+from codegen.git.clients.github_enterprise_client import GithubEnterpriseClient
+from codegen.git.clients.types import GithubClientType
+from codegen.git.schemas.github import GithubType
+from codegen.git.schemas.repo_config import RepoConfig
 
 
 class GithubClientFactory:

codegen-git/src/codegen_git/clients/github_enterprise_client.py → src/codegen/git/clients/github_enterprise_client.py

@@ -1,6 +1,6 @@
-from codegen_git.clients.github_client import GithubClient
-from codegen_git.configs.config import config
-from codegen_git.schemas.github import GithubType
+from codegen.git.clients.github_client import GithubClient
+from codegen.git.configs.config import config
+from codegen.git.schemas.github import GithubType
 
 
 class GithubEnterpriseClient(GithubClient):

src/codegen/git/clients/types.py

@@ -0,0 +1,4 @@
+from codegen.git.clients.github_client import GithubClient
+from codegen.git.clients.github_enterprise_client import GithubEnterpriseClient
+
+GithubClientType = GithubClient | GithubEnterpriseClient

codegen-git/src/codegen_git/configs/token.py → src/codegen/git/configs/token.py

@@ -1,8 +1,8 @@
 import logging
 
-from codegen_git.configs.config import config
-from codegen_git.schemas.github import GithubType
-from codegen_git.schemas.repo_config import RepoConfig
+from codegen.git.configs.config import config
+from codegen.git.schemas.github import GithubType
+from codegen.git.schemas.repo_config import RepoConfig
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/repo_operator/local_repo_operator.py → src/codegen/git/repo_operator/local_repo_operator.py

@@ -7,11 +7,11 @@
 from git import Repo as GitCLI
 from git.remote import PushInfoList
 
-from codegen_git.repo_operator.repo_operator import RepoOperator
-from codegen_git.schemas.enums import FetchResult
-from codegen_git.schemas.repo_config import BaseRepoConfig
-from codegen_git.utils.clone_url import url_to_github
-from codegen_git.utils.file_utils import create_files
+from codegen.git.repo_operator.repo_operator import RepoOperator
+from codegen.git.schemas.enums import FetchResult
+from codegen.git.schemas.repo_config import BaseRepoConfig
+from codegen.git.utils.clone_url import url_to_github
+from codegen.git.utils.file_utils import create_files
 
 
 class OperatorIsLocal(Exception):

codegen-git/src/codegen_git/repo_operator/remote_repo_operator.py → src/codegen/git/repo_operator/remote_repo_operator.py

@@ -7,16 +7,16 @@
 from git import GitCommandError, Remote
 from git.remote import PushInfoList
 
-from codegen_git.clients.git_repo_client import GitRepoClient
-from codegen_git.repo_operator.repo_operator import RepoOperator
-from codegen_git.schemas.enums import CheckoutResult, FetchResult, SetupOption
-from codegen_git.schemas.github import GithubScope, GithubType
-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 get_clone_url_for_repo_config, url_to_github
-from codegen_git.utils.codeowner_utils import create_codeowners_parser_for_repo
-from codegen_git.utils.remote_progress import CustomRemoteProgress
-from codegen_git.utils.stopwatch_utils import stopwatch
+from codegen.git.clients.git_repo_client import GitRepoClient
+from codegen.git.repo_operator.repo_operator import RepoOperator
+from codegen.git.schemas.enums import CheckoutResult, FetchResult, SetupOption
+from codegen.git.schemas.github import GithubScope, GithubType
+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 get_clone_url_for_repo_config, url_to_github
+from codegen.git.utils.codeowner_utils import create_codeowners_parser_for_repo
+from codegen.git.utils.remote_progress import CustomRemoteProgress
+from codegen.git.utils.stopwatch_utils import stopwatch
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/repo_operator/repo_operator.py → src/codegen/git/repo_operator/repo_operator.py

@@ -14,11 +14,11 @@
 from git import Repo as GitCLI
 from git.remote import PushInfoList
 
-from codegen_git.configs.constants import CODEGEN_BOT_EMAIL, CODEGEN_BOT_NAME
-from codegen_git.schemas.enums import CheckoutResult, FetchResult
-from codegen_git.schemas.repo_config import BaseRepoConfig
-from codegen_git.utils.stopwatch_utils import stopwatch
-from codegen_git.utils.time_utils import humanize_duration
+from codegen.git.configs.constants import CODEGEN_BOT_EMAIL, CODEGEN_BOT_NAME
+from codegen.git.schemas.enums import CheckoutResult, FetchResult
+from codegen.git.schemas.repo_config import BaseRepoConfig
+from codegen.git.utils.stopwatch_utils import stopwatch
+from codegen.git.utils.time_utils import humanize_duration
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/utils/clone.py → src/codegen/git/utils/clone.py

@@ -2,10 +2,10 @@
 import os
 import subprocess
 
-from codegen_git.schemas.github import GithubType
-from codegen_git.schemas.repo_config import RepoConfig
-from codegen_git.utils.clone_url import get_authenticated_clone_url_for_repo_config
-from codegen_git.utils.stopwatch_utils import subprocess_with_stopwatch
+from codegen.git.schemas.github import GithubType
+from codegen.git.schemas.repo_config import RepoConfig
+from codegen.git.utils.clone_url import get_authenticated_clone_url_for_repo_config
+from codegen.git.utils.stopwatch_utils import subprocess_with_stopwatch
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/utils/clone_url.py → src/codegen/git/utils/clone_url.py

@@ -1,8 +1,8 @@
 from urllib.parse import urlparse
 
-from codegen_git.configs.token import get_token_for_repo_config
-from codegen_git.schemas.github import GithubType
-from codegen_git.schemas.repo_config import RepoConfig
+from codegen.git.configs.token import get_token_for_repo_config
+from codegen.git.schemas.github import GithubType
+from codegen.git.schemas.repo_config import RepoConfig
 
 
 def url_to_github(url: str, branch: str) -> str:

codegen-git/src/codegen_git/utils/codeowner_utils.py → src/codegen/git/utils/codeowner_utils.py

@@ -3,8 +3,8 @@
 from codeowners import CodeOwners
 from github.PullRequest import PullRequest
 
-from codegen_git.clients.git_repo_client import GitRepoClient
-from codegen_git.configs.constants import CODEOWNERS_FILEPATHS
+from codegen.git.clients.git_repo_client import GitRepoClient
+from codegen.git.configs.constants import CODEOWNERS_FILEPATHS
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/utils/remote_progress.py → src/codegen/git/utils/remote_progress.py

@@ -3,7 +3,7 @@
 
 from git import RemoteProgress
 
-from codegen_git.schemas.enums import FetchResult
+from codegen.git.schemas.enums import FetchResult
 
 logger = logging.getLogger(__name__)
 

codegen-git/src/codegen_git/utils/stopwatch_utils.py → src/codegen/git/utils/stopwatch_utils.py

@@ -5,7 +5,7 @@
 
 import sentry_sdk
 
-from codegen_git.utils.time_utils import humanize_duration
+from codegen.git.utils.time_utils import humanize_duration
 
 logger = logging.getLogger(__name__)
 

src/codegen/sdk/code_generation/current_code_codebase.py

@@ -4,12 +4,12 @@
 from pathlib import Path
 from typing import TypedDict
 
+from codegen.git.repo_operator.local_repo_operator import LocalRepoOperator
+from codegen.git.schemas.repo_config import BaseRepoConfig
 from codegen.sdk.codebase.config import CodebaseConfig, DefaultConfig, ProjectConfig
 from codegen.sdk.core.codebase import Codebase, CodebaseType
 from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.writer_decorators import DocumentedObject, apidoc_objects, no_apidoc_objects, py_apidoc_objects, ts_apidoc_objects
-from codegen_git.repo_operator.local_repo_operator import LocalRepoOperator
-from codegen_git.schemas.repo_config import BaseRepoConfig
 
 logger = logging.getLogger(__name__)
 

src/codegen/sdk/codebase/codebase_graph.py

@@ -15,6 +15,8 @@
 from git import Commit as GitCommit
 from rustworkx import PyDiGraph, WeightedEdgeList
 
+from codegen.git.repo_operator.repo_operator import RepoOperator
+from codegen.git.utils.stopwatch_utils import stopwatch, stopwatch_with_sentry
 from codegen.sdk.codebase.config import CodebaseConfig, DefaultConfig, ProjectConfig, SessionOptions
 from codegen.sdk.codebase.config_parser import ConfigParser, get_config_parser_for_language
 from codegen.sdk.codebase.control_flow import StopCodemodException
@@ -33,8 +35,6 @@
 from codegen.sdk.extensions.sort import sort_editables
 from codegen.sdk.extensions.utils import uncache_all
 from codegen.sdk.typescript.external.ts_declassify.ts_declassify import TSDeclassify
-from codegen_git.repo_operator.repo_operator import RepoOperator
-from codegen_git.utils.stopwatch_utils import stopwatch, stopwatch_with_sentry
 
 if TYPE_CHECKING:
     from codegen.sdk.codebase.node_classes.node_classes import NodeClasses

src/codegen/sdk/codebase/config.py

@@ -1,8 +1,8 @@
 from pydantic import BaseModel, ConfigDict, Field
 
+from codegen.git.repo_operator.repo_operator import RepoOperator
 from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.secrets import Secrets
-from codegen_git.repo_operator.repo_operator import RepoOperator
 
 HARD_MAX_AI_LIMIT = 500  # Global limit for AI requests
 

src/codegen/sdk/codebase/factory/codebase_factory.py

@@ -1,11 +1,11 @@
+from codegen.git.repo_operator.local_repo_operator import LocalRepoOperator
+from codegen.git.schemas.repo_config import BaseRepoConfig
 from codegen.sdk.codebase.config import CodebaseConfig, ProjectConfig
 from codegen.sdk.core.codebase import (
     Codebase,
     CodebaseType,
 )
 from codegen.sdk.enums import ProgrammingLanguage
-from codegen_git.repo_operator.local_repo_operator import LocalRepoOperator
-from codegen_git.schemas.repo_config import BaseRepoConfig
 
 
 class CodebaseFactory: