Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
fix(python): clean up types and match TS merge order
Dhawal Upadhyayefcd1e46abf1
diff --git a/python/composio/core/models/tool_router.py b/python/composio/core/models/tool_router.pyindex a4634a820..1f6438054 100644--- a/python/composio/core/models/tool_router.py+++ b/python/composio/core/models/tool_router.py@@ -193,8 +193,8 @@ class ToolRouterExperimentalConfig(te.TypedDict, total=False):"""assistive_prompt: ToolRouterAssistivePromptConfig- custom_tools: t.List["CustomTool"]- custom_toolkits: t.List["ExperimentalToolkit"]+ custom_tools: t.List[CustomTool]+ custom_toolkits: t.List[ExperimentalToolkit]@dataclassdiff --git a/python/composio/core/models/tool_router_session.py b/python/composio/core/models/tool_router_session.pyindex de28c9ece..b7227e6b0 100644--- a/python/composio/core/models/tool_router_session.py+++ b/python/composio/core/models/tool_router_session.py@@ -223,13 +223,10 @@ class ToolRouterSession(t.Generic[TTool, TToolCollection]):"""Route a COMPOSIO_MULTI_EXECUTE_TOOL call.Splits the tools[] array into local and remote, executes each- appropriately, and merges results preserving original order.+ appropriately, and merges results: remotes first, locals appended+ (matches TS — remote results may have workbench index references).- Note: Results are merged in the original request order (index-based).- This intentionally differs from TS which appends locals after remotes —- preserving order is more predictable for callers.-- Note: modifiers are NOT applied here — the caller (routing_execute)+ Modifiers are NOT applied here — the caller (routing_execute)handles before_execute/after_execute to avoid double application."""tool_items = input_args.get("tools")@@ -305,71 +302,42 @@ class ToolRouterSession(t.Generic[TTool, TToolCollection]):if not remote_indices and len(local_results) == 1:return t.cast(t.Dict[str, t.Any], local_results[0][1])- # Merge results into the backend's results[] format- remote_data = (remote_result or {}).get("data", {})- remote_results_list: t.List[t.Any] = (- remote_data.get("results", []) if isinstance(remote_data, dict) else []- )-# Build local result entries matching backend formatlocal_entries = []for idx, result in local_results:- local_entries.append(- {- "response": {- "successful": result["successful"],- "data": result["data"],- **({"error": result["error"]} if result.get("error") else {}),- },- "tool_slug": parsed[idx]["tool_slug"],- **({"error": result["error"]} if result.get("error") else {}),- }- )-- # Merge: local entries + remote results, re-indexed sequentially- merged: t.List[t.Any] = []- remote_iter = iter(remote_results_list)- local_map = {idx: entry for (idx, _), entry in zip(local_items, local_entries)}+ entry: t.Dict[str, t.Any] = {+ "response": {+ "successful": result["successful"],+ "data": result["data"],+ },+ "tool_slug": parsed[idx]["tool_slug"],+ }+ if result.get("error"):+ entry["response"]["error"] = result["error"]+ entry["error"] = result["error"]+ local_entries.append(entry)- for i in range(len(parsed)):- if i in local_map:- merged.append(local_map[i])- else:- merged.append(next(remote_iter, {}))-- # Detect failures across local and remote results- failed_count = sum(- 1- for entry in merged- if isinstance(entry, dict)- and isinstance(entry.get("response"), dict)- and not entry["response"].get("successful", True)- )- has_any_error = failed_count > 0 or (- remote_result is not None and not remote_result.get("successful", True)+ # Merge: remotes first, locals appended (matches TS behavior —+ # remote results may be stored in workbench with index references)+ remote_data = (remote_result or {}).get("data", {})+ remote_results_list = (+ remote_data.get("results", []) if isinstance(remote_data, dict) else [])+ all_results = [+ {**entry, "index": i}+ for i, entry in enumerate([*remote_results_list, *local_entries])+ ]- # Preserve any extra metadata from the remote batch response- merged_data: t.Dict[str, t.Any] = {}- if isinstance(remote_data, dict):- merged_data.update(remote_data)- merged_data["results"] = merged-- # Build error message — include remote batch error if present- remote_batch_error = remote_result.get("error") if remote_result else None- if has_any_error:- parts = []- if failed_count > 0:- parts.append(f"{failed_count} out of {len(merged)} tools failed")- if remote_batch_error:- parts.append(f"remote batch error: {remote_batch_error}")- error_msg = "; ".join(parts) if parts else "execution failed"- else:- error_msg = None+ has_any_error = any(r.get("error") for _, r in local_results) or bool(+ remote_result and remote_result.get("error")+ )+ failed = sum(1 for r in all_results if r.get("error"))return {- "data": merged_data,- "error": error_msg,+ "data": {**remote_data, "results": all_results},+ "error": f"{failed} out of {len(all_results)} tools failed"+ if has_any_error+ else None,"successful": not has_any_error,}diff --git a/python/tests/test_custom_tools.py b/python/tests/test_custom_tools.pyindex 957e9e34f..0a6ab2d36 100644--- a/python/tests/test_custom_tools.py+++ b/python/tests/test_custom_tools.py@@ -605,7 +605,11 @@ class TestMultiExecuteRouting:},tm,)- assert len(result["data"]["results"]) == 2+ results = result["data"]["results"]+ assert len(results) == 2+ # Remotes first, locals appended (matches TS)+ assert results[0]["tool_slug"] == "R"+ assert results[1]["tool_slug"] == "GREP"def test_failure_propagated(self):@exp.tool()