universal-mcp 0.1.22rc1__py3-none-any.whl → 0.1.22rc4__py3-none-any.whl

universal_mcp/applications/__init__.py

@@ -30,6 +30,8 @@ sys.path.append(str(UNIVERSAL_MCP_HOME))
 # Name are in the format of "app-name", eg, google-calendar
 # Class name is NameApp, eg, GoogleCalendarApp
 
+app_cache: dict[str, type[BaseApplication]] = {}
+
 
 def _install_or_upgrade_package(package_name: str, repository_path: str):
     """
@@ -71,6 +73,8 @@ def app_from_slug(slug: str):
     Dynamically resolve and return the application class for the given slug.
     Attempts installation from GitHub if the package is not found locally.
     """
+    if slug in app_cache:
+        return app_cache[slug]
     class_name = get_default_class_name(slug)
     module_path = get_default_module_path(slug)
     package_name = get_default_package_name(slug)
@@ -81,6 +85,7 @@ def app_from_slug(slug: str):
         module = importlib.import_module(module_path)
         class_ = getattr(module, class_name)
         logger.debug(f"Loaded class '{class_}' from module '{module_path}'")
+        app_cache[slug] = class_
         return class_
     except ModuleNotFoundError as e:
         raise ModuleNotFoundError(f"Package '{module_path}' not found locally. Please install it first.") from e

universal_mcp/servers/server.py

@@ -4,7 +4,6 @@ from typing import Any
 import httpx
 from loguru import logger
 from mcp.server.fastmcp import FastMCP
-from mcp.server.fastmcp.server import MCPTool
 from mcp.types import TextContent
 from pydantic import ValidationError
 
@@ -203,23 +202,13 @@ class AgentRServer(BaseServer):
     """
 
     def __init__(self, config: ServerConfig, **kwargs):
-        # Initialize API key and client before calling super().__init__
+        super().__init__(config, **kwargs)
         self.api_key = config.api_key.get_secret_value() if config.api_key else None
         if not self.api_key:
             raise ValueError("API key is required for AgentR server")
-
         logger.info(f"Initializing AgentR server with API key: {self.api_key}")
         self.client = AgentrClient(api_key=self.api_key)
-        super().__init__(config, **kwargs)
-        self.integration = AgentRIntegration(name="agentr", api_key=self.api_key)
-        # Don't load apps in __init__ for stateless operation
-        self._apps_loaded = False
-
-    def _ensure_apps_loaded(self) -> None:
-        """Ensure apps are loaded, loading them if necessary."""
-        if not self._apps_loaded:
-            self._load_apps()
-            self._apps_loaded = True
+        self._load_apps()
 
     def _fetch_apps(self) -> list[AppConfig]:
         """Fetch available apps from AgentR API with retry logic.
@@ -256,7 +245,7 @@ class AgentRServer(BaseServer):
         """
         try:
             integration = (
-                AgentRIntegration(name=app_config.integration.name, api_key=self.client.api_key)
+                AgentRIntegration(name=app_config.integration.name, api_key=self.api_key)
                 if app_config.integration
                 else None
             )
@@ -292,16 +281,6 @@ class AgentRServer(BaseServer):
             # 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")
 
-    async def list_tools(self) -> list[MCPTool]:
-        """List available tools, ensuring apps are loaded first."""
-        self._ensure_apps_loaded()
-        return await super().list_tools()
-
-    async def call_tool(self, name: str, arguments: dict) -> list[TextContent]:
-        """Call a tool by name, ensuring apps are loaded first."""
-        self._ensure_apps_loaded()
-        return await super().call_tool(name, arguments)
-
 
 class SingleMCPServer(BaseServer):
     """

universal_mcp/tools/adapters.py

@@ -19,11 +19,14 @@ def convert_tool_to_mcp_tool(
 ):
     from mcp.server.fastmcp.server import MCPTool
 
-    return MCPTool(
+    logger.debug(f"Converting tool '{tool.name}' to MCP format")
+    mcp_tool = MCPTool(
         name=tool.name[:63],
         description=tool.description or "",
         inputSchema=tool.parameters,
     )
+    logger.debug(f"Successfully converted tool '{tool.name}' to MCP format")
+    return mcp_tool
 
 
 def format_to_mcp_result(result: any) -> list[TextContent]:
@@ -35,9 +38,12 @@ def format_to_mcp_result(result: any) -> list[TextContent]:
     Returns:
         List of TextContent objects
     """
+    logger.debug(f"Formatting result to MCP format, type: {type(result)}")
     if isinstance(result, str):
+        logger.debug("Result is string, wrapping in TextContent")
         return [TextContent(type="text", text=result)]
     elif isinstance(result, list) and all(isinstance(item, TextContent) for item in result):
+        logger.debug("Result is already list of TextContent objects")
         return result
     else:
         logger.warning(f"Tool returned unexpected type: {type(result)}. Wrapping in TextContent.")
@@ -60,26 +66,33 @@ def convert_tool_to_langchain_tool(
         a LangChain tool
     """
 
+    logger.debug(f"Converting tool '{tool.name}' to LangChain format")
+
     async def call_tool(
         **arguments: dict[str, any],
     ):
+        logger.debug(f"Executing LangChain tool '{tool.name}' with arguments: {arguments}")
         call_tool_result = await tool.run(arguments)
+        logger.debug(f"Tool '{tool.name}' execution completed")
         return call_tool_result
 
-    return StructuredTool(
+    langchain_tool = StructuredTool(
         name=tool.name,
         description=tool.description or "",
         coroutine=call_tool,
         response_format="content",
         args_schema=tool.parameters,
     )
+    logger.debug(f"Successfully converted tool '{tool.name}' to LangChain format")
+    return langchain_tool
 
 
 def convert_tool_to_openai_tool(
     tool: Tool,
 ):
     """Convert a Tool object to an OpenAI function."""
-    return {
+    logger.debug(f"Converting tool '{tool.name}' to OpenAI format")
+    openai_tool = {
         "type": "function",
         "function": {
             "name": tool.name,
@@ -87,3 +100,5 @@ def convert_tool_to_openai_tool(
             "parameters": tool.parameters,
         },
     }
+    logger.debug(f"Successfully converted tool '{tool.name}' to OpenAI format")
+    return openai_tool

universal_mcp/tools/tools.py

@@ -55,7 +55,7 @@ class Tool(BaseModel):
 
         return cls(
             fn=fn,
-            name=func_name[:48],
+            name=func_name,
             description=parsed_doc["summary"],
             args_description=parsed_doc["args"],
             returns_description=parsed_doc["returns"],

universal_mcp/utils/agentr.py

@@ -78,3 +78,27 @@ class AgentrClient:
         response.raise_for_status()
         data = response.json()
         return [AppConfig.model_validate(app) for app in data]
+
+    def list_all_apps(self) -> list:
+        """List all apps from AgentR API.
+
+        Returns:
+            List of app names
+        """
+        response = self.client.get("/apps/")
+        response.raise_for_status()
+        return response.json()
+
+    def list_actions(self, app_name: str):
+        """List actions for an app.
+
+        Args:
+            app_name (str): Name of the app to list actions for
+
+        Returns:
+            List of action configurations
+        """
+
+        response = self.client.get(f"/apps/{app_name}/actions/")
+        response.raise_for_status()
+        return response.json()

universal_mcp/utils/openapi/openapi.py

@@ -149,7 +149,9 @@ def _sanitize_identifier(name: str | None) -> str:
         return ""
 
     # Initial replacements for common non-alphanumeric characters
-    sanitized = name.replace("-", "_").replace(".", "_").replace("[", "_").replace("]", "").replace("$", "_")
+    sanitized = (
+        name.replace("-", "_").replace(".", "_").replace("[", "_").replace("]", "").replace("$", "_").replace("/", "_")
+    )
 
     # Remove leading underscores, but preserve a single underscore if the name (after initial replace)
     # consisted only of underscores.

universal_mcp/utils/testing.py

@@ -0,0 +1,31 @@
+from loguru import logger
+
+from universal_mcp.tools.tools import Tool
+
+
+def check_application_instance(app_instance, app_name):
+    assert app_instance is not None, f"Application object is None for {app_name}"
+    assert (
+        app_instance.name == app_name
+    ), f"Application instance name '{app_instance.name}' does not match expected name '{app_name}'"
+
+    tools = app_instance.list_tools()
+    logger.info(f"Tools for {app_name}: {len(tools)}")
+    assert len(tools) > 0, f"No tools found for {app_name}"
+
+    tools = [Tool.from_function(tool) for tool in tools]
+    seen_names = set()
+    important_tools = []
+
+    for tool in tools:
+        assert tool.name is not None, f"Tool name is None for a tool in {app_name}"
+        assert (
+            0 < len(tool.name) <= 48
+        ), f"Tool name '{tool.name}' for {app_name} has invalid length (must be between 1 and 47 characters)"
+        assert tool.description is not None, f"Tool description is None for tool '{tool.name}' in {app_name}"
+        # assert 0 < len(tool.description) <= 255, f"Tool description for '{tool.name}' in {app_name} has invalid length (must be between 1 and 255 characters)"
+        assert tool.name not in seen_names, f"Duplicate tool name: '{tool.name}' found for {app_name}"
+        seen_names.add(tool.name)
+        if "important" in tool.tags:
+            important_tools.append(tool.name)
+    assert len(important_tools) > 0, f"No important tools found for {app_name}"

{universal_mcp-0.1.22rc1.dist-info → universal_mcp-0.1.22rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.22rc1
+Version: 0.1.22rc4
 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

{universal_mcp-0.1.22rc1.dist-info → universal_mcp-0.1.22rc4.dist-info}/RECORD

@@ -6,40 +6,41 @@ universal_mcp/exceptions.py,sha256=-pbeZhpNieJfnSd2-WM80pU8W8mK8VHXcSjky0BHwdk,6
 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=No_tptWkYFcbE6Z3tMEpqUbpHXlaCOa8__yqWB5sTjY,3360
+universal_mcp/applications/__init__.py,sha256=l19_sMs5766VFWU_7O2niamvvvfQOteysqylbqvjjGQ,3500
 universal_mcp/applications/application.py,sha256=3cQ5BVWmC2gU4fgpM5wZ3ByTe7iGbQriNPVSWxclaiU,17744
 universal_mcp/integrations/README.md,sha256=lTAPXO2nivcBe1q7JT6PRa6v9Ns_ZersQMIdw-nmwEA,996
 universal_mcp/integrations/__init__.py,sha256=X8iEzs02IlXfeafp6GMm-cOkg70QdjnlTRuFo24KEfo,916
 universal_mcp/integrations/integration.py,sha256=uKucut4AKTN2M-K8Aqsm2qtchLqlQRWMU8L287X7VyQ,13043
 universal_mcp/servers/README.md,sha256=ytFlgp8-LO0oogMrHkMOp8SvFTwgsKgv7XhBVZGNTbM,2284
 universal_mcp/servers/__init__.py,sha256=eBZCsaZjiEv6ZlRRslPKgurQxmpHLQyiXv2fTBygHnM,532
-universal_mcp/servers/server.py,sha256=7IiivuINr1CjZ6gX8xMgsoTHOevbiHa9U1pUDJGNRIE,13251
+universal_mcp/servers/server.py,sha256=K7sPdCixYgJmQRxOL1icscL7-52sVsghpRX_D_uREu4,12329
 universal_mcp/stores/README.md,sha256=jrPh_ow4ESH4BDGaSafilhOVaN8oQ9IFlFW-j5Z5hLA,2465
 universal_mcp/stores/__init__.py,sha256=quvuwhZnpiSLuojf0NfmBx2xpaCulv3fbKtKaSCEmuM,603
 universal_mcp/stores/store.py,sha256=mxnmOVlDNrr8OKhENWDtCIfK7YeCBQcGdS6I2ogRCsU,6756
 universal_mcp/tools/README.md,sha256=RuxliOFqV1ZEyeBdj3m8UKfkxAsfrxXh-b6V4ZGAk8I,2468
 universal_mcp/tools/__init__.py,sha256=Fatza_R0qYWmNF1WQSfUZZKQFu5qf-16JhZzdmyx3KY,333
-universal_mcp/tools/adapters.py,sha256=n06Nz18L_4dq3iwBchNq9vHsX7whqFZ0g5iuz_0gyaM,2076
+universal_mcp/tools/adapters.py,sha256=nMoZ9jnv1uKhfq6NmBJ5-a6uwdB_H8RqkdNLIacCRfM,2978
 universal_mcp/tools/func_metadata.py,sha256=XvdXSZEzvgbH70bc-Zu0B47CD7f_rm--vblq4en3n0Q,8181
 universal_mcp/tools/manager.py,sha256=ao_ovTyca8HR4uwHdL_lTWNdquxcqRx6FaLA4U1lZvQ,11242
-universal_mcp/tools/tools.py,sha256=qiuuLe0mCWtxXp6E5ISDDaNojCrMLfV1r5L8peFoJfg,3327
+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=a7D3I4oKvdovoumeSdChhHBcZNrEtKHHb4L4O8Gm_l0,2870
+universal_mcp/utils/agentr.py,sha256=Rzfou8dfS705lNrRwKLXkpNlo4zJs1oPP_2QY46l4Uo,3486
 universal_mcp/utils/common.py,sha256=HEZC2Mhilb8DrGXQG2tboAIw1r4veGilGWjfnPF1lyA,888
 universal_mcp/utils/docstring_parser.py,sha256=SKIfAiFHiqxqageayYFlpsexipy8tN7N4RLT6GIzfoQ,7672
 universal_mcp/utils/installation.py,sha256=ItOfBFhKOh4DLz237jgAz_Fn0uOMdrKXw0n5BaUZZNs,7286
 universal_mcp/utils/singleton.py,sha256=kolHnbS9yd5C7z-tzaUAD16GgI-thqJXysNi3sZM4No,733
+universal_mcp/utils/testing.py,sha256=0znYkuFi8-WjOdbwrTbNC-UpMqG3EXcGOE0wxlERh_A,1464
 universal_mcp/utils/openapi/__inti__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 universal_mcp/utils/openapi/api_generator.py,sha256=FjtvbnWuI1P8W8wXuKLCirUtsqQ4HI_TuQrhpA4SqTs,4749
 universal_mcp/utils/openapi/api_splitter.py,sha256=S-rT3wsJWUVhU_Tv_ibNNAlQ79SfWOcU6qaa_rFfd5o,20806
 universal_mcp/utils/openapi/docgen.py,sha256=DNmwlhg_-TRrHa74epyErMTRjV2nutfCQ7seb_Rq5hE,21366
-universal_mcp/utils/openapi/openapi.py,sha256=3DWpxVZk9LGGDLrpE7BfSjurd_FJg30oWUiaEv3wjm0,51105
+universal_mcp/utils/openapi/openapi.py,sha256=sfHJWBaC2c-9ZCjTODH7Gt-un_agixOr_ylx9Xld8N4,51139
 universal_mcp/utils/openapi/preprocessor.py,sha256=PPIM3Uu8DYi3dRKdqi9thr9ufeUgkr2K08ri1BwKpoQ,60835
 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.22rc1.dist-info/METADATA,sha256=VAB3kMzP5KOKpWoBC12I7i3gW2JmSJLvx92Go9qINv8,12154
-universal_mcp-0.1.22rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-universal_mcp-0.1.22rc1.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
-universal_mcp-0.1.22rc1.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
-universal_mcp-0.1.22rc1.dist-info/RECORD,,
+universal_mcp-0.1.22rc4.dist-info/METADATA,sha256=3poFZB1sv1psL8m_KwV8FjNCWsA1tiGzB_X4QdYBaPY,12154
+universal_mcp-0.1.22rc4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+universal_mcp-0.1.22rc4.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
+universal_mcp-0.1.22rc4.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
+universal_mcp-0.1.22rc4.dist-info/RECORD,,