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): use generated client types everywhere, remove custom TypedDicts

Dhawal Upadhyayb7424401e2d7
diff --git a/python/composio/core/models/__init__.py b/python/composio/core/models/__init__.py
index 19465d870..8f732d9a0 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,
- ProxyExecuteResponse,
RegisteredCustomTool,
RegisteredCustomToolkit,
SessionContext,
@@ -36,7 +35,6 @@ __all__ = [
"ExperimentalAPI",
"ExperimentalToolkit",
"MCP",
- "ProxyExecuteResponse",
"RegisteredCustomTool",
"RegisteredCustomToolkit",
"RemoteFile",
diff --git a/python/composio/core/models/custom_tool_types.py b/python/composio/core/models/custom_tool_types.py
index 370a59f5e..39a8dbe26 100644
--- a/python/composio/core/models/custom_tool_types.py
+++ b/python/composio/core/models/custom_tool_types.py
@@ -12,6 +12,10 @@ from dataclasses import dataclass, field
import typing_extensions as te
from pydantic import BaseModel
+from composio_client.types.tool_router.session_proxy_execute_response import (
+ SessionProxyExecuteResponse,
+)
+
from composio.core.models.tools import ToolExecutionResponse
# ────────────────────────────────────────────────────────────────
@@ -69,7 +73,7 @@ class SessionContext(te.Protocol):
method: t.Literal["GET", "POST", "PUT", "DELETE", "PATCH"],
body: t.Any = None,
parameters: t.Optional[t.List[t.Dict[str, t.Any]]] = None,
- ) -> ProxyExecuteResponse:
+ ) -> SessionProxyExecuteResponse:
"""Proxy API calls through Composio's auth layer."""
...
@@ -145,22 +149,3 @@ class RegisteredCustomToolkit:
name: str
description: str
tools: t.List[RegisteredCustomTool]
-
-
-# ────────────────────────────────────────────────────────────────
-# Proxy execute response types
-# ────────────────────────────────────────────────────────────────
-
-
-class ProxyExecuteBinaryData(te.TypedDict, total=False):
- content_type: str
- size: int
- url: str
- expires_at: t.Optional[str]
-
-
-class ProxyExecuteResponse(te.TypedDict, total=False):
- status: int
- data: t.Optional[t.Any]
- headers: t.Optional[t.Dict[str, str]]
- binary_data: ProxyExecuteBinaryData
diff --git a/python/composio/core/models/session_context.py b/python/composio/core/models/session_context.py
index c2f66445c..5ab47e63a 100644
--- a/python/composio/core/models/session_context.py
+++ b/python/composio/core/models/session_context.py
@@ -10,16 +10,16 @@ import typing as t
from composio_client import omit
from composio_client.types.tool_router.session_proxy_execute_params import Parameter
+from composio_client.types.tool_router.session_proxy_execute_response import (
+ SessionProxyExecuteResponse,
+)
from composio.client import HttpClient
from composio.core.models.custom_tool_execution import (
execute_custom_tool,
find_custom_tool,
)
-from composio.core.models.custom_tool_types import (
- CustomToolsMap,
- ProxyExecuteResponse,
-)
+from composio.core.models.custom_tool_types import CustomToolsMap
from composio.core.models.tools import ToolExecutionResponse, _serialize_arguments
from composio.exceptions import ValidationError
@@ -37,7 +37,7 @@ def proxy_execute_impl(
method: t.Literal["GET", "POST", "PUT", "DELETE", "PATCH"],
body: t.Any = None,
parameters: t.Optional[t.List[t.Dict[str, t.Any]]] = None,
-) -> ProxyExecuteResponse:
+) -> SessionProxyExecuteResponse:
"""Shared proxy execute implementation used by SessionContextImpl and ToolRouterSession."""
# Client-side validation (matches TS SessionProxyExecuteParamsSchema)
if not toolkit:
@@ -71,7 +71,7 @@ def proxy_execute_impl(
)
)
- response = client.tool_router.session.proxy_execute(
+ return client.tool_router.session.proxy_execute(
session_id=session_id,
toolkit_slug=toolkit,
endpoint=endpoint,
@@ -80,22 +80,6 @@ def proxy_execute_impl(
parameters=api_params if api_params else omit,
)
- result: ProxyExecuteResponse = {
- "status": int(response.status),
- "data": response.data,
- "headers": response.headers,
- }
-
- if response.binary_data:
- result["binary_data"] = {
- "content_type": response.binary_data.content_type,
- "size": int(response.binary_data.size),
- "url": response.binary_data.url,
- "expires_at": response.binary_data.expires_at,
- }
-
- return result
-
class SessionContextImpl:
"""Concrete implementation of SessionContext.
@@ -160,7 +144,7 @@ class SessionContextImpl:
method: t.Literal["GET", "POST", "PUT", "DELETE", "PATCH"],
body: t.Any = None,
parameters: t.Optional[t.List[t.Dict[str, t.Any]]] = None,
- ) -> ProxyExecuteResponse:
+ ) -> SessionProxyExecuteResponse:
"""Proxy API calls through Composio's auth layer."""
return proxy_execute_impl(
self._client,
diff --git a/python/composio/core/models/tool_router_session.py b/python/composio/core/models/tool_router_session.py
index 64eee03a6..75ccec442 100644
--- a/python/composio/core/models/tool_router_session.py
+++ b/python/composio/core/models/tool_router_session.py
@@ -12,6 +12,12 @@ import typing as t
from concurrent.futures import ThreadPoolExecutor
from composio_client import omit
+from composio_client.types.tool_router.session_execute_response import (
+ SessionExecuteResponse,
+)
+from composio_client.types.tool_router.session_proxy_execute_response import (
+ SessionProxyExecuteResponse,
+)
from composio.client import HttpClient
from composio.core.models.connected_accounts import ConnectionRequest
@@ -22,7 +28,6 @@ from composio.core.models.custom_tool_execution import (
from composio.core.models.custom_tool_types import (
CustomToolsMap,
CustomToolsMapEntry,
- ProxyExecuteResponse,
RegisteredCustomTool,
RegisteredCustomToolkit,
)
@@ -470,7 +475,7 @@ class ToolRouterSession(t.Generic[TTool, TToolCollection]):
tool_slug: str,
*,
arguments: t.Optional[t.Dict[str, t.Any]] = None,
- ) -> t.Any:
+ ) -> SessionExecuteResponse:
"""
Execute a tool within the session.
@@ -574,12 +579,9 @@ class ToolRouterSession(t.Generic[TTool, TToolCollection]):
method: t.Literal["GET", "POST", "PUT", "DELETE", "PATCH"],
body: t.Any = None,
parameters: t.Optional[t.List[t.Dict[str, t.Any]]] = None,
- ) -> ProxyExecuteResponse:
+ ) -> SessionProxyExecuteResponse:
"""Proxy an API call through Composio's auth layer.
- The backend resolves the connected account from the toolkit
- within the session.
-
:param toolkit: Composio toolkit slug (e.g. 'gmail', 'github')
:param endpoint: API endpoint URL
:param method: HTTP method
diff --git a/python/tests/test_custom_tools.py b/python/tests/test_custom_tools.py
index b3c6a0a3c..13135c6c8 100644
--- a/python/tests/test_custom_tools.py
+++ b/python/tests/test_custom_tools.py
@@ -501,7 +501,7 @@ class TestSessionContextImpl:
result = ctx.proxy_execute(
toolkit="gmail", endpoint="https://example.com", method="GET"
)
- assert result["status"] == 200
+ assert result.status == 200
# ────────────────────────────────────────────────────────────────