Rename codemod3 + nit cleanup

Author: caroljung-cg

src/codegen/runner/sandbox/middlewares.py

@@ -12,7 +12,7 @@
 
 from codegen.runner.models.apis import ServerInfo
 from codegen.runner.sandbox.runner import SandboxRunner
-from codegen.utils.compilation.exceptions import UserCodeException
+from codegen.utils.exceptions.compilation import UserCodeException
 
 logger = logging.getLogger(__name__)
 

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

@@ -3,14 +3,14 @@
 import inflection
 from typing_extensions import deprecated
 
-from codegen.sdk.codemod import Codemod3
 from codegen.sdk.core.codebase import Codebase
 from codegen.sdk.enums import ProgrammingLanguage
 from codegen.sdk.python import PyClass
 from codegen.sdk.python.function import PyFunction
 from codegen.sdk.skills.core.skill import Skill
 from codegen.sdk.skills.core.skill_implementation import SkillImplementation
 from codegen.sdk.skills.core.utils import get_all_evaluation_skills
+from codemods.canonical.codemod import Codemod
 
 
 def remove_leading_tab_or_spaces(text: str) -> str:
@@ -108,7 +108,7 @@ def format_all_skills(skill_classes: list[Skill]) -> str:
 
     # Step 2: Format each skill into an .mdx compatible string
     for skill in sorted_skills:
-        if issubclass(skill, Codemod3):
+        if issubclass(skill, Codemod):
             continue
         sk_inst = skill
         formatted_skills.append(sk_inst.generate_snippet(skill_doc=True))

src/codegen/sdk/exceptions.py

@@ -6,10 +6,10 @@
 from codegen.sdk.core.autocommit import reader
 from codegen.sdk.core.interfaces.editable import Editable
 from codegen.sdk.core.statements.attribute import Attribute
-from codegen.sdk.exceptions import APINotApplicableForLanguageError
 from codegen.sdk.python.assignment import PyAssignment
 from codegen.sdk.python.statements.assignment_statement import PyAssignmentStatement
 from codegen.utils.decorators.docs import noapidoc, py_apidoc
+from codegen.utils.exceptions.api import APINotApplicableForLanguageError
 
 if TYPE_CHECKING:
     from codegen.sdk.python.class_definition import PyClass

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

@@ -29,7 +29,7 @@
 except (FileNotFoundError, json.decoder.JSONDecodeError):
     REPO_ID_TO_URL = {}
 if TYPE_CHECKING:
-    from codegen.sdk.codemod import Codemod3
+    from codemods.canonical.codemod import Codemod
 
 
 @unique
@@ -78,7 +78,7 @@ def to_op(self, name: str, token: str | None) -> LocalRepoOperator:
 
 @dataclass
 class CodemodMetadata:
-    codemod: type["Codemod3"]
+    codemod: type["Codemod"]
     category: str
     directory: Path
     company: str | None = None

src/codegen/sdk/testing/models.py

@@ -5,20 +5,16 @@
 import textwrap
 from collections.abc import Generator, Iterator
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 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
-
-if TYPE_CHECKING:
-    pass
+from codemods.canonical.codemod import Codemod
 
 
 def find_repos(
@@ -65,7 +61,7 @@ def codemods_from_dir(codemod_dir: Path) -> Iterator[CodemodMetadata]:
         import_path = str(relative).removeprefix("src/").replace("/", ".")
         mod = importlib.import_module(import_path)
         for name, value in inspect.getmembers(mod, inspect.isclass):
-            if issubclass(value, Codemod3) and name != "Codemod3":
+            if issubclass(value, Codemod) and name != "Codemod":
                 yield CodemodMetadata(codemod=value, category=codemod_dir.parent.name, directory=codemod_dir)
 
 
@@ -163,7 +159,7 @@ def generate_codemod_test_cases(repo: Repo, codemods: list[CodemodMetadata], cod
         # add the execute method to the codemod
         execute_func = create_function_from_string("execute", codemod_data)
         name = escape_codemod_name(codemod_data.name) + "-" + str(codemod_data.codemod_id)
-        codemod = Codemod3(name=name, execute=execute_func)
+        codemod = Codemod(name=name, execute=execute_func)
 
         codemod_metadata = CodemodMetadata(
             codemod=codemod,

src/codegen/sdk/testing/test_discovery.py

@@ -1,6 +1,6 @@
 import re
 
-from codegen.utils.compilation.exceptions import DangerousUserCodeException
+from codegen.utils.exceptions.compilation import DangerousUserCodeException
 
 
 def check_for_dangerous_operations(user_code: str) -> None:

src/codegen/utils/compilation/codeblock_validation.py

@@ -4,7 +4,7 @@
 import traceback
 from collections.abc import Callable
 
-from codegen.utils.compilation.exceptions import InvalidUserCodeException
+from codegen.utils.exceptions.compilation import InvalidUserCodeException
 
 logger = logging.getLogger(__name__)
 

src/codegen/utils/compilation/function_compilation.py

@@ -0,0 +1,2 @@
+class APINotApplicableForLanguageError(Exception):
+    pass