From 25f6ce13b2cd57a14f3c30ed9efdd63a61d6261f Mon Sep 17 00:00:00 2001 From: Edward Li Date: Thu, 23 Jan 2025 15:10:32 -0800 Subject: [PATCH] Move `gscli` into `codegen.gscli` --- docs/conftest.py | 4 +++- hatch.toml | 2 +- pyproject.toml | 2 +- src/{ => codegen}/gscli/README.md | 0 src/{ => codegen}/gscli/__init__.py | 0 src/{ => codegen}/gscli/backend/__init__.py | 0 src/{ => codegen}/gscli/backend/typestub_utils.py | 0 src/{ => codegen}/gscli/backend/utils.py | 0 src/{ => codegen}/gscli/codemod/commands.py | 0 src/{ => codegen}/gscli/generate/__init__.py | 0 src/{ => codegen}/gscli/generate/commands.py | 4 ++-- src/{ => codegen}/gscli/generate/runner_imports.py | 0 src/{ => codegen}/gscli/generate/utils.py | 0 src/{ => codegen}/gscli/main.py | 4 ++-- src/{ => codegen}/gscli/utils/__init__.py | 0 src/codegen/sdk/testing/test_discovery.py | 2 +- src/graph_sitter_build/build.py | 2 +- tests/unit/test_cli.py | 2 +- 18 files changed, 12 insertions(+), 10 deletions(-) rename src/{ => codegen}/gscli/README.md (100%) rename src/{ => codegen}/gscli/__init__.py (100%) rename src/{ => codegen}/gscli/backend/__init__.py (100%) rename src/{ => codegen}/gscli/backend/typestub_utils.py (100%) rename src/{ => codegen}/gscli/backend/utils.py (100%) rename src/{ => codegen}/gscli/codemod/commands.py (100%) rename src/{ => codegen}/gscli/generate/__init__.py (100%) rename src/{ => codegen}/gscli/generate/commands.py (98%) rename src/{ => codegen}/gscli/generate/runner_imports.py (100%) rename src/{ => codegen}/gscli/generate/utils.py (100%) rename src/{ => codegen}/gscli/main.py (75%) rename src/{ => codegen}/gscli/utils/__init__.py (100%) diff --git a/docs/conftest.py b/docs/conftest.py index 9294bfc31..f597d010b 100644 --- a/docs/conftest.py +++ b/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: diff --git a/hatch.toml b/hatch.toml index 03d1e3c62..12054f94a 100644 --- a/hatch.toml +++ b/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] diff --git a/pyproject.toml b/pyproject.toml index ba0f99b6a..bdde8a88c 100644 --- a/pyproject.toml +++ b/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 = [ diff --git a/src/gscli/README.md b/src/codegen/gscli/README.md similarity index 100% rename from src/gscli/README.md rename to src/codegen/gscli/README.md diff --git a/src/gscli/__init__.py b/src/codegen/gscli/__init__.py similarity index 100% rename from src/gscli/__init__.py rename to src/codegen/gscli/__init__.py diff --git a/src/gscli/backend/__init__.py b/src/codegen/gscli/backend/__init__.py similarity index 100% rename from src/gscli/backend/__init__.py rename to src/codegen/gscli/backend/__init__.py diff --git a/src/gscli/backend/typestub_utils.py b/src/codegen/gscli/backend/typestub_utils.py similarity index 100% rename from src/gscli/backend/typestub_utils.py rename to src/codegen/gscli/backend/typestub_utils.py diff --git a/src/gscli/backend/utils.py b/src/codegen/gscli/backend/utils.py similarity index 100% rename from src/gscli/backend/utils.py rename to src/codegen/gscli/backend/utils.py diff --git a/src/gscli/codemod/commands.py b/src/codegen/gscli/codemod/commands.py similarity index 100% rename from src/gscli/codemod/commands.py rename to src/codegen/gscli/codemod/commands.py diff --git a/src/gscli/generate/__init__.py b/src/codegen/gscli/generate/__init__.py similarity index 100% rename from src/gscli/generate/__init__.py rename to src/codegen/gscli/generate/__init__.py diff --git a/src/gscli/generate/commands.py b/src/codegen/gscli/generate/commands.py similarity index 98% rename from src/gscli/generate/commands.py rename to src/codegen/gscli/generate/commands.py index c9f9739ee..a6a504da6 100644 --- a/src/gscli/generate/commands.py +++ b/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__) diff --git a/src/gscli/generate/runner_imports.py b/src/codegen/gscli/generate/runner_imports.py similarity index 100% rename from src/gscli/generate/runner_imports.py rename to src/codegen/gscli/generate/runner_imports.py diff --git a/src/gscli/generate/utils.py b/src/codegen/gscli/generate/utils.py similarity index 100% rename from src/gscli/generate/utils.py rename to src/codegen/gscli/generate/utils.py diff --git a/src/gscli/main.py b/src/codegen/gscli/main.py similarity index 75% rename from src/gscli/main.py rename to src/codegen/gscli/main.py index a5bf8a2aa..9f5fbdaf4 100644 --- a/src/gscli/main.py +++ b/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() diff --git a/src/gscli/utils/__init__.py b/src/codegen/gscli/utils/__init__.py similarity index 100% rename from src/gscli/utils/__init__.py rename to src/codegen/gscli/utils/__init__.py diff --git a/src/codegen/sdk/testing/test_discovery.py b/src/codegen/sdk/testing/test_discovery.py index 2c56159f2..fceefa983 100644 --- a/src/codegen/sdk/testing/test_discovery.py +++ b/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 diff --git a/src/graph_sitter_build/build.py b/src/graph_sitter_build/build.py index f88580cb7..c94f522bf 100644 --- a/src/graph_sitter_build/build.py +++ b/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() diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py index 4746cc90f..9c3356d96 100644 --- a/tests/unit/test_cli.py +++ b/tests/unit/test_cli.py @@ -1,2 +1,2 @@ def test_cli(): - import gscli # noqa: F401 + import codegen.gscli # noqa: F401