universal-mcp-agents 0.1.21__py3-none-any.whl → 0.1.22__py3-none-any.whl

universal_mcp/agents/codeact0/agent.py

@@ -16,10 +16,11 @@ from universal_mcp.agents.codeact0.llm_tool import smart_print
 from universal_mcp.agents.codeact0.prompts import (
     PLAYBOOK_GENERATING_PROMPT,
     PLAYBOOK_PLANNING_PROMPT,
+    PLAYBOOK_META_PROMPT,
     create_default_prompt,
 )
 from universal_mcp.agents.codeact0.sandbox import eval_unsafe, execute_ipython_cell, handle_execute_ipython_cell
-from universal_mcp.agents.codeact0.state import CodeActState, PlaybookCode, PlaybookPlan
+from universal_mcp.agents.codeact0.state import CodeActState, PlaybookCode, PlaybookPlan, PlaybookMeta
 from universal_mcp.agents.codeact0.tools import (
     create_meta_tools,
     enter_playbook_mode,
@@ -28,6 +29,7 @@ from universal_mcp.agents.codeact0.tools import (
 from universal_mcp.agents.codeact0.utils import add_tools
 from universal_mcp.agents.llm import load_chat_model
 from universal_mcp.agents.utils import convert_tool_ids_to_dict, filter_retry_on, get_message_text
+from universal_mcp.agents.codeact0.utils import get_connected_apps_string
 
 
 class CodeActPlaybookAgent(BaseAgent):
@@ -60,10 +62,10 @@ class CodeActPlaybookAgent(BaseAgent):
         self.sandbox_timeout = sandbox_timeout
         self.default_tools = {
             "llm": ["generate_text", "classify_data", "extract_data", "call_llm"],
-            "markitdown": ["convert_to_markdown"],
         }
         add_tools(self.tools_config, self.default_tools)
 
+
     async def _build_graph(self):
         meta_tools = create_meta_tools(self.registry)
         additional_tools = [smart_print, meta_tools["web_search"]]
@@ -151,7 +153,7 @@ class CodeActPlaybookAgent(BaseAgent):
                     else:
                         raise Exception(
                             f"Unexpected tool call: {tool_call['name']}. "
-                            "tool calls must be one of 'enter_playbook_mode', 'execute_ipython_cell', 'load_functions', or 'search_functions'"
+                            "tool calls must be one of 'enter_playbook_mode', 'execute_ipython_cell', 'load_functions', or 'search_functions'. For using functions, call them in code using 'execute_ipython_cell'."
                         )
                 except Exception as e:
                     tool_result = str(e)
@@ -167,7 +169,7 @@ class CodeActPlaybookAgent(BaseAgent):
                 self.tools_config.extend(new_tool_ids)
                 self.exported_tools = await self.registry.export_tools(new_tool_ids, ToolFormat.LANGCHAIN)
                 self.final_instructions, self.tools_context = create_default_prompt(
-                    self.exported_tools, self.additional_tools, self.instructions, playbook=self.playbook
+                    self.exported_tools, self.additional_tools, self.instructions, await get_connected_apps_string(self.registry)
                 )
             if ask_user:
                 tool_messages.append(AIMessage(content=ai_msg))
@@ -224,7 +226,23 @@ class CodeActPlaybookAgent(BaseAgent):
 
                 t = user_text.lower()
                 if t == "yes, this is great":
-                    return Command(goto="playbook", update={"playbook_mode": "generating"})
+                    # Generate playbook metadata (name and description) before moving to generation
+                    meta_id = str(uuid.uuid4())
+                    writer({
+                        "type": "custom",
+                        id: meta_id,
+                        "name": "metadata",
+                        "data": {"update": bool(self.playbook)}
+                    })
+                    meta_instructions = self.instructions + PLAYBOOK_META_PROMPT
+                    messages = [{"role": "system", "content": meta_instructions}] + state["messages"]
+
+                    model_with_structured_output = self.playbook_model_instance.with_structured_output(PlaybookMeta)
+                    meta_response = model_with_structured_output.invoke(messages)
+                    meta = cast(PlaybookMeta, meta_response)
+
+                    writer({"type": "custom", id: meta_id, "name": "metadata", "data": {"name": meta.name, "description": meta.description}})
+                    return Command(goto="playbook", update={"playbook_mode": "generating", "playbook_name": meta.name, "playbook_description": meta.description})
                 if t == "i would like to modify the plan":
                     prompt_ai = AIMessage(content="What would you like to change about the plan? Let me know and I'll update the plan accordingly.", additional_kwargs={"stream": "true"})
                     return Command(update={"playbook_mode": "planning", "messages": [prompt_ai]})
@@ -256,6 +274,10 @@ class CodeActPlaybookAgent(BaseAgent):
                 else:
                     function_name = "generated_playbook"
 
+                # Use generated metadata if available
+                final_name = state.get("playbook_name") or function_name
+                final_description = state.get("playbook_description") or f"Generated playbook: {function_name}"
+
                 # Save or update an Agent using the helper registry
                 try:
                     if not self.playbook_registry:  
@@ -271,8 +293,8 @@ class CodeActPlaybookAgent(BaseAgent):
                     tool_dict = convert_tool_ids_to_dict(state["selected_tool_ids"])
 
                     res = self.playbook_registry.upsert_agent(
-                        name=function_name,
-                        description=f"Generated playbook: {function_name}",
+                        name=final_name,
+                        description=final_description,
                         instructions=instructions_payload,
                         tools=tool_dict,
                         visibility="private",
@@ -298,7 +320,7 @@ class CodeActPlaybookAgent(BaseAgent):
             self.tools_config.extend(state.get("selected_tool_ids", []))
             self.exported_tools = await self.registry.export_tools(self.tools_config, ToolFormat.LANGCHAIN)
             self.final_instructions, self.tools_context = create_default_prompt(
-                self.exported_tools, self.additional_tools, self.instructions, playbook=self.playbook
+                self.exported_tools, self.additional_tools, self.instructions, await get_connected_apps_string(self.registry)
             )
             if state.get("playbook_mode") in ["planning", "confirming", "generating"]:
                 return "playbook"

universal_mcp/agents/codeact0/prompts.py

@@ -3,6 +3,7 @@ import re
 from collections.abc import Sequence
 
 from langchain_core.tools import StructuredTool
+from universal_mcp.agents.codeact0.utils import schema_to_signature
 
 uneditable_prompt = """
 You are **Ruzo**, an AI Assistant created by AgentR — a creative, straight-forward, and direct principal software engineer with access to tools.
@@ -97,6 +98,26 @@ The parameters of the function should be the same as the final confirmed playboo
 """
 
 
+PLAYBOOK_META_PROMPT = """
+You are preparing metadata for a reusable playbook based on the confirmed step-by-step plan.
+
+TASK: Create a concise, human-friendly name and a short description for the playbook.
+
+INPUTS:
+- Conversation context and plan steps will be provided in prior messages
+
+REQUIREMENTS:
+1. Name: 3-6 words, Title Case, no punctuation except hyphens if needed
+2. Description: Single sentence, <= 140 characters, clearly states what the playbook does
+
+OUTPUT: Return ONLY a JSON object with exactly these keys:
+{
+  "name": "...",
+  "description": "..."
+}
+"""
+
+
 def make_safe_function_name(name: str) -> str:
     """Convert a tool name to a valid Python function name."""
     # Replace non-alphanumeric characters with underscores
@@ -114,14 +135,31 @@ def create_default_prompt(
     tools: Sequence[StructuredTool],
     additional_tools: Sequence[StructuredTool],
     base_prompt: str | None = None,
+    apps_string: str | None = None,
     playbook: object | None = None,
 ):
-    system_prompt = uneditable_prompt.strip() + (
-        "\n\nIn addition to the Python Standard Library, you can use the following external functions:\n"
-    )
+    system_prompt = uneditable_prompt.strip()
+    if apps_string:
+        system_prompt += f"\n\n**Connected external applications (These apps have been logged into by the user):**\n{apps_string}\n\n Use `search_functions` to search for functions you can perform using the above. You can also discover more applications using the `search_functions` tool to find additional tools and integrations, if required.\n"
+    system_prompt += "\n\nIn addition to the Python Standard Library, you can use the following external functions:\n"
+    
     tools_context = {}
 
-    for tool in tools + additional_tools:
+    for tool in tools:
+        if hasattr(tool, "func") and tool.func is not None:
+            tool_callable = tool.func
+            is_async = False
+        elif hasattr(tool, "coroutine") and tool.coroutine is not None:
+            tool_callable = tool.coroutine
+            is_async = True
+        system_prompt += f'''{"async " if is_async else ""}{schema_to_signature(tool.args, tool.name)}:
+    """{tool.description}"""
+    ...
+'''
+        safe_name = make_safe_function_name(tool.name)
+        tools_context[safe_name] = tool_callable
+
+    for tool in additional_tools:
         if hasattr(tool, "func") and tool.func is not None:
             tool_callable = tool.func
             is_async = False
@@ -131,7 +169,7 @@ def create_default_prompt(
         system_prompt += f'''{"async " if is_async else ""}def {tool.name} {str(inspect.signature(tool_callable))}:
     """{tool.description}"""
     ...
-    '''
+'''
         safe_name = make_safe_function_name(tool.name)
         tools_context[safe_name] = tool_callable
 

universal_mcp/agents/codeact0/state.py

@@ -12,6 +12,11 @@ class PlaybookCode(BaseModel):
     code: str = Field(description="The Python code for the playbook.")
 
 
+class PlaybookMeta(BaseModel):
+    name: str = Field(description="Concise, title-cased playbook name (3-6 words).")
+    description: str = Field(description="Short, one-sentence description (<= 140 chars).")
+
+
 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)."""
@@ -47,3 +52,7 @@ class CodeActState(AgentState):
     """Queue for tools exported from registry"""
     plan: list[str] | None
     """Plan for the playbook agent."""
+    playbook_name: str | None
+    """Generated playbook name after confirmation."""
+    playbook_description: str | None
+    """Generated short description after confirmation."""

universal_mcp/agents/codeact0/tools.py

@@ -70,9 +70,10 @@ def create_meta_tools(tool_registry: AgentrRegistry) -> dict[str, Any]:
 
         canonical_app_id = None
         found_tools_result = []
+        THRESHOLD = 0.8
 
         if app_id:
-            relevant_apps = await registry.search_apps(query=app_id, distance_threshold=0.7)
+            relevant_apps = await registry.search_apps(query=app_id, distance_threshold=THRESHOLD)
             if not relevant_apps:
                 return {
                     "found_tools": [],
@@ -104,11 +105,11 @@ def create_meta_tools(tool_registry: AgentrRegistry) -> dict[str, Any]:
                 prioritized_app_id_list = [canonical_app_id]
             else:
                 # 1. Perform an initial broad search for tools.
-                initial_tool_search_tasks = [registry.search_tools(query=q, distance_threshold=0.7) for q in queries]
+                initial_tool_search_tasks = [registry.search_tools(query=q, distance_threshold=THRESHOLD) for q in queries]
                 initial_tool_results = await asyncio.gather(*initial_tool_search_tasks)
 
                 # 2. Search for relevant apps.
-                app_search_tasks = [registry.search_apps(query=q, distance_threshold=0.7) for q in queries]
+                app_search_tasks = [registry.search_apps(query=q, distance_threshold=THRESHOLD) for q in queries]
                 app_search_results = await asyncio.gather(*app_search_tasks)
 
                 # 3. Create a prioritized list of app IDs for the final search.
@@ -131,7 +132,7 @@ def create_meta_tools(tool_registry: AgentrRegistry) -> dict[str, Any]:
                 for app_id_to_search in prioritized_app_id_list:
                     for query in queries:
                         final_tool_search_tasks.append(
-                            registry.search_tools(query=query, app_id=app_id_to_search, distance_threshold=0.7)
+                            registry.search_tools(query=query, app_id=app_id_to_search, distance_threshold=THRESHOLD)
                         )
                 query_results = await asyncio.gather(*final_tool_search_tasks)
 
@@ -209,29 +210,27 @@ def create_meta_tools(tool_registry: AgentrRegistry) -> dict[str, Any]:
 
     @tool
     async def web_search(query: str) -> dict:
-        """Get an LLM answer to a question informed by Perplexity web search results.
-        Useful when you need information from a wide range of real-time sources on the web.
-        Do not use this when you need to access contents of a specific webpage.
+        """
+        Get an LLM answer to a question informed by Exa search results. Useful when you need information from a wide range of real-time sources on the web. Do not use this when you need to access contents of a specific webpage.
 
-        This tool performs a Perplexity request via `perplexity__answer_with_search`, which:
-        1. Provides a **direct answer** for factual queries with citation(s)
+        This tool performs an Exa `/answer` request, which:
+        1. Provides a **direct answer** for factual queries (e.g., "What is the capital of France?" → "Paris")
         2. Generates a **summary with citations** for open-ended questions
+        (e.g., "What is the state of AI in healthcare?" → A detailed summary with source links)
 
         Args:
             query (str): The question or topic to answer.
-
         Returns:
-            dict: A structured response containing:
-                - answer (str): Generated answer with markdown formatting and citation numbers [1][2]
-                - citations (list[str]): List of source URLs corresponding to citation numbers
+            dict: A structured response containing only:
+                - answer (str): Generated answer
+                - citations (list[dict]): List of cited sources
         """
         await tool_registry.export_tools(["exa__answer"], ToolFormat.LANGCHAIN)
         response = await tool_registry.call_tool("exa__answer", {"query": query, "text": True})
-        logger.info(f"Web search response: {response}")
 
         # Extract only desired fields
         return {
-            "answer": response.get("content"),
+            "answer": response.get("answer"),
             "citations": response.get("citations", []),
         }
 
@@ -279,7 +278,7 @@ async def get_valid_tools(tool_ids: list[str], registry: AgentrRegistry) -> tupl
             continue
         if app not in connected_apps and app not in unconnected:
             unconnected.add(app)
-            text = registry.authorise_app(app_id=app)
+            text = await registry.authorise_app(app_id=app)
             start = text.find(":") + 1
             end = text.find(". R", start)
             url = text[start:end].strip()

universal_mcp/agents/codeact0/utils.py

@@ -333,35 +333,48 @@ def inject_context(
     return namespace
 
 
-def schema_to_signature(schema: dict, func_name="my_function") -> str:
+def schema_to_signature(schema: dict, func_name: str = "my_function") -> str:
+    """
+    Convert a JSON schema into a Python-style function signature string.
+    Handles fields with `type`, `anyOf`, defaults, and missing metadata safely.
+    """
     type_map = {
         "integer": "int",
         "string": "str",
         "boolean": "bool",
         "null": "None",
+        "number": "float",
+        "array": "list",
+        "object": "dict",
     }
 
     params = []
     for name, meta in schema.items():
-        # figure out type
-        if "type" in meta:
+        if not isinstance(meta, dict):
+            typ = "Any"
+        elif "type" in meta:
             typ = type_map.get(meta["type"], "Any")
         elif "anyOf" in meta:
-            types = [type_map.get(t["type"], "Any") for t in meta["anyOf"]]
-            typ = " | ".join(set(types))
+            types = []
+            for t in meta["anyOf"]:
+                if not isinstance(t, dict):
+                    continue
+                t_type = t.get("type")
+                types.append(type_map.get(t_type, "Any") if t_type else "Any")
+            typ = " | ".join(sorted(set(types))) if types else "Any"
         else:
             typ = "Any"
 
-        default = meta.get("default", None)
-        default_repr = repr(default)
-
-        params.append(f"{name}: {typ} = {default_repr}")
+        # Handle defaults gracefully
+        default = meta.get("default")
+        if default is None:
+            params.append(f"{name}: {typ}")
+        else:
+            params.append(f"{name}: {typ} = {repr(default)}")
 
-    # join into signature
     param_str = ",\n    ".join(params)
     return f"def {func_name}(\n    {param_str},\n):"
 
-
 def smart_truncate(
     output: str, max_chars_full: int = 2000, max_lines_headtail: int = 20, summary_threshold: int = 10000
 ) -> str:
@@ -394,3 +407,27 @@ def smart_truncate(
         truncated = truncated[:summary_threshold] + "\n... [output truncated to fit context] ..."
 
     return truncated
+
+
+async def get_connected_apps_string(registry) -> str:
+    """Get a formatted string of connected applications from the registry."""
+    if not registry:
+        return ""
+    
+    try:
+        # Get connected apps from registry
+        connections = await registry.list_connected_apps()
+        if not connections:
+            return "No applications are currently connected."
+        
+        # Extract app names from connections
+        connected_app_ids = {connection["app_id"] for connection in connections}
+        
+        # Format the apps list
+        apps_list = []
+        for app_id in connected_app_ids:
+            apps_list.append(f"- {app_id}")
+        
+        return "\n".join(apps_list)
+    except Exception:
+        return "Unable to retrieve connected applications."

{universal_mcp_agents-0.1.21.dist-info → universal_mcp_agents-0.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp-agents
-Version: 0.1.21
+Version: 0.1.22
 Summary: Add your description here
 Project-URL: Homepage, https://github.com/universal-mcp/applications
 Project-URL: Repository, https://github.com/universal-mcp/applications

{universal_mcp_agents-0.1.21.dist-info → universal_mcp_agents-0.1.22.dist-info}/RECORD

@@ -22,15 +22,15 @@ universal_mcp/agents/builder/prompts.py,sha256=8Xs6uzTUHguDRngVMLak3lkXFkk2VV_uQ
 universal_mcp/agents/builder/state.py,sha256=7DeWllxfN-yD6cd9wJ3KIgjO8TctkJvVjAbZT8W_zqk,922
 universal_mcp/agents/codeact0/__init__.py,sha256=8-fvUo1Sm6dURGI-lW-X3Kd78LqySYbb5NMkNJ4NDwg,76
 universal_mcp/agents/codeact0/__main__.py,sha256=_7qSz97YnRgYJTESkALS5_eBIGHiMjA5rhr3IAeBvVo,896
-universal_mcp/agents/codeact0/agent.py,sha256=KvIoZh2J2JQONfGf80LBuXDdQnnYja4ybZ4DluCKxPM,15192
+universal_mcp/agents/codeact0/agent.py,sha256=Cxdh9eJvrIfUISdFQKXnYrGc6PePrIGusSvWiALmAJo,16634
 universal_mcp/agents/codeact0/config.py,sha256=H-1woj_nhSDwf15F63WYn723y4qlRefXzGxuH81uYF0,2215
 universal_mcp/agents/codeact0/langgraph_agent.py,sha256=8nz2wq-LexImx-l1y9_f81fK72IQetnCeljwgnduNGY,420
 universal_mcp/agents/codeact0/llm_tool.py,sha256=-pAz04OrbZ_dJ2ueysT1qZd02DrbLY4EbU0tiuF_UNU,798
-universal_mcp/agents/codeact0/prompts.py,sha256=a5ja7KwSG1SmbCkoZVdyFOI5dz2Ul-OWG-JcakBySDM,9635
+universal_mcp/agents/codeact0/prompts.py,sha256=Gk6WTx2X7IOlbC3wYtGwKWDoeUtgpkMeiyfhj6LEq2I,11221
 universal_mcp/agents/codeact0/sandbox.py,sha256=Xw4tbUV_6haYIZZvteJi6lIYsW6ni_3DCRCOkslTKgM,4459
-universal_mcp/agents/codeact0/state.py,sha256=Z9fUmBTw-29MZTq2GsYYyyjLPyrtE5GDnhX4gSqHhcA,1555
-universal_mcp/agents/codeact0/tools.py,sha256=qGhbJl74xflJBNfOCiy-Ts5zKIxXjE1JVyqvtVGHZNY,13363
-universal_mcp/agents/codeact0/utils.py,sha256=Rustf3MFoFbasdnwBh9YvNrXqasgANkBAWQn9AjqBO4,16240
+universal_mcp/agents/codeact0/state.py,sha256=co3BZBuMIt1FP2qzgsbsLkyKbddCG1ieKyAw9TAskSU,1944
+universal_mcp/agents/codeact0/tools.py,sha256=WRJKNIf6_cP_enElboEyVd-aHF-kk6aq8Bg0biZijR4,13363
+universal_mcp/agents/codeact0/utils.py,sha256=PgisAxmqYIzimc4lFA1nV-R7gxkICIrtO1q0FQZ-UoY,17580
 universal_mcp/agents/shared/__main__.py,sha256=XxH5qGDpgFWfq7fwQfgKULXGiUgeTp_YKfcxftuVZq8,1452
 universal_mcp/agents/shared/prompts.py,sha256=yjP3zbbuKi87qCj21qwTTicz8TqtkKgnyGSeEjMu3ho,3761
 universal_mcp/agents/shared/tool_node.py,sha256=DC9F-Ri28Pam0u3sXWNODVgmj9PtAEUb5qP1qOoGgfs,9169
@@ -39,6 +39,6 @@ universal_mcp/applications/filesystem/app.py,sha256=0TRjjm8YnslVRSmfkXI7qQOAlqWl
 universal_mcp/applications/llm/__init__.py,sha256=_XGRxN3O1--ZS5joAsPf8IlI9Qa6negsJrwJ5VJXno0,46
 universal_mcp/applications/llm/app.py,sha256=g9mK-luOLUshZzBGyQZMOHBeCSXmh2kCKir40YnsGUo,12727
 universal_mcp/applications/ui/app.py,sha256=c7OkZsO2fRtndgAzAQbKu-1xXRuRp9Kjgml57YD2NR4,9459
-universal_mcp_agents-0.1.21.dist-info/METADATA,sha256=2Nx9bEG_IEb5wHTV-8vXpQEUTNsl0bbQkPR6Ii4R1V0,878
-universal_mcp_agents-0.1.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-universal_mcp_agents-0.1.21.dist-info/RECORD,,
+universal_mcp_agents-0.1.22.dist-info/METADATA,sha256=6f34bvvybyI6et8rvKIu-4BtFJHGmt0YZmaZutJBXuw,878
+universal_mcp_agents-0.1.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+universal_mcp_agents-0.1.22.dist-info/RECORD,,