diff --git a/src/serena/agent.py b/src/serena/agent.py index dbab9d56..afd1ec97 100644 --- a/src/serena/agent.py +++ b/src/serena/agent.py @@ -42,16 +42,16 @@ from serena.config.serena_config import ( ToolInclusionDefinition, ) from serena.dashboard import SerenaDashboardAPI, SerenaDashboardTrayManager, SerenaDashboardViewer, open_url_in_browser -from serena.facades.api.edit import EditApi -from serena.facades.api.jb import JetBrainsApi -from serena.facades.api.lsp import LspApi -from serena.facades.facade import ApiScope, Facade -from serena.facades.repl import SerenaRepl from serena.jetbrains import launch_coordinator as jetbrains_launch_coordinator from serena.ls_manager import LanguageServerManager from serena.memories.memory_manager import MemoryManager from serena.project import Project from serena.prompt_factory import SerenaPromptFactory +from serena.repl.api.edit_api import EditApi +from serena.repl.api.jb_api import JetBrainsApi +from serena.repl.api.lsp_api import LspApi +from serena.repl.facade import ApiScope, Facade +from serena.repl.repl import SerenaRepl from serena.task_executor import TaskExecutor from serena.tools import ( ActivateProjectTool, diff --git a/src/serena/cli.py b/src/serena/cli.py index bd7c4776..b8ae292c 100644 --- a/src/serena/cli.py +++ b/src/serena/cli.py @@ -931,8 +931,8 @@ class ProjectCommands(AutoRegisteringGroup): """ # NOTE: completely written by Claude Code, only functionality was reviewed, not implementation from serena.agent import SerenaAgent - from serena.facades.api.lsp import LspApi from serena.project import Project + from serena.repl.api.lsp_api import LspApi logging.configure(level=logging.INFO) project_path = os.path.abspath(project) diff --git a/src/serena/facades/api/edit.py b/src/serena/repl/api/edit_api.py similarity index 100% rename from src/serena/facades/api/edit.py rename to src/serena/repl/api/edit_api.py diff --git a/src/serena/facades/api/jb.py b/src/serena/repl/api/jb_api.py similarity index 100% rename from src/serena/facades/api/jb.py rename to src/serena/repl/api/jb_api.py diff --git a/src/serena/facades/api/lsp.py b/src/serena/repl/api/lsp_api.py similarity index 100% rename from src/serena/facades/api/lsp.py rename to src/serena/repl/api/lsp_api.py diff --git a/src/serena/facades/facade.py b/src/serena/repl/facade.py similarity index 100% rename from src/serena/facades/facade.py rename to src/serena/repl/facade.py diff --git a/src/serena/facades/repl.py b/src/serena/repl/repl.py similarity index 100% rename from src/serena/facades/repl.py rename to src/serena/repl/repl.py diff --git a/src/serena/facades/representable.py b/src/serena/repl/representable.py similarity index 100% rename from src/serena/facades/representable.py rename to src/serena/repl/representable.py diff --git a/src/serena/tools/file_tools.py b/src/serena/tools/file_tools.py index dcd8a7cc..044c19a0 100644 --- a/src/serena/tools/file_tools.py +++ b/src/serena/tools/file_tools.py @@ -12,7 +12,7 @@ from collections import defaultdict from fnmatch import fnmatch from typing import Literal, cast -from serena.facades.api.edit import EditApi +from serena.repl.api.edit_api import EditApi from serena.tools import EditingToolWithDiagnostics, Tool, ToolMarkerOptional from serena.util.file_system import scan_directory from solidlsp.ls_utils import TextUtils diff --git a/src/serena/tools/jetbrains_tools.py b/src/serena/tools/jetbrains_tools.py index 9f49efe5..0e877d5a 100644 --- a/src/serena/tools/jetbrains_tools.py +++ b/src/serena/tools/jetbrains_tools.py @@ -3,7 +3,7 @@ import logging from typing import TYPE_CHECKING, Literal -from serena.facades.api.jb import JetBrainsApi +from serena.repl.api.jb_api import JetBrainsApi from serena.tools import Tool, ToolMarkerBeta, ToolMarkerOptional, ToolMarkerSymbolicEdit, ToolMarkerSymbolicRead if TYPE_CHECKING: diff --git a/src/serena/tools/symbol_tools.py b/src/serena/tools/symbol_tools.py index a505325d..76022951 100644 --- a/src/serena/tools/symbol_tools.py +++ b/src/serena/tools/symbol_tools.py @@ -5,7 +5,7 @@ Language server-related tools from typing import cast -from serena.facades.api.lsp import LspApi +from serena.repl.api.lsp_api import LspApi from serena.tools import ( EditingToolWithDiagnostics, Tool, diff --git a/src/serena/tools/tools_base.py b/src/serena/tools/tools_base.py index 97fde923..0d494537 100644 --- a/src/serena/tools/tools_base.py +++ b/src/serena/tools/tools_base.py @@ -16,11 +16,11 @@ from sensai.util.string import dict_string from serena.code_editor import EditedFileContext # noqa: F401 (re-exported for tools) from serena.config.serena_config import LanguageBackend -from serena.facades.facade import SUCCESS_RESULT # noqa: F401 (re-exported for tools) from serena.lsp.lsp_diagnostics import DiagnosticsContext from serena.memories.memory_manager import MemoryManager from serena.project import Project from serena.prompt_factory import PromptFactory +from serena.repl.facade import SUCCESS_RESULT # noqa: F401 (re-exported for tools) from serena.util.class_decorators import singleton from serena.util.inspection import iter_subclasses from serena.util.text_utils import TextOutputUtils diff --git a/test/serena/test_edit_api.py b/test/serena/test_edit_api.py index fe158be7..a0520bfe 100644 --- a/test/serena/test_edit_api.py +++ b/test/serena/test_edit_api.py @@ -8,9 +8,9 @@ from unittest.mock import MagicMock import pytest from serena.config.serena_config import SerenaConfig -from serena.facades.api.edit import EditApi, ReplacementPreview -from serena.facades.facade import ApiScope, Facade from serena.project import Project +from serena.repl.api.edit_api import EditApi, ReplacementPreview +from serena.repl.facade import ApiScope, Facade @pytest.fixture diff --git a/test/serena/test_jetbrains_api.py b/test/serena/test_jetbrains_api.py index a7ab80fb..884c0d45 100644 --- a/test/serena/test_jetbrains_api.py +++ b/test/serena/test_jetbrains_api.py @@ -6,8 +6,8 @@ from unittest.mock import MagicMock, patch import pytest -from serena.facades.api.jb import JetBrainsApi -from serena.facades.facade import ApiScope, Facade +from serena.repl.api.jb_api import JetBrainsApi +from serena.repl.facade import ApiScope, Facade @pytest.fixture @@ -20,7 +20,7 @@ def agent() -> MagicMock: @pytest.fixture def client() -> MagicMock: client = MagicMock() - with patch("serena.facades.api.jb.JetBrainsPluginClient.from_project") as from_project: + with patch("serena.repl.api.jb_api.JetBrainsPluginClient.from_project") as from_project: from_project.return_value.__enter__.return_value = client yield client diff --git a/test/serena/test_mcp.py b/test/serena/test_mcp.py index 224e5d54..66119e8a 100644 --- a/test/serena/test_mcp.py +++ b/test/serena/test_mcp.py @@ -8,9 +8,9 @@ from serena import __version__ from serena.agent import Tool, ToolRegistry from serena.config.context_mode import SerenaAgentContext from serena.config.serena_config import SerenaConfig -from serena.facades.facade import ApiScope -from serena.facades.repl import SerenaRepl from serena.mcp import SerenaMCPFactory +from serena.repl.facade import ApiScope +from serena.repl.repl import SerenaRepl make_tool = SerenaMCPFactory.make_mcp_tool diff --git a/test/serena/test_repl_tool.py b/test/serena/test_repl_tool.py index 157b5a51..a2923915 100644 --- a/test/serena/test_repl_tool.py +++ b/test/serena/test_repl_tool.py @@ -8,9 +8,9 @@ from unittest.mock import MagicMock import pytest from serena.config.serena_config import ApiInclusionDefinition -from serena.facades.api.lsp import LspApi -from serena.facades.facade import ApiScope, Facade, FacadeApi, FacadeMethodInfo, facade_method -from serena.facades.repl import SerenaRepl +from serena.repl.api.lsp_api import LspApi +from serena.repl.facade import ApiScope, Facade, FacadeApi, FacadeMethodInfo, facade_method +from serena.repl.repl import SerenaRepl from serena.tools import SerenaReplTool from solidlsp.ls_config import LanguageServerId from test.conftest import agent_for_project_context