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): preserve mixed multi-execute result order (#4310)
CoralGarden522c4339a859dc
diff --git a/python/composio/core/models/tool_router_session.py b/python/composio/core/models/tool_router_session.pyindex 6f1f5cb1d..63e3a2e22 100644--- a/python/composio/core/models/tool_router_session.py+++ b/python/composio/core/models/tool_router_session.py@@ -415,8 +415,7 @@ 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: remotes first, locals appended- (matches TS — remote results may have workbench index references).+ appropriately, and merges results in the original request order.Modifiers are NOT applied here — the caller (routing_execute)handles before_execute/after_execute to avoid double application.@@ -506,14 +505,14 @@ class ToolRouterSession(t.Generic[TTool, TToolCollection]):"data": result["data"],},"tool_slug": parsed[idx]["tool_slug"],+ "index": idx,}if result.get("error"):local_entry["response"]["error"] = result["error"]local_entry["error"] = result["error"]local_entries.append(local_entry)- # Merge: remotes first, locals appended (matches TS behavior —- # remote results may have workbench index references)+ # Restore original request order, then re-index sequentially.remote_data_raw = (remote_result or {}).get("data")remote_data = remote_data_raw if isinstance(remote_data_raw, dict) else {}remote_results_list = (@@ -521,10 +520,18 @@ class ToolRouterSession(t.Generic[TTool, TToolCollection]):if isinstance(remote_data.get("results"), list)else [])- all_results = [- {**entry, "index": i}- for i, entry in enumerate([*remote_results_list, *local_entries])+ merged_results = [+ {+ **entry,+ "index": remote_indices[position]+ if position < len(remote_indices)+ else position,+ }+ for position, entry in enumerate(remote_results_list)]+ merged_results.extend(local_entries)+ merged_results.sort(key=lambda entry: int(entry["index"]))+ all_results = [{**entry, "index": i} for i, entry in enumerate(merged_results)]failed = sum(1 for r in all_results if r.get("error"))merged_data = {**remote_data, "results": all_results}if local_entries and any(diff --git a/python/tests/test_custom_tools.py b/python/tests/test_custom_tools.pyindex 9ae01d3c9..2c2690ede 100644--- a/python/tests/test_custom_tools.py+++ b/python/tests/test_custom_tools.py@@ -1294,9 +1294,11 @@ class TestMultiExecuteRouting:)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"+ # Results preserve the original request order.+ assert results[0]["tool_slug"] == "GREP"+ assert results[1]["tool_slug"] == "R"+ assert results[0]["index"] == 0+ assert results[1]["index"] == 1assert result["data"]["total_count"] == 2assert result["data"]["success_count"] == 2assert result["data"]["error_count"] == 0