reorg

wf_mcp/__init__.py

@@ -1,9 +1,14 @@
 from .adapters import (
     BackendAdapter,
+    ToolCallResult,
+)
+from .capabilities import (
+    CatalogNodeEntry,
+    CatalogPromptEntry,
+    CatalogResourceEntry,
     DiscoveredPrompt,
     DiscoveredResource,
     DiscoveredTool,
-    ToolCallResult,
 )
 from .catalog import CombinedCatalog
 from .connections import ConnectionRegistry, parse_connection_id, qualify_node_name
@@ -15,9 +20,6 @@ from .discovery import (
 from .events import McpEvent, make_event
 from .models import (
     AuthRecord,
-    CatalogNodeEntry,
-    CatalogPromptEntry,
-    CatalogResourceEntry,
     CatalogSnapshot,
     ConnectionConfig,
     RawWorkflowPlan,

wf_mcp/adapters.py

@@ -1,36 +1,10 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
 from typing import Any, Protocol
 
+from .capabilities import DiscoveredPrompt, DiscoveredResource, DiscoveredTool
 from .models import AuthRecord, ConnectionConfig
-
-
-@dataclass(slots=True)
-class DiscoveredTool:
-    name: str
-    description: str | None
-    input_schema: dict[str, Any]
-    output_schema: dict[str, Any]
-    outcomes: tuple[str, ...] = ("ok",)
-    metadata: dict[str, Any] = field(default_factory=dict)
-
-
-@dataclass(slots=True)
-class DiscoveredResource:
-    uri: str
-    name: str
-    description: str | None
-    mime_type: str | None = None
-    metadata: dict[str, Any] = field(default_factory=dict)
-
-
-@dataclass(slots=True)
-class DiscoveredPrompt:
-    name: str
-    description: str | None
-    arguments: list[dict[str, Any]] = field(default_factory=list)
-    metadata: dict[str, Any] = field(default_factory=dict)
+from dataclasses import dataclass, field
 
 
 @dataclass(slots=True)

wf_mcp/capabilities.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+from typing import Any
+
+
+@dataclass(slots=True)
+class DiscoveredTool:
+    name: str
+    description: str | None
+    input_schema: dict[str, Any]
+    output_schema: dict[str, Any]
+    outcomes: tuple[str, ...] = ("ok",)
+    metadata: dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass(slots=True)
+class DiscoveredResource:
+    uri: str
+    name: str
+    description: str | None
+    mime_type: str | None = None
+    metadata: dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass(slots=True)
+class DiscoveredPrompt:
+    name: str
+    description: str | None
+    arguments: list[dict[str, Any]] = field(default_factory=list)
+    metadata: dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass(slots=True)
+class CatalogNodeEntry:
+    qualified_name: str
+    connection_id: str
+    local_name: str
+    description: str | None
+    outcomes: tuple[str, ...]
+    input_schema: dict[str, Any]
+    output_schema: dict[str, Any]
+
+
+@dataclass(slots=True)
+class CatalogResourceEntry:
+    qualified_name: str
+    connection_id: str
+    local_name: str
+    uri: str
+    description: str | None
+    mime_type: str | None = None
+    metadata: dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass(slots=True)
+class CatalogPromptEntry:
+    qualified_name: str
+    connection_id: str
+    local_name: str
+    description: str | None
+    arguments: list[dict[str, Any]] = field(default_factory=list)
+    metadata: dict[str, Any] = field(default_factory=dict)

wf_mcp/catalog.py

@@ -5,14 +5,15 @@ from typing import Any
 
 from wf_authoring import NodeCatalog, NodeSpec
 
-from .adapters import DiscoveredPrompt, DiscoveredResource
-from .connections import qualify_node_name
-from .models import (
+from .capabilities import (
     CatalogNodeEntry,
     CatalogPromptEntry,
     CatalogResourceEntry,
-    CatalogSnapshot,
+    DiscoveredPrompt,
+    DiscoveredResource,
 )
+from .connections import qualify_node_name
+from .models import CatalogSnapshot
 
 
 def snapshot_from_specs(

wf_mcp/mcp_sdk_adapter.py

@@ -88,6 +88,7 @@ def _tool_result_to_call_result(result: McpCallToolResult) -> ToolCallResult:
         meta=result.meta or {},
     )
 
+
 class McpSdkAdapter(BackendAdapter):
     @asynccontextmanager
     async def _session(

wf_mcp/models.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from dataclasses import asdict, dataclass, field
 from typing import Any
 
+from .capabilities import CatalogNodeEntry, CatalogPromptEntry, CatalogResourceEntry
+
 
 @dataclass(slots=True)
 class ConnectionConfig:
@@ -20,38 +22,6 @@ class AuthRecord:
     payload: dict[str, Any] = field(default_factory=dict)
 
 
-@dataclass(slots=True)
-class CatalogNodeEntry:
-    qualified_name: str
-    connection_id: str
-    local_name: str
-    description: str | None
-    outcomes: tuple[str, ...]
-    input_schema: dict[str, Any]
-    output_schema: dict[str, Any]
-
-
-@dataclass(slots=True)
-class CatalogResourceEntry:
-    qualified_name: str
-    connection_id: str
-    local_name: str
-    uri: str
-    description: str | None
-    mime_type: str | None = None
-    metadata: dict[str, Any] = field(default_factory=dict)
-
-
-@dataclass(slots=True)
-class CatalogPromptEntry:
-    qualified_name: str
-    connection_id: str
-    local_name: str
-    description: str | None
-    arguments: list[dict[str, Any]] = field(default_factory=list)
-    metadata: dict[str, Any] = field(default_factory=dict)
-
-
 @dataclass(slots=True)
 class CatalogSnapshot:
     connection_id: str