mcp2cli 2.3.0__tar.gz → 2.4.1__tar.gz

{mcp2cli-2.3.0 → mcp2cli-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp2cli
-Version: 2.3.0
+Version: 2.4.1
 Summary: Turn any MCP server or OpenAPI spec into a CLI
 Author: Stephan Fitzpatrick
 Author-email: Stephan Fitzpatrick <stephan@knowsuchagency.com>

{mcp2cli-2.3.0 → mcp2cli-2.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp2cli"
-version = "2.3.0"
+version = "2.4.1"
 description = "Turn any MCP server or OpenAPI spec into a CLI"
 readme = "README.md"
 license = "MIT"

{mcp2cli-2.3.0 → mcp2cli-2.4.1}/src/mcp2cli/__init__.py

@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-__version__ = "2.3.0"
+__version__ = "2.4.0"
 
 import argparse
 import copy
 import hashlib
 import json
+import mimetypes
 import os
 import fnmatch
 import re
@@ -36,6 +37,7 @@ CONFIG_DIR = Path(
     os.environ.get("MCP2CLI_CONFIG_DIR", Path.home() / ".config" / "mcp2cli")
 )
 BAKED_FILE = CONFIG_DIR / "baked.json"
+ARGPARSE_HELP_PERCENT_RE = re.compile(r"(?<!%)%(?![%\(])")
 
 
 # ---------------------------------------------------------------------------
@@ -64,6 +66,7 @@ class CommandDef:
     # OpenAPI
     method: str | None = None
     path: str | None = None
+    content_type: str | None = None  # None = json, "multipart/form-data", etc.
     # MCP
     tool_name: str | None = None
     # GraphQL
@@ -108,6 +111,11 @@ def resolve_secret(value: str) -> str:
     return value
 
 
+def escape_argparse_help(help_text: str) -> str:
+    """Escape literal percent signs in help text for argparse."""
+    return ARGPARSE_HELP_PERCENT_RE.sub("%%", help_text)
+
+
 def _parse_kv_list(
     items: list[str],
     delimiter: str,
@@ -322,10 +330,11 @@ def output_result(
         print(json.dumps(data))
 
 
-def _build_http_headers(auth_headers: list[tuple[str, str]]) -> dict[str, str]:
+def _build_http_headers(auth_headers: list[tuple[str, str]], multipart: bool = False) -> dict[str, str]:
     """Build HTTP headers dict from auth_headers with a Content-Type default."""
     headers = dict(auth_headers)
-    headers.setdefault("Content-Type", "application/json")
+    if not multipart:
+        headers.setdefault("Content-Type", "application/json")
     return headers
 
 
@@ -662,19 +671,43 @@ def extract_openapi_commands(spec: dict) -> list[CommandDef]:
                 )
                 params.append(p)
 
-            # Request body
-            rb_schema = (
-                details.get("requestBody", {})
-                .get("content", {})
-                .get("application/json", {})
-                .get("schema", {})
+            # Request body — negotiate content type
+            rb_content = details.get("requestBody", {}).get("content", {})
+            multipart_schema = rb_content.get("multipart/form-data", {}).get("schema", {})
+            json_schema = rb_content.get("application/json", {}).get("schema", {})
+
+            mp_props = multipart_schema.get("properties", {})
+            has_binary = any(
+                p.get("format") == "binary" for p in mp_props.values()
             )
+
+            if has_binary:
+                rb_schema = multipart_schema
+                cmd_content_type = "multipart/form-data"
+            elif json_schema:
+                rb_schema = json_schema
+                cmd_content_type = None
+            elif mp_props:
+                rb_schema = multipart_schema
+                cmd_content_type = "multipart/form-data"
+            else:
+                rb_schema = {}
+                cmd_content_type = None
+
             required_fields = set(rb_schema.get("required", []))
             properties = rb_schema.get("properties", {})
             has_body = bool(properties)
 
             for prop_name, prop_schema in properties.items():
-                py_type, suffix = schema_type_to_python(prop_schema)
+                is_binary = (
+                    cmd_content_type == "multipart/form-data"
+                    and prop_schema.get("format") == "binary"
+                )
+                if is_binary:
+                    loc, py_type, suffix = "file", str, " (file path)"
+                else:
+                    py_type, suffix = schema_type_to_python(prop_schema)
+                    loc = "body"
                 p = ParamDef(
                     name=to_kebab(prop_name),
                     original_name=prop_name,
@@ -682,7 +715,7 @@ def extract_openapi_commands(spec: dict) -> list[CommandDef]:
                     required=prop_name in required_fields,
                     description=(prop_schema.get("description") or prop_name) + suffix,
                     choices=prop_schema.get("enum"),
-                    location="body",
+                    location=loc,
                 )
                 params.append(p)
 
@@ -694,6 +727,7 @@ def extract_openapi_commands(spec: dict) -> list[CommandDef]:
                     has_body=has_body,
                     method=method,
                     path=path,
+                    content_type=cmd_content_type,
                 )
             )
 
@@ -1577,7 +1611,10 @@ def build_argparse(
     subparsers = parser.add_subparsers(dest="_command")
 
     for cmd in commands:
-        sub = subparsers.add_parser(cmd.name, help=cmd.description)
+        sub = subparsers.add_parser(
+            cmd.name,
+            help=escape_argparse_help(cmd.description),
+        )
         sub.set_defaults(_cmd=cmd)
 
         if cmd.has_body:
@@ -1608,7 +1645,7 @@ def build_argparse(
                 kwargs["required"] = True
             else:
                 kwargs.setdefault("default", None)
-            kwargs["help"] = p.description
+            kwargs["help"] = escape_argparse_help(p.description)
             if p.choices:
                 kwargs["choices"] = p.choices
             sub.add_argument(flag, **kwargs)
@@ -1662,16 +1699,17 @@ def _filter_commands(commands: list[CommandDef], pattern: str) -> list[CommandDe
 def _collect_openapi_params(
     cmd: CommandDef,
     args: argparse.Namespace,
-) -> tuple[str, dict[str, str], dict[str, str], dict | None]:
+) -> tuple[str, dict[str, str], dict[str, str], dict | None, dict | None]:
     """Collect OpenAPI params from parsed args, separated by location.
 
-    Returns (path, query_params, extra_headers, body_or_none) where *path*
-    has ``{param}`` placeholders substituted with actual values.
+    Returns (path, query_params, extra_headers, body_or_none, files_or_none)
+    where *path* has ``{param}`` placeholders substituted with actual values.
     """
     path = cmd.path or ""
     query_params: dict[str, str] = {}
     extra_headers: dict[str, str] = {}
     body: dict | None = None
+    files: dict | None = None
 
     for p in cmd.params:
         if p.location == "path":
@@ -1701,6 +1739,17 @@ def _collect_openapi_params(
                     continue
                 if p.location == "path":
                     continue
+                if p.location == "file":
+                    if val is not None:
+                        fp = Path(val)
+                        if not fp.is_file():
+                            print(f"Error: file not found: {val}", file=sys.stderr)
+                            sys.exit(1)
+                        mime = mimetypes.guess_type(val)[0] or "application/octet-stream"
+                        if files is None:
+                            files = {}
+                        files[p.original_name] = (fp.name, open(fp, "rb"), mime)
+                    continue
                 if val is not None:
                     body[p.original_name] = val
             if not body:
@@ -1712,7 +1761,7 @@ def _collect_openapi_params(
                 if val is not None:
                     query_params[p.original_name] = val
 
-    return path, query_params, extra_headers, body
+    return path, query_params, extra_headers, body, files
 
 
 def execute_openapi(
@@ -1727,21 +1776,45 @@ def execute_openapi(
     jq_expr: str | None = None,
     head: int | None = None,
 ):
-    path, query_params, extra_headers, body = _collect_openapi_params(cmd, args)
+    path, query_params, extra_headers, body, files = _collect_openapi_params(cmd, args)
     url = base_url.rstrip("/") + path
 
-    headers = _build_http_headers(auth_headers)
+    is_multipart = files is not None or cmd.content_type == "multipart/form-data"
+    headers = _build_http_headers(auth_headers, multipart=is_multipart)
     headers.update(extra_headers)
 
-    with httpx.Client(timeout=60, auth=oauth_provider) as client:
-        resp = client.request(
-            (cmd.method or "get").upper(),
-            url,
-            headers=headers,
-            params=query_params or None,
-            json=body,
-        )
-        _handle_http_error(resp)
+    try:
+        with httpx.Client(timeout=60, auth=oauth_provider) as client:
+            if files is not None:
+                resp = client.request(
+                    (cmd.method or "get").upper(),
+                    url,
+                    headers=headers,
+                    params=query_params or None,
+                    data=body,
+                    files=files,
+                )
+            elif cmd.content_type == "multipart/form-data":
+                resp = client.request(
+                    (cmd.method or "get").upper(),
+                    url,
+                    headers=headers,
+                    params=query_params or None,
+                    data=body,
+                )
+            else:
+                resp = client.request(
+                    (cmd.method or "get").upper(),
+                    url,
+                    headers=headers,
+                    params=query_params or None,
+                    json=body,
+                )
+            _handle_http_error(resp)
+    finally:
+        if files:
+            for _, file_tuple in files.items():
+                file_tuple[1].close()
 
     if raw:
         sys.stdout.buffer.write(resp.content)