universal-mcp 0.1.24rc8__py3-none-any.whl → 0.1.24rc10__py3-none-any.whl

universal_mcp/agentr/client.py

@@ -50,7 +50,7 @@ class AgentrClient:
             raise ValueError("No API key or auth token provided")
 
     def me(self):
-        response = self.client.get("/users/me")
+        response = self.client.get("/users/me/")
         logger.debug(f"Me response: {response.status_code}")
         response.raise_for_status()
         data = response.json()
@@ -70,7 +70,7 @@ class AgentrClient:
             HTTPError: For other API errors.
         """
         response = self.client.get(
-            "/credentials",
+            "/credentials/",
             params={"app_id": app_id},
         )
         logger.debug(f"Credentials response: {response.status_code}")
@@ -93,7 +93,7 @@ class AgentrClient:
         Raises:
             HTTPError: If the API request fails.
         """
-        response = self.client.post("/connections/authorize", json={"app_id": app_id})
+        response = self.client.post("/connections/authorize/", json={"app_id": app_id})
         response.raise_for_status()
         url = response.json().get("authorize_url")
         return f"Please ask the user to visit the following url to authorize the application: {url}. Render the url in proper markdown format with a clickable link."
@@ -117,7 +117,7 @@ class AgentrClient:
         Returns:
             List[Dict[str, Any]]: A list of user app data dictionaries.
         """
-        response = self.client.get("/apps/me")
+        response = self.client.get("/apps/me/")
         response.raise_for_status()
         return response.json().get("items", [])
 
@@ -127,7 +127,7 @@ class AgentrClient:
         Returns:
             List[Dict[str, Any]]: A list of user connection data dictionaries.
         """
-        response = self.client.get("/connections")
+        response = self.client.get("/connections/")
         response.raise_for_status()
         return response.json().get("items", [])
 
@@ -143,7 +143,7 @@ class AgentrClient:
         Raises:
             httpx.HTTPError: If the API request fails.
         """
-        response = self.client.get(f"/apps/{app_id}")
+        response = self.client.get(f"/apps/{app_id}/")
         response.raise_for_status()
         return response.json()
 
@@ -159,7 +159,7 @@ class AgentrClient:
         params = {}
         if app_id:
             params["app_id"] = app_id
-        response = self.client.get("/tools", params=params)
+        response = self.client.get("/tools/", params=params)
         response.raise_for_status()
         return response.json().get("items", [])
 
@@ -175,7 +175,7 @@ class AgentrClient:
         Raises:
             httpx.HTTPError: If the API request fails.
         """
-        response = self.client.get(f"/tools/{tool_id}")
+        response = self.client.get(f"/tools/{tool_id}/")
         response.raise_for_status()
         return response.json()
 
@@ -189,7 +189,7 @@ class AgentrClient:
         Returns:
             List[Dict[str, Any]]: A list of app data dictionaries.
         """
-        response = self.client.get("/apps", params={"search": query, "limit": limit})
+        response = self.client.get("/apps/", params={"search": query, "limit": limit})
         response.raise_for_status()
         return response.json().get("items", [])
 
@@ -204,6 +204,6 @@ class AgentrClient:
         params = {"search": query, "limit": limit}
         if app_id:
             params["app_id"] = app_id
-        response = self.client.get("/tools", params=params)
+        response = self.client.get("/tools/", params=params)
         response.raise_for_status()
         return response.json().get("items", [])

universal_mcp/agents/autoagent/__main__.py

@@ -8,13 +8,11 @@ async def main():
     agent = AutoAgent(
         name="autoagent",
         instructions="You are a helpful assistant that can use tools to help the user.",
-        model="anthropic/claude-4-sonnet-20250514",
+        model="azure/gpt-4.1",
         tool_registry=AgentrRegistry(),
     )
-    result = await agent.invoke(
-        user_input="Send an email to Manoj from my google mail account, manoj@agentr.dev, with the subject 'Hello from auto agent' and the body 'testing'"
-    )
-    print(result)
+    await agent.run_interactive()
+    # print(result)
 
 
 if __name__ == "__main__":

universal_mcp/agents/autoagent/context.py

@@ -18,6 +18,7 @@ class Context:
 
     model: Annotated[str, {"__template_metadata__": {"kind": "llm"}}] = field(
         default="anthropic/claude-4-sonnet-20250514",
+        # default="vertex/gemini-2.5-flash",
         metadata={
             "description": "The name of the language model to use for the agent's main interactions. "
             "Should be in the form: provider/model-name."

universal_mcp/agents/autoagent/graph.py

@@ -18,7 +18,7 @@ from universal_mcp.types import ToolFormat
 async def build_graph(tool_registry: ToolRegistry, instructions: str = ""):
     @tool()
     async def search_tools(query: str, app_ids: list[str] | None = None) -> list[str]:
-        """Retrieve tools using a search query and app id. Use multiple times if you require tools for different tasks."""
+        """Retrieve tools using a search query and a list of app ids. Use multiple times if you require tools for different queries."""
         tools_list = []
         if app_ids is not None:
             for app_id in app_ids:
@@ -33,12 +33,11 @@ async def build_graph(tool_registry: ToolRegistry, instructions: str = ""):
         """Ask the user a question. Use this tool to ask the user for any missing information for performing a task, or when you have multiple apps to choose from for performing a task."""
         full_question = question
         return f"ASKING_USER: {full_question}"
-    
+
     @tool()
     async def load_tools(tools: list[str]) -> list[str]:
         """Choose the tools you want to use by passing their tool ids.  Loads the tools for the chosen tools and returns the tool ids."""
         return tools
-    
 
     async def call_model(
         state: State,
@@ -46,26 +45,28 @@ async def build_graph(tool_registry: ToolRegistry, instructions: str = ""):
     ):
         system_prompt = runtime.context.system_prompt if runtime.context.system_prompt else SYSTEM_PROMPT
         app_ids = await tool_registry.list_all_apps()
-        app_id_descriptions = "\n".join([f"{app['id']}: {app['description']}" for app in app_ids])
+        connections = tool_registry.client.list_my_connections()
+        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_id_descriptions = "These are the apps connected to the user's account:\n" + "\n".join(
+            [f"{app}" for app in connected_apps]
+        )
+        if unconnected_apps:
+            app_id_descriptions += "\n\nOther (not connected) apps: " + "\n".join(
+                [f"{app}" for app in unconnected_apps]
+            )
         print(app_id_descriptions)
         system_prompt = system_prompt.format(system_time=datetime.now(tz=UTC).isoformat(), app_ids=app_id_descriptions)
-        
+
         messages = [{"role": "system", "content": system_prompt + "\n" + instructions}, *state["messages"]]
         model = load_chat_model(runtime.context.model)
         # Load tools from tool registry
         loaded_tools = await tool_registry.export_tools(tools=state["selected_tool_ids"], format=ToolFormat.LANGCHAIN)
         model_with_tools = model.bind_tools([search_tools, ask_user, load_tools, *loaded_tools], tool_choice="auto")
         response_raw = model_with_tools.invoke(messages)
-        token_usage = state.get("token_usage", {})
-        for key in ["input_tokens", "output_tokens", "total_tokens"]:
-            if key in token_usage:
-                token_usage[key] += response_raw.usage_metadata[key]
-            else:
-                token_usage[key] = response_raw.usage_metadata[key]
-        print(response_raw.usage_metadata)
-        print(token_usage)
-        response = cast(AIMessage, response_raw) 
-        return {"messages": [response], "token_usage": token_usage}
+        response = cast(AIMessage, response_raw)
+        return {"messages": [response]}
 
     # Define the conditional edge that determines whether to continue or not
     def should_continue(state: State):
@@ -104,12 +105,12 @@ async def build_graph(tool_registry: ToolRegistry, instructions: str = ""):
                 tools = await search_tools.ainvoke(tool_call["args"])
                 outputs.append(
                     ToolMessage(
-                        content=json.dumps(tools)+"\n\nUse the load_tools tool to load the tools you want to use.",
+                        content=json.dumps(tools) + "\n\nUse the load_tools tool to load the tools you want to use.",
                         name=tool_call["name"],
                         tool_call_id=tool_call["id"],
                     )
                 )
-                
+
             elif tool_call["name"] == load_tools.name:
                 tool_ids = await load_tools.ainvoke(tool_call["args"])
                 print(tool_ids)
@@ -122,20 +123,25 @@ async def build_graph(tool_registry: ToolRegistry, instructions: str = ""):
                 )
             else:
                 await tool_registry.export_tools([tool_call["name"]], ToolFormat.LANGCHAIN)
-                tool_result = await tool_registry.call_tool(tool_call["name"], tool_call["args"])
-                outputs.append(
-                    ToolMessage(
-                        content=json.dumps(tool_result),
-                        name=tool_call["name"],
-                        tool_call_id=tool_call["id"],
+                try:
+                    tool_result = await tool_registry.call_tool(tool_call["name"], tool_call["args"])
+                    outputs.append(
+                        ToolMessage(
+                            content=json.dumps(tool_result),
+                            name=tool_call["name"],
+                            tool_call_id=tool_call["id"],
+                        )
+                    )
+                except Exception as e:
+                    outputs.append(
+                        ToolMessage(
+                            content=json.dumps("Error: " + str(e)),
+                            name=tool_call["name"],
+                            tool_call_id=tool_call["id"],
+                        )
                     )
-                )
         return {"messages": outputs, "selected_tool_ids": tool_ids}
 
-                
-
-
-
     builder = StateGraph(State, context_schema=Context)
 
     builder.add_node("agent", call_model)

universal_mcp/agents/autoagent/prompts.py

@@ -3,6 +3,7 @@
 SYSTEM_PROMPT = """You are a helpful AI assistant. When you lack tools for any task you should use the `search_tools` function to unlock relevant tools. Whenever you need to ask the user for any information, or choose between multiple different applications, you can ask the user using the `ask_user` function.
 
 System time: {system_time}
-App IDs: {app_ids}
-Note that when multiple apps seem relevant for a task, you should ask the user to choose the app.
+These are the list of apps available to you:
+{app_ids}
+Note that when multiple apps seem relevant for a task, you MUST ask the user to choose the app. 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.
 """

universal_mcp/agents/autoagent/state.py

@@ -25,4 +25,3 @@ def _enqueue(left: list, right: list) -> list:
 
 class State(AgentState):
     selected_tool_ids: Annotated[list[str], _enqueue]
-    token_usage: dict[str, int]

universal_mcp/agents/base.py

@@ -33,6 +33,7 @@ class BaseAgent:
         async for event, _ in self._graph.astream(
             {"messages": [{"role": "user", "content": user_input}]},
             config={"configurable": {"thread_id": thread_id}},
+            context={"system_prompt": self.instructions, "model": self.model},
             stream_mode="messages",
         ):
             event = cast(AIMessageChunk, event)
@@ -101,4 +102,7 @@ class BaseAgent:
                 self.cli.display_info("\nGoodbye! 👋")
                 break
             except Exception as e:
+                import traceback
+
+                traceback.print_exc()
                 self.cli.display_error(f"An error occurred: {str(e)}")

universal_mcp/agents/llm.py

@@ -1,12 +1,12 @@
 from langchain_anthropic import ChatAnthropic
 from langchain_core.language_models import BaseChatModel
 from langchain_google_vertexai.model_garden import ChatAnthropicVertex
+from langchain_google_vertexai import ChatVertexAI
 from langchain_openai import AzureChatOpenAI
 
 
 def load_chat_model(fully_specified_name: str, tags: list[str] | None = None) -> BaseChatModel:
     """Load a chat model from a fully specified name.
-
     Args:
         fully_specified_name (str): String in the format 'provider/model'.
     """
@@ -19,6 +19,8 @@ def load_chat_model(fully_specified_name: str, tags: list[str] | None = None) ->
         )  # pyright: ignore[reportCallIssue]
     elif provider == "azure":
         return AzureChatOpenAI(model=model, api_version="2024-12-01-preview", azure_deployment=model, tags=tags)
+    elif provider == "vertex":
+        return ChatVertexAI(model=model, temperature=0.1, tags=tags)
     else:
         raise ValueError(f"Unsupported provider: {provider}")
 

{universal_mcp-0.1.24rc8.dist-info → universal_mcp-0.1.24rc10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.24rc8
+Version: 0.1.24rc10
 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.24rc8.dist-info → universal_mcp-0.1.24rc10.dist-info}/RECORD

@@ -8,26 +8,26 @@ universal_mcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 universal_mcp/types.py,sha256=jeUEkUnwdGWo3T_qSRSF83u0fYpuydaWzdKlCYBlCQA,770
 universal_mcp/agentr/README.md,sha256=t15pVgkCwZM5wzgLgrf0Zv6hVL7dPmKXvAeTf8CiXPQ,6641
 universal_mcp/agentr/__init__.py,sha256=fv1ZnOCduIUiJ9oN4e6Ya_hA2oWQvcEuDU3Ek1vEufI,180
-universal_mcp/agentr/client.py,sha256=-oyNlR5hWSV9CFaTp3JmzP99P44_A0QJ-tMuY6LIGWk,7419
+universal_mcp/agentr/client.py,sha256=TQgwrNc7dEMXuprELf0Q-fdYdrH92Ppd7PUDZoD-KcY,7429
 universal_mcp/agentr/integration.py,sha256=V5GjqocqS02tRoI8MeV9PL6m-BzejwBzgJhOHo4MxAE,4212
 universal_mcp/agentr/registry.py,sha256=O60qOsuby1GTkgc9GXVf9BjHmjMTyDbxqbDfIJ13CJ4,6583
 universal_mcp/agentr/server.py,sha256=bIPmHMiKKwnUYnxmfZVRh1thcn7Rytm_-bNiXTfANzc,2098
 universal_mcp/agents/__init__.py,sha256=AMBDQs3p5PePjzdoHYNoPYEsUK_PLHGNVPGxK7yrKVo,270
 universal_mcp/agents/auto.py,sha256=BknCoeexTbFvwmVzYdGiiH72S_r6_5s9tmjH9M0I4d4,25410
-universal_mcp/agents/base.py,sha256=o41gxvwOqWY0IZnupAHfKeH7OG0dgHUQDDpqntsFg6M,4128
+universal_mcp/agents/base.py,sha256=8CZD1ADTIbun6uQE9O7QO-5oz4UUJdwdFWIMBLq8E10,4279
 universal_mcp/agents/cli.py,sha256=7GdRBpu9rhZPiC2vaNQXWI7K-0yCnvdlmE0IFpvy2Gk,539
 universal_mcp/agents/hil.py,sha256=6xi0hhK5g-rhCrAMcGbjcKMReLWPC8rnFZMBOF3N_cY,3687
-universal_mcp/agents/llm.py,sha256=0HUI2Srh3RWtGyrjJCKqsroEgc1Rtkta3T8I1axl1mg,1232
+universal_mcp/agents/llm.py,sha256=jollWOAUv15IouzbLpuqKzbjj2x2ioZUukSQNyNjb4Y,1382
 universal_mcp/agents/react.py,sha256=g2PwqxYe7v7wCMDCCQhTtGU1eFmSsF4g7T_t9d-v0ho,3012
 universal_mcp/agents/simple.py,sha256=JL8TFyXlA1F4zcArgKhlqVIbLWXetwM05z4MPDJgFeI,1367
 universal_mcp/agents/tools.py,sha256=7Vdw0VZYxXVAzAYSpRKWHzVl9Ll6NOnVRlc4cTXguUQ,1335
 universal_mcp/agents/utils.py,sha256=7kwFpD0Rv6JqHG-LlNCVwSu_xRX-N119mUmiBroHJL4,4109
 universal_mcp/agents/autoagent/__init__.py,sha256=E_vMnFz8Z120qdqaKXPNP_--4Tes4jImen7m_iZvtVo,913
-universal_mcp/agents/autoagent/__main__.py,sha256=ps0cT7b9DN-jQK8pOKFVRZf3Oz_dVSBSYWOa8sc7VNc,647
-universal_mcp/agents/autoagent/context.py,sha256=1ic3sIL14XZeiMjpkwysLImRTQFKXRFSx7rvgVh4plY,802
-universal_mcp/agents/autoagent/graph.py,sha256=f6RF9Cm1aiYTHoEhNHG_FNQrU-MgEb8QIHdg9pQSyuA,6390
-universal_mcp/agents/autoagent/prompts.py,sha256=5EiQVE75LrERYAh29CltjMxI7znt_eW_LP4zX_7LxHY,502
-universal_mcp/agents/autoagent/state.py,sha256=pTKbgTK8TTx7qIioVt98u9KZpeWacWaRmKJWRv3Jj40,791
+universal_mcp/agents/autoagent/__main__.py,sha256=tvA-fGN-8x9wA0MyPXydgJ2PxNTY1t3YtweYuZGrIX0,468
+universal_mcp/agents/autoagent/context.py,sha256=RgjW1uCslucxYJpdmi4govd-0V1_9e6Y_kjWl3FpLrE,847
+universal_mcp/agents/autoagent/graph.py,sha256=8q44BXZLjB00OBXcqEdV-DrZOFkTkdeov62cI7kRwX8,6901
+universal_mcp/agents/autoagent/prompts.py,sha256=ptnXyOarigq96nVW-P1ceT2WRilKvh7NPfE_Cy0NTz4,719
+universal_mcp/agents/autoagent/state.py,sha256=TQeGZD99okclkoCh5oz-VYIlEsC9yLQyDpnBnm7QCN8,759
 universal_mcp/agents/autoagent/studio.py,sha256=nfVRzPXwBjDORHA0wln2k3Nz-zQXNKgZMvgeqBvkdtM,644
 universal_mcp/agents/autoagent/utils.py,sha256=AFq-8scw_WlSZxDnTzxSNrOSiGYsIlqkqtQLDWf_rMU,431
 universal_mcp/agents/codeact/__init__.py,sha256=5D_I3lI_3tWjZERRoFav_bPe9UDaJ53pDzZYtyixg3E,10097
@@ -72,8 +72,8 @@ universal_mcp/utils/openapi/readme.py,sha256=R2Jp7DUXYNsXPDV6eFTkLiy7MXbSULUj1vH
 universal_mcp/utils/openapi/test_generator.py,sha256=h44gQXEXmrw4pD3-XNHKB7T9c2lDomqrJxVO6oszCqM,12186
 universal_mcp/utils/templates/README.md.j2,sha256=Mrm181YX-o_-WEfKs01Bi2RJy43rBiq2j6fTtbWgbTA,401
 universal_mcp/utils/templates/api_client.py.j2,sha256=972Im7LNUAq3yZTfwDcgivnb-b8u6_JLKWXwoIwXXXQ,908
-universal_mcp-0.1.24rc8.dist-info/METADATA,sha256=7ioJQnlDsraVLDJ-rGDX0xb-W5yBgZQkTMzPtke-7JQ,3143
-universal_mcp-0.1.24rc8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-universal_mcp-0.1.24rc8.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
-universal_mcp-0.1.24rc8.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
-universal_mcp-0.1.24rc8.dist-info/RECORD,,
+universal_mcp-0.1.24rc10.dist-info/METADATA,sha256=3VAPupygqW8ScZVKMma6ymtFMaE6rv_CCvedJVMQAtQ,3144
+universal_mcp-0.1.24rc10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+universal_mcp-0.1.24rc10.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
+universal_mcp-0.1.24rc10.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
+universal_mcp-0.1.24rc10.dist-info/RECORD,,