universal-mcp 0.1.8rc3__py3-none-any.whl → 0.1.9__py3-none-any.whl

universal_mcp/applications/tavily/app.py

@@ -7,25 +7,6 @@ class TavilyApp(APIApplication):
         name = "tavily"
         self.base_url = "https://api.tavily.com"
         super().__init__(name=name, integration=integration)
-        self.api_key = None
-
-    def _get_headers(self):
-        if not self.api_key:
-            credentials = self.integration.get_credentials()
-            if not credentials:
-                raise ValueError("No credentials found")
-            api_key = (
-                credentials.get("api_key")
-                or credentials.get("API_KEY")
-                or credentials.get("apiKey")
-            )
-            if not api_key:
-                raise ValueError("No API key found")
-            self.api_key = api_key
-        return {
-            "Authorization": f"Bearer {self.api_key}",
-            "Content-Type": "application/json",
-        }
 
     def search(self, query: str) -> str:
         """
@@ -44,7 +25,6 @@ class TavilyApp(APIApplication):
         Tags:
             search, ai, web, query, important, api-client, text-processing
         """
-        self.validate()
         url = f"{self.base_url}/search"
         payload = {
             "query": query,

universal_mcp/applications/wrike/app.py

@@ -19,18 +19,6 @@ class WrikeApp(APIApplication):
         super().__init__(name="wrike", integration=integration, **kwargs)
         self.base_url = "https://www.wrike.com/api/v4"
 
-    def _get_headers(self):
-        if not self.integration:
-            raise ValueError("Integration not configured for WrikeApp")
-        credentials = self.integration.get_credentials()
-
-        if "headers" in credentials:
-            return credentials["headers"]
-        return {
-            "Authorization": f"Bearer {credentials['access_token']}",
-            "Content-Type": "application/json",
-        }
-
     def get_contacts(self, deleted=None, fields=None, metadata=None) -> Any:
         """
         Retrieves a list of contacts from the server, with optional filtering and field selection.

universal_mcp/applications/youtube/app.py

@@ -1,9 +1,6 @@
 from typing import Any
 
-from loguru import logger
-
 from universal_mcp.applications import APIApplication
-from universal_mcp.exceptions import NotAuthorizedError
 from universal_mcp.integrations import Integration
 
 
@@ -22,21 +19,6 @@ class YoutubeApp(APIApplication):
         super().__init__(name="youtube", integration=integration, **kwargs)
         self.base_url = "https://www.googleapis.com/youtube/v3"
 
-    def _get_headers(self):
-        if not self.integration:
-            raise ValueError("Integration not configured for YoutubeApp")
-        credentials = self.integration.get_credentials()
-        if not credentials:
-            logger.warning("No Google credentials found via integration.")
-            action = self.integration.authorize()
-            raise NotAuthorizedError(action)
-        if "headers" in credentials:
-            return credentials["headers"]
-        return {
-            "Authorization": f"Bearer {credentials['access_token']}",
-            "Content-Type": "application/json",
-        }
-
     def get_jobs_job_reports(
         self,
         jobId,

universal_mcp/integrations/agentr.py

@@ -29,7 +29,10 @@ class AgentRIntegration(Integration):
                 "API key for AgentR is missing. Please visit https://agentr.dev to create an API key, then set it as AGENTR_API_KEY environment variable."
             )
             raise ValueError("AgentR API key required - get one at https://agentr.dev")
-        self.base_url = os.getenv("AGENTR_BASE_URL", "https://api.agentr.dev")
+        self.base_url = os.getenv("AGENTR_BASE_URL", "https://api.agentr.dev").rstrip(
+            "/"
+        )
+        self._credentials = None
 
     def set_credentials(self, credentials: dict | None = None):
         """Set credentials for the integration.
@@ -43,9 +46,9 @@ class AgentRIntegration(Integration):
             str: Authorization URL from authorize() method
         """
         return self.authorize()
-        # raise NotImplementedError("AgentR Integration does not support setting credentials. Visit the authorize url to set credentials.")
 
-    def get_credentials(self):
+    @property
+    def credentials(self):
         """Get credentials for the integration from the AgentR API.
 
         Makes API request to retrieve stored credentials for this integration.
@@ -57,16 +60,36 @@ class AgentRIntegration(Integration):
             NotAuthorizedError: If credentials are not found (404 response)
             HTTPError: For other API errors
         """
+        if self._credentials is not None:
+            return self._credentials
         response = httpx.get(
             f"{self.base_url}/api/{self.name}/credentials/",
             headers={"accept": "application/json", "X-API-KEY": self.api_key},
         )
         if response.status_code == 404:
+            logger.warning(
+                f"No credentials found for {self.name}. Requesting authorization..."
+            )
             action = self.authorize()
             raise NotAuthorizedError(action)
         response.raise_for_status()
         data = response.json()
-        return data
+        self._credentials = data
+        return self._credentials
+
+    def get_credentials(self):
+        """Get credentials for the integration from the AgentR API.
+
+        Makes API request to retrieve stored credentials for this integration.
+
+        Returns:
+            dict: Credentials data from API response
+
+        Raises:
+            NotAuthorizedError: If credentials are not found (404 response)
+            HTTPError: For other API errors
+        """
+        return self.credentials
 
     def authorize(self):
         """Get authorization URL for the integration.

universal_mcp/integrations/integration.py

@@ -91,9 +91,22 @@ class ApiKeyIntegration(Integration):
     """
 
     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)
         logger.info(f"Initializing API Key Integration: {name} with store: {store}")
+        self._api_key: str | None = None
+
+    @property
+    def api_key(self) -> str | None:
+        if not self._api_key:
+            try:
+                credentials = self.store.get(self.name)
+                self._api_key = credentials
+            except KeyNotFoundError as e:
+                action = self.authorize()
+                raise NotAuthorizedError(action) from e
+        return self._api_key
 
     def get_credentials(self) -> dict[str, str]:
         """Get API key credentials.
@@ -104,12 +117,7 @@ class ApiKeyIntegration(Integration):
         Raises:
             NotAuthorizedError: If API key is not found.
         """
-        try:
-            credentials = self.store.get(self.name)
-        except KeyNotFoundError as e:
-            action = self.authorize()
-            raise NotAuthorizedError(action) from e
-        return {"api_key": credentials}
+        return {"api_key": self.api_key}
 
     def set_credentials(self, credentials: dict[str, Any]) -> None:
         """Set API key credentials.

universal_mcp/servers/server.py

@@ -9,8 +9,7 @@ from loguru import logger
 from mcp.server.fastmcp import FastMCP
 from mcp.types import TextContent
 
-from universal_mcp.analytics import analytics
-from universal_mcp.applications import Application, app_from_slug
+from universal_mcp.applications import BaseApplication, app_from_slug
 from universal_mcp.config import AppConfig, ServerConfig, StoreConfig
 from universal_mcp.integrations import AgentRIntegration, integration_from_config
 from universal_mcp.stores import BaseStore, store_from_config
@@ -130,7 +129,7 @@ class LocalServer(BaseServer):
         self.add_tool(store.delete)
         return store
 
-    def _load_app(self, app_config: AppConfig) -> Application | None:
+    def _load_app(self, app_config: AppConfig) -> BaseApplication | None:
         """Load a single application with its integration.
 
         Args:
@@ -145,7 +144,6 @@ class LocalServer(BaseServer):
                 if app_config.integration
                 else None
             )
-            analytics.track_app_loaded(app_config.name)  # Track app loading
             return app_from_slug(app_config.name)(integration=integration)
         except Exception as e:
             logger.error(f"Failed to load app {app_config.name}: {e}", exc_info=True)
@@ -204,7 +202,7 @@ class AgentRServer(BaseServer):
             logger.error(f"Failed to fetch apps from AgentR: {e}", exc_info=True)
             raise
 
-    def _load_app(self, app_config: AppConfig) -> Application | None:
+    def _load_app(self, app_config: AppConfig) -> BaseApplication | None:
         """Load a single application with AgentR integration.
 
         Args:
@@ -221,7 +219,6 @@ class AgentRServer(BaseServer):
                 if app_config.integration
                 else None
             )
-            analytics.track_app_loaded(app_config.name)  # Track app loading
             return app_from_slug(app_config.name)(integration=integration)
         except Exception as e:
             logger.error(f"Failed to load app {app_config.name}: {e}", exc_info=True)
@@ -237,3 +234,53 @@ class AgentRServer(BaseServer):
         except Exception:
             logger.error("Failed to load apps", exc_info=True)
             raise
+
+
+class SingleMCPServer(BaseServer):
+    """
+    Minimal server implementation hosting a single BaseApplication instance.
+
+    This server type is intended for development and testing of a single
+    application's tools. It does not manage integrations or stores internally
+    beyond initializing the ToolManager and exposing the provided application's tools.
+    The application instance passed to the constructor should already be
+    configured with its appropriate integration (if required).
+
+    Args:
+        config: Server configuration (used for name, description, etc. but ignores 'apps')
+        app_instance: The single BaseApplication instance to host and expose its tools.
+                      Can be None, in which case no tools will be registered.
+        **kwargs: Additional keyword arguments passed to FastMCP parent class.
+    """
+
+    def __init__(
+        self,
+        app_instance: BaseApplication,
+        config: ServerConfig | None = None,
+        **kwargs,
+    ):
+        server_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.",
+        )
+        if not config:
+            config = server_config
+        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)

universal_mcp/stores/store.py

@@ -69,6 +69,12 @@ class BaseStore(ABC):
         """
         pass
 
+    def __repr__(self):
+        return f"{self.__class__.__name__}()"
+
+    def __str__(self):
+        return self.__repr__()
+
 
 class MemoryStore(BaseStore):
     """

universal_mcp/tools/tools.py

@@ -9,7 +9,7 @@ from loguru import logger
 from pydantic import BaseModel, Field
 
 from universal_mcp.analytics import analytics
-from universal_mcp.applications.application import Application
+from universal_mcp.applications import BaseApplication
 from universal_mcp.exceptions import NotAuthorizedError, ToolError
 from universal_mcp.utils.docstring_parser import parse_docstring
 
@@ -253,7 +253,7 @@ class ToolManager:
 
     def register_tools_from_app(
         self,
-        app: Application,
+        app: BaseApplication,
         tools: list[str] | None = None,
         tags: list[str] | None = None,
     ) -> None: