universal-mcp 0.1.17__tar.gz → 0.1.18__tar.gz

{universal_mcp-0.1.17 → universal_mcp-0.1.18}/.gitignore

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

{universal_mcp-0.1.17 → universal_mcp-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.17
+Version: 0.1.18
 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.17 → universal_mcp-0.1.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "universal-mcp"
-version = "0.1.17"
+version = "0.1.18"
 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.18/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.17 → universal_mcp-0.1.18}/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 = ""
@@ -169,14 +169,28 @@ class APIApplication(BaseApplication):
         logger.debug(f"GET request successful with status code: {response.status_code}")
         return response
 
-    def _post(self, url: str, data: dict[str, Any], params: dict[str, Any] | None = None) -> httpx.Response:
+    def _post(
+        self,
+        url: str,
+        data: Any,
+        params: dict[str, Any] | None = None,
+        content_type: str = "application/json",
+        files: dict[str, Any] | None = None,
+    ) -> httpx.Response:
         """
         Make a POST request to the specified URL.
 
         Args:
             url: The URL to send the request to
-            data: The data to send in the request body
+            data: The data to send. For 'application/json', this is JSON-serializable.
+                  For 'application/x-www-form-urlencoded' or 'multipart/form-data', this is a dict of form fields.
+                  For other content types, this is raw bytes or string.
             params: Optional query parameters
+            content_type: The Content-Type of the request body.
+                         Examples: 'application/json', 'application/x-www-form-urlencoded',
+                                   'multipart/form-data', 'application/octet-stream', 'text/plain'.
+            files: Optional dictionary of files to upload for 'multipart/form-data'.
+                   Example: {'file_field_name': ('filename.txt', open('file.txt', 'rb'), 'text/plain')}
 
         Returns:
             httpx.Response: The response from the server
@@ -184,25 +198,69 @@ class APIApplication(BaseApplication):
         Raises:
             httpx.HTTPError: If the request fails
         """
-        logger.debug(f"Making POST request to {url} with params: {params} and data: {data}")
-        response = httpx.post(
-            url,
-            headers=self._get_headers(),
-            json=data,
-            params=params,
+        logger.debug(
+            f"Making POST request to {url} with params: {params}, data type: {type(data)}, content_type={content_type}, files: {'yes' if files else 'no'}"
         )
+        headers = self._get_headers().copy()
+
+        if content_type != "multipart/form-data":
+            headers["Content-Type"] = content_type
+
+        if content_type == "multipart/form-data":
+            response = self.client.post(
+                url,
+                headers=headers,
+                data=data,  # For regular form fields
+                files=files,  # For file parts
+                params=params,
+            )
+        elif content_type == "application/x-www-form-urlencoded":
+            response = self.client.post(
+                url,
+                headers=headers,
+                data=data,
+                params=params,
+            )
+        elif content_type == "application/json":
+            response = self.client.post(
+                url,
+                headers=headers,
+                json=data,
+                params=params,
+            )
+        else:  # Handles 'application/octet-stream', 'text/plain', 'image/jpeg', etc.
+            response = self.client.post(
+                url,
+                headers=headers,
+                content=data,  # Expect data to be bytes or str
+                params=params,
+            )
         response.raise_for_status()
         logger.debug(f"POST request successful with status code: {response.status_code}")
         return response
 
-    def _put(self, url: str, data: dict[str, Any], params: dict[str, Any] | None = None) -> httpx.Response:
+    def _put(
+        self,
+        url: str,
+        data: Any,
+        params: dict[str, Any] | None = None,
+        content_type: str = "application/json",
+        files: dict[str, Any] | None = None,
+    ) -> httpx.Response:
         """
         Make a PUT request to the specified URL.
 
         Args:
             url: The URL to send the request to
-            data: The data to send in the request body
+            data: The data to send. For 'application/json', this is JSON-serializable.
+                  For 'application/x-www-form-urlencoded' or 'multipart/form-data', this is a dict of form fields.
+                  For other content types, this is raw bytes or string.
             params: Optional query parameters
+            content_type: The Content-Type of the request body.
+                         Examples: 'application/json', 'application/x-www-form-urlencoded',
+                                   'multipart/form-data', 'application/octet-stream', 'text/plain'.
+            files: Optional dictionary of files to upload for 'multipart/form-data'.
+                   Example: {'file_field_name': ('filename.txt', open('file.txt', 'rb'), 'text/plain')}
 
         Returns:
             httpx.Response: The response from the server
@@ -210,12 +268,44 @@ class APIApplication(BaseApplication):
         Raises:
             httpx.HTTPError: If the request fails
         """
-        logger.debug(f"Making PUT request to {url} with params: {params} and data: {data}")
-        response = self.client.put(
-            url,
-            json=data,
-            params=params,
+        logger.debug(
+            f"Making PUT request to {url} with params: {params}, data type: {type(data)}, content_type={content_type}, files: {'yes' if files else 'no'}"
         )
+        headers = self._get_headers().copy()
+        # For multipart/form-data, httpx handles the Content-Type header (with boundary)
+        # For other content types, we set it explicitly.
+        if content_type != "multipart/form-data":
+            headers["Content-Type"] = content_type
+
+        if content_type == "multipart/form-data":
+            response = self.client.put(
+                url,
+                headers=headers,
+                data=data,  # For regular form fields
+                files=files,  # For file parts
+                params=params,
+            )
+        elif content_type == "application/x-www-form-urlencoded":
+            response = self.client.put(
+                url,
+                headers=headers,
+                data=data,
+                params=params,
+            )
+        elif content_type == "application/json":
+            response = self.client.put(
+                url,
+                headers=headers,
+                json=data,
+                params=params,
+            )
+        else:  # Handles 'application/octet-stream', 'text/plain', 'image/jpeg', etc.
+            response = self.client.put(
+                url,
+                headers=headers,
+                content=data,  # Expect data to be bytes or str
+                params=params,
+            )
         response.raise_for_status()
         logger.debug(f"PUT request successful with status code: {response.status_code}")
         return response

{universal_mcp-0.1.17 → universal_mcp-0.1.18}/src/universal_mcp/cli.py

@@ -45,14 +45,26 @@ def generate(
         raise typer.Exit(1)
 
     try:
-        # Run the async function in the event loop
-        app_file = generate_api_from_schema(
+        app_file_data = generate_api_from_schema(
             schema_path=schema_path,
             output_path=output_path,
             class_name=class_name,
         )
-        console.print("[green]API client successfully generated and installed.[/green]")
-        console.print(f"[blue]Application file: {app_file}[/blue]")
+        if isinstance(app_file_data, dict) and "code" in app_file_data:
+            console.print("[yellow]No output path specified, printing generated code to console:[/yellow]")
+            console.print(app_file_data["code"])
+        elif isinstance(app_file_data, Path):
+            console.print("[green]API client successfully generated and installed.[/green]")
+            console.print(f"[blue]Application file: {app_file_data}[/blue]")
+        else:
+            # Handle the error case from api_generator if validation fails
+            if isinstance(app_file_data, dict) and "error" in app_file_data:
+                 console.print(f"[red]{app_file_data['error']}[/red]")
+                 raise typer.Exit(1)
+            else:
+                console.print("[red]Unexpected return value from API generator.[/red]")
+                raise typer.Exit(1)
+
     except Exception as e:
         console.print(f"[red]Error generating API client: {e}[/red]")
         raise typer.Exit(1) from e
@@ -255,5 +267,33 @@ def preprocess(
     run_preprocessing(schema_path, output_path)
 
 
+@app.command()
+def split_api(
+    input_app_file: Path = typer.Argument(..., help="Path to the generated app.py file to split"),
+    output_dir: Path = typer.Option(..., "--output-dir", "-o", help="Directory to save the split files"),
+):
+    """Splits a single generated API client file into multiple files based on path groups."""
+    from universal_mcp.utils.openapi.api_splitter import split_generated_app_file
+
+    if not input_app_file.exists() or not input_app_file.is_file():
+        console.print(f"[red]Error: Input file {input_app_file} does not exist or is not a file.[/red]")
+        raise typer.Exit(1)
+
+    if not output_dir.exists():
+        output_dir.mkdir(parents=True, exist_ok=True)
+        console.print(f"[green]Created output directory: {output_dir}[/green]")
+    elif not output_dir.is_dir():
+        console.print(f"[red]Error: Output path {output_dir} is not a directory.[/red]")
+        raise typer.Exit(1)
+
+    try:
+        split_generated_app_file(input_app_file, output_dir)
+        console.print(f"[green]Successfully split {input_app_file} into {output_dir}[/green]")
+    except Exception as e:
+        console.print(f"[red]Error splitting API client: {e}[/red]")
+      
+        raise typer.Exit(1) from e
+
+
 if __name__ == "__main__":
     app()

{universal_mcp-0.1.17 → universal_mcp-0.1.18}/src/universal_mcp/config.py

@@ -38,7 +38,6 @@ class ServerConfig(BaseSettings):
     """Main server configuration."""
 
     model_config = SettingsConfigDict(
-        env_prefix="MCP_",
         env_file=".env",
         env_file_encoding="utf-8",
         case_sensitive=True,
@@ -49,15 +48,15 @@ class ServerConfig(BaseSettings):
     description: str = Field(default="Universal MCP", description="Description of the MCP server")
     api_key: SecretStr | None = Field(default=None, description="API key for authentication")
     type: Literal["local", "agentr"] = Field(default="agentr", description="Type of server deployment")
-    transport: Literal["stdio", "sse", "http"] = Field(default="stdio", description="Transport protocol to use")
-    port: int = Field(default=8005, description="Port to run the server on (if applicable)")
+    transport: Literal["stdio", "sse", "streamable-http"] = Field(
+        default="stdio", description="Transport protocol to use"
+    )
+    port: int = Field(default=8005, description="Port to run the server on (if applicable)", ge=1024, le=65535)
     host: str = Field(default="localhost", description="Host to bind the server to (if applicable)")
     apps: list[AppConfig] | None = Field(default=None, description="List of configured applications")
     store: StoreConfig | None = Field(default=None, description="Default store configuration")
     debug: bool = Field(default=False, description="Enable debug mode")
     log_level: str = Field(default="INFO", description="Logging level")
-    max_connections: int = Field(default=100, description="Maximum number of concurrent connections")
-    request_timeout: int = Field(default=60, description="Default request timeout in seconds")
 
     @field_validator("log_level", mode="before")
     def validate_log_level(cls, v: str) -> str:

{universal_mcp-0.1.17 → universal_mcp-0.1.18}/src/universal_mcp/exceptions.py

@@ -19,3 +19,7 @@ class StoreError(Exception):
 
 class KeyNotFoundError(StoreError):
     """Exception raised when a key is not found in the store."""
+
+
+class ConfigurationError(Exception):
+    """Exception raised when a configuration error occurs."""

{universal_mcp-0.1.17 → universal_mcp-0.1.18}/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.17 → universal_mcp-0.1.18}/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]