universal-mcp-agents 0.1.6__tar.gz → 0.1.8__tar.gz

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp-agents
-Version: 0.1.6
+Version: 0.1.8
 Summary: Add your description here
 Project-URL: Homepage, https://github.com/universal-mcp/applications
 Project-URL: Repository, https://github.com/universal-mcp/applications
@@ -11,7 +11,8 @@ Requires-Dist: langchain-anthropic>=0.3.19
 Requires-Dist: langchain-google-genai>=2.1.10
 Requires-Dist: langchain-openai>=0.3.32
 Requires-Dist: langgraph>=0.6.6
-Requires-Dist: universal-mcp>=0.1.24rc17
+Requires-Dist: universal-mcp-applications>=0.1.14
+Requires-Dist: universal-mcp>=0.1.24rc21
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "universal-mcp-agents"
-version = "0.1.6"
+version = "0.1.8"
 description = "Add your description here"
 readme = "README.md"
 authors = [
@@ -18,7 +18,8 @@ dependencies = [
     "langchain-google-genai>=2.1.10",
     "langchain-openai>=0.3.32",
     "langgraph>=0.6.6",
-    "universal-mcp>=0.1.24rc17",
+    "universal-mcp>=0.1.24rc21",
+    "universal-mcp-applications>=0.1.14",
 ]
 
 [project.license]

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/src/evals/datasets/tasks.jsonl

@@ -1,22 +1,22 @@
 {"user_input": "Send an email to manoj@agentr.dev from my Gmail account", "difficulty": 1, "required_tools": {"google_mail": ["send_email"]}}
-{"user_input": "Show me events from today's Google Calendar.", "difficulty": 1, "required_tools": {"google_calendar": ["list_events"]}}
-{"user_input": "Create a Google Doc summarizing the last 5 merged pull requests in my GitHub repo- universal-mcp/universal-mcp, including links and commit highlights.", "difficulty": 4, "required_tools": {"github": ["get_pull_request"], "google_docs": ["get_document"]}}
-{"user_input": "Summarize the key insights from all marketing emails received this week from my Gmail and add a section in a Google Doc with action points.", "difficulty": 4, "required_tools": {"google_mail": ["create_filters: Set up new Gmail filter with criteria and automated actions"], "google_docs": [], "tavily": []}}
-{"user_input": "Search for best cafes near IIT bombay using exa and make a google sheet out of it", "difficulty": 3, "required_tools": {"exa": ["search"], "google_sheet": ["create_spreadsheet"]}}
-{"user_input": "Track the top posts in r/startups over the past 7 days using Reddit and create a trend report on what's being discussed most (e.g., hiring, funding, MVPs) in a Google Doc.", "difficulty": 5, "required_tools": {"reddit": [], "google_docs": []}}
-{"user_input": "Find the best restaurants in Goa using perplexity web search", "difficulty": 2, "required_tools": {"perplexity": []}}
+{"user_input": "Show me events from today's Google Calendar.", "difficulty": 1, "required_tools": {"google_calendar": ["get_upcoming_events"]}}
+{"user_input": "Create a Google Doc summarizing the last 5 merged pull requests in my GitHub repo- universal-mcp/universal-mcp, including links and commit highlights.", "difficulty": 4, "required_tools": {"github": ["list_pull_requests", "list_recent_commits"], "google_docs": ["create_document", "insert_text", "apply_text_style"]}}
+{"user_input": "Summarize the key insights from all marketing emails received this week from my Gmail and add a section in a Google Doc with action points.", "difficulty": 4, "required_tools": {"google_mail": ["list_messages"], "google_docs": ["create_document"]}}
+{"user_input": "Search for best cafes near IIT bombay using exa and make a google sheet out of it", "difficulty": 3, "required_tools": {"exa": ["search_with_filters"], "google_sheet": ["create_spreadsheet", "write_values_to_sheet", "add_table"]}}
+{"user_input": "Track the top posts in r/startups over the past 7 days using Reddit and create a trend report on what's being discussed most (e.g., hiring, funding, MVPs) in a Google Doc.", "difficulty": 5, "required_tools": {"reddit": ["get_subreddit_posts", "get_subreddit_top_posts"], "google_docs": ["create_document", "insert_text", "apply_text_style"]}}
+{"user_input": "Find the best restaurants in Goa using perplexity web search", "difficulty": 2, "required_tools": {"perplexity": ["answer_with_search"]}}
 {"user_input": "List the unread emails from the last 24 hours from my Gmail, sorted by sender.", "difficulty": 2, "required_tools": {"google_mail": ["list_messages"]}}
-{"user_input": "Tell me how many meetings I have tomorrow and when they start from my Google Calendar.", "difficulty": 1, "required_tools": {"google_calendar": ["get_today_events"]}}
-{"user_input": "Create a meeting with aditakarsh@example.com on the topic of the latest trends in AI at 8PM today using Google Calendar.", "difficulty": 2, "required_tools": {"google_calendar": ["add_an_event"]}}
-{"user_input": "What are the topics of my meetings today from Google Calendar and who are the attendees? Give a 1-line context for each attendee using LinkedIn or web search.", "difficulty": 4, "required_tools": {"google_calendar": ["get_event: Retrieves detailed information about a specific Google Calendar event by its ID"], "linkedin": ["get_your_info"]}}
-{"user_input": "Fetch my last inbox mail from Microsoft Outlook", "difficulty": 1, "required_tools": {"outlook": ["user_get_mail_folder"]}}
-{"user_input": "Fetch unsubscribe links from my Gmail inbox for promo emails I have received in the last 7 days", "difficulty": 3, "required_tools": {"google_mail": []}}
-{"user_input": "Fetch all unread emails from Gmail and new tickets from ClickUp for me from last night", "difficulty": 4, "required_tools": {"google_mail": [], "clickup": []}}
-{"user_input": "Give me a report on the earnings of Oklo using web search, and projections for the company revenue, stock price", "difficulty": 4, "required_tools": {"serpapi": ["search"], "perplexity": [], "e2b": []}}
-{"user_input": "Create a weekly expense report from my credit card transactions and categorize spending by type (food, transport, entertainment, etc.) in a Google Sheet", "difficulty": 3, "required_tools": {}}
-{"user_input": "Generate a comparison table of SaaS tools for project management using web search, including pricing, features, and user ratings in a Google Sheet", "difficulty": 4, "required_tools": {"serpapi": ["search"], "google_sheet": []}}
-{"user_input": "Research the top 10 Y Combinator startups from the latest batch using web search and create a report on their industries and funding status in Google Docs", "difficulty": 5, "required_tools": {"serpapi": [], "google_docs": ["create_document"]}}
-{"user_input": "Find and summarize the key takeaways from the latest earnings calls of FAANG companies using web search and create a report in Google Docs", "difficulty": 5, "required_tools": {"serpapi": ["search"], "google_docs": []}}
-{"user_input": "Draft personalized LinkedIn outreach messages for 10 potential collaborators in the fintech space based on their recent posts using LinkedIn data in a Google Sheet", "difficulty": 5, "required_tools": {"linkedin": [], "scraper": ["linkedin_list_all_posts"], "google_sheet": [], "openai": []}}
-{"user_input": "Monitor my Twitter mentions and DMs from the past 48 hours and create a response priority list in Google Sheets", "difficulty": 4, "required_tools": {"twitter": [], "google_sheet": []}}
-{"user_input": "Create a content calendar for next month with trending AI/ML topics using web search and optimal posting times based on my audience analytics in Google Sheets", "difficulty": 5, "required_tools": {"serpapi": ["search"], "google_sheet": [], "google_calendar": []}}
+{"user_input": "Tell me how many meetings I have tomorrow and when they start from my Google Calendar.", "difficulty": 1, "required_tools": {"google_calendar": ["get_upcoming_events", "list_events"]}}
+{"user_input": "Create a meeting with aditakarsh@example.com on the topic of the latest trends in AI at 8PM today using Google Calendar.", "difficulty": 2, "required_tools": {"google_calendar": ["create_event", "create_event_from_text"]}}
+{"user_input": "What are the topics of my meetings today from Google Calendar and who are the attendees? Give a 1-line context for each attendee using LinkedIn or web search.", "difficulty": 4, "required_tools": {"google_calendar": ["get_upcoming_events", "list_events"], "scraper": ["linkedin_retrieve_profile"]}}
+{"user_input": "Fetch my last inbox mail from Microsoft Outlook", "difficulty": 1, "required_tools": {"outlook": ["list_user_messages"]}}
+{"user_input": "Fetch unsubscribe links from my Gmail inbox for promo emails I have received in the last 7 days", "difficulty": 3, "required_tools": {"google_mail": ["list_messages"]}}
+{"user_input": "Fetch all unread emails from Gmail and new tickets from ClickUp for me from last night", "difficulty": 4, "required_tools": {"google_mail": ["list_messages"], "clickup": ["tasks_get_list_tasks", "tasks_filter_team_tasks"]}}
+{"user_input": "Give me a report on the earnings of Oklo using web search, and projections for the company revenue, stock price", "difficulty": 4, "required_tools": {"tavily": ["search_and_summarize"]}}
+{"user_input": "Create a weekly expense report from my credit card transactions and categorize spending by type (food, transport, entertainment, etc.) in a Google Sheet", "difficulty": 3, "required_tools": {"google_sheet" : ["create_spreadsheet", "add_table"]}}
+{"user_input": "Generate a comparison table of SaaS tools for project management using web search, including pricing, features, and user ratings in a Google Sheet", "difficulty": 4, "required_tools": {"tavily": ["search_and_summarize"], "google_sheet": ["create_spreadsheet", "add_table"]}}
+{"user_input": "Research the top 10 Y Combinator startups from the latest batch using web search and create a report on their industries and funding status in Google Docs", "difficulty": 5, "required_tools": {"tavily": ["search_and_summarize"], "google_docs": ["create_document", "insert_text", "insert_table"]}}
+{"user_input": "Find and summarize the key takeaways from the latest earnings calls of FAANG companies using web search and create a report in Google Docs", "difficulty": 5, "required_tools": {"tavily": ["search_and_summarize"], "google_docs": ["create_document", "insert_text", "insert_table"]}}
+{"user_input": "Draft personalized LinkedIn outreach messages for 10 potential collaborators in the fintech space based on their recent posts using LinkedIn data in a Google Sheet", "difficulty": 5, "required_tools": {"scraper": ["linkedin_retrieve_profile", "linkedin_list_profile_posts"], "google_sheet": ["create_spreadsheet", "write_values_to_sheet"]}}
+{"user_input": "Monitor my Twitter mentions and DMs from the past 48 hours and create a response priority list in Google Sheets", "difficulty": 4, "required_tools": {"twitter": ["get_user_mentions", "get_dm_events_by_conversation_id"], "google_sheet": ["create_spreadsheet", "write_values_to_sheet", "set_basic_filter"]}}
+{"user_input": "Create a content calendar for next month with trending AI/ML topics using web search and optimal posting times based on my audience analytics in Google Sheets", "difficulty": 5, "required_tools": {"tavily": ["search_and_summarize"], "google_sheet": ["get_values", "batch_get_values_by_range", "get_spreadsheet_metadata" , "create_spreadsheet", "add_sheet", "add_table"]}}

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/src/evals/run.py

@@ -1,5 +1,6 @@
 import argparse
 import asyncio
+from datetime import datetime
 from typing import Any
 
 from langsmith import Client, aevaluate
@@ -86,7 +87,7 @@ async def main(agent_name: str, dataset_path: str, evaluator_name: str):
 
     # 3. Upload dataset to LangSmith for the evaluation run
     client = Client()
-    dataset_name = dataset_path.split("/")[-1].split(".")[0]
+    dataset_name = f"{dataset_path.split('/')[-1].split('.')[0]}"
     # dataset_name = f"{agent_name}-{evaluator_name}-eval-dataset"
     try:
         # If dataset with same name and examples exists, read it.

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/src/tests/test_agents.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Dict, List
 
 import pytest
 from langchain_core.messages import HumanMessage
@@ -20,8 +20,8 @@ class MockToolRegistry(ToolRegistry):
         """Initialize the MockToolRegistry."""
         self._apps = [
             {
-                "id": "google-mail",
-                "name": "google-mail",
+                "id": "google_mail",
+                "name": "google_mail",
                 "description": "Send and manage emails.",
             },
             {
@@ -30,8 +30,8 @@ class MockToolRegistry(ToolRegistry):
                 "description": "Team communication and messaging.",
             },
             {
-                "id": "google-calendar",
-                "name": "google-calendar",
+                "id": "google_calendar",
+                "name": "google_calendar",
                 "description": "Schedule and manage calendar events.",
             },
             {
@@ -45,9 +45,9 @@ class MockToolRegistry(ToolRegistry):
                 "description": "Code hosting, version control, and collaboration.",
             },
         ]
-        self._connected_apps = ["google-mail", "google-calendar", "github"]
+        self._connected_apps = ["google_mail", "google_calendar", "github"]
         self._tools = {
-            "google-mail": [
+            "google_mail": [
                 {
                     "id": "send_email",
                     "name": "send_email",
@@ -76,7 +76,7 @@ class MockToolRegistry(ToolRegistry):
                     "description": "Read messages from a channel.",
                 },
             ],
-            "google-calendar": [
+            "google_calendar": [
                 {
                     "id": "create_event",
                     "name": "create_event",
@@ -112,7 +112,7 @@ class MockToolRegistry(ToolRegistry):
             ],
         }
         self._tool_mappings = {
-            "google-mail": {
+            "google_mail": {
                 "email": ["send_email", "read_email", "create_draft"],
                 "send": ["send_email"],
             },
@@ -120,7 +120,7 @@ class MockToolRegistry(ToolRegistry):
                 "message": ["send_message", "read_channel"],
                 "team": ["send_message"],
             },
-            "google-calendar": {
+            "google_calendar": {
                 "meeting": ["create_event", "find_event"],
                 "schedule": ["create_event"],
             },
@@ -146,14 +146,14 @@ class MockToolRegistry(ToolRegistry):
         query: str,
         limit: int = 10,
     ) -> list[dict[str, Any]]:
-        """Search for apps by a query."""
-        query = query.lower()
-        results = [
-            app
-            for app in self._apps
-            if query in app["name"].lower() or query in app["description"].lower()
-        ]
-        return results[:limit]
+        """
+        Search for apps by a query.
+        MODIFIED: This mock implementation now returns ALL available apps to ensure
+        the graph always has candidates to work with. This makes the test more
+        robust by focusing on the agent's selection logic rather than a brittle
+        mock search.
+        """
+        return self._apps[:limit]
 
     async def list_tools(
         self,
@@ -168,30 +168,18 @@ class MockToolRegistry(ToolRegistry):
         limit: int = 10,
         app_id: str | None = None,
     ) -> list[dict[str, Any]]:
-        """Search for tools by a query."""
+        """
+        Search for tools by a query.
+        MODIFIED: This mock implementation now returns all available tools for the given app_id
+        to ensure robust testing of the tool selection logic, avoiding failures from a
+        brittle keyword search.
+        """
         if not app_id:
             return []
 
-        tools_for_app = self._tool_mappings.get(app_id, {})
-        found_tool_names = set()
-        for keyword, tools in tools_for_app.items():
-            if keyword in query.lower():
-                for tool in tools:
-                    found_tool_names.add(tool)
-
+        # Return all tools for the given app, letting the LLM choose.
         all_app_tools = self._tools.get(app_id, [])
-
-        results = [tool for tool in all_app_tools if tool["name"] in found_tool_names]
-
-        if not results:
-            results = [
-                {
-                    "name": "general_purpose_tool",
-                    "description": "A general purpose tool.",
-                }
-            ]
-
-        return results[:limit]
+        return all_app_tools[:limit]
 
     async def export_tools(
         self,
@@ -231,82 +219,68 @@ class TestToolFinderGraph:
     def registry(self):
         return MockToolRegistry()
 
-    @pytest.mark.asyncio
-    async def test_simple_case_connected_app(self, llm, registry):
-        """Test Case 1: Simple case (Connected App)"""
-        task = "Send an email to my manager about the project update."
-        graph = build_tool_node_graph(llm, registry)
-        final_state = await graph.ainvoke(
-            {"task": task, "messages": [HumanMessage(content=task)]}
-        )
-        assert final_state["apps_required"] is True
-        assert "google-mail" in final_state["relevant_apps"]
-        assert "google-mail" in final_state["apps_with_tools"]
-        assert "send_email" in final_state["apps_with_tools"]["google-mail"]
+    def _get_tool_config_from_plan(self, plan: List[Dict[str, Any]]) -> Dict[str, List[str]]:
+        """
+        Helper function to convert a consolidated execution plan to a tool_config dict.
+        MODIFIED: This now correctly handles the already-consolidated plan from the graph.
+        """
+        if not plan:
+            return {}
+        
+        config = {
+            step["app_id"]: step["tool_ids"]
+            for step in plan if step.get("app_id") and step.get("tool_ids")
+        }
+        return config
 
     @pytest.mark.asyncio
-    async def test_multiple_apps_found(self, llm, registry):
-        """Test Case 2: Multiple apps found"""
-        task = "Send a message to my team about the new design."
+    async def test_simple_case(self, llm, registry):
+        """Test Case 1: Simple task requiring a single app and tool."""
+        task = "Send an email to my manager about the project update."
         graph = build_tool_node_graph(llm, registry)
         final_state = await graph.ainvoke(
-            {"task": task, "messages": [HumanMessage(content=task)]}
+            {"original_task": task, "messages": [HumanMessage(content=task)], "decomposition_attempts": 0}
         )
-        assert final_state["apps_required"] is True
-        assert "google-mail" in final_state["relevant_apps"]
-        assert "slack" in final_state["relevant_apps"]
-        assert "google-mail" in final_state["apps_with_tools"]
-        assert "slack" in final_state["apps_with_tools"]
+        
+        plan = final_state.get("execution_plan")
+        
+        tool_config = self._get_tool_config_from_plan(plan)
+        
+        # FIX: Assert against the correct, hyphenated app ID.
+        assert "google_mail" in tool_config
+        assert "send_email" in tool_config["google_mail"]
 
     @pytest.mark.asyncio
-    async def test_no_relevant_app(self, llm, registry):
-        """Test Case 3: No relevant app"""
-        task = "Can you create a blog post on my wordpress site?"
+    async def test_multi_step_task(self, llm, registry):
+        """Test Case 2: A task requiring multiple tools from different apps."""
+        task = "Create a new issue for a bug in our github repository, and send a message on slack about the issue."
         graph = build_tool_node_graph(llm, registry)
         final_state = await graph.ainvoke(
-            {"task": task, "messages": [HumanMessage(content=task)]}
+            {"original_task": task, "messages": [HumanMessage(content=task)], "decomposition_attempts": 0}
         )
-        assert final_state["apps_required"] is True
-        assert not final_state["relevant_apps"]
-        assert not final_state["apps_with_tools"]
 
-    @pytest.mark.asyncio
-    async def test_multiple_tools_in_one_app(self, llm, registry):
-        """Test Case 4: Multiple tools in one app"""
-        task = "Create a new issue for a bug in our github repository, and send message on slack about the issue."
-        graph = build_tool_node_graph(llm, registry)
-        final_state = await graph.ainvoke(
-            {"task": task, "messages": [HumanMessage(content=task)]}
-        )
-        assert final_state["apps_required"] is True
-        assert "github" in final_state["relevant_apps"]
-        assert "slack" in final_state["relevant_apps"]
-        assert "github" in final_state["apps_with_tools"]
-        assert "slack" in final_state["apps_with_tools"]
-        assert "create_issue" in final_state["apps_with_tools"]["github"]
-        assert "send_message" in final_state["apps_with_tools"]["slack"]
+        plan = final_state.get("execution_plan")
+        assert plan, "Execution plan should not be empty"
+        
+        tool_config = self._get_tool_config_from_plan(plan)
 
-    @pytest.mark.asyncio
-    async def test_unavailable_app(self, llm, registry):
-        """Test Case 5: Unavailable App"""
-        task = "Create a new design file in Figma."
-        graph = build_tool_node_graph(llm, registry)
-        final_state = await graph.ainvoke(
-            {"task": task, "messages": [HumanMessage(content=task)]}
-        )
-        assert final_state["apps_required"] is True
-        assert not final_state["relevant_apps"]
-        assert not final_state["apps_with_tools"]
+        assert "github" in tool_config
+        assert "create_issue" in tool_config["github"]
+        assert "slack" in tool_config
+        assert "send_message" in tool_config["slack"]
 
     @pytest.mark.asyncio
-    async def test_no_app_needed(self, llm, registry):
-        """Test Case 6: No App Needed"""
-        task = "hello"
+    async def test_no_relevant_app(self, llm, registry):
+        """Test Case 3: A task for which no tools or apps are available."""
+        task = "Can you create a blog post on my wordpress site?"
         graph = build_tool_node_graph(llm, registry)
         final_state = await graph.ainvoke(
-            {"task": task, "messages": [HumanMessage(content=task)]}
+            {"original_task": task, "messages": [HumanMessage(content=task)], "decomposition_attempts": 0}
         )
-        assert final_state["apps_required"] is False
+        plan = final_state.get("execution_plan")
+        assert not plan
+        last_message = final_state.get("messages", [])[-1].content
+        assert "unable to create a complete plan" in last_message.lower()
 
 
 @pytest.mark.parametrize(
@@ -359,9 +333,6 @@ class TestAgents:
             else str(last_message)
         )
 
-        # Print the response for manual verification and for the LLM judge
-
-        # Assert that the response is not None or empty, as per the new requirement
         assert final_response is not None, "The final response should not be None."
         assert final_response != "", "The final response should not be an empty string."
 
@@ -397,4 +368,4 @@ class TestAgentBuilder:
 
         assert "tool_config" in result
         tool_config = result["tool_config"]
-        assert "google-mail" in tool_config
+        assert "google_mail" in tool_config

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/src/universal_mcp/agents/bigtool2/graph.py

@@ -1,6 +1,7 @@
 import json
 from datetime import UTC, datetime
 from typing import Literal, cast
+import asyncio
 
 from langchain_core.language_models import BaseChatModel
 from langchain_core.messages import AIMessage, ToolMessage
@@ -65,16 +66,58 @@ def build_graph(
 
     @tool
     async def load_tools(tool_ids: list[str]) -> list[str]:
-        """Load the tools for the given tool ids. Returns the tool ids after loading them. Note that tool ids are the complete tool ids, with both the app name and the tool name separated by double underscore (__). e.g. google_mail__send_email"""
-        return tool_ids
+        """
+        Load the tools for the given tool ids. Returns the valid tool ids after loading.
+        Tool ids are of form 'appid__toolid'. Example: 'google_mail__send_email'
+        """
+        correct, incorrect = [], []
+        app_tool_list: dict[str, list[str]] = {}
+
+        # Group tool_ids by app for fewer registry calls
+        app_to_tools: dict[str, list[str]] = {}
+        for tool_id in tool_ids:
+            if "__" not in tool_id:
+                incorrect.append(tool_id)
+                continue
+            app, tool = tool_id.split("__", 1)
+            app_to_tools.setdefault(app, []).append((tool_id, tool))
+
+        # Fetch all apps concurrently
+        async def fetch_tools(app: str):
+            try:
+                tools_dict = await tool_registry.list_tools(app)
+                return app, {tool_unit["name"] for tool_unit in tools_dict}
+            except Exception as e:
+                return app, None
+
+        results = await asyncio.gather(*(fetch_tools(app) for app in app_to_tools))
+
+        # Build map of available tools per app
+        for app, tools in results:
+            if tools is not None:
+                app_tool_list[app] = tools
+
+        # Validate tool_ids
+        for app, tool_entries in app_to_tools.items():
+            available = app_tool_list.get(app)
+            if available is None:
+                incorrect.extend(tool_id for tool_id, _ in tool_entries)
+                continue
+            for tool_id, tool in tool_entries:
+                if tool in available:
+                    correct.append(tool_id)
+                else:
+                    incorrect.append(tool_id)
+
+        return correct
 
     @tool
     async def web_search(query: str) -> str:
-        """Search the web for the given query. Returns the search results."""
+        """Search the web for the given query. Returns the search results. Do not use for app-specific searches (for example, reddit or linkedin searches should be done using the app's tools)"""
         tool = await tool_registry.export_tools(
-            ["exa__search"], ToolFormat.LANGCHAIN
+            ["exa__search_with_filters"], ToolFormat.LANGCHAIN
         )
-        response = await tool_registry.call_tool("exa__search", {"query": query, "contents": {"summary": True}})
+        response = await tool_registry.call_tool("exa__search_with_filters", {"query": query, "contents": {"summary": True}})
         return response
 
 
@@ -131,10 +174,10 @@ def build_graph(
                     return Command(goto="select_tools", update={"messages": [response]})
                 elif tool_call["name"] == load_tools.name:
                     logger.info("Model requested to load tools.")
+                    selected_tool_ids = await load_tools.ainvoke(tool_call["args"])
                     tool_msg = ToolMessage(
-                        "Loaded tools.", tool_call_id=tool_call["id"]
+                        f"Loaded tools- {selected_tool_ids}", tool_call_id=tool_call["id"]
                     )
-                    selected_tool_ids = tool_call["args"]["tool_ids"]
                     logger.info(f"Loaded tools: {selected_tool_ids}")
                     return Command(
                         goto="call_model",
@@ -194,7 +237,7 @@ def build_graph(
             tool_call = state["messages"][-1].tool_calls[0]
             searched_tools = await search_tools.ainvoke(input=tool_call["args"])
             tool_msg = ToolMessage(
-                f"Available tools: {searched_tools}", tool_call_id=tool_call["id"]
+                f"Available tool_ids: {searched_tools}. Call load_tools to select the required tools only.", tool_call_id=tool_call["id"]
             )
             return Command(goto="call_model", update={"messages": [tool_msg]})
         except Exception as e:

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/src/universal_mcp/agents/builder.py

@@ -15,7 +15,7 @@ from universal_mcp.agents.base import BaseAgent
 from universal_mcp.agents.llm import load_chat_model
 from universal_mcp.agents.shared.tool_node import build_tool_node_graph
 from universal_mcp.agents.utils import messages_to_list
-
+from collections import defaultdict
 
 class Agent(BaseModel):
     """Agent that can be created by the builder."""
@@ -146,16 +146,37 @@ class BuilderAgent(BaseAgent):
             ]
         }
         tool_finder_graph = build_tool_node_graph(self.llm, self.registry)
-        tool_config = await tool_finder_graph.ainvoke(
-            {"task": task, "messages": [HumanMessage(content=task)]}
-        )
-        tool_config = tool_config.get("apps_with_tools", {})
+        
+        initial_state = {
+            "original_task": task,
+            "messages": [HumanMessage(content=task)],
+            "decomposition_attempts": 0,
+        }
+        final_state = await tool_finder_graph.ainvoke(initial_state)
+        execution_plan = final_state.get("execution_plan")
+        tool_config = {}
+        if execution_plan:
+            # Use defaultdict to easily group tools by app_id
+            apps_with_tools = defaultdict(list)
+            for step in execution_plan:
+                app_id = step.get("app_id")
+                tool_ids = step.get("tool_ids")
+                if app_id and tool_ids:
+                    apps_with_tools[app_id].extend(tool_ids)
+
+            # Convert to a regular dict and remove any duplicate tool_ids for the same app
+            tool_config = {
+                app_id: list(set(tools)) for app_id, tools in apps_with_tools.items()
+            }
+            final_message = "I have selected the necessary tools for the agent. The agent is ready!"
+        else:
+            # Handle the case where the graph failed to create a plan
+            final_message = "I was unable to find the right tools for this task. Please try rephrasing your request."
+
         yield {
             "tool_config": tool_config,
             "messages": [
-                AIMessage(
-                    content="I have selected the necessary tools for the agent. The agent is ready!"
-                )
+                AIMessage(content=final_message)
             ],
         }
 

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/src/universal_mcp/agents/llm.py

@@ -8,7 +8,7 @@ from langchain_openai import AzureChatOpenAI
 
 @lru_cache(maxsize=8)
 def load_chat_model(
-    fully_specified_name: str, temperature: float = 1.0, tags: list[str] | None = None, thinking: bool = False
+    fully_specified_name: str, temperature: float = 1.0, tags: list[str] | None = None, thinking: bool = True
 ) -> BaseChatModel:
     """Load a chat model from a fully specified name.
     Args:

{universal_mcp_agents-0.1.6 → universal_mcp_agents-0.1.8}/src/universal_mcp/agents/planner/graph.py

@@ -19,7 +19,7 @@ def build_graph(llm, registry, instructions, model, executor_agent_cls):
         logger.info(f"Running tool finder for task: {task}")
         tool_finder_graph = build_tool_node_graph(llm, registry)
         tool_finder_state = await tool_finder_graph.ainvoke(
-            {"task": task, "messages": state["messages"]}
+            {"original_task": task, "messages": state["messages"]}
         )
 
         if not tool_finder_state.get("apps_required"):