Move gscli into codegen.gscli

docs/conftest.py

@@ -11,7 +11,8 @@
 from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.typescript.class_definition import TSClass
 from codegen.sdk.typescript.file import TSFile
-from gscli.generate.runner_imports import EXTERNAL_IMPORTS
+from codegen.gscli.generate.runner_imports import EXTERNAL_IMPORTS
+
 SAMPLE_FILENAME = {
     ProgrammingLanguage.PYTHON: "sample.py",
     ProgrammingLanguage.TYPESCRIPT: "sample.tsx",
@@ -20,6 +21,7 @@
     language: Path(__file__).parent / "samples" / name for language, name in SAMPLE_FILENAME.items()}
 SAMPLE_INPUT = {language: path.read_text() for language, path in SAMPLE_INPUT_PATH.items()}
 DEFAULT_LANGUAGE = ProgrammingLanguage.TYPESCRIPT
+
 @pytest.fixture(scope="function")
 def codebase(tmpdir):
     with get_codebase_session(tmpdir, programming_language=DEFAULT_LANGUAGE, files={SAMPLE_FILENAME[DEFAULT_LANGUAGE]: SAMPLE_INPUT[DEFAULT_LANGUAGE]}) as codebase:

hatch.toml

@@ -72,8 +72,8 @@ macos-max-compat = false
 [build]
 packages = [
     "src/codegen/sdk",
+    "src/codegen/gscli",
     "src/graph_visualization",
-    "src/gscli",
 ]
 
 [metadata.hooks.vcs]

pyproject.toml

@@ -61,7 +61,7 @@ classifiers = [
 "Intended Audience :: Developers", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Topic :: Software Development", "Development Status :: 4 - Beta", "Environment :: MacOS X", "Programming Language :: Python :: 3", "Programming Language :: Python", ]
 
 [project.scripts]
-gs = "gscli.main:main"
+gs = "codegen.gscli.main:main"
 run_string = "codegen.sdk.core.main:main"
 [project.optional-dependencies]
 types = [

src/gscli/generate/commands.py → src/codegen/gscli/generate/commands.py

@@ -8,6 +8,8 @@
 import inflection
 from termcolor import colored
 
+from codegen.gscli.generate.runner_imports import _generate_runner_imports
+from codegen.gscli.generate.utils import LanguageType, generate_builtins_file
 from codegen.sdk.code_generation.doc_utils.canonicals import get_canonical_codemod_class_mdx, get_canonical_codemod_classes
 from codegen.sdk.code_generation.doc_utils.skills import format_all_skills
 from codegen.sdk.code_generation.doc_utils.utils import get_all_classes_to_document
@@ -17,8 +19,6 @@
 from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.python import PyClass
 from codegen.sdk.skills.core.utils import get_all_skills, get_guide_skills_dict
-from gscli.generate.runner_imports import _generate_runner_imports
-from gscli.generate.utils import LanguageType, generate_builtins_file
 
 logger = logging.getLogger(__name__)
 

src/gscli/main.py → src/codegen/gscli/main.py

@@ -3,8 +3,8 @@
 
 import click
 
-from gscli.codemod.commands import codemod
-from gscli.generate.commands import generate
+from codegen.gscli.codemod.commands import codemod
+from codegen.gscli.generate.commands import generate
 
 
 @click.group()

src/codegen/sdk/testing/test_discovery.py

@@ -10,12 +10,12 @@
 import emoji
 from loguru import logger
 
+from codegen.gscli.generate.runner_imports import get_runner_imports
 from codegen.sdk.codemod import Codemod3
 from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.testing.constants import DIFF_FILEPATH
 from codegen.sdk.testing.models import BASE_PATH, CODEMOD_PATH, REPO_ID_TO_URL, TEST_DIR, VERIFIED_CODEMOD_DATA_DIR, VERIFIED_CODEMOD_DIFFS, ClonedRepoTestCase, CodemodMetadata, Repo, Size
 from codegen.sdk.testing.verified_codemod_utils import CodemodAPI, RepoCodemodMetadata, SkillTestConfig, anonymize_id
-from gscli.generate.runner_imports import get_runner_imports
 
 if TYPE_CHECKING:
     pass

src/graph_sitter_build/build.py

@@ -8,7 +8,7 @@
 def update_init_file(file: Path) -> None:
     path = Path(__file__).parent.parent
     sys.path.append(str(path))
-    from gscli.generate.runner_imports import generate_exported_modules, get_runner_imports
+    from codegen.gscli.generate.runner_imports import generate_exported_modules, get_runner_imports
 
     content = file.read_text()
     content = get_runner_imports(include_codegen=False) + "\n" + content + "\n" + generate_exported_modules()

tests/unit/test_cli.py

@@ -1,2 +1,2 @@
 def test_cli():
-    import gscli  # noqa: F401
+    import codegen.gscli  # noqa: F401