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.

Fix Python ToolRouter typing checks

Dhawal Upadhyay006273a4f75d
diff --git a/python/composio/core/models/tool_router.py b/python/composio/core/models/tool_router.py
index fb49df914..e6c45cd03 100644
--- a/python/composio/core/models/tool_router.py
+++ b/python/composio/core/models/tool_router.py
@@ -226,24 +226,19 @@ class ToolRouterPreloadConfig(te.TypedDict, total=False):
class _SessionPreloadLike(te.Protocol):
- tools: t.Union[t.List[str], t.Literal["all"], None]
-
-
-class _SessionConfigLike(te.Protocol):
- preload: _SessionPreloadLike
-
-
-class _SessionWithPreloadConfig(te.Protocol):
- config: _SessionConfigLike
+ @property
+ def tools(self) -> t.Union[t.List[str], str, None]: ...
def _session_preload_config(
- session: _SessionWithPreloadConfig,
+ preload: _SessionPreloadLike,
) -> ToolRouterSessionPreloadConfig:
- tools = session.config.preload.tools
- return ToolRouterSessionPreloadConfig(
- tools=tools if isinstance(tools, str) else list(tools or [])
- )
+ tools = preload.tools
+ if tools == "all":
+ return ToolRouterSessionPreloadConfig(tools="all")
+ if isinstance(tools, list):
+ return ToolRouterSessionPreloadConfig(tools=t.cast(t.List[str], tools))
+ return ToolRouterSessionPreloadConfig(tools=[])
def _apply_session_preset_defaults(
@@ -925,9 +920,9 @@ class ToolRouter(Resource, t.Generic[TTool, TToolCollection]):
"custom_tools"
]
if "custom_toolkits" in experimental_payload:
- inline_custom_tools_payload["custom_toolkits"] = experimental_payload[
- "custom_toolkits"
- ]
+ inline_custom_tools_payload["custom_toolkits"] = (
+ experimental_payload["custom_toolkits"]
+ )
if experimental_payload:
create_params["experimental"] = experimental_payload
@@ -981,7 +976,7 @@ class ToolRouter(Resource, t.Generic[TTool, TToolCollection]):
experimental=experimental_response,
custom_tools_map=custom_tools_map,
user_id=user_id,
- preload=_session_preload_config(session),
+ preload=_session_preload_config(session.config.preload),
preloaded_custom_tool_slugs=preloaded_custom_tool_slugs,
inline_custom_tools_payload=inline_custom_tools_payload,
)
@@ -1038,7 +1033,7 @@ class ToolRouter(Resource, t.Generic[TTool, TToolCollection]):
url=session.mcp.url,
),
experimental=experimental_response,
- preload=_session_preload_config(session),
+ preload=_session_preload_config(session.config.preload),
)
diff --git a/python/composio/core/models/tool_router_session.py b/python/composio/core/models/tool_router_session.py
index 448834561..6b879a63f 100644
--- a/python/composio/core/models/tool_router_session.py
+++ b/python/composio/core/models/tool_router_session.py
@@ -356,10 +356,13 @@ class ToolRouterSession(t.Generic[TTool, TToolCollection]):
return result
entry = find_custom_tool(self._custom_tools_map, slug)
if entry:
- return execute_custom_tool(
- entry,
- arguments,
- t.cast(SessionContextImpl, self._session_context),
+ return t.cast(
+ t.Dict[str, t.Any],
+ execute_custom_tool(
+ entry,
+ arguments,
+ t.cast(SessionContextImpl, self._session_context),
+ ),
)
# Non-multi-execute meta tools always go to backend
return backend_execute(slug, arguments)