universal-mcp 0.1.24rc13__tar.gz → 0.1.24rc14__tar.gz

{universal_mcp-0.1.24rc13 → universal_mcp-0.1.24rc14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.24rc13
+Version: 0.1.24rc14
 Summary: Universal MCP acts as a middle ware for your API applications. It can store your credentials, authorize, enable disable apps on the fly and much more.
 Author-email: Manoj Bajaj <manojbajaj95@gmail.com>
 License: MIT

{universal_mcp-0.1.24rc13 → universal_mcp-0.1.24rc14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "universal-mcp"
-version = "0.1.24-rc13"
+version = "0.1.24-rc14"
 description = "Universal MCP acts as a middle ware for your API applications. It can store your credentials, authorize, enable disable apps on the fly and much more."
 readme = "README.md"
 authors = [

{universal_mcp-0.1.24rc13 → universal_mcp-0.1.24rc14}/src/universal_mcp/agents/__init__.py

@@ -1,9 +1,10 @@
 from universal_mcp.agents.autoagent import AutoAgent
 from universal_mcp.agents.base import BaseAgent
 from universal_mcp.agents.bigtool import BigToolAgent
-from universal_mcp.agents.builder import BuilderAgent
 from universal_mcp.agents.planner import PlannerAgent
 from universal_mcp.agents.react import ReactAgent
 from universal_mcp.agents.simple import SimpleAgent
+from universal_mcp.agents.bigtool2 import BigToolAgent2
+from universal_mcp.agents.builder import BuilderAgent
 
-__all__ = ["BaseAgent", "ReactAgent", "SimpleAgent", "AutoAgent", "BigToolAgent", "PlannerAgent", "BuilderAgent"]
+__all__ = ["BaseAgent", "ReactAgent", "SimpleAgent", "AutoAgent", "BigToolAgent", "PlannerAgent", "BuilderAgent" ,"BigToolAgent2"]

{universal_mcp-0.1.24rc13 → universal_mcp-0.1.24rc14}/src/universal_mcp/agents/bigtool/graph.py

@@ -72,11 +72,11 @@ def build_graph(
             messages = [{"role": "system", "content": system_message}, *state["messages"]]
 
             logger.info(f"Selected tool IDs: {state['selected_tool_ids']}")
-            selected_tools = await tool_registry.export_tools(
-                tools=state["selected_tool_ids"],
-                format=ToolFormat.LANGCHAIN,
-            )
-            logger.info(f"Exported {len(selected_tools)} tools for model.")
+            if len(state["selected_tool_ids"]) > 0:
+                selected_tools = await tool_registry.export_tools(tools=state["selected_tool_ids"], format=ToolFormat.LANGCHAIN)
+                logger.info(f"Exported {len(selected_tools)} tools for model.")
+            else:
+                selected_tools = []
 
             model = llm
             if isinstance(model, ChatAnthropic):

universal_mcp-0.1.24rc14/src/universal_mcp/agents/bigtool2/__init__.py

@@ -0,0 +1,53 @@
+from langgraph.checkpoint.base import BaseCheckpointSaver
+
+from universal_mcp.agents.base import BaseAgent
+from universal_mcp.agents.llm import load_chat_model
+from universal_mcp.logger import logger
+from universal_mcp.tools.registry import ToolRegistry
+
+from .graph import build_graph
+from .prompts import SYSTEM_PROMPT
+
+
+class BigToolAgent2(BaseAgent):
+    def __init__(
+        self,
+        name: str,
+        instructions: str,
+        model: str,
+        registry: ToolRegistry,
+        memory: BaseCheckpointSaver | None = None,
+        **kwargs,
+    ):
+        # Combine the base system prompt with agent-specific instructions
+        full_instructions = f"{SYSTEM_PROMPT}\n\n**User Instructions:**\n{instructions}"
+        super().__init__(name, full_instructions, model, memory, **kwargs)
+
+        self.registry = registry
+        self.llm = load_chat_model(self.model)
+        self.recursion_limit = kwargs.get("recursion_limit", 10)
+
+        logger.info(f"BigToolAgent '{self.name}' initialized with model '{self.model}'.")
+
+    async def _build_graph(self):
+        """Build the bigtool agent graph using the existing create_agent function."""
+        logger.info(f"Building graph for BigToolAgent '{self.name}'...")
+        try:
+            graph_builder = build_graph(
+                tool_registry=self.registry,
+                llm=self.llm,
+            )
+
+            compiled_graph = graph_builder.compile(checkpointer=self.memory)
+            logger.info("Graph built and compiled successfully.")
+            return compiled_graph
+        except Exception as e:
+            logger.error(f"Error building graph for BigToolAgent '{self.name}': {e}")
+            raise
+
+    @property
+    def graph(self):
+        return self._graph
+
+
+__all__ = ["BigToolAgent2"]

universal_mcp-0.1.24rc14/src/universal_mcp/agents/bigtool2/__main__.py

@@ -0,0 +1,24 @@
+import asyncio
+
+from loguru import logger
+
+from universal_mcp.agentr.registry import AgentrRegistry
+from universal_mcp.agents.bigtool2 import BigToolAgent2
+
+
+async def main():
+    agent = BigToolAgent2(
+        name="bigtool",
+        instructions="You are a helpful assistant that can use tools to help the user.",
+        model="azure/gpt-4.1",
+        registry=AgentrRegistry(),
+    )
+    async for event in agent.stream(
+        user_input="Send an email to manoj@agentr.dev",
+        thread_id="test123",
+    ):
+        logger.info(event.content)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

universal_mcp-0.1.24rc14/src/universal_mcp/agents/bigtool2/agent.py

@@ -0,0 +1,11 @@
+from universal_mcp.agents.bigtool2 import BigToolAgent2
+from universal_mcp.agentr.registry import AgentrRegistry
+
+async def agent():
+    agent_object = await BigToolAgent2(
+        name="BigTool Agent 2",
+        instructions="You are a helpful assistant that can use various tools to complete tasks.",
+        model="anthropic/claude-4-sonnet-20250514",
+        registry=AgentrRegistry(),
+    )._build_graph()
+    return agent_object

universal_mcp-0.1.24rc14/src/universal_mcp/agents/bigtool2/context.py

@@ -0,0 +1,33 @@
+from dataclasses import dataclass, field
+
+from .prompts import SYSTEM_PROMPT
+
+
+@dataclass(kw_only=True)
+class Context:
+    """The context for the agent."""
+
+    system_prompt: str = field(
+        default=SYSTEM_PROMPT,
+        metadata={
+            "description": "The system prompt to use for the agent's interactions. "
+            "This prompt sets the context and behavior for the agent."
+        },
+    )
+
+    model: str = field(
+        default="anthropic/claude-4-sonnet-20250514",
+        metadata={
+            "description": "The name of the language model to use for the agent's main interactions. "
+            "Should be in the form: provider/model-name."
+        },
+    )
+
+    recursion_limit: int = field(
+        default=10,
+        metadata={
+            "description": "The maximum number of times the agent can call itself recursively. "
+            "This is to prevent infinite recursion."
+        },
+    )
+

universal_mcp-0.1.24rc14/src/universal_mcp/agents/bigtool2/graph.py

@@ -0,0 +1,169 @@
+import json
+from datetime import UTC, datetime
+from typing import Literal, TypedDict, cast
+
+from langchain_anthropic import ChatAnthropic
+from langchain_core.language_models import BaseChatModel
+from langchain_core.messages import AIMessage, ToolMessage
+from langchain_core.tools import tool
+from langgraph.graph import StateGraph
+from langgraph.runtime import Runtime
+from langgraph.types import Command
+
+from universal_mcp.agents.bigtool2.context import Context
+from universal_mcp.agents.bigtool2.state import State
+from universal_mcp.logger import logger
+from universal_mcp.tools.registry import ToolRegistry
+from universal_mcp.types import ToolFormat
+
+
+
+def build_graph(
+    tool_registry: ToolRegistry,
+    llm: BaseChatModel
+):
+    @tool
+    async def search_tools(queries: list[str]) -> str:
+        """Search tools for a given list of queries
+        Each single query should be atomic (doable with a single tool).
+        For tasks requiring multiple tools, add separate queries for each subtask"""
+        logger.info(f"Searching tools for queries: '{queries}'")
+        try:
+            all_tool_candidates = ""
+            app_ids = await tool_registry.list_all_apps()
+            connections = await tool_registry.list_connected_apps()
+            connection_ids = set([connection["app_id"] for connection in connections])
+            connected_apps = [app["id"] for app in app_ids if app["id"] in connection_ids]
+            unconnected_apps = [app["id"] for app in app_ids if app["id"] not in connection_ids]
+            app_tools = {}
+            for task_query in queries:
+                tools_list = await tool_registry.search_tools(task_query, limit=40)
+                tool_candidates = [f"{tool['id']}: {tool['description']}" for tool in tools_list]
+                for tool in tool_candidates:
+                    app = tool.split("__")[0]
+                    if app not in app_tools:
+                        if len(app_tools.keys()) >= 10:
+                            break
+                        app_tools[app] = []
+                    if len(app_tools[app]) < 3:
+                        app_tools[app].append(tool)
+            for app in app_tools:
+                app_status = "connected" if app in connected_apps else "NOT connected"
+                all_tool_candidates += f"Tools from {app} (status: {app_status} by user):\n"
+                for tool in app_tools[app]:
+                    all_tool_candidates += f" - {tool}\n"
+                all_tool_candidates += "\n"
+                
+            
+            return all_tool_candidates
+        except Exception as e:
+            logger.error(f"Error retrieving tools: {e}")
+            return "Error: " + str(e)
+    
+    @tool
+    async def load_tools(tool_ids: list[str]) -> list[str]:
+        """Load the tools for the given tool ids. Returns the tool ids."""
+        return tool_ids
+
+
+    async def call_model(state: State, runtime: Runtime[Context]) -> Command[Literal["select_tools", "call_tools"]]:
+        logger.info("Calling model...")
+        try:
+            system_message = runtime.context.system_prompt.format(system_time=datetime.now(tz=UTC).isoformat())
+            messages = [{"role": "system", "content": system_message}, *state["messages"]]
+
+            logger.info(f"Selected tool IDs: {state['selected_tool_ids']}")
+            if len(state["selected_tool_ids"]) > 0:
+                selected_tools = await tool_registry.export_tools(tools=state["selected_tool_ids"], format=ToolFormat.LANGCHAIN)
+                logger.info(f"Exported {len(selected_tools)} tools for model.")
+            else:
+                selected_tools = []
+
+            model = llm
+
+            model_with_tools = model.bind_tools([search_tools, load_tools, *selected_tools], tool_choice="auto")
+            response = cast(AIMessage, await model_with_tools.ainvoke(messages))
+
+            if response.tool_calls:
+                logger.info(f"Model responded with {len(response.tool_calls)} tool calls.")
+                if len(response.tool_calls) > 1:
+                    raise Exception("Not possible in Claude with llm.bind_tools(tools=tools, tool_choice='auto')")
+                tool_call = response.tool_calls[0]
+                if tool_call["name"] == search_tools.name:
+                    logger.info("Model requested to select tools.")
+                    return Command(goto="select_tools", update={"messages": [response]})
+                elif tool_call["name"] == load_tools.name:
+                    logger.info("Model requested to load tools.")
+                    tool_msg = ToolMessage(f"Loaded tools.", 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", update={ "messages": [response, tool_msg], "selected_tool_ids": selected_tool_ids})
+
+                elif tool_call["name"] not in state["selected_tool_ids"]:
+                    try:
+                        await tool_registry.export_tools([tool_call["name"]], ToolFormat.LANGCHAIN)
+                        logger.info(
+                            f"Tool '{tool_call['name']}' not in selected tools, but available. Proceeding to call."
+                        )
+                        return Command(goto="call_tools", update={"messages": [response]})
+                    except Exception as e:
+                        logger.error(f"Unexpected tool call: {tool_call['name']}. Error: {e}")
+                        raise Exception(
+                            f"Unexpected tool call: {tool_call['name']}. Available tools: {state['selected_tool_ids']}"
+                        ) from e
+                logger.info(f"Proceeding to call tool: {tool_call['name']}")
+                return Command(goto="call_tools", update={"messages": [response]})
+            else:
+                logger.info("Model responded with a message, ending execution.")
+                return Command(update={"messages": [response]})
+        except Exception as e:
+            logger.error(f"Error in call_model: {e}")
+            raise
+
+    async def select_tools(state: State, runtime: Runtime[Context]) -> Command[Literal["call_model"]]:
+        logger.info("Selecting tools...")
+        try:
+            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"])
+            return Command(goto="call_model", update={"messages": [tool_msg]})
+        except Exception as e:
+            logger.error(f"Error in select_tools: {e}")
+            raise
+
+    async def call_tools(state: State) -> Command[Literal["call_model"]]:
+        logger.info("Calling tools...")
+        outputs = []
+        recent_tool_ids = []
+        for tool_call in state["messages"][-1].tool_calls:
+            logger.info(f"Executing tool: {tool_call['name']} with args: {tool_call['args']}")
+            try:
+                await tool_registry.export_tools([tool_call["name"]], ToolFormat.LANGCHAIN)
+                tool_result = await tool_registry.call_tool(tool_call["name"], tool_call["args"])
+                logger.info(f"Tool '{tool_call['name']}' executed successfully.")
+                outputs.append(
+                    ToolMessage(
+                        content=json.dumps(tool_result),
+                        name=tool_call["name"],
+                        tool_call_id=tool_call["id"],
+                    )
+                )
+                recent_tool_ids.append(tool_call["name"])
+            except Exception as e:
+                logger.error(f"Error executing tool '{tool_call['name']}': {e}")
+                outputs.append(
+                    ToolMessage(
+                        content=json.dumps("Error: " + str(e)),
+                        name=tool_call["name"],
+                        tool_call_id=tool_call["id"],
+                    )
+                )
+        return Command(goto="call_model", update={"messages": outputs, "selected_tool_ids": recent_tool_ids})
+
+    builder = StateGraph(State, context_schema=Context)
+
+    builder.add_node(call_model)
+    builder.add_node(select_tools)
+    builder.add_node(call_tools)
+    builder.set_entry_point("call_model")
+    return builder

universal_mcp-0.1.24rc14/src/universal_mcp/agents/bigtool2/prompts.py

@@ -0,0 +1,12 @@
+"""Default prompts used by the agent."""
+
+SYSTEM_PROMPT = """You are a helpful AI assistant.
+
+**Core Directives:**
+1.  **Always Use Tools for Tasks:** For any user request that requires an action (e.g., sending an email, searching for information, creating an event), you MUST use a tool. Do not answer from your own knowledge or refuse a task if a tool might exist for it.
+2.  **First Step is ALWAYS `search_tools`:** Before you can use any other tool, you MUST first call the `search_tools` function to find the right tools for the user's request. This is your mandatory first action. You must not use the same/similar query multiple times in the list. The list should have multiple queries only if the task has clearly different sub-tasks.
+3.  **Load Tools:** After looking at the output of `search_tools`, you MUST call the `load_tools` function to load only the tools you want to use. Use your judgement to eliminate irrelevant apps that came up just because of semantic similarity. However, sometimes, multiple apps might be relevant for the same task. Prefer connected apps over unconnected apps while breaking a tie. If more than one relevant app (or none of the relevant apps) are connected, you must ask the user to choose the app. In case the user asks you to use an app that is not connected, call the apps tools normally. The tool will return a link for connecting that you should pass on to the user.
+3.  **Strictly Follow the Process:** Your only job in your first turn is to analyze the user's request and call `search_tools` with a concise query describing the core task. Do not engage in conversation.
+
+System time: {system_time}
+"""

universal_mcp-0.1.24rc14/src/universal_mcp/agents/bigtool2/state.py

@@ -0,0 +1,27 @@
+from typing import Annotated
+
+from langgraph.prebuilt.chat_agent_executor import AgentState
+
+
+def _enqueue(left: list, right: list) -> list:
+    """Treat left as a FIFO queue, append new items from right (preserve order),
+    keep items unique, and cap total size to 20 (drop oldest items)."""
+    max_size = 30
+    preferred_size = 20
+    if len(right) > preferred_size:
+        preferred_size = min(max_size, len(right))
+    queue = list(left or [])
+
+    for item in right[:preferred_size] or []:
+        if item in queue:
+            queue.remove(item)
+        queue.append(item)
+
+    if len(queue) > preferred_size:
+        queue = queue[-preferred_size:]
+
+    return queue
+
+
+class State(AgentState):
+    selected_tool_ids: Annotated[list[str], _enqueue]