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

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 = ""

universal_mcp/integrations/__init__.py

@@ -22,8 +22,8 @@ def integration_from_config(config: IntegrationConfig, store: BaseStore | None =
 
 __all__ = [
     "AgentRIntegration",
-    "Integration",
     "ApiKeyIntegration",
+    "Integration",
     "OAuthIntegration",
     "integration_from_config",
 ]

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/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]

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)]
 
 
@@ -148,14 +156,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 +194,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-0.1.16.dist-info → universal_mcp-0.1.18rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.16
+Version: 0.1.18rc2
 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.16.dist-info → universal_mcp-0.1.18rc2.dist-info}/RECORD

@@ -7,12 +7,12 @@ universal_mcp/logger.py,sha256=VmH_83efpErLEDTJqz55Dp0dioTXfGvMBLZUx5smOLc,2116
 universal_mcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 universal_mcp/applications/README.md,sha256=eqbizxaTxKH2O1tyIJR2yI0Db5TQxtgPd_vbpWyCa2Y,3527
 universal_mcp/applications/__init__.py,sha256=yDLrQhICcvoSf8KTLkKOdqcG1N7c4UOYL3tNIjAo2kk,3182
-universal_mcp/applications/application.py,sha256=3P7dpdOukaXnubjQi8jV_NZYESpW8QWYLF6QdcxzxzA,13771
+universal_mcp/applications/application.py,sha256=ObxkufxEyvl7WBKneZdQOl5Wdmo9KSnujfIf7dsQKEI,13751
 universal_mcp/integrations/README.md,sha256=lTAPXO2nivcBe1q7JT6PRa6v9Ns_ZersQMIdw-nmwEA,996
-universal_mcp/integrations/__init__.py,sha256=zEHYH_1FBsWvHssOMkaElQXG5UydciZfoTS49Q_Um6E,916
-universal_mcp/integrations/integration.py,sha256=4SRcD78ZF9-m65aTxkoF-CZl7XKUsfSr1wppKz_ZgiA,13078
+universal_mcp/integrations/__init__.py,sha256=X8iEzs02IlXfeafp6GMm-cOkg70QdjnlTRuFo24KEfo,916
+universal_mcp/integrations/integration.py,sha256=QvZlq3G5OU4tHPv9uq9Nv5NFe30NdUsJU-Av474n0_o,13154
 universal_mcp/servers/README.md,sha256=ytFlgp8-LO0oogMrHkMOp8SvFTwgsKgv7XhBVZGNTbM,2284
-universal_mcp/servers/__init__.py,sha256=etFrqXFODIl9oGeqQS-aUxzw4J6pjzYjHl4VPvQaR3A,508
+universal_mcp/servers/__init__.py,sha256=eBZCsaZjiEv6ZlRRslPKgurQxmpHLQyiXv2fTBygHnM,532
 universal_mcp/servers/server.py,sha256=1UWvywUzgGVYyIGlaES9tgj_xP_f6EC4bK_vM0nE_tE,9237
 universal_mcp/stores/README.md,sha256=jrPh_ow4ESH4BDGaSafilhOVaN8oQ9IFlFW-j5Z5hLA,2465
 universal_mcp/stores/__init__.py,sha256=quvuwhZnpiSLuojf0NfmBx2xpaCulv3fbKtKaSCEmuM,603
@@ -21,7 +21,7 @@ universal_mcp/tools/README.md,sha256=RuxliOFqV1ZEyeBdj3m8UKfkxAsfrxXh-b6V4ZGAk8I
 universal_mcp/tools/__init__.py,sha256=Fatza_R0qYWmNF1WQSfUZZKQFu5qf-16JhZzdmyx3KY,333
 universal_mcp/tools/adapters.py,sha256=gz_sNDc_bseMHWmpQmqhOq65veE-DuK_kJYXGIx0Wi8,1427
 universal_mcp/tools/func_metadata.py,sha256=zIDXgIBvu5Gh8aNlg-Q7cZZos9Iky75MS0Me0BraXeM,8086
-universal_mcp/tools/manager.py,sha256=Uqa6aEGAVcZC_Q69L8KQQiW4D_cXvrJQL1lg3_L7GuQ,7526
+universal_mcp/tools/manager.py,sha256=GMBKPl-W6zoyK6Hisiz-i9WROsV8W7VC9Vou8d55rXA,7983
 universal_mcp/tools/tools.py,sha256=8YBTaJCM38Nhan9Al6Vlq4FtSULrKlxg1q_o8OL1_FM,3322
 universal_mcp/utils/__init__.py,sha256=8wi4PGWu-SrFjNJ8U7fr2iFJ1ktqlDmSKj1xYd7KSDc,41
 universal_mcp/utils/agentr.py,sha256=GlFK5_RJXP3XpIGKLzkIe5nu2rfT6bqSoT0h1hipy9g,3438
@@ -37,8 +37,8 @@ universal_mcp/utils/openapi/preprocessor.py,sha256=qLYv4ekors5B2OU_YUvXICYQ7XYhA
 universal_mcp/utils/openapi/readme.py,sha256=R2Jp7DUXYNsXPDV6eFTkLiy7MXbSULUj1vHh4O_nB4c,2974
 universal_mcp/utils/templates/README.md.j2,sha256=Mrm181YX-o_-WEfKs01Bi2RJy43rBiq2j6fTtbWgbTA,401
 universal_mcp/utils/templates/api_client.py.j2,sha256=972Im7LNUAq3yZTfwDcgivnb-b8u6_JLKWXwoIwXXXQ,908
-universal_mcp-0.1.16.dist-info/METADATA,sha256=IR1TbIkUM2NxYhZEAQIYvnr2qungmK-DT94mVB15wyY,12122
-universal_mcp-0.1.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-universal_mcp-0.1.16.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
-universal_mcp-0.1.16.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
-universal_mcp-0.1.16.dist-info/RECORD,,
+universal_mcp-0.1.18rc2.dist-info/METADATA,sha256=mUp7-GIgVvEJ0EXC-_E1ElgkBk37OjOtpF4baB8-gd8,12125
+universal_mcp-0.1.18rc2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+universal_mcp-0.1.18rc2.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
+universal_mcp-0.1.18rc2.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
+universal_mcp-0.1.18rc2.dist-info/RECORD,,