@devries-cameron20 / composio-1 / commits / ee738a6b9
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.

fix(py): cursorbot

jkomyno committed Feb 6, 2026 at 02:08 UTC ee738a6b933098b68efc0cdfe5a7c722e221e8a7
23 files changed +97 -68
python/composio/core/models/tool_router.py
+1 -1
@@ -11,9 +11,9 @@ import typing as t
11 from dataclasses import dataclass
12 from enum import Enum
13
14 +import typing_extensions as te
15 from composio_client import omit
16 from composio_client.types.tool_router import session_create_params
16 -import typing_extensions as te
17
18 from composio.client import HttpClient
19 from composio.core.models.base import Resource
python/composio/core/models/tools.py
+1 -1
@@ -20,6 +20,7 @@ from composio.core.provider import (
20 TProvider,
21 )
22 from composio.core.provider.agentic import AgenticProvider, AgenticProviderExecuteFn
23 +from composio.core.provider.base import ExecuteToolFn
24 from composio.core.provider.none_agentic import (
25 NonAgenticProvider,
26 )
@@ -27,7 +28,6 @@ from composio.core.types import ToolkitVersionParam
28 from composio.exceptions import InvalidParams, NotFoundError, ToolVersionRequiredError
29 from composio.utils.pydantic import none_to_omit
30 from composio.utils.toolkit_version import get_toolkit_version
30 -from composio.core.provider.base import ExecuteToolFn
31
32 from ._modifiers import (
33 Modifiers,
python/composio/core/models/triggers.py
+42 -24
@@ -13,9 +13,9 @@ from concurrent.futures import ThreadPoolExecutor
13 from enum import Enum
14 from unittest import mock
15
16 -from composio_client.types import TriggersTypeRetrieveResponse
16 import typing_extensions as te
17 from composio_client import omit
18 +from composio_client.types import TriggersTypeRetrieveResponse
19 from pysher import Pusher
20 from pysher.channel import Channel as PusherChannel
21 from pysher.connection import Connection as PusherConnection
@@ -110,8 +110,20 @@ class WebhookPayloadV2(te.TypedDict):
110 data: t.Dict[str, t.Any]
111
112
113 -class WebhookPayloadV3Metadata(te.TypedDict):
114 - """V3 webhook payload metadata."""
113 +class WebhookPayloadV3(te.TypedDict):
114 + """V3 webhook payload structure - generic envelope for all composio.* events."""
115 +
116 + id: str
117 + timestamp: str
118 + type: str # Any composio.* event type (e.g., 'composio.trigger.message', 'composio.connected_account.expired')
119 + metadata: t.Dict[
120 + str, t.Any
121 + ] # Shape varies by event type (trigger vs connection events)
122 + data: t.Dict[str, t.Any]
123 +
124 +
125 +class WebhookTriggerPayloadV3Metadata(te.TypedDict):
126 + """V3 trigger-specific webhook payload metadata."""
127
128 log_id: str
129 trigger_slug: str
@@ -121,13 +133,13 @@ class WebhookPayloadV3Metadata(te.TypedDict):
133 user_id: str
134
135
124 -class WebhookPayloadV3(te.TypedDict):
125 - """V3 webhook payload structure."""
136 +class WebhookTriggerPayloadV3(te.TypedDict):
137 + """V3 trigger-specific webhook payload structure."""
138
139 id: str
140 timestamp: str
129 - type: str # Any composio.* event type (e.g., 'composio.trigger.message', 'composio.connected_account.expired')
130 - metadata: WebhookPayloadV3Metadata
141 + type: str
142 + metadata: WebhookTriggerPayloadV3Metadata
143 data: t.Dict[str, t.Any]
144
145
@@ -1222,35 +1234,41 @@ class Triggers(Resource):
1234 )
1235
1236 if is_trigger_event:
1237 + trigger_data = t.cast(WebhookTriggerPayloadV3, data)
1238 + trigger_metadata = trigger_data["metadata"]
1239 return t.cast(
1240 TriggerEvent,
1241 {
1228 - "id": metadata["trigger_id"],
1229 - "uuid": metadata["trigger_id"],
1230 - "user_id": metadata["user_id"],
1231 - "toolkit_slug": metadata["trigger_slug"].split("_")[0].upper()
1232 - if "_" in metadata["trigger_slug"]
1242 + "id": trigger_metadata["trigger_id"],
1243 + "uuid": trigger_metadata["trigger_id"],
1244 + "user_id": trigger_metadata["user_id"],
1245 + "toolkit_slug": trigger_metadata["trigger_slug"]
1246 + .split("_")[0]
1247 + .upper()
1248 + if "_" in trigger_metadata["trigger_slug"]
1249 else "UNKNOWN",
1234 - "trigger_slug": metadata["trigger_slug"],
1250 + "trigger_slug": trigger_metadata["trigger_slug"],
1251 "metadata": {
1236 - "id": metadata["trigger_id"],
1237 - "uuid": metadata["trigger_id"],
1238 - "toolkit_slug": metadata["trigger_slug"].split("_")[0].upper()
1239 - if "_" in metadata["trigger_slug"]
1252 + "id": trigger_metadata["trigger_id"],
1253 + "uuid": trigger_metadata["trigger_id"],
1254 + "toolkit_slug": trigger_metadata["trigger_slug"]
1255 + .split("_")[0]
1256 + .upper()
1257 + if "_" in trigger_metadata["trigger_slug"]
1258 else "UNKNOWN",
1241 - "trigger_slug": metadata["trigger_slug"],
1259 + "trigger_slug": trigger_metadata["trigger_slug"],
1260 "trigger_data": None,
1261 "trigger_config": {},
1262 "connected_account": {
1245 - "id": metadata["connected_account_id"],
1246 - "uuid": metadata["connected_account_id"],
1247 - "auth_config_id": metadata["auth_config_id"],
1248 - "auth_config_uuid": metadata["auth_config_id"],
1249 - "user_id": metadata["user_id"],
1263 + "id": trigger_metadata["connected_account_id"],
1264 + "uuid": trigger_metadata["connected_account_id"],
1265 + "auth_config_id": trigger_metadata["auth_config_id"],
1266 + "auth_config_uuid": trigger_metadata["auth_config_id"],
1267 + "user_id": trigger_metadata["user_id"],
1268 "status": "ACTIVE",
1269 },
1270 },
1253 - "payload": data["data"],
1271 + "payload": trigger_data["data"],
1272 "original_payload": None,
1273 },
1274 )
python/composio/sdk.py
+1 -1
@@ -10,8 +10,8 @@ from composio.client import DEFAULT_MAX_RETRIES, APIEnvironment, HttpClient
10 from composio.core.models import (
11 AuthConfigs,
12 ConnectedAccounts,
13 - ToolRouter,
13 Toolkits,
14 + ToolRouter,
15 Tools,
16 Triggers,
17 )
python/composio/utils/schema_converter.py
+4 -2
@@ -12,10 +12,12 @@ We handle those by pre-filtering them before passing to the library.
12 import typing as t
13 from functools import reduce
14
15 +from json_schema_to_pydantic import (
16 + CombinerError,
17 + SchemaError,
18 +)
19 from json_schema_to_pydantic import ( # type: ignore[import-untyped]
20 create_model as create_model_from_schema,
17 - SchemaError,
18 - CombinerError,
21 )
22
23 from composio.utils.logging import get as get_logger
python/composio/utils/shared.py
+2 -2
@@ -11,10 +11,10 @@ from pydantic.fields import FieldInfo
11
12 from composio.utils.logging import get as get_logger
13 from composio.utils.schema_converter import (
14 - json_schema_to_pydantic_type,
15 - PYDANTIC_TYPE_TO_PYTHON_TYPE,
14 CONTAINER_TYPE,
15 FALLBACK_VALUES,
16 + PYDANTIC_TYPE_TO_PYTHON_TYPE,
17 + json_schema_to_pydantic_type,
18 )
19
20 logger = get_logger(__name__)
python/examples/experimental_tool_router_advanced_example.py
+1 -1
@@ -138,8 +138,8 @@ def example_type_safe_configuration():
138 print("\n=== Type-Safe Configuration Example ===")
139
140 from composio.core.models.tool_router import (
141 - ToolRouterToolkitsDisabledConfig,
141 ToolRouterManageConnectionsConfig,
142 + ToolRouterToolkitsDisabledConfig,
143 )
144
145 # Type-safe toolkit config
python/examples/tool_router/authorize.py
+1
@@ -6,6 +6,7 @@ within a Tool Router session.
6 """
7
8 import os
9 +
10 from composio import Composio
11
12 # Initialize Composio
python/examples/tool_router/claude_agent.py
+5 -3
@@ -1,8 +1,10 @@
1 -from composio import Composio
2 -from composio_claude_agent_sdk import ClaudeAgentSDKProvider
3 -from claude_agent_sdk import query, ClaudeAgentOptions
1 import asyncio
2
3 +from claude_agent_sdk import ClaudeAgentOptions, query
4 +from composio_claude_agent_sdk import ClaudeAgentSDKProvider
5 +
6 +from composio import Composio
7 +
8 composio = Composio(provider=ClaudeAgentSDKProvider())
9 session = composio.create(
10 user_id="user_123",
python/examples/tool_router/crewai_agent.py
+2 -2
@@ -1,7 +1,7 @@
1 -from crewai import Agent, Task, Crew
2 -from composio import Composio
1 +from crewai import Agent, Crew, Task
2 from crewai.mcp import MCPServerHTTP
3
4 +from composio import Composio
5
6 composio = Composio()
7 session = composio.create(
python/examples/tool_router/langchain_agent.py
+5 -3
@@ -1,8 +1,10 @@
1 -from composio import Composio
2 -from langchain_mcp_adapters.client import MultiServerMCPClient
1 +import asyncio
2 +
3 from langchain.agents import create_agent
4 +from langchain_mcp_adapters.client import MultiServerMCPClient
5 from langchain_openai.chat_models import ChatOpenAI
5 -import asyncio
6 +
7 +from composio import Composio
8
9 composio = Composio()
10 session = composio.create(
python/examples/tool_router/openai_agents.py
+2 -1
@@ -1,5 +1,6 @@
1 +from agents import Agent, HostedMCPTool, Runner
2 +
3 from composio import Composio
2 -from agents import Agent, Runner, HostedMCPTool
4
5 composio = Composio()
6 session = composio.create(
python/examples/tool_router/tool_router_mcp.py
+5 -3
@@ -6,11 +6,13 @@ The MCP server provides a standardized way to access tools across different plat
6 and OpenAI Agents provider allows you to use these tools with OpenAI's agent framework.
7 """
8
9 -import os
9 import asyncio
11 -from composio import Composio
10 +import os
11 +
12 +from agents import Agent, HostedMCPTool, Runner
13 from composio_openai_agents import OpenAIAgentsProvider
13 -from agents import Agent, Runner, HostedMCPTool
14 +
15 +from composio import Composio
16
17
18 async def main():
python/examples/tool_router/tools.py
+3 -1
@@ -7,10 +7,12 @@ and execute complex workflows.
7 """
8
9 import asyncio
10 +
11 from agents import Agent, Runner
12 +from composio_openai_agents import OpenAIAgentsProvider
13 +
14 from composio import Composio, after_execute, before_execute
15 from composio.types import ToolExecuteParams, ToolExecutionResponse
13 -from composio_openai_agents import OpenAIAgentsProvider
16
17
18 async def main():
python/providers/claude_agent_sdk/composio_claude_agent_sdk/provider.py
+2
@@ -13,6 +13,8 @@ from claude_agent_sdk import (
13 McpSdkServerConfig,
14 SdkMcpTool,
15 create_sdk_mcp_server,
16 +)
17 +from claude_agent_sdk import (
18 tool as sdk_tool,
19 )
20
python/providers/claude_agent_sdk/tests/test_provider.py
-1
@@ -6,7 +6,6 @@ import json
6 from unittest.mock import MagicMock, patch
7
8 import pytest
9 -
9 from composio_claude_agent_sdk.provider import ClaudeAgentSDKProvider
10
11
python/providers/langchain/langchain_demo.py
-1
@@ -8,7 +8,6 @@ from langchain_openai import ChatOpenAI
8
9 from composio import Composio
10
11 -
11 openai_client = ChatOpenAI(model="gpt-5")
12
13
python/providers/openai_agents/openai_agents_demo.py
+1
@@ -2,6 +2,7 @@ import asyncio
2
3 from agents import Agent, Runner
4 from composio_openai_agents import OpenAIAgentsProvider
5 +
6 from composio import Composio
7
8 # Initialize Composio toolset
python/scripts/generate-docs.py
+1 -6
@@ -26,12 +26,7 @@ except ImportError:
26 SCRIPT_DIR = Path(__file__).parent
27 PACKAGE_DIR = SCRIPT_DIR.parent
28 OUTPUT_DIR = (
29 - PACKAGE_DIR.parent
30 - / "docs"
31 - / "content"
32 - / "reference"
33 - / "sdk-reference"
34 - / "python"
29 + PACKAGE_DIR.parent / "docs" / "content" / "reference" / "sdk-reference" / "python"
30 )
31
32 # GitHub base URL for source links
python/tests/test_auth_configs.py
+4 -3
@@ -1,14 +1,15 @@
1 """Tests for auth configs management."""
2
3 -import pytest
3 from unittest.mock import Mock
4
6 -from composio.core.models.auth_configs import AuthConfigs
5 +import pytest
6 +
7 from composio.client.types import (
8 - auth_config_list_response,
8 auth_config_create_response,
9 + auth_config_list_response,
10 auth_config_retrieve_response,
11 )
12 +from composio.core.models.auth_configs import AuthConfigs
13
14
15 class TestAuthConfigs:
python/tests/test_connected_accounts.py
+1 -1
@@ -7,8 +7,8 @@ import pytest
7 from composio import exceptions
8 from composio.core.models.connected_accounts import (
9 AuthScheme,
10 - ConnectionRequest,
10 ConnectedAccounts,
11 + ConnectionRequest,
12 )
13
14
python/tests/test_tool_router.py
+9 -9
@@ -5,16 +5,16 @@ from unittest.mock import MagicMock, patch
5 import pytest
6
7 from composio.core.models.tool_router import (
8 + ToolkitConnectionsDetails,
9 + ToolkitConnectionState,
10 ToolRouter,
9 - ToolRouterMCPServerConfig,
10 - ToolRouterToolkitsEnableConfig,
11 - ToolRouterToolkitsDisableConfig,
12 - ToolRouterManageConnectionsConfig,
11 ToolRouterExperimentalConfig,
14 - ToolRouterSessionExperimental,
15 - ToolkitConnectionState,
16 - ToolkitConnectionsDetails,
12 + ToolRouterManageConnectionsConfig,
13 + ToolRouterMCPServerConfig,
14 ToolRouterMCPServerType,
15 + ToolRouterSessionExperimental,
16 + ToolRouterToolkitsDisableConfig,
17 + ToolRouterToolkitsEnableConfig,
18 )
19
20
@@ -1117,9 +1117,9 @@ class TestToolRouterTypes:
1117 def test_toolkit_connection_state(self):
1118 """Test ToolkitConnectionState dataclass."""
1119 from composio.core.models.tool_router import (
1120 + ToolkitConnectedAccount,
1121 ToolkitConnection,
1122 ToolkitConnectionAuthConfig,
1122 - ToolkitConnectedAccount,
1123 )
1124
1125 connection = ToolkitConnection(
@@ -1242,8 +1242,8 @@ class TestToolRouterExecution:
1242 return response
1243
1244 # Create a real execute function with modifiers
1245 - from composio.core.models.tools import Tools as RealTools
1245 from composio.core.models._modifiers import Modifier
1246 + from composio.core.models.tools import Tools as RealTools
1247
1248 real_tools = RealTools(client=mock_client, provider=mock_provider)
1249
python/tests/test_triggers.py
+4 -2
@@ -5,12 +5,14 @@ import hashlib
5 import hmac
6 import json
7 import time
8 -import pytest
8 from datetime import datetime, timezone
9 from unittest.mock import Mock, patch
10 +
11 +import pytest
12 from composio_client import omit
12 -from composio.core.models.triggers import Triggers, WebhookVersion
13 +
14 from composio import exceptions
15 +from composio.core.models.triggers import Triggers, WebhookVersion
16
17
18 class TestTriggers: