universal-mcp-agents 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

universal_mcp/agents/__init__.py

@@ -6,6 +6,7 @@ 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.codeact import CodeActAgent
 
 
 def get_agent(agent_name: str):
@@ -23,8 +24,10 @@ def get_agent(agent_name: str):
         return BigToolAgent
     elif agent_name == "bigtool2":
         return BigToolAgent2
+    elif agent_name == "codeact":
+        return CodeActAgent
     else:
-        raise ValueError(f"Unknown agent: {agent_name}. Possible values: auto, react, simple, builder, planner, bigtool, bigtool2")
+        raise ValueError(f"Unknown agent: {agent_name}. Possible values: auto, react, simple, builder, planner, bigtool, bigtool2, codeact")
 
 __all__ = [
     "BaseAgent",

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,12 +66,54 @@ 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_with_filters"], ToolFormat.LANGCHAIN
         )
@@ -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/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/codeact/__init__.py

@@ -1,255 +1,3 @@
-import inspect
-import re
-from collections.abc import Awaitable, Callable, Sequence
-from typing import Any, TypeVar
+from .agent import CodeActAgent
 
-from langchain_core.language_models import BaseChatModel
-from langchain_core.tools import StructuredTool
-from langchain_core.tools import tool as create_tool
-from langgraph.graph import END, START, MessagesState, StateGraph
-from langgraph.types import Command
-
-from .utils import extract_and_combine_codeblocks
-
-EvalFunction = Callable[[str, dict[str, Any]], tuple[str, dict[str, Any]]]
-EvalCoroutine = Callable[[str, dict[str, Any]], Awaitable[tuple[str, dict[str, Any]]]]
-
-
-class CodeActState(MessagesState):
-    """State for CodeAct agent."""
-
-    script: str | None
-    """The Python code script to be executed."""
-    context: dict[str, Any]
-    """Dictionary containing the execution context with available tools and variables."""
-
-
-StateSchema = TypeVar("StateSchema", bound=CodeActState)
-StateSchemaType = type[StateSchema]
-
-
-def make_safe_function_name(name: str) -> str:
-    """Convert a tool name to a valid Python function name."""
-    # Replace non-alphanumeric characters with underscores
-    safe_name = re.sub(r"[^a-zA-Z0-9_]", "_", name)
-    # Ensure the name doesn't start with a digit
-    if safe_name and safe_name[0].isdigit():
-        safe_name = f"tool_{safe_name}"
-    # Handle empty name edge case
-    if not safe_name:
-        safe_name = "unnamed_tool"
-    return safe_name
-
-
-def create_default_prompt(tools: list[StructuredTool], base_prompt: str | None = None):
-    """Create default prompt for the CodeAct agent."""
-    tools = [t if isinstance(t, StructuredTool) else create_tool(t) for t in tools]
-    prompt = f"{base_prompt}\n\n" if base_prompt else ""
-    prompt += """You will be given a task to perform. You should output either
-- a Python code snippet that provides the solution to the task, or a step towards the solution. Any output you want to extract from the code should be printed to the console. Code should be output in a fenced code block.
-- text to be shown directly to the user, if you want to ask for more information or provide the final answer.
-
-In addition to the Python Standard Library, you can use the following functions:
-"""
-
-    for tool in tools:
-        # Use coroutine if it exists, otherwise use func
-        tool_callable = (
-            tool.coroutine
-            if hasattr(tool, "coroutine") and tool.coroutine is not None
-            else tool.func
-        )
-        # Create a safe function name
-        safe_name = make_safe_function_name(tool.name)
-        # Determine if it's an async function
-        is_async = inspect.iscoroutinefunction(tool_callable)
-        # Add appropriate function definition
-        prompt += f'''
-{"async " if is_async else ""}def {safe_name}{str(inspect.signature(tool_callable))}:
-    """{tool.description}"""
-    ...
-'''
-
-    prompt += """
-
-Variables defined at the top level of previous code snippets can be referenced in your code.
-
-Reminder: use Python code snippets to call tools"""
-    return prompt
-
-
-def create_codeact(
-    model: BaseChatModel,
-    tools: Sequence[StructuredTool | Callable],
-    eval_fn: EvalFunction | EvalCoroutine,
-    *,
-    prompt: str | None = None,
-    reflection_prompt: str | None = None,
-    reflection_model: BaseChatModel | None = None,
-    max_reflections: int = 3,
-    state_schema: StateSchemaType = CodeActState,
-) -> StateGraph:
-    """Create a CodeAct agent.
-
-    Args:
-        model: The language model to use for generating code
-        tools: List of tools available to the agent. Can be passed as python functions or StructuredTool instances.
-        eval_fn: Function or coroutine that executes code in a sandbox. Takes code string and locals dict,
-            returns a tuple of (stdout output, new variables dict)
-        prompt: Optional custom system prompt. If None, uses default prompt.
-            To customize default prompt you can use `create_default_prompt` helper:
-            `create_default_prompt(tools, "You are a helpful assistant.")`
-        reflection_prompt: Optional prompt for reflection. If provided, will be used to evaluate responses.
-            If the reflection output contains "NONE", the response is considered valid, otherwise the
-            reflection output is passed back to the model for regeneration.
-        reflection_model: Optional model to use for reflection. If None, uses the same model as for generation.
-        max_reflections: Maximum number of reflection iterations (default: 3).
-        state_schema: The state schema to use for the agent.
-
-    Returns:
-        A StateGraph implementing the CodeAct architecture
-    """
-    tools = [t if isinstance(t, StructuredTool) else create_tool(t) for t in tools]
-
-    if prompt is None:
-        prompt = create_default_prompt(tools)
-
-    # If no reflection model is provided, use the main model
-    if reflection_model is None:
-        reflection_model = model
-
-    # Make tools available to the code sandbox - use safe names for keys
-    tools_context = {}
-    for tool in tools:
-        safe_name = make_safe_function_name(tool.name)
-        # Use coroutine if it exists, otherwise use func (same as in create_default_prompt)
-        tool_callable = (
-            tool.coroutine
-            if hasattr(tool, "coroutine") and tool.coroutine is not None
-            else tool.func
-        )
-        # Only use the safe name for consistency with the prompt
-        tools_context[safe_name] = tool_callable
-
-    def call_model(state: StateSchema) -> Command:
-        messages = [{"role": "system", "content": prompt}] + state["messages"]
-
-        # Run the model and potentially loop for reflection
-        response = model.invoke(messages)
-
-        # Extract and combine all code blocks
-        code = extract_and_combine_codeblocks(response.content)
-
-        # Loop for reflection if needed and if code is present
-        if reflection_prompt and code:
-            reflection_count = 0
-            while reflection_count < max_reflections:
-                # Format conversation history with XML-style tags
-                conversation_history = "\n".join(
-                    [
-                        f'<message role="{("user" if m.type == "human" else "assistant")}">\n{m.content}\n</message>'
-                        for m in state["messages"]
-                    ]
-                )
-
-                # Add the current response
-                conversation_history += (
-                    f'\n<message role="assistant">\n{response.content}\n</message>'
-                )
-
-                # Create the reflection prompt with the tagged conversation history
-                formatted_prompt = f"""
-Review the assistant's latest code for as per the quality rules:
-
-<conversation_history>
-{conversation_history}
-</conversation_history>
-
-If you find ANY of these issues, describe the problem briefly and clearly.
-If NO issues are found, respond with EXACTLY: "NONE"
-"""
-
-                # Create messages for reflection with correct ordering
-                reflection_messages = [
-                    {"role": "system", "content": reflection_prompt},
-                    # Include the formatted reflection prompt as the final user message
-                    {"role": "user", "content": formatted_prompt},
-                ]
-                reflection_result = reflection_model.invoke(reflection_messages)
-
-                # Check if reflection passed
-                if "NONE" in reflection_result.content:
-                    # Reflection passed, exit loop
-                    break
-
-                # Reflection didn't pass, regenerate response
-                reflection_messages = [
-                    {"role": "system", "content": prompt},
-                    *state["messages"],
-                    {"role": "assistant", "content": response.content},
-                    {
-                        "role": "user",
-                        "content": f"""
-I need you to completely regenerate your previous response based on this feedback:
-
-'''
-{reflection_result.content}
-'''
-
-DO NOT reference the feedback directly. Instead, provide a completely new response that addresses the issues.
-""",
-                    },
-                ]
-                response = model.invoke(reflection_messages)
-
-                # Extract code from the new response
-                code = extract_and_combine_codeblocks(response.content)
-
-                # If no code in the new response, exit the reflection loop
-                if not code:
-                    break
-
-                # Increment reflection count
-                reflection_count += 1
-
-        # Return appropriate command with only the latest response
-        if code:
-            return Command(
-                goto="sandbox", update={"messages": [response], "script": code}
-            )
-        else:
-            # no code block, end the loop and respond to the user
-            return Command(update={"messages": [response], "script": None})
-
-    # If eval_fn is a async, we define async node function.
-    if inspect.iscoroutinefunction(eval_fn):
-
-        async def sandbox(state: StateSchema):
-            existing_context = state.get("context", {})
-            context = {**existing_context, **tools_context}
-            # Execute the script in the sandbox
-            output, new_vars = await eval_fn(state["script"], context)
-            new_context = {**existing_context, **new_vars}
-            return {
-                "messages": [{"role": "user", "content": output}],
-                "context": new_context,
-            }
-    else:
-
-        def sandbox(state: StateSchema):
-            existing_context = state.get("context", {})
-            context = {**existing_context, **tools_context}
-            # Execute the script in the sandbox
-            output, new_vars = eval_fn(state["script"], context)
-            new_context = {**existing_context, **new_vars}
-            return {
-                "messages": [{"role": "user", "content": output}],
-                "context": new_context,
-            }
-
-    agent = StateGraph(state_schema)
-    agent.add_node(call_model, destinations=(END, "sandbox"))
-    agent.add_node(sandbox)
-    agent.add_edge(START, "call_model")
-    agent.add_edge("sandbox", "call_model")
-    return agent
+__all__ = ["CodeActAgent"]

universal_mcp/agents/codeact/__main__.py

@@ -0,0 +1,25 @@
+import asyncio
+
+from universal_mcp.agentr.registry import AgentrRegistry
+from universal_mcp.agents.codeact.agent import CodeActAgent
+from universal_mcp.agents.utils import messages_to_list
+
+
+async def main():
+    agent = CodeActAgent(
+        "CodeAct Agent",
+        instructions="Be very concise in your answers.",
+        model="azure/gpt-4o",
+        tools={"google_mail": ["send_email"]},
+        registry=AgentrRegistry(),
+    )
+    result = await agent.invoke(
+        "Send an email to manoj@agentr.dev from my Gmail account with a subject 'testing codeact agent' and body 'This is a test of the codeact agent.'"
+    )
+    from rich import print
+
+    print(messages_to_list(result["messages"]))
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

universal_mcp/agents/codeact/agent.py

@@ -0,0 +1,171 @@
+import inspect
+from typing import Callable, Union
+
+from langchain_core.language_models import BaseChatModel
+from langchain_core.tools import StructuredTool, tool as create_tool
+from langgraph.checkpoint.base import BaseCheckpointSaver
+from langgraph.graph import END, StateGraph
+from loguru import logger
+from universal_mcp.tools.registry import ToolRegistry
+from universal_mcp.types import ToolConfig, ToolFormat
+
+from universal_mcp.agents.base import BaseAgent
+from universal_mcp.agents.llm import load_chat_model
+from universal_mcp.agents.codeact.prompts import (
+    create_default_prompt,
+    make_safe_function_name,
+    REFLECTION_PROMPT,
+    RETRY_PROMPT,
+)
+from universal_mcp.agents.codeact.sandbox import eval_unsafe
+from universal_mcp.agents.codeact.state import CodeActState
+from universal_mcp.agents.codeact.utils import extract_and_combine_codeblocks
+
+
+class CodeActAgent(BaseAgent):
+    def __init__(
+        self,
+        name: str,
+        instructions: str,
+        model: str,
+        memory: BaseCheckpointSaver | None = None,
+        tools: ToolConfig | None = None,
+        registry: ToolRegistry | None = None,
+        *,
+        reflection_prompt: str = None,
+        reflection_model: BaseChatModel = None,
+        max_reflections: int = 3,
+        **kwargs,
+    ):
+        super().__init__(name, instructions, model, memory, **kwargs)
+        self.model_instance = load_chat_model(model)
+        self.tools_config = tools or {}
+        self.registry = registry
+        self.eval_fn = eval_unsafe
+        self.reflection_prompt = reflection_prompt
+        self.reflection_model = reflection_model or self.model_instance
+        self.max_reflections = max_reflections if reflection_prompt else 0
+        self.tools_context = {}
+        self.processed_tools: list[Union[StructuredTool, Callable]] = []
+
+    async def _build_graph(self):
+        if self.tools_config:
+            if not self.registry:
+                raise ValueError("Tools are configured but no registry is provided")
+            # Langchain tools are fine
+            exported_tools = await self.registry.export_tools(
+                self.tools_config, ToolFormat.LANGCHAIN
+            )
+            self.processed_tools = [
+                t if isinstance(t, StructuredTool) else create_tool(t)
+                for t in exported_tools
+            ]
+
+        self.instructions = create_default_prompt(
+            self.processed_tools, self.instructions
+        )
+
+        for tool in self.processed_tools:
+            safe_name = make_safe_function_name(tool.name)
+            tool_callable = (
+                tool.coroutine
+                if hasattr(tool, "coroutine") and tool.coroutine is not None
+                else tool.func
+            )
+            self.tools_context[safe_name] = tool_callable
+
+        agent = StateGraph(CodeActState)
+        agent.add_node("call_model", lambda state, config: self.call_model(state, config))
+        agent.add_node("sandbox", self.sandbox)
+
+        agent.set_entry_point("call_model")
+        agent.add_conditional_edges(
+            "call_model",
+            self.should_run_sandbox,
+            {
+                "sandbox": "sandbox",
+                END: END,
+            },
+        )
+        agent.add_edge("sandbox", "call_model")
+        return agent.compile(checkpointer=self.memory)
+
+    def should_run_sandbox(self, state: CodeActState) -> str:
+        if state.get("script"):
+            return "sandbox"
+        return END
+
+    def call_model(self, state: CodeActState, config: dict) -> dict:
+        context = config.get("context", {})
+        instructions = context.get("system_prompt", self.instructions)
+        model = self.model_instance
+        reflection_model = self.reflection_model
+
+        messages = [{"role": "system", "content": instructions}] + state["messages"]
+
+        response = model.invoke(messages)
+
+        code = extract_and_combine_codeblocks(response.content)
+
+        if self.max_reflections > 0 and code:
+            reflection_count = 0
+            while reflection_count < self.max_reflections:
+                conversation_history = "\n".join(
+                    [
+                        f'<message role="{("user" if m.type == "human" else "assistant")}">\n{m.content}\n</message>'
+                        for m in state["messages"]
+                    ]
+                )
+                conversation_history += (
+                    f'\n<message role="assistant">\n{response.content}\n</message>'
+                )
+
+                formatted_prompt = REFLECTION_PROMPT.format(
+                    conversation_history=conversation_history
+                )
+
+                reflection_messages = [
+                    {"role": "system", "content": self.reflection_prompt},
+                    {"role": "user", "content": formatted_prompt},
+                ]
+                reflection_result = reflection_model.invoke(reflection_messages)
+
+                if "NONE" in reflection_result.content:
+                    break
+
+                retry_prompt = RETRY_PROMPT.format(
+                    reflection_result=reflection_result.content
+                )
+
+                regeneration_messages = [
+                    {"role": "system", "content": instructions},
+                    *state["messages"],
+                    {"role": "assistant", "content": response.content},
+                    {"role": "user", "content": retry_prompt},
+                ]
+                response = model.invoke(regeneration_messages)
+
+                code = extract_and_combine_codeblocks(response.content)
+
+                if not code:
+                    break
+
+                reflection_count += 1
+
+        if code:
+            return {"messages": [response], "script": code}
+        else:
+            return {"messages": [response], "script": None}
+
+    async def sandbox(self, state: CodeActState) -> dict:
+        existing_context = state.get("context", {})
+        context = {**existing_context, **self.tools_context}
+        if inspect.iscoroutinefunction(self.eval_fn):
+            output, new_vars = await self.eval_fn(state["script"], context)
+        else:
+            output, new_vars = self.eval_fn(state["script"], context)
+        new_context = {**existing_context, **new_vars}
+        return {
+            "messages": [{"role": "user", "content": output}],
+            "context": new_context,
+        }