universal-mcp 0.1.24rc22__tar.gz → 0.1.24rc24__tar.gz

{universal_mcp-0.1.24rc22 → universal_mcp-0.1.24rc24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.24rc22
+Version: 0.1.24rc24
 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.24rc22 → universal_mcp-0.1.24rc24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "universal-mcp"
-version = "0.1.24-rc22"
+version = "0.1.24-rc24"
 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.24rc22 → universal_mcp-0.1.24rc24}/src/universal_mcp/agentr/README.md

@@ -14,29 +14,30 @@ pip install universal-mcp
 
 ## Usage
 
-The AgentR platform is designed to seamlessly integrate a wide array of tools into your agentic applications. The primary entry point for this is the `Agentr` class, which provides a high-level interface for loading and listing tools.
+The AgentR platform is designed to seamlessly integrate a wide array of tools into your agentic applications. The primary entry point for this is the `AgentrRegistry` class, which provides a high-level interface for loading and listing tools.
 
-### High-Level Client (`Agentr`)
+### High-Level Client (`AgentrRegistry`)
 
-This is the recommended way to get started. It abstracts away the details of the registry and tool management.
+This is the recommended way to get started. It abstracts away the details of the tool management.
 
 ```python
 import os
-from universal_mcp.agentr import Agentr
+from universal_mcp.agentr import AgentrRegistry
 from universal_mcp.tools import ToolFormat
 
 # Initialize the main client
 # It reads from environment variables by default (AGENTR_API_KEY, AGENTR_BASE_URL)
-agentr = Agentr(
+registry = AgentrRegistry(
     api_key=os.environ.get("AGENTR_API_KEY")
 )
 
 # Load specific tools from the AgentR server into the tool manager
-agentr.load_tools(["reddit__search_subreddits", "google-drive__list_files"])
-
-# List the tools that are now loaded and ready to be used
-# You can specify a format compatible with your LLM (e.g., OPENAI)
-tools = agentr.list_tools(format=ToolFormat.OPENAI)
+# The export_tools method loads the tools and then exports them to the specified format.
+tools_config = {
+    "reddit": ["search_subreddits"],
+    "google-drive": ["list_files"]
+}
+tools = await registry.export_tools(tools_config, format=ToolFormat.OPENAI)
 print(tools)
 ```
 
@@ -59,7 +60,7 @@ client = AgentrClient(
 )
 
 # Fetch a list of available applications from the AgentR server
-apps = client.list_apps()
+apps = client.list_all_apps()
 print("Available Apps:", apps)
 
 # Get credentials for a specific app by its ID (e.g., 'reddit')
@@ -71,7 +72,7 @@ except NotAuthorizedError as e:
     print(e)  # "Please ask the user to visit the following url to authorize..."
 
 # List all available tools globally
-all_tools = client.list_tools()
+all_tools = client.list_all_tools()
 print("All Available Tools:", all_tools)
 
 # Example of fetching a single app and a single tool
@@ -80,14 +81,14 @@ if apps:
     app_id = apps[0]['id']
 
     # Fetch a single app's details
-    app_details = client.get_app(app_id)
+    app_details = client.get_app_details(app_id)
     print(f"Fetched details for app '{app_id}':", app_details)
 
 if all_tools:
     tool_id = all_tools[0]['id']
 
     # Fetch a single tool's details
-    tool_details = client.get_tool(tool_id)
+    tool_details = client.get_tool_details(tool_id)
     print(f"Fetched details for tool '{tool_id}':", tool_details)
 ```
 
@@ -134,7 +135,7 @@ registry = AgentrRegistry(client=client)
 
 async def main():
     # List all apps available on the AgentR platform
-    available_apps = await registry.list_apps()
+    available_apps = await registry.list_all_apps()
     print(available_apps)
 
     if available_apps:
@@ -143,14 +144,6 @@ async def main():
         app_details = await registry.get_app_details(app_id)
         print(f"Details for {app_id}:", app_details)
 
-    # The load_tools method is used internally by the high-level Agentr client
-    # but can be called directly if needed.
-    # from universal_mcp.tools import ToolManager
-    # tool_manager = ToolManager()
-    # registry.load_tools(["reddit_search_subreddits"], tool_manager)
-    # print(tool_manager.list_tools())
-
-
 if __name__ == "__main__":
     asyncio.run(main())
 ```
@@ -179,27 +172,30 @@ print(tool_manager.list_tools())
 
 ## Executing Tools
 
-Once tools are loaded, you can execute them using the `call_tool` method on the `ToolManager` instance, which is available via `agentr.manager`.
+Once tools are loaded, you can execute them using the `call_tool` method on the `AgentrRegistry` instance.
 
 ```python
 import os
 import asyncio
-from universal_mcp.agentr import Agentr
+from universal_mcp.agentr import AgentrRegistry
+from universal_mcp.tools import ToolFormat
 
 async def main():
-    # 1. Initialize Agentr
-    agentr = Agentr(api_key=os.environ.get("AGENTR_API_KEY"))
+    # 1. Initialize AgentrRegistry
+    registry = AgentrRegistry(api_key=os.environ.get("AGENTR_API_KEY"))
 
-    # 2. Load the tool(s) you want to use
+    # 2. Load the tool(s) you want to use by exporting them
     tool_name = "reddit__search_subreddits"
-    agentr.load_tools([tool_name])
+    tools_config = {"reddit": ["search_subreddits"]}
+    await registry.export_tools(tools_config, format=ToolFormat.OPENAI)
+
 
-    # 3. Execute the tool using the tool manager
+    # 3. Execute the tool using the registry's call_tool method
     try:
         # Note the 'await' since call_tool is an async method
-        result = await agentr.manager.call_tool(
-            name=tool_name,
-            arguments={"query": "elon musk", "limit": 5, "sort": "relevance"}
+        result = await registry.call_tool(
+            tool_name=tool_name,
+            tool_args={"query": "elon musk", "limit": 5, "sort": "relevance"}
         )
         print("Execution result:", result)
     except Exception as e:
@@ -207,4 +203,4 @@ async def main():
 
 if __name__ == "__main__":
     asyncio.run(main())
-```
+```

{universal_mcp-0.1.24rc22 → universal_mcp-0.1.24rc24}/src/universal_mcp/agentr/client.py

@@ -183,7 +183,7 @@ class AgentrClient:
         response.raise_for_status()
         return response.json()
 
-    def search_all_apps(self, query: str, limit: int = 2):
+    def search_all_apps(self, query: str, limit: int = 2, distance_threshold: float = 0.6):
         """Search for apps from the AgentR API.
 
         Args:
@@ -193,11 +193,13 @@ 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, "distance_threshold": distance_threshold}
+        )
         response.raise_for_status()
         return response.json().get("items", [])
 
-    def search_all_tools(self, query: str, limit: int = 2, app_id: str | None = None):
+    def search_all_tools(self, query: str, limit: int = 2, app_id: str | None = None, distance_threshold: float = 0.6):
         """Search for tools from the AgentR API.
 
         Args:
@@ -205,7 +207,7 @@ class AgentrClient:
             limit (int, optional): The number of tools to return. Defaults to 2.
             app_id (str, optional): The ID of the app to search tools for.
         """
-        params = {"search": query, "limit": limit}
+        params = {"search": query, "limit": limit, "distance_threshold": distance_threshold}
         if app_id:
             params["app_id"] = app_id
         response = self.client.get("/tools/", params=params)

{universal_mcp-0.1.24rc22 → universal_mcp-0.1.24rc24}/src/universal_mcp/agentr/registry.py

@@ -82,6 +82,7 @@ class AgentrRegistry(ToolRegistry):
         self,
         query: str,
         limit: int = 10,
+        distance_threshold: float = 0.6,
     ) -> list[dict[str, Any]]:
         """Search for apps by a query.
 
@@ -93,7 +94,7 @@ class AgentrRegistry(ToolRegistry):
             List of app dictionaries matching the query
         """
         try:
-            apps = self.client.search_all_apps(query=query, limit=limit)
+            apps = self.client.search_all_apps(query=query, limit=limit, distance_threshold=distance_threshold)
             return apps
         except Exception as e:
             logger.error(f"Error searching apps from AgentR: {e}")
@@ -123,6 +124,7 @@ class AgentrRegistry(ToolRegistry):
         query: str,
         limit: int = 2,
         app_id: str | None = None,
+        distance_threshold: float = 0.6,
     ) -> list[dict[str, Any]]:
         """Search for tools by a query.
 
@@ -134,7 +136,9 @@ class AgentrRegistry(ToolRegistry):
             List of tool dictionaries matching the query
         """
         try:
-            tools = self.client.search_all_tools(query=query, limit=limit, app_id=app_id)
+            tools = self.client.search_all_tools(
+                query=query, limit=limit, app_id=app_id, distance_threshold=distance_threshold
+            )
             return tools
         except Exception as e:
             logger.error(f"Error searching tools from AgentR: {e}")
@@ -157,8 +161,6 @@ class AgentrRegistry(ToolRegistry):
         from langchain_core.tools import StructuredTool
 
         try:
-            # Clear tools from tool manager before loading new tools
-            self.tool_manager.clear_tools()
             logger.info(f"Exporting tools to {format.value} format")
             if isinstance(tools, dict):
                 self._load_tools_from_tool_config(tools)
@@ -233,3 +235,15 @@ class AgentrRegistry(ToolRegistry):
     async def list_connected_apps(self) -> list[dict[str, Any]]:
         """List all apps that the user has connected."""
         return self.client.list_my_connections()
+
+    async def authorise_app(self, app_id: str) -> str:
+        """Authorise an app to connect to the user's account.
+
+        Args:
+            app_id: The ID of the app to authorise
+
+        Returns:
+            String containing authorisation url
+        """
+        url = self.client.get_authorization_url(app_id=app_id)
+        return url

{universal_mcp-0.1.24rc22 → universal_mcp-0.1.24rc24}/src/universal_mcp/applications/application.py

@@ -11,6 +11,8 @@ from loguru import logger
 
 from universal_mcp.integrations.integration import Integration
 
+DEFAULT_API_TIMEOUT = 30  # seconds
+
 
 class BaseApplication(ABC):
     """Defines the foundational structure for applications in Universal MCP.
@@ -90,7 +92,7 @@ class APIApplication(BaseApplication):
                              BaseApplication.
         """
         super().__init__(name, **kwargs)
-        self.default_timeout: int = 180
+        self.default_timeout: int = DEFAULT_API_TIMEOUT
         self.integration = integration
         logger.debug(f"Initializing APIApplication '{name}' with integration: {integration}")
         self._client: httpx.Client | None = client
@@ -452,6 +454,7 @@ class GraphQLApplication(BaseApplication):
         super().__init__(name, **kwargs)
         self.base_url = base_url
         self.integration = integration
+        self.default_timeout: float = DEFAULT_API_TIMEOUT
         logger.debug(f"Initializing Application '{name}' with kwargs: {kwargs}")
         self._client: GraphQLClient | None = client
 

{universal_mcp-0.1.24rc22 → universal_mcp-0.1.24rc24}/src/universal_mcp/tools/adapters.py

@@ -1,3 +1,4 @@
+import inspect
 from typing import Any
 
 from loguru import logger
@@ -90,6 +91,7 @@ def convert_tool_to_langchain_tool(
     """
 
     logger.debug(f"Converting tool '{tool.name}' to LangChain format")
+    full_docstring = inspect.getdoc(tool.fn)
 
     async def call_tool(
         **arguments: dict[str, Any],
@@ -101,7 +103,7 @@ def convert_tool_to_langchain_tool(
 
     langchain_tool = StructuredTool(
         name=tool.name,
-        description=tool.description or "",
+        description=full_docstring or tool.description or "",
         coroutine=call_tool,
         response_format="content",
         args_schema=tool.parameters,

{universal_mcp-0.1.24rc22 → universal_mcp-0.1.24rc24}/src/universal_mcp/tools/registry.py

@@ -16,6 +16,7 @@ class ToolRegistry(ABC):
 
     def __init__(self):
         """Initializes the registry and its internal tool manager."""
+        self._app_instances = {}
         self.tool_manager = ToolManager()
         logger.debug(f"{self.__class__.__name__} initialized.")
 
@@ -32,7 +33,7 @@ class ToolRegistry(ABC):
         pass
 
     @abstractmethod
-    async def search_apps(self, query: str, limit: int = 2) -> list[dict[str, Any]]:
+    async def search_apps(self, query: str, limit: int = 2, distance_threshold: float = 0.6) -> list[dict[str, Any]]:
         """Search for apps by a query."""
         pass
 
@@ -42,7 +43,9 @@ class ToolRegistry(ABC):
         pass
 
     @abstractmethod
-    async def search_tools(self, query: str, limit: int = 2, app_id: str | None = None) -> list[dict[str, Any]]:
+    async def search_tools(
+        self, query: str, limit: int = 2, app_id: str | None = None, distance_threshold: float = 0.6
+    ) -> list[dict[str, Any]]:
         """Search for tools by a query, optionally filtered by an app."""
         pass
 
@@ -73,7 +76,9 @@ class ToolRegistry(ABC):
         """Helper method to load and register tools for an app."""
         logger.info(f"Loading tools for app '{app_name}' (tools: {tool_names or 'default'})")
         try:
-            app_instance = self._create_app_instance(app_name)
+            if app_name not in self._app_instances:
+                self._app_instances[app_name] = self._create_app_instance(app_name)
+            app_instance = self._app_instances[app_name]
             self.tool_manager.register_tools_from_app(app_instance, tool_names=tool_names)
             logger.info(f"Successfully registered tools for app: {app_name}")
         except Exception as e:

{universal_mcp-0.1.24rc22 → universal_mcp-0.1.24rc24}/src/universal_mcp/cli.py

@@ -3,8 +3,8 @@ from pathlib import Path
 import typer
 from rich.console import Console
 from rich.panel import Panel
-
 from universal_mcp.agents.cli import app as client_app
+
 from universal_mcp.utils.installation import (
     get_supported_apps,
     install_app,