Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

refactor(python): remove dead CustomToolkit dataclass

Dhawal Upadhyay8b0e618b6401
diff --git a/python/composio/__init__.py b/python/composio/__init__.py
index 033065579..03fac43c3 100644
--- a/python/composio/__init__.py
+++ b/python/composio/__init__.py
@@ -1,7 +1,7 @@
from .__version__ import __version__
+from .core.models.custom_tool import ExperimentalToolkit
from .core.models.custom_tool_types import (
CustomTool,
- CustomToolkit,
SessionContext,
)
from .core.models.tool_router_session_files import RemoteFile
@@ -31,7 +31,7 @@ from .sdk import Composio
__all__ = (
"Composio",
"CustomTool",
- "CustomToolkit",
+ "ExperimentalToolkit",
"RemoteFile",
"SessionContext",
"ConnectionExpiredEvent",
diff --git a/python/composio/core/models/__init__.py b/python/composio/core/models/__init__.py
index 565b9da62..19465d870 100644
--- a/python/composio/core/models/__init__.py
+++ b/python/composio/core/models/__init__.py
@@ -3,7 +3,6 @@ from .connected_accounts import ConnectedAccounts
from .custom_tool import ExperimentalAPI, ExperimentalToolkit
from .custom_tool_types import (
CustomTool,
- CustomToolkit,
ProxyExecuteResponse,
RegisteredCustomTool,
RegisteredCustomToolkit,
@@ -34,7 +33,6 @@ __all__ = [
"ConnectionState",
"ConnectionStatusEnum",
"CustomTool",
- "CustomToolkit",
"ExperimentalAPI",
"ExperimentalToolkit",
"MCP",
diff --git a/python/composio/core/models/custom_tool.py b/python/composio/core/models/custom_tool.py
index a6185b40d..46980249f 100644
--- a/python/composio/core/models/custom_tool.py
+++ b/python/composio/core/models/custom_tool.py
@@ -54,7 +54,6 @@ from .custom_tool_types import (
SLUG_REGEX,
CustomTool,
CustomToolExecuteFn,
- CustomToolkit,
CustomToolsMap,
CustomToolsMapEntry,
)
@@ -490,7 +489,7 @@ def serialize_custom_tools(tools: t.List[CustomTool]) -> t.List[t.Dict[str, t.An
def serialize_custom_toolkits(
- toolkits: t.Sequence[t.Union[CustomToolkit, ExperimentalToolkit]],
+ toolkits: t.Sequence[ExperimentalToolkit],
) -> t.List[t.Dict[str, t.Any]]:
"""Serialize custom toolkits into the format expected by the backend."""
result = []
@@ -524,7 +523,7 @@ def serialize_custom_toolkits(
def build_custom_tools_map(
tools: t.List[CustomTool],
- toolkits: t.Optional[t.List[t.Union[CustomToolkit, ExperimentalToolkit]]] = None,
+ toolkits: t.Optional[t.List[ExperimentalToolkit]] = None,
) -> CustomToolsMap:
"""Build a CustomToolsMap from custom tools and toolkits."""
by_final_slug: t.Dict[str, CustomToolsMapEntry] = {}
@@ -578,13 +577,13 @@ def build_custom_tools_map(
return CustomToolsMap(
by_final_slug=by_final_slug,
by_original_slug=by_original_slug,
- toolkits=list(toolkits) if toolkits else None, # type: ignore[arg-type]
+ toolkits=list(toolkits) if toolkits else None,
)
def build_custom_tools_map_from_response(
tools: t.List[CustomTool],
- toolkits: t.Optional[t.List[t.Union[CustomToolkit, ExperimentalToolkit]]],
+ toolkits: t.Optional[t.List[ExperimentalToolkit]],
experimental: t.Optional[SessionCreateResponseExperimental],
) -> CustomToolsMap:
"""Build a CustomToolsMap using the slug/original_slug mapping from the backend response."""
@@ -638,5 +637,5 @@ def build_custom_tools_map_from_response(
return CustomToolsMap(
by_final_slug=by_final_slug,
by_original_slug=by_original_slug,
- toolkits=list(toolkits) if toolkits else None, # type: ignore[arg-type]
+ toolkits=list(toolkits) if toolkits else None,
)
diff --git a/python/composio/core/models/custom_tool_types.py b/python/composio/core/models/custom_tool_types.py
index 97d85b02b..370a59f5e 100644
--- a/python/composio/core/models/custom_tool_types.py
+++ b/python/composio/core/models/custom_tool_types.py
@@ -97,20 +97,6 @@ class CustomTool:
output_schema: t.Optional[t.Dict[str, t.Any]] = None
-@dataclass(frozen=True)
-class CustomToolkit:
- """Custom toolkit definition returned from ``composio.experimental.Toolkit()``.
-
- Pass to ``composio.create(user_id, experimental={"custom_toolkits": [...]})``
- to bind to a session.
- """
-
- slug: str
- name: str
- description: str
- tools: t.Tuple[CustomTool, ...]
-
-
# ────────────────────────────────────────────────────────────────
# Internal routing map types
# ────────────────────────────────────────────────────────────────
@@ -131,7 +117,7 @@ class CustomToolsMap:
by_final_slug: t.Dict[str, CustomToolsMapEntry] = field(default_factory=dict)
by_original_slug: t.Dict[str, CustomToolsMapEntry] = field(default_factory=dict)
- toolkits: t.Optional[t.List[CustomToolkit]] = None
+ toolkits: t.Optional[t.List[t.Any]] = None
# ────────────────────────────────────────────────────────────────
diff --git a/python/composio/core/models/tool_router.py b/python/composio/core/models/tool_router.py
index 232ec933f..a4634a820 100644
--- a/python/composio/core/models/tool_router.py
+++ b/python/composio/core/models/tool_router.py
@@ -25,7 +25,6 @@ from composio.core.models.custom_tool import (
)
from composio.core.models.custom_tool_types import (
CustomTool,
- CustomToolkit,
CustomToolsMap,
)
from composio.core.models.tool_router_session import ToolRouterSession
@@ -195,7 +194,7 @@ class ToolRouterExperimentalConfig(te.TypedDict, total=False):
assistive_prompt: ToolRouterAssistivePromptConfig
custom_tools: t.List["CustomTool"]
- custom_toolkits: t.List[t.Union["CustomToolkit", "ExperimentalToolkit"]]
+ custom_toolkits: t.List["ExperimentalToolkit"]
@dataclass
@@ -712,9 +711,7 @@ class ToolRouter(Resource, t.Generic[TTool, TToolCollection]):
# Map SDK's experimental.assistive_prompt.user_timezone to API's
# experimental.assistive_prompt_config.user_timezone
custom_tools: t.Optional[t.List[CustomTool]] = None
- custom_toolkits: t.Optional[
- t.List[t.Union[CustomToolkit, ExperimentalToolkit]]
- ] = None
+ custom_toolkits: t.Optional[t.List[ExperimentalToolkit]] = None
if experimental is not None:
experimental_payload: t.Dict[str, t.Any] = {}