universal-mcp 0.1.8rc3__py3-none-any.whl → 0.1.8rc4__py3-none-any.whl

universal_mcp/applications/firecrawl/app.py

@@ -15,41 +15,11 @@ class FirecrawlApp(APIApplication):
 
     def __init__(self, integration: Integration | None = None) -> None:
         super().__init__(name="firecrawl", integration=integration)
-        self.api_key: str | None = None
-
-    def _set_api_key(self):
-        """
-        Ensures the API key is loaded from the integration.
-        Raises ValueError if the integration or key is missing/misconfigured.
-        """
-        if self.api_key:
-            return
-
-        if not self.integration:
-            raise ValueError("Integration is None. Cannot retrieve Firecrawl API Key.")
-
-        credentials = self.integration.get_credentials()
-        if not credentials:
-            raise ValueError(
-                f"Failed to retrieve Firecrawl API Key using integration '{self.integration.name}'. "
-                f"Check store configuration (e.g., ensure the correct source like environment variable is set)."
-            )
-        api_key = (
-            credentials.get("api_key")
-            or credentials.get("API_KEY")
-            or credentials.get("apiKey")
-        )
-        if not api_key:
-            raise ValueError(
-                f"Failed to retrieve Firecrawl API Key using integration '{self.integration.name}'. "
-                f"Check store configuration (e.g., ensure the correct environment variable is set)."
-            )
-        self.api_key = api_key
 
     def _get_client(self) -> FirecrawlApiClient:
         """Initializes and returns the Firecrawl client after ensuring API key is set."""
-        self._set_api_key()
-        return FirecrawlApiClient(api_key=self.api_key)
+        api_key = self.integration.get_credentials().get("api_key")
+        return FirecrawlApiClient(api_key=api_key)
 
     def scrape_url(
         self, url: str, params: dict[str, Any] | None = None

universal_mcp/applications/google_calendar/app.py

@@ -11,17 +11,6 @@ class GoogleCalendarApp(APIApplication):
         super().__init__(name="google-calendar", integration=integration)
         self.base_api_url = "https://www.googleapis.com/calendar/v3/calendars/primary"
 
-    def _get_headers(self):
-        if not self.integration:
-            raise ValueError("Integration not configured for GoogleCalendarApp")
-        credentials = self.integration.get_credentials()
-        if "headers" in credentials:
-            return credentials["headers"]
-        return {
-            "Authorization": f"Bearer {credentials['access_token']}",
-            "Accept": "application/json",
-        }
-
     def _format_datetime(self, dt_string: str) -> str:
         """Format a datetime string from ISO format to a human-readable format.
 

universal_mcp/applications/google_docs/app.py

@@ -1,9 +1,6 @@
 from typing import Any
 
-from loguru import logger
-
 from universal_mcp.applications.application import APIApplication
-from universal_mcp.exceptions import NotAuthorizedError
 from universal_mcp.integrations import Integration
 
 
@@ -12,21 +9,6 @@ class GoogleDocsApp(APIApplication):
         super().__init__(name="google-docs", integration=integration)
         self.base_api_url = "https://docs.googleapis.com/v1/documents"
 
-    def _get_headers(self):
-        if not self.integration:
-            raise ValueError("Integration not configured for GoogleDocsApp")
-        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 create_document(self, title: str) -> dict[str, Any]:
         """
         Creates a new blank Google Document with the specified title and returns the API response.

universal_mcp/applications/google_drive/app.py

@@ -4,7 +4,6 @@ import httpx
 from loguru import logger
 
 from universal_mcp.applications.application import APIApplication
-from universal_mcp.exceptions import NotAuthorizedError
 from universal_mcp.integrations import Integration
 
 
@@ -18,22 +17,6 @@ class GoogleDriveApp(APIApplication):
         super().__init__(name="google-drive", integration=integration)
         self.base_url = "https://www.googleapis.com/drive/v3"
 
-    def _get_headers(self):
-        if not self.integration:
-            raise ValueError("Integration not configured for GoogleDriveApp")
-        credentials = self.integration.get_credentials()
-        if not credentials:
-            logger.warning("No Google Drive 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_drive_info(self) -> dict[str, Any]:
         """
         Retrieves detailed information about the user's Google Drive storage and account.

universal_mcp/applications/google_mail/app.py

@@ -13,22 +13,6 @@ class GoogleMailApp(APIApplication):
         super().__init__(name="google-mail", integration=integration)
         self.base_api_url = "https://gmail.googleapis.com/gmail/v1/users/me"
 
-    def _get_headers(self):
-        if not self.integration:
-            raise ValueError("Integration not configured for GmailApp")
-        credentials = self.integration.get_credentials()
-        if not credentials:
-            logger.warning("No Gmail 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 send_email(self, to: str, subject: str, body: str) -> str:
         """
         Sends an email using the Gmail API and returns a confirmation or error message.

universal_mcp/applications/google_sheet/app.py

@@ -1,9 +1,6 @@
 from typing import Any
 
-from loguru import logger
-
 from universal_mcp.applications.application import APIApplication
-from universal_mcp.exceptions import NotAuthorizedError
 from universal_mcp.integrations import Integration
 
 
@@ -17,21 +14,6 @@ class GoogleSheetApp(APIApplication):
         super().__init__(name="google-sheet", integration=integration)
         self.base_api_url = "https://sheets.googleapis.com/v4/spreadsheets"
 
-    def _get_headers(self):
-        if not self.integration:
-            raise ValueError("Integration not configured for GoogleSheetsApp")
-        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 create_spreadsheet(self, title: str) -> dict[str, Any]:
         """
         Creates a new blank Google Spreadsheet with the specified title and returns the API response.

universal_mcp/applications/perplexity/app.py

@@ -1,7 +1,5 @@
 from typing import Any, Literal
 
-from loguru import logger
-
 from universal_mcp.applications.application import APIApplication
 from universal_mcp.integrations import Integration
 
@@ -12,38 +10,6 @@ class PerplexityApp(APIApplication):
         self.api_key: str | None = None
         self.base_url = "https://api.perplexity.ai"
 
-    def _set_api_key(self):
-        if self.api_key:
-            return
-
-        if not self.integration:
-            raise ValueError("Integration is None. Cannot retrieve Perplexity API Key.")
-
-        credentials = self.integration.get_credentials()
-        if not credentials:
-            raise ValueError(
-                f"Failed to retrieve Perplexity API Key using integration '{self.integration.name}'. "
-            )
-        api_key = (
-            credentials.get("api_key")
-            or credentials.get("API_KEY")
-            or credentials.get("apiKey")
-        )
-        if not api_key:
-            raise ValueError(
-                f"Invalid credential format received for Perplexity API Key via integration '{self.integration.name}'. "
-            )
-        self.api_key = api_key
-
-    def _get_headers(self) -> dict[str, str]:
-        self._set_api_key()
-        logger.debug(f"Perplexity API Key: {self.api_key}")
-        return {
-            "Authorization": f"Bearer {self.api_key}",
-            "Content-Type": "application/json",
-            "Accept": "application/json",
-        }
-
     def chat(
         self,
         query: str,

universal_mcp/applications/resend/app.py

@@ -5,24 +5,6 @@ from universal_mcp.integrations import Integration
 class ResendApp(APIApplication):
     def __init__(self, integration: Integration) -> None:
         super().__init__(name="resend", 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}",
-        }
 
     def send_email(self, to: str, subject: str, content: str) -> str:
         """

universal_mcp/applications/serpapi/app.py

@@ -1,5 +1,4 @@
 import httpx
-from loguru import logger
 from serpapi import SerpApiClient as SerpApiSearch
 
 from universal_mcp.applications.application import APIApplication
@@ -8,31 +7,6 @@ from universal_mcp.applications.application import APIApplication
 class SerpapiApp(APIApplication):
     def __init__(self, **kwargs):
         super().__init__(name="serpapi", **kwargs)
-        self.api_key: str | None = None
-
-    def _set_api_key(self):
-        if self.api_key is not None:
-            return
-        if not self.integration:
-            raise ValueError("Integration is None. Cannot retrieve SERP API Key.")
-
-        credentials = self.integration.get_credentials()
-        if not credentials:
-            raise ValueError(
-                f"Failed to retrieve SERP API Key using integration '{self.integration.name}'. "
-                f"Check store configuration (e.g., ensure the correct environment variable is set)."
-            )
-        api_key = (
-            credentials.get("api_key")
-            or credentials.get("API_KEY")
-            or credentials.get("apiKey")
-        )
-        if not api_key:
-            raise ValueError(
-                f"Invalid credential format received for SERP API Key via integration '{self.integration.name}'. "
-            )
-        self.api_key = api_key
-        logger.info("SERP API Key successfully retrieved via integration.")
 
     async def search(self, params: dict[str, any] = None) -> str:
         """
@@ -53,9 +27,9 @@ class SerpapiApp(APIApplication):
         """
         if params is None:
             params = {}
-        self._set_api_key()
+        api_key = self.integration.get_credentials().get("api_key")
         params = {
-            "api_key": self.api_key,
+            "api_key": api_key,
             "engine": "google_light",  # Fastest engine by default
             **params,  # Include any additional parameters
         }

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,7 +9,6 @@ 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.config import AppConfig, ServerConfig, StoreConfig
 from universal_mcp.integrations import AgentRIntegration, integration_from_config
@@ -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)
@@ -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)