Refactoring: Move jetbrains_plugin_client and jetbrains_types out of tools package

This resolves cyclic import issues
This commit is contained in:
Dominik Jain authored and Dominik Jain committed 2026-02-13 19:20:08 +01:00
1 parent 798a31b6a7
commit d80c45e7e7
5 files changed
+6 -6

No files matched your search

+1 -1
View File
@@ -6,6 +6,7 @@ from collections.abc import Iterable, Iterator, Reversible
from contextlib import contextmanager
from typing import TYPE_CHECKING, Generic, Optional, TypeVar, cast
from serena.jetbrains.jetbrains_plugin_client import JetBrainsPluginClient
from serena.symbol import JetBrainsSymbol, LanguageServerSymbol, LanguageServerSymbolRetriever, PositionInFile, Symbol
from solidlsp import SolidLanguageServer, ls_types
from solidlsp.ls import LSPFileBuffer
@@ -13,7 +14,6 @@ from solidlsp.ls_utils import PathUtils, TextUtils
from .constants import DEFAULT_SOURCE_FILE_ENCODING
from .project import Project
from .tools.jetbrains_plugin_client import JetBrainsPluginClient
if TYPE_CHECKING:
from .agent import SerenaAgent
@@ -12,10 +12,10 @@ import requests
from requests import Response
from sensai.util.string import ToStringMixin
import serena.tools.jetbrains_types as jb
import serena.jetbrains.jetbrains_types as jb
from serena.jetbrains.jetbrains_types import PluginStatusDTO
from serena.project import Project
from serena.text_utils import render_html
from serena.tools.jetbrains_types import PluginStatusDTO
from serena.util.version import Version
T = TypeVar("T")
File renamed without changes.
+1 -1
View File
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Generic, Literal, NotRequired, Self, Type
from sensai.util.string import ToStringMixin
import serena.tools.jetbrains_types as jb
import serena.jetbrains.jetbrains_types as jb
from solidlsp import SolidLanguageServer
from solidlsp.ls import ReferenceInSymbol as LSPReferenceInSymbol
from solidlsp.ls_types import Position, SymbolKind, UnifiedSymbolInformation
+2 -2
View File
@@ -2,9 +2,9 @@ import logging
from collections import defaultdict
from typing import Any, Literal
import serena.tools.jetbrains_types as jb
import serena.jetbrains.jetbrains_types as jb
from serena.jetbrains.jetbrains_plugin_client import JetBrainsPluginClient
from serena.tools import Tool, ToolMarkerOptional, ToolMarkerSymbolicRead
from serena.tools.jetbrains_plugin_client import JetBrainsPluginClient
log = logging.getLogger(__name__)