universal-mcp 0.1.24rc2__tar.gz → 0.1.24rc3__tar.gz

{universal_mcp-0.1.24rc2 → universal_mcp-0.1.24rc3}/.gitignore

@@ -48,3 +48,12 @@ src/universal_mcp/applications/test_without_docs/
 
 # Temporary files
 tmp/
+
+
+# Docs
+site/
+.cache/
+
+# langgraph temporary files
+.langgraph_api/
+langgraph.json

{universal_mcp-0.1.24rc2 → universal_mcp-0.1.24rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.24rc2
+Version: 0.1.24rc3
 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
@@ -12,13 +12,22 @@ Requires-Dist: gql[all]>=3.5.2
 Requires-Dist: jinja2>=3.1.3
 Requires-Dist: jsonref>=1.1.0
 Requires-Dist: keyring>=25.6.0
+Requires-Dist: langchain-mcp-adapters>=0.1.9
+Requires-Dist: langchain-openai>=0.3.27
+Requires-Dist: langgraph-cli[inmem]>=0.3.4
+Requires-Dist: langgraph>=0.5.2
+Requires-Dist: langsmith>=0.4.5
 Requires-Dist: loguru>=0.7.3
-Requires-Dist: mcp>=1.9.3
+Requires-Dist: mcp>=1.10.0
+Requires-Dist: mkdocs-material>=9.6.15
+Requires-Dist: mkdocs>=1.6.1
 Requires-Dist: posthog>=3.24.0
 Requires-Dist: pydantic-settings>=2.8.1
 Requires-Dist: pydantic>=2.11.1
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=14.0.0
+Requires-Dist: streamlit>=1.46.1
+Requires-Dist: ty>=0.0.1a17
 Requires-Dist: typer>=0.15.2
 Provides-Extra: dev
 Requires-Dist: litellm>=1.30.7; extra == 'dev'
@@ -28,6 +37,11 @@ Requires-Dist: pyright>=1.1.398; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.26.0; extra == 'dev'
 Requires-Dist: pytest>=8.3.5; extra == 'dev'
 Requires-Dist: ruff>=0.11.4; extra == 'dev'
+Provides-Extra: docs
+Requires-Dist: mkdocs-glightbox>=0.4.0; extra == 'docs'
+Requires-Dist: mkdocs-material[imaging]>=9.5.45; extra == 'docs'
+Requires-Dist: mkdocs>=1.6.1; extra == 'docs'
+Requires-Dist: mkdocstrings-python>=1.12.2; extra == 'docs'
 Description-Content-Type: text/markdown
 
 # Universal MCP

{universal_mcp-0.1.24rc2 → universal_mcp-0.1.24rc3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "universal-mcp"
-version = "0.1.24-rc2"
+version = "0.1.24-rc3"
 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 = [
@@ -19,13 +19,22 @@ dependencies = [
     "gql[all]>=3.5.2",
     "jsonref>=1.1.0",
     "keyring>=25.6.0",
+    "langchain-mcp-adapters>=0.1.9",
+    "langchain-openai>=0.3.27",
+    "langgraph>=0.5.2",
+    "langgraph-cli[inmem]>=0.3.4",
+    "langsmith>=0.4.5",
     "loguru>=0.7.3",
-    "mcp>=1.9.3",
+    "mcp>=1.10.0",
+    "mkdocs>=1.6.1",
+    "mkdocs-material>=9.6.15",
     "posthog>=3.24.0",
     "pydantic>=2.11.1",
     "pydantic-settings>=2.8.1",
     "pyyaml>=6.0.2",
     "rich>=14.0.0",
+    "streamlit>=1.46.1",
+    "ty>=0.0.1a17",
     "typer>=0.15.2",
 ]
 
@@ -39,6 +48,12 @@ dev = [
     "pytest-asyncio>=0.26.0",
     "ruff>=0.11.4",
 ]
+docs = [
+    "mkdocs>=1.6.1",
+    "mkdocs-glightbox>=0.4.0",
+    "mkdocs-material[imaging]>=9.5.45",
+    "mkdocstrings-python>=1.12.2",
+]
 
 [project.scripts]
 universal_mcp = "universal_mcp.cli:app"

{universal_mcp-0.1.24rc2 → universal_mcp-0.1.24rc3}/src/tests/test_api_generator.py

@@ -70,10 +70,7 @@ async def test_generate_api_with_output(sample_schema, temp_dir):
     """Test API generation with output file."""
     output_path = temp_dir / "test.py"
 
-    app_file = generate_api_from_schema(schema_path=sample_schema, output_path=output_path)
-
-    assert "app_file" != None
-    assert "readme_file" != None
+    app_file, schemas_file = generate_api_from_schema(schema_path=sample_schema, output_path=output_path)
 
     assert app_file.exists()
     content = app_file.read_text()
@@ -106,9 +103,8 @@ async def test_generate_api_without_docstrings(sample_schema, temp_dir):
     """Test API generation without docstring generation."""
     output_path = temp_dir / "test_without_docs.py"
 
-    app_file = generate_api_from_schema(schema_path=sample_schema, output_path=output_path)
+    app_file, schemas_file = generate_api_from_schema(schema_path=sample_schema, output_path=output_path)
 
-    assert app_file is not None
     assert app_file.exists()
 
     # Verify the app was generated
@@ -163,9 +159,8 @@ async def test_generate_api_with_complex_schema(temp_dir):
         json.dump(schema, f)
 
     output_path = temp_dir / "complex.py"
-    app_file = generate_api_from_schema(schema_path=schema_file, output_path=output_path)
+    app_file, schemas_file = generate_api_from_schema(schema_path=schema_file, output_path=output_path)
 
-    assert app_file is not None
     assert app_file.exists()
 
     content = app_file.read_text()

{universal_mcp-0.1.24rc2 → universal_mcp-0.1.24rc3}/src/tests/test_api_integration.py

@@ -1,25 +1,23 @@
 import pytest
 
-from universal_mcp.applications import app_from_slug
+from universal_mcp.applications import app_from_config
+from universal_mcp.config import AppConfig  # <-- Import the AppConfig model
 from universal_mcp.exceptions import NotAuthorizedError
 from universal_mcp.integrations import ApiKeyIntegration
 from universal_mcp.stores import MemoryStore
 
 
 def test_perplexity_api_no_key():
-    # Create a memory store
     store = MemoryStore()
 
-    # Create API key integration with the store
     integration = ApiKeyIntegration("PERPLEXITY", store=store)
+    perplexity_app_config = AppConfig(name="perplexity")
+    PerplexityApp = app_from_config(perplexity_app_config)
 
-    # Create Perplexity app with the integration
-    app = app_from_slug("perplexity")(integration=integration)
+    app = PerplexityApp(integration=integration)
 
-    # Try to make a chat request without setting API key
     with pytest.raises(NotAuthorizedError) as exc_info:
         app.chat("Hello, how are you?")
 
-    # Verify the error message suggests setting up API key
     assert "Please ask the user for api key" in str(exc_info.value)
     assert "PERPLEXITY_API_KEY" in str(exc_info.value)

{universal_mcp-0.1.24rc2 → universal_mcp-0.1.24rc3}/src/tests/test_applications.py

@@ -1,6 +1,7 @@
 import pytest
 
-from universal_mcp.applications import app_from_slug
+from universal_mcp.applications import app_from_config
+from universal_mcp.config import AppConfig
 from universal_mcp.utils.testing import check_application_instance
 
 ALL_APPS = [
@@ -69,6 +70,7 @@ ALL_APPS = [
 
 @pytest.mark.parametrize("app_name", ALL_APPS)
 def test_application(app_name):
-    app = app_from_slug(app_name)
-    app_instance = app(integration=None)
+    app_config = AppConfig(name=app_name, source_type="package")
+    app_class = app_from_config(app_config)
+    app_instance = app_class(integration=None)
     check_application_instance(app_instance, app_name)

{universal_mcp-0.1.24rc2 → universal_mcp-0.1.24rc3}/src/tests/test_tool_manager.py

@@ -1,7 +1,7 @@
 import pytest
 
 from universal_mcp.applications.application import BaseApplication
-from universal_mcp.exceptions import ToolError
+from universal_mcp.exceptions import ToolError, ToolNotFoundError
 from universal_mcp.tools.adapters import ToolFormat
 from universal_mcp.tools.manager import Tool, ToolManager
 
@@ -72,27 +72,27 @@ class ExampleApp(BaseApplication):
         return [dummy_add, dummy_multiply, dummy_error]
 
 
-def test_add_tool(tool_manager):
+def test_add_tool(tool_manager: ToolManager):
     tool = tool_manager.add_tool(dummy_add)
     assert tool.name == "dummy_add"
     assert tool.name in [t.name for t in tool_manager.list_tools()]
 
 
-def test_add_duplicate_tool(tool_manager):
+def test_add_duplicate_tool(tool_manager: ToolManager):
     tool1 = tool_manager.add_tool(dummy_add)
     tool2 = tool_manager.add_tool(dummy_add)
     assert tool1 is tool2  # Should return existing tool
     assert len(tool_manager.list_tools()) == 1
 
 
-def test_remove_tool(tool_manager):
+def test_remove_tool(tool_manager: ToolManager):
     tool = tool_manager.add_tool(dummy_add)
     assert tool_manager.remove_tool(tool.name) is True
     assert tool_manager.get_tool(tool.name) is None
     assert tool_manager.remove_tool("nonexistent") is False
 
 
-def test_clear_tools(tool_manager, dummy_tools):
+def test_clear_tools(tool_manager: ToolManager, dummy_tools):
     for tool in dummy_tools:
         tool_manager.add_tool(tool)
     assert len(tool_manager.list_tools()) == 3
@@ -100,7 +100,7 @@ def test_clear_tools(tool_manager, dummy_tools):
     assert len(tool_manager.list_tools()) == 0
 
 
-def test_list_tools_format(tool_manager, dummy_tools):
+def test_list_tools_format(tool_manager: ToolManager, dummy_tools):
     for tool in dummy_tools:
         tool_manager.add_tool(tool)
 
@@ -117,7 +117,7 @@ def test_list_tools_format(tool_manager, dummy_tools):
     assert len(openai_tools) == 3
 
 
-def test_filter_tools_by_tags(tool_manager, dummy_tools):
+def test_filter_tools_by_tags(tool_manager: ToolManager, dummy_tools):
     for tool in dummy_tools:
         tool_manager.add_tool(tool)
 
@@ -139,20 +139,20 @@ async def test_call_tool_success(tool_manager):
 
 
 @pytest.mark.asyncio
-async def test_call_tool_error(tool_manager):
+async def test_call_tool_error(tool_manager: ToolManager):
     tool_manager.add_tool(dummy_error)
     with pytest.raises(ToolError):
         await tool_manager.call_tool("dummy_error", {})
 
 
 @pytest.mark.asyncio
-async def test_call_nonexistent_tool(tool_manager):
-    with pytest.raises(ToolError):
+async def test_call_nonexistent_tool(tool_manager: ToolManager):
+    with pytest.raises(ToolNotFoundError):
         await tool_manager.call_tool("nonexistent", {})
 
 
 @pytest.mark.asyncio
-async def test_call_tool_from_app(tool_manager):
+async def test_call_tool_from_app(tool_manager: ToolManager):
     app = ExampleApp()
     # Only important are added by default
     tool_manager.register_tools_from_app(app)
@@ -164,7 +164,7 @@ async def test_call_tool_from_app(tool_manager):
 
 
 @pytest.mark.asyncio
-async def test_call_tool_from_app_with_tags(tool_manager):
+async def test_call_tool_from_app_with_tags(tool_manager: ToolManager):
     app = ExampleApp()
     # Only important are added by default
     tool_manager.register_tools_from_app(app, tags=["math"])
@@ -175,7 +175,7 @@ async def test_call_tool_from_app_with_tags(tool_manager):
 
 
 @pytest.mark.asyncio
-async def test_load_tool_from_name(tool_manager):
+async def test_load_tool_from_name(tool_manager: ToolManager):
     app = ExampleApp()
     # Only important are added by default
     tool_manager.register_tools_from_app(app, tool_names=["dummy_multiply", "dummy_add"])

universal_mcp-0.1.24rc3/src/universal_mcp/agentr/__init__.py

@@ -0,0 +1,6 @@
+from .agentr import Agentr
+from .client import AgentrClient
+from .integration import AgentrIntegration
+from .registry import AgentrRegistry
+
+__all__ = ["Agentr", "AgentrClient", "AgentrRegistry", "AgentrIntegration"]

universal_mcp-0.1.24rc3/src/universal_mcp/agentr/agentr.py

@@ -0,0 +1,30 @@
+import os
+
+from universal_mcp.tools import Tool, ToolFormat, ToolManager
+
+from .client import AgentrClient
+from .registry import AgentrRegistry
+
+
+class Agentr:
+    def __init__(
+        self,
+        api_key: str | None = None,
+        base_url: str | None = None,
+        registry: AgentrRegistry | None = None,
+        format: ToolFormat | None = None,
+        manager: ToolManager | None = None,
+    ):
+        self.api_key = api_key or os.getenv("AGENTR_API_KEY")
+        self.base_url = base_url or os.getenv("AGENTR_BASE_URL")
+        self.client = AgentrClient(api_key=self.api_key, base_url=self.base_url)
+        self.registry = registry or AgentrRegistry(client=self.client)
+        self.format = format or ToolFormat.NATIVE
+        self.manager = manager or ToolManager()
+
+    def load_tools(self, tool_names: list[str]) -> None:
+        self.registry.load_tools(tool_names, self.manager)
+        return
+
+    def list_tools(self, format: ToolFormat | None = None) -> list[Tool]:
+        return self.manager.list_tools(format=format or self.format)

universal_mcp-0.1.24rc2/src/universal_mcp/utils/agentr.py → universal_mcp-0.1.24rc3/src/universal_mcp/agentr/client.py

@@ -82,6 +82,22 @@ class AgentrClient:
         data = response.json()
         return [AppConfig.model_validate(app) for app in data]
 
+    def fetch_app(self, app_id: str) -> dict:
+        """Fetch a specific app from AgentR API.
+
+        Args:
+            app_id (str): ID of the app to fetch
+
+        Returns:
+            dict: App configuration data
+
+        Raises:
+            httpx.HTTPError: If API request fails
+        """
+        response = self.client.get(f"/apps/{app_id}/")
+        response.raise_for_status()
+        return response.json()
+
     def list_all_apps(self) -> list:
         """List all apps from AgentR API.
 
@@ -92,16 +108,16 @@ class AgentrClient:
         response.raise_for_status()
         return response.json()
 
-    def list_actions(self, app_name: str):
+    def list_actions(self, app_id: str):
         """List actions for an app.
 
         Args:
-            app_name (str): Name of the app to list actions for
+            app_id (str): ID of the app to list actions for
 
         Returns:
             List of action configurations
         """
 
-        response = self.client.get(f"/apps/{app_name}/actions/")
+        response = self.client.get(f"/apps/{app_id}/actions/")
         response.raise_for_status()
         return response.json()

universal_mcp-0.1.24rc3/src/universal_mcp/agentr/integration.py

@@ -0,0 +1,104 @@
+from universal_mcp.integrations.integration import Integration
+
+from .client import AgentrClient
+
+
+class AgentrIntegration(Integration):
+    """Manages authentication and authorization via the AgentR platform.
+
+    This integration uses an `AgentrClient` to interact with the AgentR API
+    for operations like retrieving authorization URLs and fetching stored
+    credentials. It simplifies integration with services supported by AgentR.
+
+    Attributes:
+        name (str): Name of the integration (e.g., "github", "google").
+        store (BaseStore): Store, typically not used directly by this class
+                       as AgentR manages the primary credential storage.
+        client (AgentrClient): Client for communicating with the AgentR API.
+        _credentials (dict | None): Cached credentials.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        client: AgentrClient | None = None,
+        api_key: str | None = None,
+        base_url: str | None = None,
+        **kwargs,
+    ):
+        """Initializes the AgentRIntegration.
+
+        Args:
+            name (str): The name of the service integration as configured on
+                        the AgentR platform (e.g., "github").
+            client (AgentrClient | None, optional): The AgentR client. If not provided,
+                                                   a new `AgentrClient` will be created.
+            api_key (str | None, optional): API key for AgentR. If not provided,
+                                           will be loaded from environment variables.
+            base_url (str | None, optional): Base URL for AgentR API. If not provided,
+                                            will be loaded from environment variables.
+            **kwargs: Additional arguments passed to the parent `Integration`.
+        """
+        super().__init__(name, **kwargs)
+        self.type = "agentr"
+        self.client = client or AgentrClient(api_key=api_key, base_url=base_url)
+        self._credentials = None
+
+    def set_credentials(self, credentials: dict[str, str] | None = None) -> str:
+        """Not used for direct credential setting; initiates authorization instead.
+
+        For AgentR integrations, credentials are set via the AgentR platform's
+        OAuth flow. This method effectively redirects to the `authorize` flow.
+
+        Args:
+            credentials (dict | None, optional): Not used by this implementation.
+
+        Returns:
+            str: The authorization URL or message from the `authorize()` method.
+        """
+        raise NotImplementedError("AgentR integrations do not support direct credential setting")
+
+    @property
+    def credentials(self):
+        """Retrieves credentials from the AgentR API, with caching.
+
+        If credentials are not cached locally (in `_credentials`), this property
+        fetches them from the AgentR platform using `self.client.get_credentials`.
+
+        Returns:
+            dict: The credentials dictionary obtained from AgentR.
+
+        Raises:
+            NotAuthorizedError: If credentials are not found (e.g., 404 from AgentR).
+            httpx.HTTPStatusError: For other API errors from AgentR.
+        """
+        if self._credentials is not None:
+            return self._credentials
+        self._credentials = self.client.get_credentials(self.name)
+        return self._credentials
+
+    def get_credentials(self):
+        """Retrieves credentials from the AgentR API. Alias for `credentials` property.
+
+        Returns:
+            dict: The credentials dictionary obtained from AgentR.
+
+        Raises:
+            NotAuthorizedError: If credentials are not found.
+            httpx.HTTPStatusError: For other API errors.
+        """
+        return self.credentials
+
+    def authorize(self) -> str:
+        """Retrieves the authorization URL from the AgentR platform.
+
+        This URL should be presented to the user to initiate the OAuth flow
+        managed by AgentR for the service associated with `self.name`.
+
+        Returns:
+            str: The authorization URL.
+
+        Raises:
+            httpx.HTTPStatusError: If the API request to AgentR fails.
+        """
+        return self.client.get_authorization_url(self.name)

universal_mcp-0.1.24rc3/src/universal_mcp/agentr/registry.py

@@ -0,0 +1,91 @@
+from loguru import logger
+
+from universal_mcp.agentr.client import AgentrClient
+from universal_mcp.applications import app_from_slug
+from universal_mcp.tools.manager import ToolManager, _get_app_and_tool_name
+from universal_mcp.tools.registry import ToolRegistry
+
+from .integration import AgentrIntegration
+
+
+class AgentrRegistry(ToolRegistry):
+    """Platform manager implementation for AgentR platform."""
+
+    def __init__(self, client: AgentrClient | None = None, **kwargs):
+        """Initialize the AgentR platform manager."""
+
+        self.client = client or AgentrClient(**kwargs)
+        logger.debug("AgentrRegistry initialized successfully")
+
+    async def list_apps(self) -> list[dict[str, str]]:
+        """Get list of available apps from AgentR.
+
+        Returns:
+            List of app dictionaries with id, name, description, and available fields
+        """
+        try:
+            all_apps = await self.client.list_all_apps()
+            available_apps = [
+                {"id": app["id"], "name": app["name"], "description": app.get("description", "")}
+                for app in all_apps
+                if app.get("available", False)
+            ]
+            logger.info(f"Found {len(available_apps)} available apps from AgentR")
+            return available_apps
+        except Exception as e:
+            logger.error(f"Error fetching apps from AgentR: {e}")
+            return []
+
+    async def get_app_details(self, app_id: str) -> dict[str, str]:
+        """Get detailed information about a specific app from AgentR.
+
+        Args:
+            app_id: The ID of the app to get details for
+
+        Returns:
+            Dictionary containing app details
+        """
+        try:
+            app_info = await self.client.fetch_app(app_id)
+            return {
+                "id": app_info.get("id"),
+                "name": app_info.get("name"),
+                "description": app_info.get("description"),
+                "category": app_info.get("category"),
+                "available": app_info.get("available", True),
+            }
+        except Exception as e:
+            logger.error(f"Error getting details for app {app_id}: {e}")
+            return {
+                "id": app_id,
+                "name": app_id,
+                "description": "Error loading details",
+                "category": "Unknown",
+                "available": True,
+            }
+
+    def load_tools(self, tools: list[str] | None, tool_manager: ToolManager) -> None:
+        """Load tools from AgentR and register them as tools.
+
+        Args:
+            tools: The list of tools to load ( prefixed with app name )
+            tool_manager: The tool manager to register tools with
+        """
+        if not tools:
+            return
+        logger.info(f"Loading all actions for app: {tools}")
+        # Group all tools by app_name, tools
+        tools_by_app = {}
+        for tool_name in tools:
+            app_name, _ = _get_app_and_tool_name(tool_name)
+            if app_name not in tools_by_app:
+                tools_by_app[app_name] = []
+            tools_by_app[app_name].append(tool_name)
+
+        for app_name, tool_names in tools_by_app.items():
+            app = app_from_slug(app_name)
+            integration = AgentrIntegration(name=app_name)
+            # TODO: Import with name param, some apps are written incorrectly and hence passing name fails
+            app_instance = app(integration=integration)
+            tool_manager.register_tools_from_app(app_instance, tool_names=tool_names)
+        return

universal_mcp-0.1.24rc3/src/universal_mcp/agentr/server.py

@@ -0,0 +1,51 @@
+from loguru import logger
+
+from universal_mcp.applications import app_from_config
+from universal_mcp.config import AppConfig, ServerConfig
+from universal_mcp.servers.server import BaseServer
+from universal_mcp.tools import ToolManager
+
+from .client import AgentrClient
+from .integration import AgentrIntegration
+
+
+def load_from_agentr_server(client: AgentrClient, tool_manager: ToolManager) -> None:
+    """Load apps from AgentR server and register their tools."""
+    try:
+        apps = client.fetch_apps()
+        for app in apps:
+            try:
+                app_config = AppConfig.model_validate(app)
+                integration = (
+                    AgentrIntegration(name=app_config.integration.name, client=client)  # type: ignore
+                    if app_config.integration
+                    else None
+                )
+                app_instance = app_from_config(app_config)(integration=integration)
+                tool_manager.register_tools_from_app(app_instance, app_config.actions)
+                logger.info(f"Loaded app from AgentR: {app_config.name}")
+            except Exception as e:
+                logger.error(f"Failed to load app from AgentR: {e}", exc_info=True)
+    except Exception as e:
+        logger.error(f"Failed to fetch apps from AgentR: {e}", exc_info=True)
+        raise
+
+
+class AgentrServer(BaseServer):
+    """Server that loads apps from AgentR server."""
+
+    def __init__(self, config: ServerConfig, **kwargs):
+        super().__init__(config, **kwargs)
+        self._tools_loaded = False
+        self.api_key = config.api_key.get_secret_value() if config.api_key else None
+        self.base_url = config.base_url
+        self.client = AgentrClient(api_key=self.api_key, base_url=self.base_url)
+
+    @property
+    def tool_manager(self) -> ToolManager:
+        if self._tool_manager is None:
+            self._tool_manager = ToolManager(warn_on_duplicate_tools=True)
+        if not self._tools_loaded:
+            load_from_agentr_server(self.client, self._tool_manager)
+            self._tools_loaded = True
+        return self._tool_manager

universal_mcp-0.1.24rc3/src/universal_mcp/agents/__init__.py

@@ -0,0 +1,6 @@
+from .auto import AutoAgent
+from .base import BaseAgent
+from .react import ReactAgent
+from .simple import SimpleAgent
+
+__all__ = ["BaseAgent", "ReactAgent", "SimpleAgent", "AutoAgent"]