mcpcn-office-powerpoint-mcp-server 2.0.9__tar.gz → 2.1.1__tar.gz

{mcpcn_office_powerpoint_mcp_server-2.0.9 → mcpcn_office_powerpoint_mcp_server-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpcn-office-powerpoint-mcp-server
-Version: 2.0.9
+Version: 2.1.1
 Summary: MCP Server for PowerPoint manipulation using python-pptx - Consolidated Edition
 Project-URL: Homepage, https://github.com/GongRzhe/Office-PowerPoint-MCP-Server.git
 Project-URL: Bug Tracker, https://github.com/GongRzhe/Office-PowerPoint-MCP-Server.git/issues

{mcpcn_office_powerpoint_mcp_server-2.0.9 → mcpcn_office_powerpoint_mcp_server-2.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mcpcn-office-powerpoint-mcp-server"
-version = "2.0.9"
+version = "2.1.1"
 description = "MCP Server for PowerPoint manipulation using python-pptx - Consolidated Edition"
 readme = "README.md"
 license = {file = "LICENSE"}

{mcpcn_office_powerpoint_mcp_server-2.0.9 → mcpcn_office_powerpoint_mcp_server-2.1.1}/tools/content_tools.py

@@ -333,6 +333,9 @@ def register_content_tools(app: FastMCP, presentations: Dict, get_current_presen
         
         try:
             if operation == "add":
+                # Auto-detect URL even if source_type is not explicitly "url"
+                if isinstance(image_source, str) and (image_source.startswith("http://") or image_source.startswith("https://")):
+                    source_type = "url"
                 # Add new textbox
                 shape = ppt_utils.add_textbox(
                     slide, left, top, width, height, text,
@@ -504,7 +507,7 @@ def register_content_tools(app: FastMCP, presentations: Dict, get_current_presen
         统一的图片处理工具（添加/增强）。
 
         功能
-        - operation="add"：将图片插入到指定幻灯片位置，支持本地文件或 Base64 图片源。
+        - operation="add"：将图片插入到指定幻灯片位置，支持本地文件或 Base64 图片源或图片地址。
         - operation="enhance"：对已有图片文件进行画质增强与风格化处理，输出增强后的图片路径。
 
         参数
@@ -513,9 +516,10 @@ def register_content_tools(app: FastMCP, presentations: Dict, get_current_presen
         - image_source: str —
           * 当 source_type="file"：本地图片文件路径。
           * 当 source_type="base64"：图片的 Base64 字符串。
-        - source_type: str — "file" 或 "base64"。
-          * add 支持 "file" 与 "base64"。
-          * enhance 仅支持 "file"（不接受 base64）。
+          * 当 source_type="url"：图片的 http/https 地址。
+        - source_type: str — "file"、"base64" 或 "url"。
+          * add 支持 "file"、"base64"、"url"（仅允许 http/https）。
+          * enhance 仅支持 "file"（不接受 base64 或 url）。
         - left, top: float — 插入位置（英寸）。
         - width, height: Optional[float] — 插入尺寸（英寸）。可只提供一项以按比例缩放；都不提供则按图片原始尺寸。
         - enhancement_style: Optional[str] — "presentation" 或 "custom"。当 operation="add" 且需要自动增强时可用；"presentation" 走预设的专业增强流程。
@@ -615,59 +619,63 @@ def register_content_tools(app: FastMCP, presentations: Dict, get_current_presen
                 elif source_type == "url":
                     # Handle image URL (http/https)
                     try:
-                        parsed = urllib.parse.urlparse(image_source)
+                        # Normalize and percent-encode URL path/query to support spaces and non-ASCII characters
+                        parsed = urllib.parse.urlsplit(image_source)
                         if parsed.scheme not in ("http", "https"):
                             return {"error": f"Unsupported URL scheme: {parsed.scheme}. Only http/https allowed."}
+                        encoded_path = urllib.parse.quote(parsed.path or "", safe="/%")
+                        # Re-encode query preserving keys and multiple values
+                        qsl = urllib.parse.parse_qsl(parsed.query or "", keep_blank_values=True)
+                        encoded_query = urllib.parse.urlencode(qsl, doseq=True)
+                        encoded_url = urllib.parse.urlunsplit((parsed.scheme, parsed.netloc, encoded_path, encoded_query, parsed.fragment))
                         
                         # Download helper using requests if available, else urllib
                         content_type = None
                         temp_path = None
+                        image_exts = (".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp", ".tif", ".tiff")
                         
                         if requests is not None:
-                            with requests.get(image_source, stream=True) as resp:
+                            with requests.get(encoded_url, stream=True) as resp:
                                 if resp.status_code != 200:
                                     return {"error": f"Failed to download image. HTTP {resp.status_code}"}
-                                content_type = resp.headers.get("Content-Type", "")
+                                content_type = resp.headers.get("Content-Type", "") or ""
                                 
-                                if not content_type.startswith("image/"):
-                                    return {"error": f"URL content is not an image (Content-Type: {content_type or 'unknown'})"}
-                                
-                                # Determine suffix
+                                # Determine suffix and allow fallback by URL extension if Content-Type missing or not image/*
                                 suffix = ".png"
+                                is_image = content_type.startswith("image/")
                                 try:
-                                    main_type = content_type.split(";")[0].strip()
+                                    main_type = (content_type.split(";")[0].strip() if content_type else "")
                                     if "/" in main_type:
                                         ext = main_type.split("/")[1].lower()
-                                        # Basic normalization
                                         if ext in ("jpeg", "pjpeg"):
                                             suffix = ".jpg"
                                         elif ext in ("png", "gif", "bmp", "webp", "tiff"):
                                             suffix = f".{ext}"
                                 except Exception:
                                     pass
-                                # Fallback to URL path extension
                                 if suffix == ".png":
                                     path_ext = os.path.splitext(parsed.path or "")[1].lower()
-                                    if path_ext in (".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp", ".tif", ".tiff"):
+                                    if path_ext in image_exts:
                                         suffix = path_ext
                                 
+                                if not is_image and suffix not in image_exts:
+                                    return {"error": f"URL content is not an image (Content-Type: {content_type or 'unknown'})"}
+                                
                                 with tempfile.NamedTemporaryFile(delete=False, suffix=suffix) as temp_file:
                                     temp_path = temp_file.name
-                                    total = 0
                                     for chunk in resp.iter_content(chunk_size=8192):
                                         if not chunk:
                                             continue
                                         temp_file.write(chunk)
                         else:
-                            req = urllib.request.Request(image_source, headers={"User-Agent": "Mozilla/5.0"})
+                            req = urllib.request.Request(encoded_url, headers={"User-Agent": "Mozilla/5.0"})
                             with urllib.request.urlopen(req) as resp:
-                                content_type = resp.headers.get("Content-Type", "")
-                                if not content_type.startswith("image/"):
-                                    return {"error": f"URL content is not an image (Content-Type: {content_type or 'unknown'})"}
+                                content_type = resp.headers.get("Content-Type", "") or ""
                                 
                                 suffix = ".png"
+                                is_image = content_type.startswith("image/")
                                 try:
-                                    main_type = content_type.split(";")[0].strip()
+                                    main_type = (content_type.split(";")[0].strip() if content_type else "")
                                     if "/" in main_type:
                                         ext = main_type.split("/")[1].lower()
                                         if ext in ("jpeg", "pjpeg"):
@@ -678,12 +686,14 @@ def register_content_tools(app: FastMCP, presentations: Dict, get_current_presen
                                     pass
                                 if suffix == ".png":
                                     path_ext = os.path.splitext(parsed.path or "")[1].lower()
-                                    if path_ext in (".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp", ".tif", ".tiff"):
+                                    if path_ext in image_exts:
                                         suffix = path_ext
                                 
+                                if not is_image and suffix not in image_exts:
+                                    return {"error": f"URL content is not an image (Content-Type: {content_type or 'unknown'})"}
+                                
                                 with tempfile.NamedTemporaryFile(delete=False, suffix=suffix) as temp_file:
                                     temp_path = temp_file.name
-                                    total = 0
                                     while True:
                                         chunk = resp.read(8192)
                                         if not chunk: