Skip to content

Commit a16e219

Browse files
authored
Rename codemod3 + nit cleanup (#54)
# Motivation <!-- Why is this change necessary? --> # Content <!-- Please include a summary of the change --> # Testing <!-- How was the change tested? --> # Please check the following before marking your PR as ready for review - [x] I have added tests for my changes - [x] I have updated the documentation or added new documentation as needed - [x] I have read and agree to the [Contributor License Agreement](../CLA.md)
1 parent 73f46bc commit a16e219

File tree

58 files changed

+113
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+113
-125
lines changed

src/codegen/runner/sandbox/middlewares.py

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

1313
from codegen.runner.models.apis import ServerInfo
1414
from codegen.runner.sandbox.runner import SandboxRunner
15-
from codegen.utils.compilation.exceptions import UserCodeException
15+
from codegen.utils.exceptions.compilation import UserCodeException
1616

1717
logger = logging.getLogger(__name__)
1818

src/codegen/sdk/code_generation/doc_utils/skills.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import inflection
44
from typing_extensions import deprecated
55

6-
from codegen.sdk.codemod import Codemod3
76
from codegen.sdk.core.codebase import Codebase
87
from codegen.sdk.enums import ProgrammingLanguage
98
from codegen.sdk.python import PyClass
109
from codegen.sdk.python.function import PyFunction
1110
from codegen.sdk.skills.core.skill import Skill
1211
from codegen.sdk.skills.core.skill_implementation import SkillImplementation
1312
from codegen.sdk.skills.core.utils import get_all_evaluation_skills
13+
from codemods.canonical.codemod import Codemod
1414

1515

1616
def remove_leading_tab_or_spaces(text: str) -> str:
@@ -108,7 +108,7 @@ def format_all_skills(skill_classes: list[Skill]) -> str:
108108

109109
# Step 2: Format each skill into an .mdx compatible string
110110
for skill in sorted_skills:
111-
if issubclass(skill, Codemod3):
111+
if issubclass(skill, Codemod):
112112
continue
113113
sk_inst = skill
114114
formatted_skills.append(sk_inst.generate_snippet(skill_doc=True))

src/codegen/sdk/exceptions.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/codegen/sdk/python/statements/attribute.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
from codegen.sdk.core.autocommit import reader
77
from codegen.sdk.core.interfaces.editable import Editable
88
from codegen.sdk.core.statements.attribute import Attribute
9-
from codegen.sdk.exceptions import APINotApplicableForLanguageError
109
from codegen.sdk.python.assignment import PyAssignment
1110
from codegen.sdk.python.statements.assignment_statement import PyAssignmentStatement
1211
from codegen.utils.decorators.docs import noapidoc, py_apidoc
12+
from codegen.utils.exceptions.api import APINotApplicableForLanguageError
1313

1414
if TYPE_CHECKING:
1515
from codegen.sdk.python.class_definition import PyClass

src/codegen/sdk/testing/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
except (FileNotFoundError, json.decoder.JSONDecodeError):
3030
REPO_ID_TO_URL = {}
3131
if TYPE_CHECKING:
32-
from codegen.sdk.codemod import Codemod3
32+
from codemods.canonical.codemod import Codemod
3333

3434

3535
@unique
@@ -78,7 +78,7 @@ def to_op(self, name: str, token: str | None) -> LocalRepoOperator:
7878

7979
@dataclass
8080
class CodemodMetadata:
81-
codemod: type["Codemod3"]
81+
codemod: type["Codemod"]
8282
category: str
8383
directory: Path
8484
company: str | None = None

src/codegen/sdk/testing/test_discovery.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,16 @@
55
import textwrap
66
from collections.abc import Generator, Iterator
77
from pathlib import Path
8-
from typing import TYPE_CHECKING
98

109
import emoji
1110
from loguru import logger
1211

1312
from codegen.gscli.generate.runner_imports import get_runner_imports
14-
from codegen.sdk.codemod import Codemod3
1513
from codegen.sdk.enums import ProgrammingLanguage
1614
from codegen.sdk.testing.constants import DIFF_FILEPATH
1715
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
1816
from codegen.sdk.testing.verified_codemod_utils import CodemodAPI, RepoCodemodMetadata, SkillTestConfig, anonymize_id
19-
20-
if TYPE_CHECKING:
21-
pass
17+
from codemods.canonical.codemod import Codemod
2218

2319

2420
def find_repos(
@@ -65,7 +61,7 @@ def codemods_from_dir(codemod_dir: Path) -> Iterator[CodemodMetadata]:
6561
import_path = str(relative).removeprefix("src/").replace("/", ".")
6662
mod = importlib.import_module(import_path)
6763
for name, value in inspect.getmembers(mod, inspect.isclass):
68-
if issubclass(value, Codemod3) and name != "Codemod3":
64+
if issubclass(value, Codemod) and name != "Codemod":
6965
yield CodemodMetadata(codemod=value, category=codemod_dir.parent.name, directory=codemod_dir)
7066

7167

@@ -163,7 +159,7 @@ def generate_codemod_test_cases(repo: Repo, codemods: list[CodemodMetadata], cod
163159
# add the execute method to the codemod
164160
execute_func = create_function_from_string("execute", codemod_data)
165161
name = escape_codemod_name(codemod_data.name) + "-" + str(codemod_data.codemod_id)
166-
codemod = Codemod3(name=name, execute=execute_func)
162+
codemod = Codemod(name=name, execute=execute_func)
167163

168164
codemod_metadata = CodemodMetadata(
169165
codemod=codemod,

src/codegen/utils/compilation/codeblock_validation.py

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

3-
from codegen.utils.compilation.exceptions import DangerousUserCodeException
3+
from codegen.utils.exceptions.compilation import DangerousUserCodeException
44

55

66
def check_for_dangerous_operations(user_code: str) -> None:

src/codegen/utils/compilation/function_compilation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import traceback
55
from collections.abc import Callable
66

7-
from codegen.utils.compilation.exceptions import InvalidUserCodeException
7+
from codegen.utils.exceptions.compilation import InvalidUserCodeException
88

99
logger = logging.getLogger(__name__)
1010

src/codegen/utils/exceptions/api.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
class APINotApplicableForLanguageError(Exception):
2+
pass

0 commit comments

Comments
 (0)