From a6bac508093a86705dc5bb80cde24f2a95e93753 Mon Sep 17 00:00:00 2001 From: Edward Li Date: Thu, 23 Jan 2025 15:15:46 -0800 Subject: [PATCH] Move `graph_visualization` into `codebase.visualizations` --- src/codegen/sdk/core/class_definition.py | 2 +- src/codegen/sdk/core/codebase.py | 2 +- src/codegen/sdk/core/detached_symbols/function_call.py | 4 ++-- src/codegen/sdk/core/external_module.py | 2 +- src/codegen/sdk/core/file.py | 2 +- src/codegen/sdk/core/function.py | 2 +- src/codegen/sdk/core/import_resolution.py | 2 +- src/codegen/sdk/core/interfaces/editable.py | 4 ++-- src/{graph_visualization => codegen/visualizations}/enums.py | 0 src/{graph_visualization => codegen/visualizations}/py.typed | 0 .../visualizations}/visualization_manager.py | 2 +- .../visualizations}/viz_utils.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename src/{graph_visualization => codegen/visualizations}/enums.py (100%) rename src/{graph_visualization => codegen/visualizations}/py.typed (100%) rename src/{graph_visualization => codegen/visualizations}/visualization_manager.py (96%) rename src/{graph_visualization => codegen/visualizations}/viz_utils.py (97%) diff --git a/src/codegen/sdk/core/class_definition.py b/src/codegen/sdk/core/class_definition.py index a2095fb5a..522b28192 100644 --- a/src/codegen/sdk/core/class_definition.py +++ b/src/codegen/sdk/core/class_definition.py @@ -31,7 +31,7 @@ from codegen.sdk.enums import SymbolType from codegen.sdk.extensions.utils import cached_property from codegen.sdk.writer_decorators import apidoc, noapidoc -from graph_visualization.enums import VizNode +from codegen.visualizations.enums import VizNode if TYPE_CHECKING: from codegen.sdk.core.detached_symbols.code_block import CodeBlock diff --git a/src/codegen/sdk/core/codebase.py b/src/codegen/sdk/core/codebase.py index 9b0894406..b777fa3ab 100644 --- a/src/codegen/sdk/core/codebase.py +++ b/src/codegen/sdk/core/codebase.py @@ -67,12 +67,12 @@ from codegen.sdk.typescript.type_alias import TSTypeAlias from codegen.sdk.utils import determine_project_language from codegen.sdk.writer_decorators import apidoc, noapidoc +from codegen.visualizations.visualization_manager import VisualizationManager from codegen_git.repo_operator.local_repo_operator import LocalRepoOperator from codegen_git.repo_operator.repo_operator import RepoOperator from codegen_git.schemas.enums import CheckoutResult from codegen_git.schemas.repo_config import BaseRepoConfig from codegen_git.utils.stopwatch_utils import stopwatch -from graph_visualization.visualization_manager import VisualizationManager if TYPE_CHECKING: from app.codemod.types import Group diff --git a/src/codegen/sdk/core/detached_symbols/function_call.py b/src/codegen/sdk/core/detached_symbols/function_call.py index a6a476e35..1ad84f040 100644 --- a/src/codegen/sdk/core/detached_symbols/function_call.py +++ b/src/codegen/sdk/core/detached_symbols/function_call.py @@ -31,7 +31,7 @@ from codegen.sdk.codebase.codebase_graph import CodebaseGraph from codegen.sdk.core.function import Function from codegen.sdk.core.interfaces.callable import Callable - from graph_visualization.enums import VizNode + from codegen.visualizations.enums import VizNode Parent = TypeVar("Parent", bound="Expression | None") @@ -216,7 +216,7 @@ def predecessor(self) -> FunctionCall[Parent] | None: @noapidoc @override def viz(self) -> VizNode: - from graph_visualization.enums import VizNode + from codegen.visualizations.enums import VizNode func = self.function_definition from codegen.sdk.core.function import Function diff --git a/src/codegen/sdk/core/external_module.py b/src/codegen/sdk/core/external_module.py index 6780b5cf4..3343c7031 100644 --- a/src/codegen/sdk/core/external_module.py +++ b/src/codegen/sdk/core/external_module.py @@ -15,7 +15,7 @@ from codegen.sdk.core.placeholder.placeholder_stub import StubPlaceholder from codegen.sdk.enums import ImportType, NodeType from codegen.sdk.writer_decorators import apidoc, noapidoc -from graph_visualization.enums import VizNode +from codegen.visualizations.enums import VizNode if TYPE_CHECKING: from codegen.sdk.core.detached_symbols.parameter import Parameter diff --git a/src/codegen/sdk/core/file.py b/src/codegen/sdk/core/file.py index 35623d12a..0cd9bd006 100644 --- a/src/codegen/sdk/core/file.py +++ b/src/codegen/sdk/core/file.py @@ -38,7 +38,7 @@ from codegen.sdk.tree_sitter_parser import get_parser_by_filepath_or_extension, parse_file from codegen.sdk.typescript.function import TSFunction from codegen.sdk.writer_decorators import apidoc, noapidoc -from graph_visualization.enums import VizNode +from codegen.visualizations.enums import VizNode logger = logging.getLogger(__name__) diff --git a/src/codegen/sdk/core/function.py b/src/codegen/sdk/core/function.py index d0a5cbd22..625cf7031 100644 --- a/src/codegen/sdk/core/function.py +++ b/src/codegen/sdk/core/function.py @@ -23,7 +23,7 @@ from codegen.sdk.extensions.sort import sort_editables from codegen.sdk.extensions.utils import cached_property from codegen.sdk.writer_decorators import apidoc, noapidoc -from graph_visualization.enums import VizNode +from codegen.visualizations.enums import VizNode if TYPE_CHECKING: from codegen.sdk.core.export import Export diff --git a/src/codegen/sdk/core/import_resolution.py b/src/codegen/sdk/core/import_resolution.py index b55e63dcf..aa0fd37c7 100644 --- a/src/codegen/sdk/core/import_resolution.py +++ b/src/codegen/sdk/core/import_resolution.py @@ -27,7 +27,7 @@ from codegen.sdk.extensions.utils import cached_property from codegen.sdk.output.constants import ANGULAR_STYLE from codegen.sdk.writer_decorators import apidoc, noapidoc -from graph_visualization.enums import VizNode +from codegen.visualizations.enums import VizNode if TYPE_CHECKING: from codegen.sdk.core.file import SourceFile diff --git a/src/codegen/sdk/core/interfaces/editable.py b/src/codegen/sdk/core/interfaces/editable.py index 926df1229..4c2f7a328 100644 --- a/src/codegen/sdk/core/interfaces/editable.py +++ b/src/codegen/sdk/core/interfaces/editable.py @@ -47,7 +47,7 @@ from codegen.sdk.core.statements.statement import Statement from codegen.sdk.core.symbol import Symbol from codegen.sdk.core.symbol_group import SymbolGroup - from graph_visualization.enums import VizNode + from codegen.visualizations.enums import VizNode CONTAINER_CHARS = (b"(", b")", b"{", b"}", b"[", b"]", b"<", b">", b"import") MAX_REPR_LEN: int = 200 @@ -975,7 +975,7 @@ def _log_parse(self, msg: str, *args, **kwargs): @noapidoc def viz(self) -> VizNode: from codegen.sdk.core.interfaces.has_name import HasName - from graph_visualization.enums import VizNode + from codegen.visualizations.enums import VizNode if isinstance(self, HasName): return VizNode(file_path=self.filepath, start_point=self.start_point, end_point=self.end_point, name=self.name, symbol_name=self.__class__.__name__) diff --git a/src/graph_visualization/enums.py b/src/codegen/visualizations/enums.py similarity index 100% rename from src/graph_visualization/enums.py rename to src/codegen/visualizations/enums.py diff --git a/src/graph_visualization/py.typed b/src/codegen/visualizations/py.typed similarity index 100% rename from src/graph_visualization/py.typed rename to src/codegen/visualizations/py.typed diff --git a/src/graph_visualization/visualization_manager.py b/src/codegen/visualizations/visualization_manager.py similarity index 96% rename from src/graph_visualization/visualization_manager.py rename to src/codegen/visualizations/visualization_manager.py index fc8996f6f..0398f170a 100644 --- a/src/graph_visualization/visualization_manager.py +++ b/src/codegen/visualizations/visualization_manager.py @@ -5,8 +5,8 @@ from networkx import Graph from codegen.sdk.core.interfaces.editable import Editable +from codegen.visualizations.viz_utils import graph_to_json from codegen_git.repo_operator.repo_operator import RepoOperator -from graph_visualization.viz_utils import graph_to_json logger = logging.getLogger(__name__) diff --git a/src/graph_visualization/viz_utils.py b/src/codegen/visualizations/viz_utils.py similarity index 97% rename from src/graph_visualization/viz_utils.py rename to src/codegen/visualizations/viz_utils.py index 5c03d9fed..04fad6888 100644 --- a/src/graph_visualization/viz_utils.py +++ b/src/codegen/visualizations/viz_utils.py @@ -9,8 +9,8 @@ from codegen.sdk.core.interfaces.editable import Editable from codegen.sdk.core.interfaces.importable import Importable from codegen.sdk.output.utils import DeterministicJSONEncoder +from codegen.visualizations.enums import GraphJson, GraphType from codegen_git.repo_operator.repo_operator import RepoOperator -from graph_visualization.enums import GraphJson, GraphType if TYPE_CHECKING: pass