Skip to content

Commit f4a8327

Browse files
authored
refactor: move configs into its own module (#597)
1 parent 0a9750a commit f4a8327

File tree

31 files changed

+47
-47
lines changed

31 files changed

+47
-47
lines changed

codegen-examples/examples/pr_review_bot/run.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import codegen
44
from codegen import Codebase
5-
from codegen.shared.configs.models.codebase import CodebaseConfig
6-
from codegen.shared.configs.models.secrets import SecretsConfig
5+
from codegen.configs.models.codebase import CodebaseConfig
6+
from codegen.configs.models.secrets import SecretsConfig
77

88
github_token = "Your github token"
99
open_ai_key = "your open ai key"

codegen-examples/examples/sqlalchemy_soft_delete/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def process_soft_deletes(codebase):
9191

9292
if __name__ == "__main__":
9393
from codegen import Codebase
94-
from codegen.shared.configs.models.codebase import CodebaseConfig
94+
from codegen.configs.models.codebase import CodebaseConfig
9595

9696
repo_path = Path("/tmp/core")
9797
repo_url = "https://github.com/hasgeek/funnel.git"

docs/building-with-codegen/parsing-codebases.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ You can customize the behavior of your Codebase instance by passing a `CodebaseC
6969

7070
```python
7171
from codegen import Codebase
72-
from codegen.shared.configs.models.codebase import CodebaseConfig
73-
from codegen.shared.configs.models.secrets import SecretsConfig
72+
from codegen.configs.models.codebase import CodebaseConfig
73+
from codegen.configs.models.secrets import SecretsConfig
7474

7575
codebase = Codebase(
7676
"path/to/repository",

src/codegen/cli/auth/session.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
from codegen.cli.git.repo import get_git_repo
99
from codegen.cli.rich.codeblocks import format_command
10+
from codegen.configs.constants import CODEGEN_DIR_NAME, ENV_FILENAME
11+
from codegen.configs.session_manager import session_manager
12+
from codegen.configs.user_config import UserConfig
1013
from codegen.git.repo_operator.local_git_repo import LocalGitRepo
11-
from codegen.shared.configs.constants import CODEGEN_DIR_NAME, ENV_FILENAME
12-
from codegen.shared.configs.session_manager import session_manager
13-
from codegen.shared.configs.user_config import UserConfig
1414

1515

1616
class CodegenSession:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import rich_click as click
55
from rich.table import Table
66

7-
from codegen.shared.configs.constants import ENV_FILENAME, GLOBAL_ENV_FILE
8-
from codegen.shared.configs.session_manager import session_manager
9-
from codegen.shared.configs.user_config import UserConfig
7+
from codegen.configs.constants import ENV_FILENAME, GLOBAL_ENV_FILE
8+
from codegen.configs.session_manager import session_manager
9+
from codegen.configs.user_config import UserConfig
1010

1111

1212
@click.group(name="config")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,8 +1385,8 @@ def baz():
13851385
13861386
```python
13871387
from codegen import Codebase
1388-
from codegen.shared.configs.models.codebase import CodebaseConfig
1389-
from codegen.shared.configs.models.secrets import SecretsConfig
1388+
from codegen.configs.models.codebase import CodebaseConfig
1389+
from codegen.configs.models.secrets import SecretsConfig
13901390
13911391
codebase = Codebase(
13921392
"path/to/repository",

src/codegen/shared/configs/models/base_config.py renamed to src/codegen/configs/models/base_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from dotenv import set_key
55
from pydantic_settings import BaseSettings, SettingsConfigDict
66

7-
from codegen.shared.configs.constants import ENV_FILENAME, GLOBAL_ENV_FILE
8-
from codegen.shared.configs.session_manager import session_root
7+
from codegen.configs.constants import ENV_FILENAME, GLOBAL_ENV_FILE
8+
from codegen.configs.session_manager import session_root
99

1010

1111
class BaseConfig(BaseSettings, ABC):

src/codegen/shared/configs/models/codebase.py renamed to src/codegen/configs/models/codebase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pydantic import Field
22

3-
from codegen.shared.configs.models.base_config import BaseConfig
3+
from codegen.configs.models.base_config import BaseConfig
44

55

66
class CodebaseConfig(BaseConfig):

src/codegen/shared/configs/models/repository.py renamed to src/codegen/configs/models/repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22

3-
from codegen.shared.configs.models.base_config import BaseConfig
3+
from codegen.configs.models.base_config import BaseConfig
44

55

66
class RepositoryConfig(BaseConfig):

src/codegen/shared/configs/models/secrets.py renamed to src/codegen/configs/models/secrets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from codegen.shared.configs.models.base_config import BaseConfig
1+
from codegen.configs.models.base_config import BaseConfig
22

33

44
class SecretsConfig(BaseConfig):

src/codegen/shared/configs/session_manager.py renamed to src/codegen/configs/session_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import json
44
from pathlib import Path
55

6-
from codegen.shared.configs.constants import CODEGEN_DIR_NAME, SESSION_FILE
6+
from codegen.configs.constants import CODEGEN_DIR_NAME, SESSION_FILE
77

88

99
class SessionManager:

src/codegen/shared/configs/user_config.py renamed to src/codegen/configs/user_config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
from pydantic import Field
55

6-
from codegen.shared.configs.models.codebase import CodebaseConfig
7-
from codegen.shared.configs.models.repository import RepositoryConfig
8-
from codegen.shared.configs.models.secrets import SecretsConfig
6+
from codegen.configs.models.codebase import CodebaseConfig
7+
from codegen.configs.models.repository import RepositoryConfig
8+
from codegen.configs.models.secrets import SecretsConfig
99

1010

1111
class UserConfig:

src/codegen/extensions/lsp/protocol.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from lsprotocol.types import INITIALIZE, InitializeParams, InitializeResult
66
from pygls.protocol import LanguageServerProtocol, lsp_method
77

8+
from codegen.configs.models.codebase import DefaultCodebaseConfig
89
from codegen.extensions.lsp.io import LSPIO
910
from codegen.extensions.lsp.progress import LSPProgress
1011
from codegen.extensions.lsp.utils import get_path
1112
from codegen.sdk.core.codebase import Codebase
12-
from codegen.shared.configs.models.codebase import DefaultCodebaseConfig
1313

1414
if TYPE_CHECKING:
1515
from codegen.extensions.lsp.server import CodegenLanguageServer

src/codegen/git/repo_operator/repo_operator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from git.remote import PushInfoList
1717
from github.PullRequest import PullRequest
1818

19+
from codegen.configs.models.secrets import DefaultSecrets
1920
from codegen.git.clients.git_repo_client import GitRepoClient
2021
from codegen.git.configs.constants import CODEGEN_BOT_EMAIL, CODEGEN_BOT_NAME
2122
from codegen.git.repo_operator.local_git_repo import LocalGitRepo
@@ -26,7 +27,6 @@
2627
from codegen.git.utils.codeowner_utils import create_codeowners_parser_for_repo
2728
from codegen.git.utils.file_utils import create_files
2829
from codegen.git.utils.remote_progress import CustomRemoteProgress
29-
from codegen.shared.configs.models.secrets import DefaultSecrets
3030
from codegen.shared.performance.stopwatch_utils import stopwatch
3131
from codegen.shared.performance.time_utils import humanize_duration
3232

src/codegen/runner/clients/codebase_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import logging
44

5+
from codegen.configs.models import secrets
56
from codegen.git.schemas.repo_config import RepoConfig
67
from codegen.runner.clients.server_client import LocalServerClient
78
from codegen.runner.models.apis import SANDBOX_SERVER_PORT
8-
from codegen.shared.configs.models import secrets
99

1010
logger = logging.getLogger(__name__)
1111

src/codegen/runner/sandbox/server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import psutil
88
from fastapi import FastAPI
99

10+
from codegen.configs.models.repository import DefaultRepoConfig
11+
from codegen.configs.models.secrets import DefaultSecrets
1012
from codegen.git.schemas.repo_config import RepoConfig
1113
from codegen.runner.enums.warmup_state import WarmupState
1214
from codegen.runner.models.apis import (
@@ -23,8 +25,6 @@
2325
)
2426
from codegen.runner.sandbox.middlewares import CodemodRunMiddleware
2527
from codegen.runner.sandbox.runner import SandboxRunner
26-
from codegen.shared.configs.models.repository import DefaultRepoConfig
27-
from codegen.shared.configs.models.secrets import DefaultSecrets
2828
from codegen.shared.enums.programming_language import ProgrammingLanguage
2929
from codegen.shared.performance.memory_utils import get_memory_stats
3030

src/codegen/sdk/code_generation/codegen_sdk_codebase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os.path
22

3+
from codegen.configs.models.codebase import DefaultCodebaseConfig
34
from codegen.sdk.code_generation.current_code_codebase import get_codegen_codebase_base_path, get_current_code_codebase
45
from codegen.sdk.core.codebase import Codebase
5-
from codegen.shared.configs.models.codebase import DefaultCodebaseConfig
66

77

88
def get_codegen_sdk_subdirectories() -> list[str]:

src/codegen/sdk/code_generation/current_code_codebase.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from pathlib import Path
55
from typing import TypedDict
66

7+
from codegen.configs.models.codebase import CodebaseConfig, DefaultCodebaseConfig
8+
from codegen.configs.models.secrets import DefaultSecrets, SecretsConfig
79
from codegen.git.repo_operator.repo_operator import RepoOperator
810
from codegen.git.schemas.repo_config import RepoConfig
911
from codegen.sdk.codebase.config import ProjectConfig
1012
from codegen.sdk.core.codebase import Codebase, CodebaseType
11-
from codegen.shared.configs.models.codebase import CodebaseConfig, DefaultCodebaseConfig
12-
from codegen.shared.configs.models.secrets import DefaultSecrets, SecretsConfig
1313
from codegen.shared.decorators.docs import DocumentedObject, apidoc_objects, no_apidoc_objects, py_apidoc_objects, ts_apidoc_objects
1414
from codegen.shared.enums.programming_language import ProgrammingLanguage
1515

src/codegen/sdk/codebase/codebase_context.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
from rustworkx import PyDiGraph, WeightedEdgeList
1313

14+
from codegen.configs.models.codebase import DefaultCodebaseConfig
15+
from codegen.configs.models.secrets import DefaultSecrets, SecretsConfig
1416
from codegen.sdk.codebase.config import ProjectConfig, SessionOptions
1517
from codegen.sdk.codebase.config_parser import ConfigParser, get_config_parser_for_language
1618
from codegen.sdk.codebase.diff_lite import ChangeType, DiffLite
@@ -27,8 +29,6 @@
2729
from codegen.sdk.extensions.sort import sort_editables
2830
from codegen.sdk.extensions.utils import uncache_all
2931
from codegen.sdk.typescript.external.ts_declassify.ts_declassify import TSDeclassify
30-
from codegen.shared.configs.models.codebase import DefaultCodebaseConfig
31-
from codegen.shared.configs.models.secrets import DefaultSecrets, SecretsConfig
3232
from codegen.shared.enums.programming_language import ProgrammingLanguage
3333
from codegen.shared.exceptions.control_flow import StopCodemodException
3434
from codegen.shared.performance.stopwatch_utils import stopwatch, stopwatch_with_sentry
@@ -39,6 +39,7 @@
3939
from codeowners import CodeOwners as CodeOwnersParser
4040
from git import Commit as GitCommit
4141

42+
from codegen.configs.models.codebase import CodebaseConfig
4243
from codegen.git.repo_operator.repo_operator import RepoOperator
4344
from codegen.sdk.codebase.io.io import IO
4445
from codegen.sdk.codebase.node_classes.node_classes import NodeClasses
@@ -50,7 +51,6 @@
5051
from codegen.sdk.core.interfaces.importable import Importable
5152
from codegen.sdk.core.node_id_factory import NodeId
5253
from codegen.sdk.core.parser import Parser
53-
from codegen.shared.configs.models.codebase import CodebaseConfig
5454

5555
import logging
5656

src/codegen/sdk/codebase/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from pydantic.config import ConfigDict
66
from pydantic.fields import Field
77

8+
from codegen.configs.models.codebase import DefaultCodebaseConfig
89
from codegen.git.repo_operator.repo_operator import RepoOperator
910
from codegen.git.schemas.repo_config import RepoConfig
1011
from codegen.git.utils.file_utils import split_git_path
1112
from codegen.git.utils.language import determine_project_language
12-
from codegen.shared.configs.models.codebase import DefaultCodebaseConfig
1313
from codegen.shared.enums.programming_language import ProgrammingLanguage
1414

1515
HARD_MAX_AI_LIMIT = 500 # Global limit for AI requests

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
from codegen.configs.models.codebase import CodebaseConfig
2+
from codegen.configs.models.secrets import DefaultSecrets, SecretsConfig
13
from codegen.git.repo_operator.repo_operator import RepoOperator
24
from codegen.sdk.codebase.config import DefaultCodebaseConfig, ProjectConfig
35
from codegen.sdk.core.codebase import (
46
Codebase,
57
CodebaseType,
68
)
7-
from codegen.shared.configs.models.codebase import CodebaseConfig
8-
from codegen.shared.configs.models.secrets import DefaultSecrets, SecretsConfig
99
from codegen.shared.enums.programming_language import ProgrammingLanguage
1010

1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
from contextlib import AbstractContextManager, contextmanager
55
from typing import Literal, overload
66

7+
from codegen.configs.models.codebase import CodebaseConfig
8+
from codegen.configs.models.secrets import DefaultSecrets, SecretsConfig
79
from codegen.git.repo_operator.repo_operator import RepoOperator
810
from codegen.sdk.codebase.codebase_context import CodebaseContext
911
from codegen.sdk.codebase.config import ProjectConfig, SessionOptions, TestFlags
1012
from codegen.sdk.codebase.factory.codebase_factory import CodebaseFactory
1113
from codegen.sdk.core.codebase import Codebase, PyCodebaseType, TSCodebaseType
1214
from codegen.sdk.core.file import SourceFile
1315
from codegen.sdk.tree_sitter_parser import print_errors
14-
from codegen.shared.configs.models.codebase import CodebaseConfig
15-
from codegen.shared.configs.models.secrets import DefaultSecrets, SecretsConfig
1616
from codegen.shared.enums.programming_language import ProgrammingLanguage
1717

1818

src/codegen/sdk/core/codebase.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
from rich.console import Console
2323
from typing_extensions import TypeVar, deprecated
2424

25+
from codegen.configs.models.codebase import CodebaseConfig, DefaultCodebaseConfig
26+
from codegen.configs.models.secrets import DefaultSecrets, SecretsConfig
2527
from codegen.git.repo_operator.repo_operator import RepoOperator
2628
from codegen.git.schemas.enums import CheckoutResult
2729
from codegen.git.utils.pr_review import CodegenPR
@@ -78,8 +80,6 @@
7880
from codegen.sdk.typescript.statements.import_statement import TSImportStatement
7981
from codegen.sdk.typescript.symbol import TSSymbol
8082
from codegen.sdk.typescript.type_alias import TSTypeAlias
81-
from codegen.shared.configs.models.codebase import CodebaseConfig, DefaultCodebaseConfig
82-
from codegen.shared.configs.models.secrets import DefaultSecrets, SecretsConfig
8383
from codegen.shared.decorators.docs import apidoc, noapidoc, py_noapidoc
8484
from codegen.shared.enums.programming_language import ProgrammingLanguage
8585
from codegen.shared.exceptions.control_flow import MaxAIRequestsError

src/codegen/sdk/system-prompt.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,8 +1407,8 @@ You can customize the behavior of your Codebase instance by passing a `CodebaseC
14071407

14081408
```python
14091409
from codegen import Codebase
1410-
from codegen.shared.configs.models.codebase import CodebaseConfig
1411-
from codegen.shared.configs.models.secrets import SecretsConfig
1410+
from codegen.configs.models.codebase import CodebaseConfig
1411+
from codegen.configs.models.secrets import SecretsConfig
14121412

14131413
codebase = Codebase(
14141414
"path/to/repository",

tests/integration/codegen/runner/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
import pytest
77

8+
from codegen.configs.models.secrets import DefaultSecrets
89
from codegen.git.clients.git_repo_client import GitRepoClient
910
from codegen.git.repo_operator.repo_operator import RepoOperator
1011
from codegen.git.schemas.enums import SetupOption
1112
from codegen.git.schemas.repo_config import RepoConfig
1213
from codegen.runner.clients.codebase_client import CodebaseClient
13-
from codegen.shared.configs.models.secrets import DefaultSecrets
1414
from codegen.shared.enums.programming_language import ProgrammingLanguage
1515

1616

tests/integration/codemod/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
from _pytest.python import Metafunc
1111
from pyinstrument import Profiler
1212

13+
from codegen.configs.models.codebase import CodebaseConfig
1314
from codegen.git.repo_operator.repo_operator import RepoOperator
1415
from codegen.sdk.codebase.config import ProjectConfig
1516
from codegen.sdk.core.codebase import Codebase
16-
from codegen.shared.configs.models.codebase import CodebaseConfig
1717
from tests.shared.codemod.constants import DIFF_FILEPATH
1818
from tests.shared.codemod.models import BASE_PATH, BASE_TMP_DIR, VERIFIED_CODEMOD_DIFFS, CodemodMetadata, Repo, Size
1919
from tests.shared.codemod.test_discovery import find_codemod_test_cases, find_repos, find_verified_codemod_cases

tests/integration/codemod/test_parse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import psutil
66
import pytest
77

8+
from codegen.configs.models.codebase import DefaultCodebaseConfig
89
from codegen.git.repo_operator.repo_operator import RepoOperator
910
from codegen.sdk.codebase.config import ProjectConfig
1011
from codegen.sdk.codebase.validation import PostInitValidationStatus, post_init_validation
1112
from codegen.sdk.core.codebase import Codebase
12-
from codegen.shared.configs.models.codebase import DefaultCodebaseConfig
1313
from tests.shared.codemod.models import Repo
1414
from tests.shared.utils.recursion import set_recursion_limit
1515

tests/shared/codemod/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
from pydantic import BaseModel, ConfigDict
1111

12+
from codegen.configs.models.codebase import CodebaseConfig
1213
from codegen.git.repo_operator.repo_operator import RepoOperator
13-
from codegen.shared.configs.models.codebase import CodebaseConfig
1414
from codegen.shared.enums.programming_language import ProgrammingLanguage
1515
from tests.shared.codemod.constants import DIFF_FILEPATH
1616
from tests.shared.codemod.verified_codemod_utils import CodemodAPI

tests/unit/codegen/sdk/core/test_directory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
import pytest
77

8+
from codegen.configs.models.codebase import DefaultCodebaseConfig
89
from codegen.sdk.codebase.codebase_context import CodebaseContext
910
from codegen.sdk.codebase.factory.get_session import get_codebase_session
1011
from codegen.sdk.core.directory import Directory
1112
from codegen.sdk.core.file import File
12-
from codegen.shared.configs.models.codebase import DefaultCodebaseConfig
1313
from codegen.shared.enums.programming_language import ProgrammingLanguage
1414

1515

0 commit comments

Comments
 (0)