universal-mcp 0.1.18rc4__py3-none-any.whl → 0.1.20__py3-none-any.whl

universal_mcp/cli.py

@@ -59,8 +59,8 @@ def generate(
         else:
             # Handle the error case from api_generator if validation fails
             if isinstance(app_file_data, dict) and "error" in app_file_data:
-                 console.print(f"[red]{app_file_data['error']}[/red]")
-                 raise typer.Exit(1)
+                console.print(f"[red]{app_file_data['error']}[/red]")
+                raise typer.Exit(1)
             else:
                 console.print("[red]Unexpected return value from API generator.[/red]")
                 raise typer.Exit(1)
@@ -119,9 +119,8 @@ def run(
     from universal_mcp.logger import setup_logger
     from universal_mcp.servers import server_from_config
 
-    setup_logger()
-
     config = ServerConfig.model_validate_json(config_path.read_text()) if config_path else ServerConfig()
+    setup_logger(level=config.log_level)
     server = server_from_config(config)
     server.run(transport=config.transport)
 
@@ -291,7 +290,7 @@ def split_api(
         console.print(f"[green]Successfully split {input_app_file} into {output_dir}[/green]")
     except Exception as e:
         console.print(f"[red]Error splitting API client: {e}[/red]")
-      
+
         raise typer.Exit(1) from e
 
 

universal_mcp/config.py

@@ -46,7 +46,7 @@ class ServerConfig(BaseSettings):
 
     name: str = Field(default="Universal MCP", description="Name of the MCP server")
     description: str = Field(default="Universal MCP", description="Description of the MCP server")
-    api_key: SecretStr | None = Field(default=None, description="API key for authentication")
+    api_key: SecretStr | None = Field(default=None, description="API key for authentication", alias="AGENTR_API_KEY")
     type: Literal["local", "agentr"] = Field(default="agentr", description="Type of server deployment")
     transport: Literal["stdio", "sse", "streamable-http"] = Field(
         default="stdio", description="Transport protocol to use"

universal_mcp/servers/server.py

@@ -217,8 +217,9 @@ class AgentRServer(BaseServer):
         **kwargs: Additional keyword arguments passed to FastMCP
     """
 
-    def __init__(self, config: ServerConfig, api_key: str | None = None, **kwargs):
-        self.api_key = api_key or str(config.api_key)
+    def __init__(self, config: ServerConfig, **kwargs):
+        self.api_key = config.api_key.get_secret_value() if config.api_key else None
+        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.client.api_key)
@@ -328,4 +329,4 @@ class SingleMCPServer(BaseServer):
                 description=f"Minimal MCP server for the local {app_instance.name} application.",
             )
         super().__init__(config, **kwargs)
-        self._tool_manager.register_tools_from_app(app_instance)
+        self._tool_manager.register_tools_from_app(app_instance, tags="all")

universal_mcp/tools/adapters.py

@@ -17,7 +17,7 @@ def convert_tool_to_mcp_tool(
     from mcp.server.fastmcp.server import MCPTool
 
     return MCPTool(
-        name=tool.name,
+        name=tool.name[:63],
         description=tool.description or "",
         inputSchema=tool.parameters,
     )

universal_mcp/tools/manager.py

@@ -33,6 +33,10 @@ def _filter_by_name(tools: list[Tool], tool_names: list[str] | None) -> list[Too
 
 
 def _filter_by_tags(tools: list[Tool], tags: list[str] | None) -> list[Tool]:
+    logger.debug(f"Filtering tools by tags: {tags}")
+    if "all" in tags:
+        return tools
+
     if not tags:
         return tools
     return [tool for tool in tools if any(tag in tool.tags for tag in tags)]
@@ -197,11 +201,9 @@ class ToolManager:
 
         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/tools/tools.py

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

universal_mcp/utils/agentr.py

@@ -18,9 +18,12 @@ class AgentrClient:
         base_url (str, optional): Base URL for AgentR API. Defaults to https://api.agentr.dev
     """
 
-    def __init__(self, api_key: str = None, base_url: str = None):
-        self.api_key = api_key or os.getenv("AGENTR_API_KEY")
-        if not self.api_key:
+    def __init__(self, api_key: str | None = None, base_url: str | None = None):
+        if api_key:
+            self.api_key = api_key
+        elif os.getenv("AGENTR_API_KEY"):
+            self.api_key = os.getenv("AGENTR_API_KEY")
+        else:
             logger.error(
                 "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."
             )

universal_mcp/utils/openapi/openapi.py

@@ -643,43 +643,28 @@ def _generate_method_code(path, method, operation):
             param_details[param_obj.name] = param_obj
 
     # Fetch request body example
-    request_body_example_str = None
+    example_data = None # Initialize example_data here for wider scope
+
     if has_body:
         try:
             json_content = operation["requestBody"]["content"]["application/json"]
-            example_data = None
+            #From direct content definition
             if "example" in json_content:
                 example_data = json_content["example"]
             elif "examples" in json_content and json_content["examples"]:
                 first_example_key = list(json_content["examples"].keys())[0]
                 example_data = json_content["examples"][first_example_key].get("value")
-
-            if example_data is not None:
-                try:
-                    example_json = json.dumps(example_data, indent=2)
-                    indented_example = textwrap.indent(example_json, " " * 8)  # 8 spaces
-                    request_body_example_str = f"\n        Example:\n        ```json\n{indented_example}\n        ```"
-                except TypeError:
-                    request_body_example_str = f"\n        Example: {example_data}"
+            #If not found directly, try from resolved body schema (for nested/referenced examples)
+            if example_data is None and body_schema_to_use and "example" in body_schema_to_use:
+                example_data = body_schema_to_use["example"]
         except KeyError:
-            pass  # No example found
-
-    # Identify the last argument related to the request body
-    last_body_arg_name = None
-    # request_body_params contains the names as they appear in the signature
-    if final_request_body_arg_names_for_signature:  # Use the new list with final aliased names
-        # Find which of these appears last in the combined args list
-        body_args_in_signature = [
-            a.split("=")[0] for a in args if a.split("=")[0] in final_request_body_arg_names_for_signature
-        ]
-        if body_args_in_signature:
-            last_body_arg_name = body_args_in_signature[-1]
+            pass  # No example found or application/json content not present
 
     if signature_arg_names:
         args_doc_lines.append("Args:")
         for arg_signature_str in args:
             arg_name = arg_signature_str.split("=")[0]
-            example_str = None  # Initialize example_str here
+            example_str = None  # Initialize example_str here for each argument
             detail = param_details.get(arg_name)
             if detail:
                 desc = detail.description or "No description provided."
@@ -692,26 +677,22 @@ def _generate_method_code(path, method, operation):
                 if detail.example and not detail.is_file: # Don't show schema example for file inputs
                     example_str = repr(detail.example)
                     arg_line += f" Example: {example_str}."
-
-                # Append the full body example after the last body-related argument
-                if arg_name == last_body_arg_name and request_body_example_str:
-                    # Remove the simple Example: if it exists before adding the detailed one
-                    if example_str and (
-                        f" Example: {example_str}." in arg_line or f" Example: {example_str} ." in arg_line
-                    ):
-                        arg_line = arg_line.replace(
-                            f" Example: {example_str}.", ""
-                        )  # Remove with or without trailing period
-                    arg_line += request_body_example_str  # Append the formatted JSON example
+                # Fallback for body parameters if no direct example was found
+                elif not example_str and detail.where == "body" and example_data and isinstance(example_data, dict) and detail.identifier in example_data:
+                    current_body_param_example = example_data[detail.identifier]
+                    if current_body_param_example is not None: # Ensure the extracted part is not None
+                        try:
+                            arg_line += f" Example: {repr(current_body_param_example)}."
+                        except Exception: # Fallback if repr fails
+                            arg_line += " Example: [Could not represent example]."
 
                 args_doc_lines.append(arg_line)
-            elif arg_name == final_empty_body_param_name and has_empty_body:  # Use potentially suffixed name
+
+            elif arg_name == final_empty_body_param_name and has_empty_body:
                 args_doc_lines.append(
                     f"    {arg_name} (dict | None): Optional dictionary for an empty JSON request body (e.g., {{}})."
                 )
-                if ( arg_name == last_body_arg_name and request_body_example_str ): 
-                    args_doc_lines[-1] += request_body_example_str
-            elif arg_name == raw_body_param_name: # Docstring for raw body parameter
+            elif arg_name == raw_body_param_name: 
                 raw_body_type_hint = "bytes"
                 raw_body_desc = "Raw binary content for the request body."
                 if selected_content_type and "text" in selected_content_type:
@@ -720,13 +701,9 @@ def _generate_method_code(path, method, operation):
                 elif selected_content_type and selected_content_type.startswith("image/"):
                      raw_body_type_hint = "bytes (image data)"
                      raw_body_desc = f"Raw image content ({selected_content_type}) for the request body."
-
                 args_doc_lines.append(
                     f"    {arg_name} ({raw_body_type_hint} | None): {raw_body_desc}"
                 )
-                # Example for raw body is harder to give generically, but if present in spec, could be added.
-                if ( arg_name == last_body_arg_name and request_body_example_str ): 
-                    args_doc_lines[-1] += request_body_example_str
     
     if args_doc_lines:
         docstring_parts.append("\n".join(args_doc_lines))

{universal_mcp-0.1.18rc4.dist-info → universal_mcp-0.1.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.18rc4
+Version: 0.1.20
 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.8.1
+Requires-Dist: mcp>=1.9.0
 Requires-Dist: posthog>=3.24.0
 Requires-Dist: pydantic-settings>=2.8.1
 Requires-Dist: pydantic>=2.11.1

{universal_mcp-0.1.18rc4.dist-info → universal_mcp-0.1.20.dist-info}/RECORD

@@ -1,7 +1,7 @@
 universal_mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 universal_mcp/analytics.py,sha256=Dkv8mkc_2T2t5NxLSZzcr3BlmOispj1RKtbB86V1i4M,2306
-universal_mcp/cli.py,sha256=Xcdm4UMIlwxK6f0FHvmu5b6lZ8q14S3vZexRM32zAK4,10298
-universal_mcp/config.py,sha256=mjvrVK7eGmMq8CKBgZOMD1wVOAVzd7gzTUxW5sgIfWE,3297
+universal_mcp/cli.py,sha256=-MVcqDEL_0AefmEgjq3ZCa2tySxXwi-Tfoat2kboX_U,10311
+universal_mcp/config.py,sha256=HaAZvf-XzQZpqGGWUuT5zojWloO8GL5Acfa5_0sDs_Q,3321
 universal_mcp/exceptions.py,sha256=-pbeZhpNieJfnSd2-WM80pU8W8mK8VHXcSjky0BHwdk,665
 universal_mcp/logger.py,sha256=VmH_83efpErLEDTJqz55Dp0dioTXfGvMBLZUx5smOLc,2116
 universal_mcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,18 +13,18 @@ universal_mcp/integrations/__init__.py,sha256=X8iEzs02IlXfeafp6GMm-cOkg70QdjnlTR
 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=eBZCsaZjiEv6ZlRRslPKgurQxmpHLQyiXv2fTBygHnM,532
-universal_mcp/servers/server.py,sha256=ZyI--B2Lho5BFhfcAzbOsnlFN-3spRbb-FrhhCc2G7M,12727
+universal_mcp/servers/server.py,sha256=6xRUxTJHiX0AqEWbAZ6eb6jEkvuBX5Qpkb53hmKcfc0,12822
 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=gz_sNDc_bseMHWmpQmqhOq65veE-DuK_kJYXGIx0Wi8,1427
+universal_mcp/tools/adapters.py,sha256=OCZuWxLscys6mw1Q5ctQFshv9q3szlikwHhn4j5PMnE,1432
 universal_mcp/tools/func_metadata.py,sha256=zIDXgIBvu5Gh8aNlg-Q7cZZos9Iky75MS0Me0BraXeM,8086
-universal_mcp/tools/manager.py,sha256=eNYEGCeTvtSsyPkPWo4ciuJEqNw4ux-XCr0r5OyBejg,7981
-universal_mcp/tools/tools.py,sha256=8YBTaJCM38Nhan9Al6Vlq4FtSULrKlxg1q_o8OL1_FM,3322
+universal_mcp/tools/manager.py,sha256=iwywaTjVGvBCJJasfwDWrASUleYqxenm4S-0txdhCF0,8076
+universal_mcp/tools/tools.py,sha256=qiuuLe0mCWtxXp6E5ISDDaNojCrMLfV1r5L8peFoJfg,3327
 universal_mcp/utils/__init__.py,sha256=8wi4PGWu-SrFjNJ8U7fr2iFJ1ktqlDmSKj1xYd7KSDc,41
-universal_mcp/utils/agentr.py,sha256=xXCrWh_GL70eYXjuYz-1YkPzKLDqwg0S98TBS3Osqg8,3271
+universal_mcp/utils/agentr.py,sha256=YmX6hvFW84keJKTZqP3jPz4rP9DM5wHZ0vTMHfxO6AI,3360
 universal_mcp/utils/common.py,sha256=HEZC2Mhilb8DrGXQG2tboAIw1r4veGilGWjfnPF1lyA,888
 universal_mcp/utils/docstring_parser.py,sha256=6oIeCjOUirFdVpXdGZt5zDKje6jmCY42-GeYOc_7r2I,11317
 universal_mcp/utils/installation.py,sha256=ItOfBFhKOh4DLz237jgAz_Fn0uOMdrKXw0n5BaUZZNs,7286
@@ -33,13 +33,13 @@ universal_mcp/utils/openapi/__inti__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 universal_mcp/utils/openapi/api_generator.py,sha256=FjtvbnWuI1P8W8wXuKLCirUtsqQ4HI_TuQrhpA4SqTs,4749
 universal_mcp/utils/openapi/api_splitter.py,sha256=6O2y7fcCo2k3ixLr6_9-aAZx2kas3UAxQhqJy1esNkE,18829
 universal_mcp/utils/openapi/docgen.py,sha256=DNmwlhg_-TRrHa74epyErMTRjV2nutfCQ7seb_Rq5hE,21366
-universal_mcp/utils/openapi/openapi.py,sha256=8XCIkJuwTN0UUcrBslQxitvz4y0NItBtuIgxdvb-Gdg,46857
+universal_mcp/utils/openapi/openapi.py,sha256=EQME-VC5ccXpukIF0h96YsQOZj6oWip8W7a0bRN3s_k,45677
 universal_mcp/utils/openapi/preprocessor.py,sha256=qLYv4ekors5B2OU_YUvXICYQ7XYhAOEPyAnKtnBvNpM,46699
 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.18rc4.dist-info/METADATA,sha256=MPY4E-Q_CWOtHzhCb1lCeHwZo_840SMgxh1Xuz1s_sc,12125
-universal_mcp-0.1.18rc4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-universal_mcp-0.1.18rc4.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
-universal_mcp-0.1.18rc4.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
-universal_mcp-0.1.18rc4.dist-info/RECORD,,
+universal_mcp-0.1.20.dist-info/METADATA,sha256=Ue8JfKp1O-fFRZ6WjcH30hcGhbS4_V61s3HEWk9Nx3o,12122
+universal_mcp-0.1.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+universal_mcp-0.1.20.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
+universal_mcp-0.1.20.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
+universal_mcp-0.1.20.dist-info/RECORD,,