@devries-cameron20 / composio Mirror · read-only / commits / 8286f2009
Fork 0

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

Solve all omit related issues

Prateek committed Oct 1, 2025 at 16:12 UTC 8286f200925a5a601f7b7ae35fce28d95b12df4a
5 files changed +63 -51
python/composio/core/models/mcp.py
+7 -11
@@ -9,13 +9,13 @@ from __future__ import annotations
9 import typing as t
10
11 import typing_extensions as te
12 -from composio_client import omit
12 from composio_client.types.mcp.custom_create_response import CustomCreateResponse
13 from composio_client.types.tool_router_create_session_params import ConfigToolkit
14
15 from composio.client import HttpClient
16 from composio.core.models.base import Resource
17 from composio.exceptions import ValidationError
18 +from composio.utils.pydantic import none_to_omit
19
20 # Data Types (matching TypeScript specification)
21
@@ -189,7 +189,7 @@ class MCP(Resource):
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
192 + custom_tools = none_to_omit(allowed_tools)
193
194 # Use the custom MCP create endpoint
195 response = self._client.mcp.custom.create(
@@ -244,15 +244,11 @@ class MCP(Resource):
244 response = self._client.mcp.list(
245 page_no=page_no,
246 limit=limit,
247 - toolkits=toolkits if toolkits is not None else omit,
248 - auth_config_ids=auth_config_ids
249 - if auth_config_ids is not None
250 - else omit,
251 - name=name if name is not None else omit,
252 - order_by=order_by if order_by is not None else omit,
253 - order_direction=order_direction
254 - if order_direction is not None
255 - else omit,
247 + toolkits=none_to_omit(toolkits),
248 + auth_config_ids=none_to_omit(auth_config_ids),
249 + name=none_to_omit(name),
250 + order_by=none_to_omit(order_by),
251 + order_direction=none_to_omit(order_direction),
252 )
253
254 items = (
python/composio/core/models/toolkits.py
+7 -6
@@ -11,6 +11,7 @@ from composio.client.types import (
11 toolkit_retrieve_response,
12 )
13 from composio.core.models.connected_accounts import ConnectedAccounts
14 +from composio.utils.pydantic import none_to_omit
15
16 from .base import Resource
17
@@ -48,12 +49,12 @@ class Toolkits(Resource):
49 ) -> toolkit_list_response.ToolkitListResponse:
50 """List all toolkits."""
51 return self._client.toolkits.list(
51 - category=category if category is not None else self._client.not_given,
52 - cursor=cursor if cursor is not None else self._client.not_given,
53 - is_local=is_local if is_local is not None else self._client.not_given,
54 - limit=limit if limit is not None else self._client.not_given,
55 - managed_by=managed_by if managed_by is not None else self._client.not_given,
56 - sort_by=sort_by if sort_by is not None else self._client.not_given,
52 + category=none_to_omit(category),
53 + cursor=none_to_omit(cursor),
54 + is_local=none_to_omit(is_local),
55 + limit=none_to_omit(limit),
56 + managed_by=none_to_omit(managed_by),
57 + sort_by=none_to_omit(sort_by),
58 )
59
60 @t.overload
python/composio/core/models/tools.py
+19 -31
@@ -3,6 +3,7 @@ from __future__ import annotations
3 import functools
4 import typing as t
5
6 +from composio_client import omit
7 import typing_extensions as te
8
9 from composio.client import HttpClient
@@ -25,6 +26,7 @@ from composio.core.provider.none_agentic import (
26 )
27 from composio.core.types import ToolkitVersionParam
28 from composio.exceptions import InvalidParams, NotFoundError
29 +from composio.utils.pydantic import none_to_omit
30 from composio.utils.toolkit_version import get_toolkit_version
31
32 from ._modifiers import (
@@ -100,7 +102,7 @@ class Tools(Resource, t.Generic[TProvider]):
102 return t.cast(
103 Tool,
104 self._client.tools.retrieve(
103 - tool_slug=slug, toolkit_versions=self._toolkit_versions
105 + tool_slug=slug, toolkit_versions=none_to_omit(self._toolkit_versions)
106 ),
107 )
108
@@ -128,7 +130,7 @@ class Tools(Resource, t.Generic[TProvider]):
130 tools_list.extend(
131 self._client.tools.list(
132 tool_slugs=",".join(tools),
131 - toolkit_versions=self._toolkit_versions,
133 + toolkit_versions=none_to_omit(self._toolkit_versions),
134 ).items
135 )
136
@@ -136,13 +138,11 @@ class Tools(Resource, t.Generic[TProvider]):
138 if toolkits is not None or search is not None:
139 tools_list.extend(
140 self._client.tools.list(
139 - toolkit_slug=(
140 - ",".join(toolkits) if toolkits else self._client.not_given
141 - ),
142 - search=search if search else self._client.not_given,
141 + toolkit_slug=none_to_omit(",".join(toolkits) if toolkits else None),
142 + search=none_to_omit(search),
143 scopes=scopes,
144 limit=limit,
145 - toolkit_versions=self._toolkit_versions,
145 + toolkit_versions=none_to_omit(self._toolkit_versions),
146 ).items
147 )
148 return tools_list
@@ -352,24 +352,12 @@ class Tools(Resource, t.Generic[TProvider]):
352 self._client.tools.execute(
353 tool_slug=slug,
354 arguments=arguments,
355 - connected_account_id=(
356 - connected_account_id
357 - if connected_account_id is not None
358 - else self._client.not_given
359 - ),
360 - custom_auth_params=(
361 - custom_auth_params
362 - if custom_auth_params is not None
363 - else self._client.not_given
364 - ),
365 - custom_connection_data=(
366 - custom_connection_data
367 - if custom_connection_data is not None
368 - else self._client.not_given
369 - ),
370 - user_id=user_id if user_id is not None else self._client.not_given,
371 - text=text if text is not None else self._client.not_given,
372 - version=version if version is not None else self._client.not_given,
355 + connected_account_id=none_to_omit(connected_account_id),
356 + custom_auth_params=none_to_omit(custom_auth_params),
357 + custom_connection_data=none_to_omit(custom_connection_data),
358 + user_id=none_to_omit(user_id),
359 + text=none_to_omit(text),
360 + version=none_to_omit(version),
361 # Note: We don't pass toolkit_versions to the API, we resolve the specific version above
362 ).model_dump(
363 exclude={
@@ -426,7 +414,7 @@ class Tools(Resource, t.Generic[TProvider]):
414 tool = t.cast(
415 Tool,
416 self._client.tools.retrieve(
429 - tool_slug=slug, toolkit_versions=effective_toolkit_versions
417 + tool_slug=slug, toolkit_versions=none_to_omit(effective_toolkit_versions)
418 ),
419 )
420 self._tool_schemas[slug] = tool
@@ -475,7 +463,7 @@ class Tools(Resource, t.Generic[TProvider]):
463 user_id=user_id,
464 text=text,
465 version=version,
478 - toolkit_versions=effective_toolkit_versions,
466 + toolkit_versions=none_to_omit(effective_toolkit_versions),
467 )
468 )
469 response = self._file_helper.substitute_file_downloads(
@@ -499,13 +487,13 @@ class Tools(Resource, t.Generic[TProvider]):
487 return self._client.tools.proxy(
488 endpoint=options["endpoint"],
489 method=options["method"],
502 - body=options.get("body", self._client.not_given),
490 + body=options.get("body", omit),
491 connected_account_id=options.get(
504 - "connected_account_id", self._client.not_given
492 + "connected_account_id", omit
493 ),
506 - parameters=options.get("parameters", self._client.not_given),
494 + parameters=options.get("parameters", omit),
495 custom_connection_data=options.get(
508 - "custom_connection_data", self._client.not_given
496 + "custom_connection_data", omit
497 ),
498 )
499
python/composio/core/models/triggers.py
+4 -3
@@ -8,6 +8,7 @@ import typing as t
8 import uuid
9 from concurrent.futures import ThreadPoolExecutor
10 from unittest import mock
11 +from composio_client import omit
12
13 import typing_extensions as te
14 from pysher import Pusher
@@ -676,8 +677,8 @@ class Triggers(Resource):
677 query_auth_config_ids_1=auth_config_ids,
678 query_connected_account_ids_1=connected_account_ids,
679 query_show_disabled_1=show_disabled,
679 - limit=limit if limit is not None else self._client.not_given,
680 - page=page if page is not None else self._client.not_given,
680 + limit=limit if limit is not None else omit,
681 + page=page if page is not None else omit,
682 )
683
684 @t.overload
@@ -729,7 +730,7 @@ class Triggers(Resource):
730 slug=slug,
731 connected_account_id=connected_account_id,
732 body_trigger_config_1=(
732 - trigger_config if trigger_config is not None else self._client.not_given
733 + trigger_config if trigger_config is not None else omit
734 ),
735 )
736
python/composio/utils/pydantic.py
+26
@@ -1,4 +1,30 @@
1 +import typing as t
2 +
3 import pydantic
4 +from composio_client import omit
5 +
6 +
7 +def none_to_omit(value: t.Optional[t.Any]) -> t.Union[t.Any, type(omit)]:
8 + """Convert None to omit for composio_client API calls.
9 +
10 + This utility function helps convert Python's None values to composio_client's
11 + omit sentinel value, which tells the API to exclude the parameter entirely.
12 +
13 + Args:
14 + value: Any value that might be None
15 +
16 + Returns:
17 + The original value if not None, otherwise omit
18 +
19 + Example:
20 + >>> none_to_omit("hello")
21 + "hello"
22 + >>> none_to_omit(None)
23 + <omit>
24 + >>> none_to_omit(42)
25 + 42
26 + """
27 + return omit if value is None else value
28
29
30 def parse_pydantic_error(e: pydantic.ValidationError) -> str: