universal-mcp 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

universal_mcp/servers/server.py

@@ -1,4 +1,3 @@
-from abc import ABC, abstractmethod
 from collections.abc import Callable
 from typing import Any
 
@@ -6,16 +5,18 @@ import httpx
 from loguru import logger
 from mcp.server.fastmcp import FastMCP
 from mcp.types import TextContent
+from pydantic import ValidationError
 
 from universal_mcp.applications import BaseApplication, app_from_slug
 from universal_mcp.config import AppConfig, ServerConfig, StoreConfig
+from universal_mcp.exceptions import ConfigurationError, ToolError
 from universal_mcp.integrations import AgentRIntegration, integration_from_config
 from universal_mcp.stores import BaseStore, store_from_config
 from universal_mcp.tools import ToolManager
 from universal_mcp.utils.agentr import AgentrClient
 
 
-class BaseServer(FastMCP, ABC):
+class BaseServer(FastMCP):
     """Base server class with common functionality.
 
     This class provides core server functionality including store setup,
@@ -26,24 +27,27 @@ class BaseServer(FastMCP, ABC):
         **kwargs: Additional keyword arguments passed to FastMCP
     """
 
-    def __init__(self, config: ServerConfig, **kwargs):
-        super().__init__(config.name, config.description, port=config.port, **kwargs)
-        logger.info(f"Initializing server: {config.name} ({config.type}) with store: {config.store}")
-
-        self.config = config  # Store config at base level for consistency
-        self._tool_manager = ToolManager(warn_on_duplicate_tools=True)
-
-    @abstractmethod
-    def _load_apps(self) -> None:
-        """Load and register applications."""
-        pass
+    def __init__(self, config: ServerConfig, tool_manager: ToolManager | None = None, **kwargs):
+        try:
+            super().__init__(config.name, config.description, port=config.port, **kwargs)
+            logger.info(f"Initializing server: {config.name} ({config.type}) with store: {config.store}")
+            self.config = config
+            self._tool_manager = tool_manager or ToolManager(warn_on_duplicate_tools=True)
+            ServerConfig.model_validate(config)
+        except Exception as e:
+            logger.error(f"Failed to initialize server: {e}", exc_info=True)
+            raise ConfigurationError(f"Server initialization failed: {str(e)}") from e
 
     def add_tool(self, tool: Callable) -> None:
         """Add a tool to the server.
 
         Args:
             tool: Tool to add
+
+        Raises:
+            ValueError: If tool is invalid
         """
+
         self._tool_manager.add_tool(tool)
 
     async def list_tools(self) -> list[dict]:
@@ -83,11 +87,21 @@ class BaseServer(FastMCP, ABC):
 
         Raises:
             ToolError: If tool execution fails
+            ValueError: If tool name is invalid or arguments are malformed
         """
+        if not name:
+            raise ValueError("Tool name is required")
+        if not isinstance(arguments, dict):
+            raise ValueError("Arguments must be a dictionary")
+
         logger.info(f"Calling tool: {name} with arguments: {arguments}")
-        result = await self._tool_manager.call_tool(name, arguments)
-        logger.info(f"Tool '{name}' completed successfully")
-        return self._format_tool_result(result)
+        try:
+            result = await self._tool_manager.call_tool(name, arguments)
+            logger.info(f"Tool '{name}' completed successfully")
+            return self._format_tool_result(result)
+        except Exception as e:
+            logger.error(f"Tool '{name}' failed: {e}", exc_info=True)
+            raise ToolError(f"Tool execution failed: {str(e)}") from e
 
 
 class LocalServer(BaseServer):
@@ -111,14 +125,23 @@ class LocalServer(BaseServer):
 
         Returns:
             Configured store instance or None if no config provided
+
+        Raises:
+            ConfigurationError: If store configuration is invalid
         """
         if not store_config:
+            logger.info("No store configuration provided")
             return None
 
-        store = store_from_config(store_config)
-        self.add_tool(store.set)
-        self.add_tool(store.delete)
-        return store
+        try:
+            store = store_from_config(store_config)
+            self.add_tool(store.set)
+            self.add_tool(store.delete)
+            logger.info(f"Successfully configured store: {store_config.type}")
+            return store
+        except Exception as e:
+            logger.error(f"Failed to setup store: {e}", exc_info=True)
+            raise ConfigurationError(f"Store setup failed: {str(e)}") from e
 
     def _load_app(self, app_config: AppConfig) -> BaseApplication | None:
         """Load a single application with its integration.
@@ -129,22 +152,57 @@ class LocalServer(BaseServer):
         Returns:
             Configured application instance or None if loading fails
         """
+        if not app_config.name:
+            logger.error("App configuration missing name")
+            return None
+
         try:
-            integration = (
-                integration_from_config(app_config.integration, store=self.store) if app_config.integration else None
-            )
-            return app_from_slug(app_config.name)(integration=integration)
+            integration = None
+            if app_config.integration:
+                try:
+                    integration = integration_from_config(app_config.integration, store=self.store)
+                    logger.debug(f"Successfully configured integration for {app_config.name}")
+                except Exception as e:
+                    logger.error(f"Failed to setup integration for {app_config.name}: {e}", exc_info=True)
+                    # Continue without integration if it fails
+
+            app = app_from_slug(app_config.name)(integration=integration)
+            logger.info(f"Successfully loaded app: {app_config.name}")
+            return app
         except Exception as e:
             logger.error(f"Failed to load app {app_config.name}: {e}", exc_info=True)
             return None
 
     def _load_apps(self) -> None:
-        """Load all configured applications."""
-        logger.info(f"Loading apps: {self.config.apps}")
+        """Load all configured applications with graceful degradation."""
+        if not self.config.apps:
+            logger.warning("No applications configured")
+            return
+
+        logger.info(f"Loading {len(self.config.apps)} apps")
+        loaded_apps = 0
+        failed_apps = []
+
         for app_config in self.config.apps:
             app = self._load_app(app_config)
             if app:
-                self._tool_manager.register_tools_from_app(app, app_config.actions)
+                try:
+                    self._tool_manager.register_tools_from_app(app, app_config.actions)
+                    loaded_apps += 1
+                    logger.info(f"Successfully registered tools for {app_config.name}")
+                except Exception as e:
+                    logger.error(f"Failed to register tools for {app_config.name}: {e}", exc_info=True)
+                    failed_apps.append(app_config.name)
+            else:
+                failed_apps.append(app_config.name)
+
+        if failed_apps:
+            logger.warning(f"Failed to load {len(failed_apps)} apps: {', '.join(failed_apps)}")
+
+        if loaded_apps == 0:
+            logger.error("No apps were successfully loaded")
+        else:
+            logger.info(f"Successfully loaded {loaded_apps}/{len(self.config.apps)} apps")
 
 
 class AgentRServer(BaseServer):
@@ -154,27 +212,38 @@ class AgentRServer(BaseServer):
         config: Server configuration
         api_key: Optional API key for AgentR authentication. If not provided,
                 will attempt to read from AGENTR_API_KEY environment variable.
+        max_retries: Maximum number of retries for API calls (default: 3)
+        retry_delay: Delay between retries in seconds (default: 1)
         **kwargs: Additional keyword arguments passed to FastMCP
     """
 
     def __init__(self, config: ServerConfig, api_key: str | None = None, **kwargs):
-        self.client = AgentrClient(api_key=api_key)
+        self.api_key = api_key or str(config.api_key)
+        self.client = AgentrClient(api_key=self.api_key)
         super().__init__(config, **kwargs)
         self.integration = AgentRIntegration(name="agentr", api_key=self.client.api_key)
         self._load_apps()
 
     def _fetch_apps(self) -> list[AppConfig]:
-        """Fetch available apps from AgentR API.
+        """Fetch available apps from AgentR API with retry logic.
 
         Returns:
             List of application configurations
 
         Raises:
-            httpx.HTTPError: If API request fails
+            httpx.HTTPError: If API request fails after all retries
+            ValidationError: If app configuration validation fails
         """
         try:
             apps = self.client.fetch_apps()
-            return [AppConfig.model_validate(app) for app in apps]
+            validated_apps = []
+            for app in apps:
+                try:
+                    validated_apps.append(AppConfig.model_validate(app))
+                except ValidationError as e:
+                    logger.error(f"Failed to validate app config: {e}", exc_info=True)
+                    continue
+            return validated_apps
         except httpx.HTTPError as e:
             logger.error(f"Failed to fetch apps from AgentR: {e}", exc_info=True)
             raise
@@ -194,21 +263,37 @@ class AgentRServer(BaseServer):
                 if app_config.integration
                 else None
             )
-            return app_from_slug(app_config.name)(integration=integration)
+            app = app_from_slug(app_config.name)(integration=integration)
+            logger.info(f"Successfully loaded app: {app_config.name}")
+            return app
         except Exception as e:
             logger.error(f"Failed to load app {app_config.name}: {e}", exc_info=True)
             return None
 
     def _load_apps(self) -> None:
-        """Load all apps available from AgentR."""
+        """Load all apps available from AgentR with graceful degradation."""
         try:
-            for app_config in self._fetch_apps():
+            app_configs = self._fetch_apps()
+            if not app_configs:
+                logger.warning("No apps found from AgentR API")
+                return
+
+            loaded_apps = 0
+            for app_config in app_configs:
                 app = self._load_app(app_config)
                 if app:
                     self._tool_manager.register_tools_from_app(app, app_config.actions)
+                    loaded_apps += 1
+
+            if loaded_apps == 0:
+                logger.error("Failed to load any apps from AgentR")
+            else:
+                logger.info(f"Successfully loaded {loaded_apps}/{len(app_configs)} apps from AgentR")
+
         except Exception:
             logger.error("Failed to load apps", exc_info=True)
-            raise
+            # Don't raise the exception to allow server to start with partial functionality
+            logger.warning("Server will start with limited functionality due to app loading failures")
 
 
 class SingleMCPServer(BaseServer):
@@ -234,27 +319,13 @@ class SingleMCPServer(BaseServer):
         config: ServerConfig | None = None,
         **kwargs,
     ):
+        if not app_instance:
+            raise ValueError("app_instance is required")
         if not config:
             config = ServerConfig(
                 type="local",
-                name=f"{app_instance.name.title()} MCP Server for Local Development"
-                if app_instance
-                else "Unnamed MCP Server",
-                description=f"Minimal MCP server for the local {app_instance.name} application."
-                if app_instance
-                else "Minimal MCP server with no application loaded.",
+                name=f"{app_instance.name.title()} MCP Server for Local Development",
+                description=f"Minimal MCP server for the local {app_instance.name} application.",
             )
         super().__init__(config, **kwargs)
-
-        self.app_instance = app_instance
-        self._load_apps()
-
-    def _load_apps(self) -> None:
-        """Registers tools from the single provided application instance."""
-        if not self.app_instance:
-            logger.warning("No app_instance provided. No tools registered.")
-            return
-
-        tool_functions = self.app_instance.list_tools()
-        for tool_func in tool_functions:
-            self._tool_manager.add_tool(tool_func)
+        self._tool_manager.register_tools_from_app(app_instance)

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)]
 
 
@@ -77,7 +85,6 @@ class ToolManager:
         tools = list(self._tools.values())
         if tags:
             tools = _filter_by_tags(tools, tags)
-
         if format == ToolFormat.MCP:
             tools = [convert_tool_to_mcp_tool(tool) for tool in tools]
         elif format == ToolFormat.LANGCHAIN:
@@ -86,7 +93,6 @@ class ToolManager:
             tools = [convert_tool_to_openai_tool(tool) for tool in tools]
         else:
             raise ValueError(f"Invalid format: {format}")
-
         return tools
 
     def add_tool(self, fn: Callable[..., Any] | Tool, name: str | None = None) -> Tool:
@@ -148,14 +154,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 +192,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/utils/agentr.py

@@ -5,10 +5,9 @@ from loguru import logger
 
 from universal_mcp.config import AppConfig
 from universal_mcp.exceptions import NotAuthorizedError
-from universal_mcp.utils.singleton import Singleton
 
 
-class AgentrClient(metaclass=Singleton):
+class AgentrClient:
     """Helper class for AgentR API operations.
 
     This class provides utility methods for interacting with the AgentR API,
@@ -27,6 +26,9 @@ class AgentrClient(metaclass=Singleton):
             )
             raise ValueError("AgentR API key required - get one at https://agentr.dev")
         self.base_url = (base_url or os.getenv("AGENTR_BASE_URL", "https://api.agentr.dev")).rstrip("/")
+        self.client = httpx.Client(
+            base_url=self.base_url, headers={"X-API-KEY": self.api_key}, timeout=30, follow_redirects=True
+        )
 
     def get_credentials(self, integration_name: str) -> dict:
         """Get credentials for an integration from the AgentR API.
@@ -41,9 +43,8 @@ class AgentrClient(metaclass=Singleton):
             NotAuthorizedError: If credentials are not found (404 response)
             HTTPError: For other API errors
         """
-        response = httpx.get(
-            f"{self.base_url}/api/{integration_name}/credentials/",
-            headers={"accept": "application/json", "X-API-KEY": self.api_key},
+        response = self.client.get(
+            f"/api/{integration_name}/credentials/",
         )
         if response.status_code == 404:
             logger.warning(f"No credentials found for {integration_name}. Requesting authorization...")
@@ -64,15 +65,14 @@ class AgentrClient(metaclass=Singleton):
         Raises:
             HTTPError: If API request fails
         """
-        response = httpx.get(
-            f"{self.base_url}/api/{integration_name}/authorize/",
-            headers={"X-API-KEY": self.api_key},
+        response = self.client.get(
+            f"/api/{integration_name}/authorize/",
         )
         response.raise_for_status()
         url = response.json()
         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."
 
-    def fetch_apps(self) -> list[dict]:
+    def fetch_apps(self) -> list[AppConfig]:
         """Fetch available apps from AgentR API.
 
         Returns:
@@ -81,11 +81,7 @@ class AgentrClient(metaclass=Singleton):
         Raises:
             httpx.HTTPError: If API request fails
         """
-        response = httpx.get(
-            f"{self.base_url}/api/apps/",
-            headers={"X-API-KEY": self.api_key},
-            timeout=10,
-        )
+        response = self.client.get("/api/apps/")
         response.raise_for_status()
         data = response.json()
         return [AppConfig.model_validate(app) for app in data]

universal_mcp/utils/installation.py

@@ -47,7 +47,7 @@ def _generate_mcp_config(api_key: str) -> None:
         "args": ["universal_mcp@latest", "run"],
         "env": {
             "AGENTR_API_KEY": api_key,
-            "PATH": str(uvx_path.parent),
+            "UV_PATH": str(uvx_path.parent),
         },
     }