universal-mcp 0.1.16__tar.gz → 0.1.18rc2__tar.gz

{universal_mcp-0.1.16 → universal_mcp-0.1.18rc2}/.gitignore

@@ -48,4 +48,3 @@ src/universal_mcp/applications/test_without_docs/
 
 # Temporary files
 tmp/
-examples

{universal_mcp-0.1.16 → universal_mcp-0.1.18rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.16
+Version: 0.1.18rc2
 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
@@ -14,7 +14,7 @@ Requires-Dist: keyring>=25.6.0
 Requires-Dist: langchain-mcp-adapters>=0.0.3
 Requires-Dist: litellm>=1.30.7
 Requires-Dist: loguru>=0.7.3
-Requires-Dist: mcp>=1.7.1
+Requires-Dist: mcp>=1.8.1
 Requires-Dist: posthog>=3.24.0
 Requires-Dist: pydantic-settings>=2.8.1
 Requires-Dist: pydantic>=2.11.1

{universal_mcp-0.1.16 → universal_mcp-0.1.18rc2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "universal-mcp"
-version = "0.1.16"
+version = "0.1.18-rc2"
 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 = [
@@ -21,7 +21,7 @@ dependencies = [
     "langchain-mcp-adapters>=0.0.3",
     "litellm>=1.30.7",
     "loguru>=0.7.3",
-    "mcp>=1.7.1",
+    "mcp>=1.8.1",
     "posthog>=3.24.0",
     "pydantic>=2.11.1",
     "pydantic-settings>=2.8.1",

universal_mcp-0.1.18rc2/src/tests/test_tool_manager.py

@@ -0,0 +1,185 @@
+import pytest
+
+from universal_mcp.applications.application import BaseApplication
+from universal_mcp.exceptions import ToolError
+from universal_mcp.tools.adapters import ToolFormat
+from universal_mcp.tools.manager import Tool, ToolManager
+
+
+# Dummy tools for testing
+async def dummy_add(a: int, b: int) -> int:
+    """
+    Adds two integers asynchronously.
+
+    Args:
+        a: The first integer.
+        b: The second integer.
+
+    Returns:
+        The sum of a and b.
+
+    Tags:
+        math, important
+    """
+    return a + b
+
+
+async def dummy_multiply(a: int, b: int) -> int:
+    """
+    Multiplies two integers asynchronously.
+
+    Args:
+        a: The first integer.
+        b: The second integer.
+
+    Returns:
+        The product of a and b.
+
+    Tags:
+        math
+    """
+    return a * b
+
+
+async def dummy_error() -> None:
+    """
+    Raises a ValueError for testing error handling.
+
+    Raises:
+        ValueError: Always raised with the message "Test error".
+
+    Tags:
+        test
+    """
+    raise ValueError("Test error")
+
+
+@pytest.fixture
+def tool_manager():
+    return ToolManager()
+
+
+@pytest.fixture
+def dummy_tools():
+    return [Tool.from_function(dummy_add), Tool.from_function(dummy_multiply), Tool.from_function(dummy_error)]
+
+
+class ExampleApp(BaseApplication):
+    def __init__(self):
+        super().__init__(name="example_app")
+
+    def list_tools(self):
+        return [dummy_add, dummy_multiply, dummy_error]
+
+
+def test_add_tool(tool_manager):
+    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):
+    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):
+    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):
+    for tool in dummy_tools:
+        tool_manager.add_tool(tool)
+    assert len(tool_manager.list_tools()) == 3
+    tool_manager.clear_tools()
+    assert len(tool_manager.list_tools()) == 0
+
+
+def test_list_tools_format(tool_manager, dummy_tools):
+    for tool in dummy_tools:
+        tool_manager.add_tool(tool)
+
+    # Test MCP format
+    mcp_tools = tool_manager.list_tools(format=ToolFormat.MCP)
+    assert len(mcp_tools) == 3
+
+    # Test LangChain format
+    langchain_tools = tool_manager.list_tools(format=ToolFormat.LANGCHAIN)
+    assert len(langchain_tools) == 3
+
+    # Test OpenAI format
+    openai_tools = tool_manager.list_tools(format=ToolFormat.OPENAI)
+    assert len(openai_tools) == 3
+
+
+def test_filter_tools_by_tags(tool_manager, dummy_tools):
+    for tool in dummy_tools:
+        tool_manager.add_tool(tool)
+
+    # Test filtering by important tag
+    important_tools = tool_manager.list_tools(tags=["important"])
+    assert len(important_tools) == 1
+    assert important_tools[0].name == "dummy_add"
+
+    # Test filtering by math tag
+    math_tools = tool_manager.list_tools(tags=["math"])
+    assert len(math_tools) == 2
+
+
+@pytest.mark.asyncio
+async def test_call_tool_success(tool_manager):
+    tool_manager.add_tool(dummy_add)
+    result = await tool_manager.call_tool("dummy_add", {"a": 2, "b": 3})
+    assert result == 5
+
+
+@pytest.mark.asyncio
+async def test_call_tool_error(tool_manager):
+    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):
+        await tool_manager.call_tool("nonexistent", {})
+
+
+@pytest.mark.asyncio
+async def test_call_tool_from_app(tool_manager):
+    app = ExampleApp()
+    # Only important are added by default
+    tool_manager.register_tools_from_app(app)
+    tools = tool_manager.list_tools()
+    assert len(tools) == 1
+    assert "example_app_dummy_add" in [t.name for t in tools]
+    result = await tool_manager.call_tool("example_app_dummy_add", {"a": 2, "b": 3})
+    assert result == 5
+
+
+@pytest.mark.asyncio
+async def test_call_tool_from_app_with_tags(tool_manager):
+    app = ExampleApp()
+    # Only important are added by default
+    tool_manager.register_tools_from_app(app, tags=["math"])
+    tools = tool_manager.list_tools()
+    assert len(tools) == 2
+    assert "example_app_dummy_add" in [t.name for t in tools]
+    assert "example_app_dummy_multiply" in [t.name for t in tools]
+
+
+@pytest.mark.asyncio
+async def test_load_tool_from_name(tool_manager):
+    app = ExampleApp()
+    # Only important are added by default
+    tool_manager.register_tools_from_app(app, tool_names=["dummy_multiply", "dummy_add"])
+    tools = tool_manager.list_tools()
+    assert len(tools) == 2
+    assert "example_app_dummy_multiply" in [t.name for t in tools]
+    assert "example_app_dummy_add" in [t.name for t in tools]

{universal_mcp-0.1.16 → universal_mcp-0.1.18rc2}/src/universal_mcp/applications/application.py

@@ -81,7 +81,7 @@ class APIApplication(BaseApplication):
         """
         super().__init__(name, **kwargs)
         self.default_timeout: int = 180
-        self.integration: Integration | None = integration
+        self.integration = integration
         logger.debug(f"Initializing APIApplication '{name}' with integration: {integration}")
         self._client: httpx.Client | None = client
         self.base_url: str = ""

{universal_mcp-0.1.16 → universal_mcp-0.1.18rc2}/src/universal_mcp/integrations/integration.py

@@ -1,4 +1,3 @@
-from abc import ABC, abstractmethod
 from typing import Any
 
 import httpx
@@ -18,7 +17,7 @@ def sanitize_api_key_name(name: str) -> str:
         return f"{name.upper()}{suffix}"
 
 
-class Integration(ABC):
+class Integration:
     """Abstract base class for handling application integrations and authentication.
 
     This class defines the interface for different types of integrations that handle
@@ -35,9 +34,11 @@ class Integration(ABC):
 
     def __init__(self, name: str, store: BaseStore | None = None):
         self.name = name
-        self.store = store
+        if store is None:
+            self.store = MemoryStore()
+        else:
+            self.store = store
 
-    @abstractmethod
     def authorize(self) -> str | dict[str, Any]:
         """Authorize the integration.
 
@@ -49,7 +50,6 @@ class Integration(ABC):
         """
         pass
 
-    @abstractmethod
     def get_credentials(self) -> dict[str, Any]:
         """Get credentials for the integration.
 
@@ -59,9 +59,9 @@ class Integration(ABC):
         Raises:
             NotAuthorizedError: If credentials are not found or invalid.
         """
-        pass
+        credentials = self.store.get(self.name)
+        return credentials
 
-    @abstractmethod
     def set_credentials(self, credentials: dict[str, Any]) -> None:
         """Set credentials for the integration.
 
@@ -71,7 +71,7 @@ class Integration(ABC):
         Raises:
             ValueError: If credentials are invalid or missing required fields.
         """
-        pass
+        self.store.set(self.name, credentials)
 
 
 class ApiKeyIntegration(Integration):
@@ -91,7 +91,7 @@ class ApiKeyIntegration(Integration):
         store: Store instance for persisting credentials and other data
     """
 
-    def __init__(self, name: str, store: BaseStore = MemoryStore(), **kwargs):
+    def __init__(self, name: str, store: BaseStore | None = None, **kwargs):
         self.type = "api_key"
         sanitized_name = sanitize_api_key_name(name)
         super().__init__(sanitized_name, store, **kwargs)

{universal_mcp-0.1.16 → universal_mcp-0.1.18rc2}/src/universal_mcp/servers/__init__.py

@@ -1,5 +1,5 @@
 from universal_mcp.config import ServerConfig
-from universal_mcp.servers.server import AgentRServer, LocalServer, SingleMCPServer
+from universal_mcp.servers.server import AgentRServer, BaseServer, LocalServer, SingleMCPServer
 
 
 def server_from_config(config: ServerConfig):
@@ -12,4 +12,4 @@ def server_from_config(config: ServerConfig):
         raise ValueError(f"Unsupported server type: {config.type}")
 
 
-__all__ = [AgentRServer, LocalServer, SingleMCPServer, server_from_config]
+__all__ = [AgentRServer, LocalServer, SingleMCPServer, BaseServer, server_from_config]

{universal_mcp-0.1.16 → universal_mcp-0.1.18rc2}/src/universal_mcp/tools/manager.py

@@ -1,3 +1,4 @@
+import re
 from collections.abc import Callable
 from typing import Any
 
@@ -19,14 +20,21 @@ DEFAULT_IMPORTANT_TAG = "important"
 TOOL_NAME_SEPARATOR = "_"
 
 
-def _filter_by_name(tools: list[Tool], tool_names: list[str]) -> list[Tool]:
+def _filter_by_name(tools: list[Tool], tool_names: list[str] | None) -> list[Tool]:
     if not tool_names:
         return tools
-    return [tool for tool in tools if tool.name in tool_names]
+    logger.debug(f"Filtering tools by name: {tool_names}")
+    filtered_tools = []
+    for tool in tools:
+        for name in tool_names:
+            if re.search(name, tool.name):
+                filtered_tools.append(tool)
+    return filtered_tools
 
 
 def _filter_by_tags(tools: list[Tool], tags: list[str] | None) -> list[Tool]:
-    tags = tags or [DEFAULT_IMPORTANT_TAG]
+    if not tags:
+        return tools
     return [tool for tool in tools if any(tag in tool.tags for tag in tags)]
 
 
@@ -148,14 +156,14 @@ class ToolManager:
     def register_tools_from_app(
         self,
         app: BaseApplication,
-        tool_names: list[str] = None,
-        tags: list[str] = None,
+        tool_names: list[str] | None = None,
+        tags: list[str] | None = None,
     ) -> None:
         """Register tools from an application.
 
         Args:
             app: The application to register tools from.
-            tools: Optional list of specific tool names to register.
+            tool_names: Optional list of specific tool names to register.
             tags: Optional list of tags to filter tools by.
         """
         try:
@@ -186,8 +194,16 @@ class ToolManager:
                 tool_name = getattr(function, "__name__", "unknown")
                 logger.error(f"Failed to create Tool from '{tool_name}' in {app.name}: {e}")
 
-        tools = _filter_by_name(tools, tool_names)
-        tools = _filter_by_tags(tools, tags)
+        if tags:
+            tools = _filter_by_tags(tools, tags)
+
+        if tool_names:
+            tools = _filter_by_name(tools, tool_names)
+
+        # If no tool names or tags are provided, use the default important tag
+        if not tool_names and not tags:
+            tools = _filter_by_tags(tools, [DEFAULT_IMPORTANT_TAG])
+
         self.register_tools(tools)
         return
 

{universal_mcp-0.1.16 → universal_mcp-0.1.18rc2}/src/universal_mcp/integrations/__init__.py

@@ -22,8 +22,8 @@ def integration_from_config(config: IntegrationConfig, store: BaseStore | None =
 
 __all__ = [
     "AgentRIntegration",
-    "Integration",
     "ApiKeyIntegration",
+    "Integration",
     "OAuthIntegration",
     "integration_from_config",
 ]