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.

Solve all omit related issues

Prateek8286f200925a
diff --git a/python/composio/core/models/mcp.py b/python/composio/core/models/mcp.py
index be421e87c..bd03dc9ba 100644
--- a/python/composio/core/models/mcp.py
+++ b/python/composio/core/models/mcp.py
@@ -9,13 +9,13 @@ from __future__ import annotations
import typing as t
import typing_extensions as te
-from composio_client import omit
from composio_client.types.mcp.custom_create_response import CustomCreateResponse
from composio_client.types.tool_router_create_session_params import ConfigToolkit
from composio.client import HttpClient
from composio.core.models.base import Resource
from composio.exceptions import ValidationError
+from composio.utils.pydantic import none_to_omit
# Data Types (matching TypeScript specification)
@@ -189,7 +189,7 @@ class MCP(Resource):
auth_config_ids.append(toolkit_config["auth_config"])
# Use the allowed_tools parameter instead of individual toolkit configs
- custom_tools = allowed_tools if allowed_tools is not None else omit
+ custom_tools = none_to_omit(allowed_tools)
# Use the custom MCP create endpoint
response = self._client.mcp.custom.create(
@@ -244,15 +244,11 @@ class MCP(Resource):
response = self._client.mcp.list(
page_no=page_no,
limit=limit,
- toolkits=toolkits if toolkits is not None else omit,
- auth_config_ids=auth_config_ids
- if auth_config_ids is not None
- else omit,
- name=name if name is not None else omit,
- order_by=order_by if order_by is not None else omit,
- order_direction=order_direction
- if order_direction is not None
- else omit,
+ toolkits=none_to_omit(toolkits),
+ auth_config_ids=none_to_omit(auth_config_ids),
+ name=none_to_omit(name),
+ order_by=none_to_omit(order_by),
+ order_direction=none_to_omit(order_direction),
)
items = (
diff --git a/python/composio/core/models/toolkits.py b/python/composio/core/models/toolkits.py
index 773423f18..69f840e1f 100644
--- a/python/composio/core/models/toolkits.py
+++ b/python/composio/core/models/toolkits.py
@@ -11,6 +11,7 @@ from composio.client.types import (
toolkit_retrieve_response,
)
from composio.core.models.connected_accounts import ConnectedAccounts
+from composio.utils.pydantic import none_to_omit
from .base import Resource
@@ -48,12 +49,12 @@ class Toolkits(Resource):
) -> toolkit_list_response.ToolkitListResponse:
"""List all toolkits."""
return self._client.toolkits.list(
- category=category if category is not None else self._client.not_given,
- cursor=cursor if cursor is not None else self._client.not_given,
- is_local=is_local if is_local is not None else self._client.not_given,
- limit=limit if limit is not None else self._client.not_given,
- managed_by=managed_by if managed_by is not None else self._client.not_given,
- sort_by=sort_by if sort_by is not None else self._client.not_given,
+ category=none_to_omit(category),
+ cursor=none_to_omit(cursor),
+ is_local=none_to_omit(is_local),
+ limit=none_to_omit(limit),
+ managed_by=none_to_omit(managed_by),
+ sort_by=none_to_omit(sort_by),
)
@t.overload
diff --git a/python/composio/core/models/tools.py b/python/composio/core/models/tools.py
index 5dca05d42..e8ee9a580 100644
--- a/python/composio/core/models/tools.py
+++ b/python/composio/core/models/tools.py
@@ -3,6 +3,7 @@ from __future__ import annotations
import functools
import typing as t
+from composio_client import omit
import typing_extensions as te
from composio.client import HttpClient
@@ -25,6 +26,7 @@ from composio.core.provider.none_agentic import (
)
from composio.core.types import ToolkitVersionParam
from composio.exceptions import InvalidParams, NotFoundError
+from composio.utils.pydantic import none_to_omit
from composio.utils.toolkit_version import get_toolkit_version
from ._modifiers import (
@@ -100,7 +102,7 @@ class Tools(Resource, t.Generic[TProvider]):
return t.cast(
Tool,
self._client.tools.retrieve(
- tool_slug=slug, toolkit_versions=self._toolkit_versions
+ tool_slug=slug, toolkit_versions=none_to_omit(self._toolkit_versions)
),
)
@@ -128,7 +130,7 @@ class Tools(Resource, t.Generic[TProvider]):
tools_list.extend(
self._client.tools.list(
tool_slugs=",".join(tools),
- toolkit_versions=self._toolkit_versions,
+ toolkit_versions=none_to_omit(self._toolkit_versions),
).items
)
@@ -136,13 +138,11 @@ class Tools(Resource, t.Generic[TProvider]):
if toolkits is not None or search is not None:
tools_list.extend(
self._client.tools.list(
- toolkit_slug=(
- ",".join(toolkits) if toolkits else self._client.not_given
- ),
- search=search if search else self._client.not_given,
+ toolkit_slug=none_to_omit(",".join(toolkits) if toolkits else None),
+ search=none_to_omit(search),
scopes=scopes,
limit=limit,
- toolkit_versions=self._toolkit_versions,
+ toolkit_versions=none_to_omit(self._toolkit_versions),
).items
)
return tools_list
@@ -352,24 +352,12 @@ class Tools(Resource, t.Generic[TProvider]):
self._client.tools.execute(
tool_slug=slug,
arguments=arguments,
- connected_account_id=(
- connected_account_id
- if connected_account_id is not None
- else self._client.not_given
- ),
- custom_auth_params=(
- custom_auth_params
- if custom_auth_params is not None
- else self._client.not_given
- ),
- custom_connection_data=(
- custom_connection_data
- if custom_connection_data is not None
- else self._client.not_given
- ),
- user_id=user_id if user_id is not None else self._client.not_given,
- text=text if text is not None else self._client.not_given,
- version=version if version is not None else self._client.not_given,
+ connected_account_id=none_to_omit(connected_account_id),
+ custom_auth_params=none_to_omit(custom_auth_params),
+ custom_connection_data=none_to_omit(custom_connection_data),
+ user_id=none_to_omit(user_id),
+ text=none_to_omit(text),
+ version=none_to_omit(version),
# Note: We don't pass toolkit_versions to the API, we resolve the specific version above
).model_dump(
exclude={
@@ -426,7 +414,7 @@ class Tools(Resource, t.Generic[TProvider]):
tool = t.cast(
Tool,
self._client.tools.retrieve(
- tool_slug=slug, toolkit_versions=effective_toolkit_versions
+ tool_slug=slug, toolkit_versions=none_to_omit(effective_toolkit_versions)
),
)
self._tool_schemas[slug] = tool
@@ -475,7 +463,7 @@ class Tools(Resource, t.Generic[TProvider]):
user_id=user_id,
text=text,
version=version,
- toolkit_versions=effective_toolkit_versions,
+ toolkit_versions=none_to_omit(effective_toolkit_versions),
)
)
response = self._file_helper.substitute_file_downloads(
@@ -499,13 +487,13 @@ class Tools(Resource, t.Generic[TProvider]):
return self._client.tools.proxy(
endpoint=options["endpoint"],
method=options["method"],
- body=options.get("body", self._client.not_given),
+ body=options.get("body", omit),
connected_account_id=options.get(
- "connected_account_id", self._client.not_given
+ "connected_account_id", omit
),
- parameters=options.get("parameters", self._client.not_given),
+ parameters=options.get("parameters", omit),
custom_connection_data=options.get(
- "custom_connection_data", self._client.not_given
+ "custom_connection_data", omit
),
)
diff --git a/python/composio/core/models/triggers.py b/python/composio/core/models/triggers.py
index e0168a8b4..efe9201f7 100644
--- a/python/composio/core/models/triggers.py
+++ b/python/composio/core/models/triggers.py
@@ -8,6 +8,7 @@ import typing as t
import uuid
from concurrent.futures import ThreadPoolExecutor
from unittest import mock
+from composio_client import omit
import typing_extensions as te
from pysher import Pusher
@@ -676,8 +677,8 @@ class Triggers(Resource):
query_auth_config_ids_1=auth_config_ids,
query_connected_account_ids_1=connected_account_ids,
query_show_disabled_1=show_disabled,
- limit=limit if limit is not None else self._client.not_given,
- page=page if page is not None else self._client.not_given,
+ limit=limit if limit is not None else omit,
+ page=page if page is not None else omit,
)
@t.overload
@@ -729,7 +730,7 @@ class Triggers(Resource):
slug=slug,
connected_account_id=connected_account_id,
body_trigger_config_1=(
- trigger_config if trigger_config is not None else self._client.not_given
+ trigger_config if trigger_config is not None else omit
),
)
diff --git a/python/composio/utils/pydantic.py b/python/composio/utils/pydantic.py
index 71034e74a..17eb34977 100644
--- a/python/composio/utils/pydantic.py
+++ b/python/composio/utils/pydantic.py
@@ -1,4 +1,30 @@
+import typing as t
+
import pydantic
+from composio_client import omit
+
+
+def none_to_omit(value: t.Optional[t.Any]) -> t.Union[t.Any, type(omit)]:
+ """Convert None to omit for composio_client API calls.
+
+ This utility function helps convert Python's None values to composio_client's
+ omit sentinel value, which tells the API to exclude the parameter entirely.
+
+ Args:
+ value: Any value that might be None
+
+ Returns:
+ The original value if not None, otherwise omit
+
+ Example:
+ >>> none_to_omit("hello")
+ "hello"
+ >>> none_to_omit(None)
+ <omit>
+ >>> none_to_omit(42)
+ 42
+ """
+ return omit if value is None else value
def parse_pydantic_error(e: pydantic.ValidationError) -> str: