universal-mcp 0.1.6rc1__py3-none-any.whl → 0.1.7rc2__py3-none-any.whl

universal_mcp/applications/e2b/app.py

@@ -1,6 +1,6 @@
 from e2b_code_interpreter import Sandbox
 from loguru import logger
-
+from typing import Annotated
 from universal_mcp.applications.application import APIApplication
 from universal_mcp.integrations import Integration
 
@@ -25,11 +25,18 @@ class E2BApp(APIApplication):
         credentials = self.integration.get_credentials()
         if not credentials:
             raise ValueError(
-                f"Failed to retrieve E2B API Key using integration '{self.integration.name}'. "
-                f"Check store configuration (e.g., ensure the correct environment variable is set)."
+                f"Invalid credential format received for E2B API Key via integration '{self.integration.name}'. "
             )
-
-        self.api_key = credentials
+        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 E2B API Key via integration '{self.integration.name}'. "
+            )
+        self.api_key = api_key
         logger.info("E2B API Key successfully retrieved via integration.")
 
     def _format_execution_output(self, logs) -> str:
@@ -50,7 +57,9 @@ class E2BApp(APIApplication):
             return "Execution finished with no output (stdout/stderr)."
         return "\n\n".join(output_parts)
 
-    def execute_python_code(self, code: str) -> str:
+    def execute_python_code(
+        self, code: Annotated[str, "The Python code to execute."]
+    ) -> str:
         """
         Executes Python code within a secure E2B cloud sandbox.
 
@@ -61,6 +70,9 @@ class E2BApp(APIApplication):
             A string containing the formatted standard output (stdout) and standard error (stderr)
             from the execution. If an error occurs during setup or execution, an
             error message string is returned.
+
+        Raises:
+            NotAuthorizedError: If the API key is not set.
         """
         self._set_api_key()
         with Sandbox(api_key=self.api_key) as sandbox:

universal_mcp/applications/firecrawl/app.py

@@ -26,9 +26,7 @@ class FirecrawlApp(APIApplication):
             return
 
         if not self.integration:
-            raise ValueError(
-                "Integration is None. Cannot retrieve Firecrawl API Key."
-            )
+            raise ValueError("Integration is None. Cannot retrieve Firecrawl API Key.")
 
         credentials = self.integration.get_credentials()
         if not credentials:
@@ -36,9 +34,18 @@ class FirecrawlApp(APIApplication):
                 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
 
-        self.api_key = credentials
-        
     def _get_client(self) -> FirecrawlApiClient:
         """Initializes and returns the Firecrawl client after ensuring API key is set."""
         self._set_api_key()
@@ -128,9 +135,9 @@ class FirecrawlApp(APIApplication):
         """
         try:
             client = self._get_client()
-            status = client.check_crawl_status(id=job_id)    
+            status = client.check_crawl_status(id=job_id)
             return status
-        
+
         except Exception as e:
             return f"Error checking crawl status for job ID {job_id}: {type(e).__name__} - {e}"
 
@@ -148,13 +155,12 @@ class FirecrawlApp(APIApplication):
         try:
             client = self._get_client()
             response = client.cancel_crawl(id=job_id)
-            
+
             return response
 
-        except Exception as e:            
+        except Exception as e:
             return f"Error cancelling crawl job ID {job_id}: {type(e).__name__} - {e}"
 
-
     def start_batch_scrape(
         self,
         urls: list[str],
@@ -196,9 +202,9 @@ class FirecrawlApp(APIApplication):
         """
         try:
             client = self._get_client()
-            status = client.check_batch_scrape_status(id=job_id)            
+            status = client.check_batch_scrape_status(id=job_id)
             return status
-        
+
         except Exception as e:
             return f"Error checking batch scrape status for job ID {job_id}: {type(e).__name__} - {e}"
 
@@ -220,7 +226,7 @@ class FirecrawlApp(APIApplication):
             A dictionary containing the job initiation response on success,
             or a string containing an error message on failure.
         """
-        
+
         try:
             client = self._get_client()
             response = client.async_extract(
@@ -246,7 +252,7 @@ class FirecrawlApp(APIApplication):
             client = self._get_client()
             status = client.get_extract_status(job_id=job_id)
             return status
-        
+
         except Exception as e:
             return f"Error checking extraction status for job ID {job_id}: {type(e).__name__} - {e}"
 
@@ -262,4 +268,4 @@ class FirecrawlApp(APIApplication):
             self.check_batch_scrape_status,
             self.start_extract,
             self.check_extract_status,
-        ]
+        ]

universal_mcp/applications/perplexity/app.py

@@ -2,6 +2,7 @@ from typing import Any, Literal
 
 from universal_mcp.applications.application import APIApplication
 from universal_mcp.integrations import Integration
+from loguru import logger
 
 
 class PerplexityApp(APIApplication):
@@ -19,25 +20,43 @@ class PerplexityApp(APIApplication):
 
         credentials = self.integration.get_credentials()
         if not credentials:
-             raise ValueError(
+            raise ValueError(
                 f"Failed to retrieve Perplexity API Key using integration '{self.integration.name}'. "
-             )
-        
-        if not isinstance(credentials, str) or not credentials.strip():
-             raise ValueError(
+            )
+        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 = credentials
+        self.api_key = api_key
 
     def _get_headers(self) -> dict[str, str]:
         self._set_api_key()
+        logger.info(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, model: Literal["r1-1776","sonar","sonar-pro","sonar-reasoning","sonar-reasoning-pro", "sonar-deep-research"] = "sonar" , temperature: float = 1, system_prompt: str = "Be precise and concise.") -> dict[str, Any] | str:
+    def chat(
+        self,
+        query: str,
+        model: Literal[
+            "r1-1776",
+            "sonar",
+            "sonar-pro",
+            "sonar-reasoning",
+            "sonar-reasoning-pro",
+            "sonar-deep-research",
+        ] = "sonar",
+        temperature: float = 1,
+        system_prompt: str = "Be precise and concise.",
+    ) -> dict[str, Any] | str:
         """
         Sends a query to a Perplexity Sonar online model and returns the response.
 
@@ -69,11 +88,11 @@ class PerplexityApp(APIApplication):
 
         data = self._post(endpoint, data=payload)
         response = data.json()
-        content = response['choices'][0]['message']['content']
-        citations = response.get('citations', [])
+        content = response["choices"][0]["message"]["content"]
+        citations = response.get("citations", [])
         return {"content": content, "citations": citations}
 
     def list_tools(self):
         return [
             self.chat,
-        ]
+        ]

universal_mcp/applications/resend/app.py

@@ -5,13 +5,23 @@ 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):
-        credentials = self.integration.get_credentials()
-        if not credentials:
-            raise ValueError("No credentials found")
+        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 {credentials['api_key']}",
+            "Authorization": f"Bearer {self.api_key}",
         }
 
     def send_email(self, to: str, subject: str, content: str) -> str:

universal_mcp/applications/serp/app.py

@@ -22,8 +22,16 @@ class SerpApp(APIApplication):
                 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)."
             )
-
-        self.api_key = credentials
+        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:

universal_mcp/applications/tavily/app.py

@@ -7,13 +7,23 @@ 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):
-        credentials = self.integration.get_credentials()
-        if not credentials:
-            raise ValueError("No credentials found")
+        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 {credentials['api_key']}",
+            "Authorization": f"Bearer {self.api_key}",
             "Content-Type": "application/json",
         }
 

universal_mcp/config.py

@@ -10,7 +10,7 @@ class StoreConfig(BaseModel):
 
 class IntegrationConfig(BaseModel):
     name: str
-    type: Literal["api_key", "oauth", "agentr"]
+    type: Literal["api_key", "oauth", "agentr", "oauth2"]
     credentials: dict | None = None
     store: StoreConfig | None = None
 

universal_mcp/integrations/integration.py

@@ -8,12 +8,13 @@ from universal_mcp.stores.store import Store
 
 
 def sanitize_api_key_name(name: str) -> str:
-    suffix = "_API_KEY" 
+    suffix = "_API_KEY"
     if name.endswith(suffix) or name.endswith(suffix.lower()):
         return name.upper()
     else:
         return f"{name.upper()}{suffix}"
-    
+
+
 class Integration(ABC):
     """Abstract base class for handling application integrations and authentication.
 
@@ -91,7 +92,7 @@ class ApiKeyIntegration(Integration):
         if credentials is None:
             action = self.authorize()
             raise NotAuthorizedError(action)
-        return credentials
+        return {"api_key": credentials}
 
     def set_credentials(self, credentials: dict):
         self.store.set(self.name, credentials)

universal_mcp/servers/server.py

@@ -115,7 +115,11 @@ class LocalServer(Server):
                     tool_name = tool.__name__
                     name = app.name + "_" + tool_name
                     description = tool.__doc__
-                    if app_config.actions is None or tool_name in app_config.actions:
+                    if (
+                        app_config.actions is None
+                        or len(app_config.actions) == 0
+                        or name in app_config.actions
+                    ):
                         self.add_tool(tool, name=name, description=description)
             except Exception as e:
                 logger.error(f"Error loading app {app_config.name}: {e}")
@@ -167,7 +171,11 @@ class AgentRServer(Server):
                     tool_name = tool.__name__
                     name = app.name + "_" + tool_name
                     description = tool.__doc__
-                    if app_config.actions is None or tool_name in app_config.actions:
+                    if (
+                        app_config.actions is None
+                        or len(app_config.actions) == 0
+                        or name in app_config.actions
+                    ):
                         self.add_tool(tool, name=name, description=description)
             except Exception as e:
                 logger.error(f"Error loading app {app_config.name}: {e}")

universal_mcp/utils/installation.py

@@ -61,7 +61,7 @@ def install_claude(api_key: str) -> None:
         config["mcpServers"] = {}
     config["mcpServers"]["universal_mcp"] = {
         "command": get_uvx_path(),
-        "args": ["universal_mcp@latest", "run"],
+        "args": ["universal_mcp[all]@latest", "run"],
         "env": {"AGENTR_API_KEY": api_key},
     }
     with open(config_path, "w") as f:
@@ -90,7 +90,7 @@ def install_cursor(api_key: str) -> None:
         config["mcpServers"] = {}
     config["mcpServers"]["universal_mcp"] = {
         "command": get_uvx_path(),
-        "args": ["universal_mcp@latest", "run"],
+        "args": ["universal_mcp[all]@latest", "run"],
         "env": {"AGENTR_API_KEY": api_key},
     }
 

{universal_mcp-0.1.6rc1.dist-info → universal_mcp-0.1.7rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.6rc1
+Version: 0.1.7rc2
 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>
 Requires-Python: >=3.11

{universal_mcp-0.1.6rc1.dist-info → universal_mcp-0.1.7rc2.dist-info}/RECORD

@@ -1,15 +1,15 @@
 universal_mcp/__init__.py,sha256=2gdHpHaDDcsRjZjJ01FLN-1iidN_wbDAolNpxhGoFB4,59
 universal_mcp/cli.py,sha256=DG-Qxc5vQIdbhAIQuU7bKKJuRGzwyOigjfCKSWBRhBI,5258
-universal_mcp/config.py,sha256=9eb3DDg4PBBr1MlGeBrA4bja3Y6howOH-UKpo7JIbs8,828
+universal_mcp/config.py,sha256=sJaPI4q51CDPPG0z32rMJiE7a64eaa9nxbjJgYnaFA4,838
 universal_mcp/exceptions.py,sha256=Zp2_v_m3L7GDAmD1ZyuwFtY6ngapdhxuIygrvpZAQtM,271
 universal_mcp/logger.py,sha256=W6A868vyvpdkEQ4Dd0rWdC_7ErSxSQ1z2uxCb77IM8Y,2015
 universal_mcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 universal_mcp/applications/__init__.py,sha256=qeWnbdIudyMR7ST4XTc0gpEM9o6TsM1ZnZ92dMAPSBA,754
 universal_mcp/applications/application.py,sha256=dqp8lgIi2xhY62imwo7C6769URQtNmqd6Ok6PiTr6wc,3399
 universal_mcp/applications/e2b/README.md,sha256=S4lTp-vEZ8VTCKPXqjUXu5nYlUMAF8lw8CQyBGPgxjs,700
-universal_mcp/applications/e2b/app.py,sha256=5piCipi1TC_KuKLFP17do1Y1r28fqApvRsZy76equ9w,2573
+universal_mcp/applications/e2b/app.py,sha256=l7oRmxIuVglA1v9EtYqx_rlvYjUZz7GShmI_VLEQLjI,2979
 universal_mcp/applications/firecrawl/README.md,sha256=KAWe_TQbrc9eA6bSyde5dapMP1CNvarVItV_YJH3d_0,1430
-universal_mcp/applications/firecrawl/app.py,sha256=RSy8zRn4k1A1tIpJNqrUnPI8ctEv1nKWuOuJQcp9mGo,9264
+universal_mcp/applications/firecrawl/app.py,sha256=aPYx3uCsrR6CHz0RERE0ikHMbzwbhKE-SDkF5DVZLiQ,9572
 universal_mcp/applications/github/README.md,sha256=6ID-__gUJ5ZxzAS_OjzmoUAag1LamSvEB75DHcj3m-g,1294
 universal_mcp/applications/github/app.py,sha256=L201f5MSx1YVx0nqgduZ5gyHPZdX0UfcEhPmDWiWK6s,13686
 universal_mcp/applications/google_calendar/app.py,sha256=g_3vrsM2ltwpTySgC5I4SYg47n4UJiYigECO0ax1EHM,19134
@@ -26,23 +26,23 @@ universal_mcp/applications/notion/README.md,sha256=45NmPOmSQv99qBvWdwmnV5vbaYc9_
 universal_mcp/applications/notion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 universal_mcp/applications/notion/app.py,sha256=XpLnmeXj0Gnf_RYHlbAFnwtSCTYsrNzk6MSMSyDmHGQ,17283
 universal_mcp/applications/perplexity/README.md,sha256=QGV1iReH5p-Np7vvkZsVHxxDKQ0YaitHEwomNmGEyQs,732
-universal_mcp/applications/perplexity/app.py,sha256=J27IDcz9pRC_uW4wABpn-EcI4RvKIzoh_o2hzysM5wA,3187
+universal_mcp/applications/perplexity/app.py,sha256=q3FUnSHwq-_HnIUTYuxVdKmNJ5p0b-Aj3vZ0ZrP7Mg4,3494
 universal_mcp/applications/reddit/README.md,sha256=YVbJ1RN6NWlB-P6w2LxCk_DuUWl7mwaKZScY-mIMnNc,1271
 universal_mcp/applications/reddit/app.py,sha256=leU__w5VxX1vMK-kfuy-dvY97Pn8Mn80X2payVshirU,13562
 universal_mcp/applications/resend/README.md,sha256=k-sb2UwbFvDPEz6qQPLWd2cJj8hDx5f3NW7dz2jAfjI,719
-universal_mcp/applications/resend/app.py,sha256=bRo-CRDuk65EUSHOJnbVHWV6TuiUHtedz6FXKRS1ym0,1386
+universal_mcp/applications/resend/app.py,sha256=fl_0U61Rm0fqz1lCxPiuGRkl2x0meafp6kMZbshD7wo,1733
 universal_mcp/applications/serp/README.md,sha256=hX4VeT2iL_67ZsMhKd60DAujQCh9K3IdHroHIq808RY,691
-universal_mcp/applications/serp/app.py,sha256=hPXu1sBiRZRCCzr4q2uvt54F0-B3aZK2Uz4wfKokkZ4,3131
+universal_mcp/applications/serp/app.py,sha256=ug-XkyRrWRRgO_DV_lw4kIzQaGREd5VW1vV4Xv3ptAc,3461
 universal_mcp/applications/tavily/README.md,sha256=cNg4EwX5wBbkDpPtNBNC3A_GxglfSVhdAJuweSrXN20,721
-universal_mcp/applications/tavily/app.py,sha256=FSIRFz7jwm2i9wiDpRWIoQBxHaJ6dl89AjSZY9WP2VE,1776
+universal_mcp/applications/tavily/app.py,sha256=K5TLh6OSQ7w792poupZidzgbWotrIyEsu7YnGzPRX0w,2123
 universal_mcp/applications/zenquotes/README.md,sha256=wA3hjqjrkrczQaffpwyolSKq6gXmkLgeHx6_EQrYEOY,709
 universal_mcp/applications/zenquotes/app.py,sha256=nidRGwVORIU25QGCCbjDIv1UNFUj5nWA3qqK4JP0Tdg,621
 universal_mcp/integrations/README.md,sha256=lTAPXO2nivcBe1q7JT6PRa6v9Ns_ZersQMIdw-nmwEA,996
 universal_mcp/integrations/__init__.py,sha256=8e11JZyctaR9CmlNkfEZ6HhGDvhlvf9iug2wdjb5pwY,270
 universal_mcp/integrations/agentr.py,sha256=l0mo79oeDML19udFfoCo9lyhbDAf0X94_lnpOgbTrb0,3331
-universal_mcp/integrations/integration.py,sha256=8TYr7N1F6oV8PPOSLo0eA_6nD-vrwIWbuplqwD03uuQ,5819
+universal_mcp/integrations/integration.py,sha256=X8COgD8vg1bKUq4-0ytkMytk1eEaDF1O2JLvu3ewgFk,5828
 universal_mcp/servers/__init__.py,sha256=dgRW_khG537GeLKC5_U5jhxCuu1L_1YeTujeDg0601E,654
-universal_mcp/servers/server.py,sha256=uHArnw_kYIhvlE-Zp5GharGqapGy4jaOlxRQGsOafPM,6431
+universal_mcp/servers/server.py,sha256=9GazpAzNiMgCMg4Vb4VeyoviddEt6pQzi7vLli8vC5A,6677
 universal_mcp/stores/__init__.py,sha256=Sc4AWtee_qtK5hpEVUAH2XM_6EBhcfikQXWiGXdNfes,560
 universal_mcp/stores/store.py,sha256=CNOnmKeOCkSU2ZA9t12AIWJcmqZZX_LSyZaV8FQf8Xk,4545
 universal_mcp/utils/__init__.py,sha256=8wi4PGWu-SrFjNJ8U7fr2iFJ1ktqlDmSKj1xYd7KSDc,41
@@ -50,9 +50,9 @@ universal_mcp/utils/api_generator.py,sha256=-wRBpLVfJQXy1R-8FpDNs6b8_eeekVDuPc_u
 universal_mcp/utils/bridge.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 universal_mcp/utils/docgen.py,sha256=yK6Ijo8G-wHPU3E1AnFpnXS9vXt2j9FM77w0etTaNOA,12639
 universal_mcp/utils/dump_app_tools.py,sha256=cLB9SumKsbs-rXJ_02lpMyyNkOmKZ57gekhCjhAlcHg,2009
-universal_mcp/utils/installation.py,sha256=uSL_H76fG_7yN4QNxkfp1mEF_00iAPyiXqtdWEMVJe8,3747
+universal_mcp/utils/installation.py,sha256=3vy9ZLjQj1xpSAOyWpOanBr7o5DtffzWB5JAjN0Jjtk,3757
 universal_mcp/utils/openapi.py,sha256=ud_ZB7_60BcS1Vao7ESKDqo0gry9JN5wzy-CFssrjm8,13140
-universal_mcp-0.1.6rc1.dist-info/METADATA,sha256=WofjKtlNIky51G0DqQTvWvO_9bJNoNwE6nJclnHkKbs,10855
-universal_mcp-0.1.6rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-universal_mcp-0.1.6rc1.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
-universal_mcp-0.1.6rc1.dist-info/RECORD,,
+universal_mcp-0.1.7rc2.dist-info/METADATA,sha256=p5lVC89uhzjoZVt6ltqWNKdwpLljzROvssQRJAXrVu0,10855
+universal_mcp-0.1.7rc2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+universal_mcp-0.1.7rc2.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
+universal_mcp-0.1.7rc2.dist-info/RECORD,,