universal-mcp 0.1.13rc7__py3-none-any.whl → 0.1.14__py3-none-any.whl

universal_mcp/applications/__init__.py

@@ -1,5 +1,7 @@
 import importlib
+import os
 import subprocess
+import sys
 
 from loguru import logger
 
@@ -9,8 +11,16 @@ from universal_mcp.applications.application import (
     GraphQLApplication,
 )
 
+UNIVERSAL_MCP_HOME = os.path.join(os.path.expanduser("~"), ".universal-mcp", "packages")
+
+if not os.path.exists(UNIVERSAL_MCP_HOME):
+    os.makedirs(UNIVERSAL_MCP_HOME)
+
+# set python path to include the universal-mcp home directory
+sys.path.append(UNIVERSAL_MCP_HOME)
+
+
 # Name are in the format of "app-name", eg, google-calendar
-# Folder name is "app_name", eg, google_calendar
 # Class name is NameApp, eg, GoogleCalendarApp
 
 
@@ -38,7 +48,7 @@ def _install_package(slug_clean: str):
     Helper to install a package via pip from the universal-mcp GitHub repository.
     """
     repo_url = f"git+https://github.com/universal-mcp/{slug_clean}"
-    cmd = ["uv", "pip", "install", repo_url]
+    cmd = ["uv", "pip", "install", repo_url, "--target", UNIVERSAL_MCP_HOME]
     logger.info(f"Installing package '{slug_clean}' with command: {' '.join(cmd)}")
     try:
         subprocess.check_call(cmd)

universal_mcp/cli.py

@@ -23,6 +23,12 @@ def generate(
         "-o",
         help="Output file path - should match the API name (e.g., 'twitter.py' for Twitter API)",
     ),
+    class_name: str = typer.Option(
+        None,
+        "--class-name",
+        "-c",
+        help="Class name to use for the API client",
+    ),
 ):
     """Generate API client from OpenAPI schema with optional docstring generation.
 
@@ -38,25 +44,35 @@ def generate(
 
     try:
         # Run the async function in the event loop
-        result = generate_api_from_schema(
+        app_file = generate_api_from_schema(
             schema_path=schema_path,
             output_path=output_path,
+            class_name=class_name,
         )
-
-        if not output_path:
-            # Print to stdout if no output path
-            print(result["code"])
-        else:
-            typer.echo("API client successfully generated and installed.")
-            if "app_file" in result:
-                typer.echo(f"Application file: {result['app_file']}")
-            if "readme_file" in result and result["readme_file"]:
-                typer.echo(f"Documentation: {result['readme_file']}")
+        typer.echo("API client successfully generated and installed.")
+        typer.echo(f"Application file: {app_file}")
     except Exception as e:
         typer.echo(f"Error generating API client: {e}", err=True)
         raise typer.Exit(1) from e
 
 
+@app.command()
+def readme(
+    file_path: Path = typer.Argument(..., help="Path to the Python file to process"),
+    class_name: str = typer.Option(
+        None,
+        "--class-name",
+        "-c",
+        help="Class name to use for the API client",
+    ),
+):
+    """Generate a README.md file for the API client."""
+    from universal_mcp.utils.readme import generate_readme
+
+    readme_file = generate_readme(file_path, class_name)
+    typer.echo(f"README.md file generated at: {readme_file}")
+
+
 @app.command()
 def docgen(
     file_path: Path = typer.Argument(..., help="Path to the Python file to process"),

universal_mcp/utils/api_generator.py

@@ -4,7 +4,6 @@ import os
 import shutil
 from pathlib import Path
 
-from jinja2 import Environment, FileSystemLoader, TemplateError, select_autoescape
 from loguru import logger
 
 from universal_mcp.utils.openapi import generate_api_client, load_schema
@@ -36,67 +35,6 @@ def get_class_info(module: any) -> tuple[str | None, any]:
     return None, None
 
 
-def generate_readme(app_dir: Path, folder_name: str, tools: list) -> Path:
-    """Generate README.md with API documentation.
-
-    Args:
-        app_dir: Directory where the README will be generated
-        folder_name: Name of the application folder
-        tools: List of Function objects from the OpenAPI schema
-
-    Returns:
-        Path to the generated README file
-
-    Raises:
-        FileNotFoundError: If the template directory doesn't exist
-        TemplateError: If there's an error rendering the template
-        IOError: If there's an error writing the README file
-    """
-    app = folder_name.replace("_", " ").title()
-    logger.info(f"Generating README for {app} in {app_dir}")
-
-    # Format tools into (name, description) tuples
-    formatted_tools = []
-    for tool in tools:
-        name = tool.__name__
-        description = tool.__doc__.strip().split("\n")[0]
-        formatted_tools.append((name, description))
-
-    # Set up Jinja2 environment
-    template_dir = Path(__file__).parent.parent / "templates"
-    if not template_dir.exists():
-        logger.error(f"Template directory not found: {template_dir}")
-        raise FileNotFoundError(f"Template directory not found: {template_dir}")
-
-    try:
-        env = Environment(
-            loader=FileSystemLoader(template_dir), autoescape=select_autoescape()
-        )
-        template = env.get_template("README.md.j2")
-    except Exception as e:
-        logger.error(f"Error loading template: {e}")
-        raise TemplateError(f"Error loading template: {e}") from e
-
-    # Render the template
-    try:
-        readme_content = template.render(name=app, tools=formatted_tools)
-    except Exception as e:
-        logger.error(f"Error rendering template: {e}")
-        raise TemplateError(f"Error rendering template: {e}") from e
-
-    # Write the README file
-    readme_file = app_dir / "README.md"
-    try:
-        with open(readme_file, "w") as f:
-            f.write(readme_content)
-        logger.info(f"Documentation generated at: {readme_file}")
-    except Exception as e:
-        logger.error(f"Error writing README file: {e}")
-        raise OSError(f"Error writing README file: {e}") from e
-
-    return readme_file
-
-
 def test_correct_output(gen_file: Path):
     # Check file is non-empty
     if gen_file.stat().st_size == 0:
@@ -120,7 +58,7 @@ def test_correct_output(gen_file: Path):
 def generate_api_from_schema(
     schema_path: Path,
     output_path: Path | None = None,
-    add_docstrings: bool = True,
+    class_name: str | None = None,
 ) -> tuple[Path, Path]:
     """
     Generate API client from OpenAPI schema and write to app.py with a README.
@@ -147,7 +85,7 @@ def generate_api_from_schema(
 
     # 2. Generate client code
     try:
-        code = generate_api_client(schema)
+        code = generate_api_client(schema, class_name)
         logger.info("API client code generated.")
     except Exception as e:
         logger.error("Code generation failed: %s", e)
@@ -192,34 +130,6 @@ def generate_api_from_schema(
     shutil.copy(gen_file, app_file)
     logger.info("App file written to: %s", app_file)
 
-    # 6. Collect tools and generate README
-    import importlib.util
-    import sys
-
-    # Load the generated module as "temp_module"
-    spec = importlib.util.spec_from_file_location("temp_module", str(app_file))
-    module = importlib.util.module_from_spec(spec)
-    sys.modules["temp_module"] = module
-    spec.loader.exec_module(module)
-
-    # Retrieve the generated API class
-    class_name, cls = get_class_info(module)
-
-    # Instantiate client and collect its tools
-    tools = []
-    if cls:
-        try:
-            client = cls()
-            tools = client.list_tools()
-        except Exception as e:
-            logger.warning(
-                "Failed to instantiate '%s' or list tools: %s", class_name, e
-            )
-    else:
-        logger.warning("No generated class found in module 'temp_module'")
-    readme_file = generate_readme(target_dir, output_path.stem, tools)
-    logger.info("README generated at: %s", readme_file)
-
     # Cleanup intermediate file
     try:
         os.remove(gen_file)
@@ -227,4 +137,4 @@ def generate_api_from_schema(
     except Exception as e:
         logger.warning("Could not remove intermediate file %s: %s", gen_file, e)
 
-    return app_file, readme_file
+    return app_file

universal_mcp/utils/docgen.py

@@ -176,7 +176,7 @@ def extract_json_from_text(text):
 
 
 def generate_docstring(
-    function_code: str, model: str = "perplexity/sonar-pro"
+    function_code: str, model: str = "perplexity/sonar"
 ) -> DocstringOutput:
     """
     Generate a docstring for a Python function using litellm with structured output.
@@ -509,7 +509,7 @@ def insert_docstring_into_function(function_code: str, docstring: str) -> str:
         return function_code
 
 
-def process_file(file_path: str, model: str = "perplexity/sonar-pro") -> int:
+def process_file(file_path: str, model: str = "perplexity/sonar") -> int:
     """
     Process a Python file and add docstrings to all functions in it.
 

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[applications]@latest", "run"],
+        "args": ["universal_mcp@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[applications]@latest", "run"],
+        "args": ["universal_mcp@latest", "run"],
         "env": {"AGENTR_API_KEY": api_key},
     }
 
@@ -120,7 +120,7 @@ def install_cline(api_key: str) -> None:
         config["mcpServers"] = {}
     config["mcpServers"]["universal_mcp"] = {
         "command": get_uvx_path(),
-        "args": ["universal_mcp[applications]@latest", "run"],
+        "args": ["universal_mcp@latest", "run"],
         "env": {"AGENTR_API_KEY": api_key},
     }
 
@@ -156,7 +156,7 @@ def install_continue(api_key: str) -> None:
         config["mcpServers"] = {}
     config["mcpServers"]["universal_mcp"] = {
         "command": get_uvx_path(),
-        "args": ["universal_mcp[applications]@latest", "run"],
+        "args": ["universal_mcp@latest", "run"],
         "env": {"AGENTR_API_KEY": api_key},
     }
 
@@ -192,7 +192,7 @@ def install_goose(api_key: str) -> None:
         config["mcpServers"] = {}
     config["mcpServers"]["universal_mcp"] = {
         "command": get_uvx_path(),
-        "args": ["universal_mcp[applications]@latest", "run"],
+        "args": ["universal_mcp@latest", "run"],
         "env": {"AGENTR_API_KEY": api_key},
     }
 
@@ -228,7 +228,7 @@ def install_windsurf(api_key: str) -> None:
         config["mcpServers"] = {}
     config["mcpServers"]["universal_mcp"] = {
         "command": get_uvx_path(),
-        "args": ["universal_mcp[applications]@latest", "run"],
+        "args": ["universal_mcp@latest", "run"],
         "env": {"AGENTR_API_KEY": api_key},
     }
 
@@ -267,7 +267,7 @@ def install_zed(api_key: str) -> None:
             server.update(
                 {
                     "command": get_uvx_path(),
-                    "args": ["universal_mcp[applications]@latest", "run"],
+                    "args": ["universal_mcp@latest", "run"],
                     "env": {"AGENTR_API_KEY": api_key},
                 }
             )
@@ -278,7 +278,7 @@ def install_zed(api_key: str) -> None:
             {
                 "name": "universal_mcp",
                 "command": get_uvx_path(),
-                "args": ["universal_mcp[applications]@latest", "run"],
+                "args": ["universal_mcp@latest", "run"],
                 "env": {"AGENTR_API_KEY": api_key},
             }
         )