Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
Mirrored from https://github.com/Camo67/composio.git
Synced Nov 22, 19:30 UTC
Fix type errors in mcp.py and tool_router.py
Prateek committed
Oct 1, 2025 at 04:33 UTC
7fe45d09b94bdfb2742495fb02b0919b76715170
3 files changed
+45
-49
python/composio/core/models/mcp.py
+39
-33
@@ -11,15 +11,21 @@ import typing as t
11
import typing_extensions as te
12
from composio_client import omit
13
from composio_client.types.mcp.custom_create_response import CustomCreateResponse
14
+from composio_client.types.tool_router_create_session_params import ConfigToolkit
15
16
from composio.client import HttpClient
17
from composio.core.models.base import Resource
17
-from composio.core.types import MCPToolkitConfig
18
from composio.exceptions import ValidationError
19
20
# Data Types (matching TypeScript specification)
21
22
23
+class MCPCreateResponse(CustomCreateResponse):
24
+ """MCP Create Response with generate method (extends CustomCreateResponse)."""
25
+
26
+ generate: t.Callable[[str, t.Optional[bool]], "MCPServerInstance"]
27
+
28
+
29
class MCPServerInstance(te.TypedDict):
30
"""MCP Server Instance data structure (matching TypeScript implementation)."""
31
@@ -58,7 +64,7 @@ class MCPListResponse(te.TypedDict):
64
65
def _add_generate_method(
66
response: CustomCreateResponse, mcp_instance: "MCP"
61
-) -> CustomCreateResponse:
67
+) -> MCPCreateResponse:
68
"""Add generate method to CustomCreateResponse object."""
69
70
def generate(
@@ -74,9 +80,9 @@ def _add_generate_method(
80
"""
81
return mcp_instance.generate(user_id, response.id, manually_manage_connections)
82
77
- # Add the generate method to the response object
78
- response.generate = generate
79
- return response
83
+ # Add the generate method to the response object and cast to MCPCreateResponse
84
+ response.generate = generate # type: ignore
85
+ return t.cast(MCPCreateResponse, response)
86
87
88
class MCP(Resource):
@@ -98,10 +104,10 @@ class MCP(Resource):
104
def create(
105
self,
106
name: str,
101
- toolkits: t.List[t.Union[MCPToolkitConfig, str]],
107
+ toolkits: t.List[t.Union[ConfigToolkit, str]],
108
manually_manage_connections: bool = False,
109
allowed_tools: t.Optional[t.List[str]] = None,
104
- ) -> CustomCreateResponse:
110
+ ) -> MCPCreateResponse:
111
"""
112
Create a new MCP server configuration with specified toolkits and authentication settings.
113
@@ -120,11 +126,11 @@ class MCP(Resource):
126
... toolkits=[
127
... {
128
... 'toolkit': 'github',
123
- ... 'auth_config_id': 'ac_xyz',
129
+ ... 'auth_config': 'ac_xyz',
130
... },
131
... {
132
... 'toolkit': 'slack',
127
- ... 'auth_config_id': 'ac_abc',
133
+ ... 'auth_config': 'ac_abc',
134
... },
135
... ],
136
... allowed_tools=['GITHUB_CREATE_ISSUE', 'GITHUB_LIST_REPOS', 'SLACK_SEND_MESSAGE'],
@@ -153,11 +159,11 @@ class MCP(Resource):
159
160
try:
161
# Normalize toolkits to MCPToolkitConfig format
156
- normalized_toolkit_configs = []
162
+ normalized_toolkit_configs: t.List[ConfigToolkit] = []
163
for toolkit in toolkits:
164
if isinstance(toolkit, str):
165
# Convert string to MCPToolkitConfig
160
- normalized_toolkit_configs.append({"toolkit": toolkit})
166
+ normalized_toolkit_configs.append(ConfigToolkit(toolkit=toolkit))
167
else:
168
# Already MCPToolkitConfig, use as-is
169
normalized_toolkit_configs.append(toolkit)
@@ -177,10 +183,10 @@ class MCP(Resource):
183
toolkit_names.append(toolkit_config["toolkit"])
184
185
if (
180
- "auth_config_id" in toolkit_config
181
- and toolkit_config["auth_config_id"] not in auth_config_ids
186
+ "auth_config" in toolkit_config
187
+ and toolkit_config["auth_config"] not in auth_config_ids
188
):
183
- auth_config_ids.append(toolkit_config["auth_config_id"])
189
+ auth_config_ids.append(toolkit_config["auth_config"])
190
191
# Use the allowed_tools parameter instead of individual toolkit configs
192
custom_tools = allowed_tools if allowed_tools is not None else omit
@@ -207,8 +213,8 @@ class MCP(Resource):
213
toolkits: t.Optional[str] = None,
214
auth_config_ids: t.Optional[str] = None,
215
name: t.Optional[str] = None,
210
- order_by: t.Optional[str] = None,
211
- order_direction: t.Optional[str] = None,
216
+ order_by: t.Optional[te.Literal["created_at", "updated_at"]] = None,
217
+ order_direction: t.Optional[te.Literal["asc", "desc"]] = None,
218
) -> MCPListResponse:
219
"""
220
List MCP servers with optional filtering and pagination.
@@ -238,11 +244,11 @@ class MCP(Resource):
244
response = self._client.mcp.list(
245
page_no=page_no,
246
limit=limit,
241
- toolkits=toolkits,
242
- auth_config_ids=auth_config_ids,
243
- name=name,
244
- order_by=order_by,
245
- order_direction=order_direction,
247
+ toolkits=toolkits if toolkits is not None else omit,
248
+ auth_config_ids=auth_config_ids if auth_config_ids is not None else omit,
249
+ name=name if name is not None else omit,
250
+ order_by=order_by if order_by is not None else omit,
251
+ order_direction=order_direction if order_direction is not None else omit,
252
)
253
254
items = (
@@ -285,7 +291,7 @@ class MCP(Resource):
291
self,
292
server_id: str,
293
name: t.Optional[str] = None,
288
- toolkits: t.Optional[t.List[t.Union[MCPToolkitConfig, str]]] = None,
294
+ toolkits: t.Optional[t.List[t.Union[ConfigToolkit, str]]] = None,
295
manually_manage_connections: t.Optional[bool] = None,
296
allowed_tools: t.Optional[t.List[str]] = None,
297
):
@@ -317,28 +323,28 @@ class MCP(Resource):
323
>>> server_with_auth = composio.experimental.mcp.update(
324
... 'mcp_12345',
325
... toolkits=[
320
- ... {'toolkit': 'github', 'auth_config_id': 'auth_abc123'},
321
- ... {'toolkit': 'slack', 'auth_config_id': 'auth_def456'}
326
+ ... {'toolkit': 'github', 'auth_config': 'auth_abc123'},
327
+ ... {'toolkit': 'slack', 'auth_config': 'auth_def456'}
328
... ],
329
... allowed_tools=['GITHUB_CREATE_ISSUE', 'SLACK_SEND_MESSAGE'],
330
... manually_manage_connections=False
331
... )
332
"""
333
try:
328
- update_params = {}
334
+ update_params: t.Dict[str, t.Any] = {}
335
336
if name is not None:
337
update_params["name"] = name
338
339
if toolkits is not None:
334
- # Normalize toolkits to MCPToolkitConfig format (same as create method)
335
- normalized_toolkit_configs = []
340
+ # Normalize toolkits to ConfigToolkit format (same as create method)
341
+ normalized_toolkit_configs: t.List[ConfigToolkit] = []
342
for toolkit in toolkits:
343
if isinstance(toolkit, str):
338
- # Convert string to MCPToolkitConfig
339
- normalized_toolkit_configs.append({"toolkit": toolkit})
344
+ # Convert string to ConfigToolkit
345
+ normalized_toolkit_configs.append(ConfigToolkit(toolkit=toolkit))
346
else:
341
- # Already MCPToolkitConfig, use as-is
347
+ # Already ConfigToolkit, use as-is
348
normalized_toolkit_configs.append(toolkit)
349
350
# Extract toolkits and prepare for API call
@@ -353,10 +359,10 @@ class MCP(Resource):
359
toolkit_names.append(toolkit_config["toolkit"])
360
361
if (
356
- "auth_config_id" in toolkit_config
357
- and toolkit_config["auth_config_id"] not in auth_config_ids
362
+ "auth_config" in toolkit_config
363
+ and toolkit_config["auth_config"] not in auth_config_ids
364
):
359
- auth_config_ids.append(toolkit_config["auth_config_id"])
365
+ auth_config_ids.append(toolkit_config["auth_config"])
366
367
update_params["toolkits"] = toolkit_names
368
update_params["auth_config_ids"] = auth_config_ids
python/composio/core/models/tool_router.py
+6
-5
@@ -11,9 +11,10 @@ import typing as t
11
12
import typing_extensions as te
13
14
+from composio_client.types.tool_router_create_session_params import ConfigToolkit
15
+
16
from composio.client import HttpClient
17
from composio.core.models.base import Resource
16
-from composio.core.types import MCPToolkitConfig
18
from composio.exceptions import ValidationError
19
20
# Data Types
@@ -45,7 +46,7 @@ class ToolRouter(Resource):
46
def create_session(
47
self,
48
user_id: str,
48
- toolkits: t.Optional[t.List[t.Union[MCPToolkitConfig, str]]] = None,
49
+ toolkits: t.Optional[t.List[t.Union[ConfigToolkit, str]]] = None,
50
manually_manage_connections: t.Optional[bool] = None,
51
) -> ToolRouterSession:
52
"""
@@ -67,7 +68,7 @@ class ToolRouter(Resource):
68
>>> session = composio.experimental.tool_router.create_session(
69
... 'user_123',
70
... toolkits=[
70
- ... {'toolkit': 'github', 'auth_config_id': 'ac_123'},
71
+ ... {'toolkit': 'github', 'auth_config': 'ac_123'},
72
... 'hackernews'
73
... ],
74
... manually_manage_connections=False
@@ -79,12 +80,12 @@ class ToolRouter(Resource):
80
"""
81
try:
82
# Normalize toolkits to the format expected by the API
82
- toolkit_configs = []
83
+ toolkit_configs: t.List[ConfigToolkit] = []
84
if toolkits:
85
for toolkit in toolkits:
86
if isinstance(toolkit, str):
87
# Convert string to toolkit config
87
- toolkit_configs.append({"toolkit": toolkit})
88
+ toolkit_configs.append(ConfigToolkit(toolkit=toolkit))
89
else:
90
# Already a config object, use as-is
91
toolkit_configs.append(toolkit)
python/composio/core/types.py
-11
@@ -13,20 +13,9 @@ ToolkitVersionParam = t.Union[
13
] # String can be any global version
14
15
16
-# Shared types for MCP and ToolRouter
17
-class MCPToolkitConfig(te.TypedDict):
18
- """Configuration for a single toolkit in MCP server or ToolRouter session."""
19
-
20
- toolkit: te.NotRequired[str] # e.g., "github", "slack", "composio_search"
21
- auth_config_id: te.NotRequired[
22
- str
23
- ] # Auth configuration ID (for toolkits requiring auth)
24
-
25
-
16
__all__ = [
17
"ToolkitLatestVersion",
18
"ToolkitVersion",
19
"ToolkitVersions",
20
"ToolkitVersionParam",
31
- "MCPToolkitConfig",
21
]