mcpcn-office-powerpoint-mcp-server 2.0.8__py3-none-any.whl → 2.1.0__py3-none-any.whl

{mcpcn_office_powerpoint_mcp_server-2.0.8.dist-info → mcpcn_office_powerpoint_mcp_server-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpcn-office-powerpoint-mcp-server
-Version: 2.0.8
+Version: 2.1.0
 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.8.dist-info → mcpcn_office_powerpoint_mcp_server-2.1.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-ppt_mcp_server.py,sha256=IX9oqlVBRpaBIhWJcIwoUQpdAmeKowtBQatHYSEiDU0,14264
+ppt_mcp_server.py,sha256=YOmBZc_Yh1RWk8QNOveCz-2i5qi3udcmWN0XdvRJopc,15232
 slide_layout_templates.json,sha256=ryA8zIZv6WBwjhBQaJXRWES3uqE7esqqFmXyiPEdauU,107256
 tools/__init__.py,sha256=b53px-U7Ny4-FMnAdFLoJMtPxD7lt7DB8ydvcdATCz0,983
 tools/chart_tools.py,sha256=vvXI53gm9_2mfNOiG-qCfwLdqqr2pe_uDXHN9adVsZk,3124
 tools/connector_tools.py,sha256=8cUPAfTZ-5vvooLCVQIWfblMzcFe3cPdh_bG5UezykQ,3402
-tools/content_tools.py,sha256=4tuFTPcDNnR3av1sp0ExgUueHVi6B5CzOjBqVscNV5E,28668
+tools/content_tools.py,sha256=evPaCEUtWlzNG9zPwEhPm7dzVZEuLywNMg8FgOW-6UQ,36683
 tools/hyperlink_tools.py,sha256=EweAxbYGvOpNpzDxH5DnrFzGMQmnzNGGehEoCCx9d18,5920
 tools/master_tools.py,sha256=05a7ZUEDN5a7ySwG97Sj4UJK7Y0pcCxang553Bh7iOM,4986
 tools/presentation_tools.py,sha256=rnVRYOu4A0Sw97sf8qKBK6-q5dYnK1vO2XNAzN8je4o,7977
@@ -18,8 +18,8 @@ utils/design_utils.py,sha256=vEstbqsBe202PYS4NvqdOLL3Aq5na7G2SBJnY-BYD_g,23761
 utils/presentation_utils.py,sha256=9Y4F0twPvr0srjq53_Szkwxcn7dh06IWy3snRLaMuM8,6262
 utils/template_utils.py,sha256=8iSJcJIgoOmi53TtlRnMwRLTDI84EfSW2PWj8EW3Z1k,44574
 utils/validation_utils.py,sha256=0OiwFE1WZh05ZP-0hLzidyxKSUIJaJ3QrV0_s6FpxZk,11775
-mcpcn_office_powerpoint_mcp_server-2.0.8.dist-info/METADATA,sha256=KIJW0ylNPFVOTYOOL-PmAjo0yJMuiJPZOwWxz0SSvqc,35856
-mcpcn_office_powerpoint_mcp_server-2.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcpcn_office_powerpoint_mcp_server-2.0.8.dist-info/entry_points.txt,sha256=4iWuiBR6HdlTqSJjCVyqyqVGpSGiD4ssw7LkEzmgvXw,75
-mcpcn_office_powerpoint_mcp_server-2.0.8.dist-info/licenses/LICENSE,sha256=A-aSf9c0K2FKh7xtMkSr5Ot76NX8mrdLffsajnmZGKs,1064
-mcpcn_office_powerpoint_mcp_server-2.0.8.dist-info/RECORD,,
+mcpcn_office_powerpoint_mcp_server-2.1.0.dist-info/METADATA,sha256=j8wH5kHpR1e_hGCcGrut-1JI5fcxc5rOll9zOPLdKUg,35856
+mcpcn_office_powerpoint_mcp_server-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mcpcn_office_powerpoint_mcp_server-2.1.0.dist-info/entry_points.txt,sha256=4iWuiBR6HdlTqSJjCVyqyqVGpSGiD4ssw7LkEzmgvXw,75
+mcpcn_office_powerpoint_mcp_server-2.1.0.dist-info/licenses/LICENSE,sha256=A-aSf9c0K2FKh7xtMkSr5Ot76NX8mrdLffsajnmZGKs,1064
+mcpcn_office_powerpoint_mcp_server-2.1.0.dist-info/RECORD,,

ppt_mcp_server.py

@@ -7,6 +7,8 @@ import os
 import argparse
 from typing import Dict, Any
 from mcp.server.fastmcp import FastMCP
+import functools
+import inspect
 
 # import utils  # Currently unused
 from tools import (
@@ -27,6 +29,28 @@ app = FastMCP(
     name="ppt-mcp-server"
 )
 
+# Global response wrapper: if a tool returns {"error": ...}, raise to mark outer isError=true
+_original_app_tool = app.tool
+def _tool_with_error_promotion(*t_args, **t_kwargs):
+    def _decorator(func):
+        @functools.wraps(func)
+        def _wrapped(*args, **kwargs):
+            result = func(*args, **kwargs)
+            # Promote dict-with-error to exception so outer layer sets isError=true
+            if isinstance(result, dict) and "error" in result and result["error"]:
+                raise RuntimeError(str(result["error"]))
+            return result
+        # Preserve original callable signature for FastMCP parameter binding
+        try:
+            _wrapped.__signature__ = inspect.signature(func)
+        except Exception:
+            pass
+        return _original_app_tool(*t_args, **t_kwargs)(_wrapped)
+    return _decorator
+
+# Monkey patch app.tool before any registrations
+app.tool = _tool_with_error_promotion
+
 # Global state to store presentations in memory
 presentations = {}
 current_presentation_id = None

tools/content_tools.py

@@ -8,6 +8,14 @@ import utils as ppt_utils
 import tempfile
 import base64
 import os
+import urllib.request
+import urllib.parse
+
+# Optional: requests for better HTTP handling
+try:
+    import requests  # type: ignore
+except Exception:
+    requests = None
 
 
 def register_content_tools(app: FastMCP, presentations: Dict, get_current_presentation_id, validate_parameters, is_positive, is_non_negative, is_in_range, is_valid_rgb):
@@ -325,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,
@@ -516,6 +527,7 @@ def register_content_tools(app: FastMCP, presentations: Dict, get_current_presen
         - filter_type: Optional[str] — 过滤器类型（如 "DETAIL"、"SMOOTH" 等，取决于 Pillow 支持）。
         - output_path: Optional[str] — 增强后图片的输出路径（不传则生成临时文件）。
         - presentation_id: Optional[str] — 指定演示文稿 ID；不传则使用当前打开的演示文稿。
+          注：在某些部署环境（如你当前环境）中，必须显式传入 presentation_id 才会对目标文档生效。
 
         返回
         - operation="add"：
@@ -528,33 +540,40 @@ def register_content_tools(app: FastMCP, presentations: Dict, get_current_presen
         - 失败时返回 {"error": str}
 
         注意事项
-        - 当前不支持直接传入网络 URL。如需使用网络图片，请先下载为本地文件，或转为 Base64 后将 source_type 设为 "base64"。
+        - 现在支持通过 URL 插入图片（仅 operation="add"）：source_type="url"，仅允许 http/https 协议。
+          会在内部下载到临时文件后插入并自动清理。若返回的 Content-Type 非 image/* 将返回错误。
+          enhance 仍然仅支持本地文件路径。
+        - 在某些部署环境（如你当前环境）中，需显式提供 presentation_id 参数，否则可能插入到非预期文档或不生效。
         - operation="enhance" 不接受 Base64，必须提供可访问的本地文件路径。
         - 插入 Base64 图片时，内部会写入临时文件后再插入，操作完成后临时文件会被清理。
         - slide_index 必须在当前演示文稿的有效范围内，否则将返回错误。
 
         示例
+        - 通过 URL 插入图片（仅 add）：
+            manage_image(slide_index=0, operation="add",
+                         image_source="https://example.com/logo.png", source_type="url",
+                         left=1.0, top=1.0, width=3.0, presentation_id="YOUR_PRESENTATION_ID")
         - 插入本地图片：
             manage_image(slide_index=0, operation="add",
                          image_source="D:/images/logo.png", source_type="file",
-                         left=1.0, top=1.0, width=3.0)
+                         left=1.0, top=1.0, width=3.0, presentation_id="YOUR_PRESENTATION_ID")
 
         - 插入 Base64 图片：
             manage_image(slide_index=1, operation="add",
                          image_source="<BASE64字符串>", source_type="base64",
-                         left=2.0, top=1.5, width=4.0, height=2.5)
+                         left=2.0, top=1.5, width=4.0, height=2.5, presentation_id="YOUR_PRESENTATION_ID")
 
         - 插入并应用专业增强（演示风格）：
             manage_image(slide_index=2, operation="add",
                          image_source="assets/photo.jpg", source_type="file",
-                         enhancement_style="presentation", left=1.0, top=2.0)
+                         enhancement_style="presentation", left=1.0, top=2.0, presentation_id="YOUR_PRESENTATION_ID")
 
         - 增强已有图片文件（自定义参数）：
             manage_image(slide_index=0, operation="enhance",
                          image_source="assets/photo.jpg", source_type="file",
                          brightness=1.2, contrast=1.1, saturation=1.3,
                          sharpness=1.1, blur_radius=0, filter_type=None,
-                         output_path="assets/photo_enhanced.jpg")
+                         output_path="assets/photo_enhanced.jpg", presentation_id="YOUR_PRESENTATION_ID")
         """
         pres_id = presentation_id if presentation_id is not None else get_current_presentation_id()
         
@@ -596,6 +615,109 @@ def register_content_tools(app: FastMCP, presentations: Dict, get_current_presen
                         return {
                             "error": f"Failed to process base64 image: {str(e)}"
                         }
+                elif source_type == "url":
+                    # Handle image URL (http/https)
+                    try:
+                        # 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(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", "") or ""
+                                
+                                # 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() if content_type else "")
+                                    if "/" in main_type:
+                                        ext = main_type.split("/")[1].lower()
+                                        if ext in ("jpeg", "pjpeg"):
+                                            suffix = ".jpg"
+                                        elif ext in ("png", "gif", "bmp", "webp", "tiff"):
+                                            suffix = f".{ext}"
+                                except Exception:
+                                    pass
+                                if suffix == ".png":
+                                    path_ext = os.path.splitext(parsed.path or "")[1].lower()
+                                    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
+                                    for chunk in resp.iter_content(chunk_size=8192):
+                                        if not chunk:
+                                            continue
+                                        temp_file.write(chunk)
+                        else:
+                            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", "") or ""
+                                
+                                suffix = ".png"
+                                is_image = content_type.startswith("image/")
+                                try:
+                                    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"):
+                                            suffix = ".jpg"
+                                        elif ext in ("png", "gif", "bmp", "webp", "tiff"):
+                                            suffix = f".{ext}"
+                                except Exception:
+                                    pass
+                                if suffix == ".png":
+                                    path_ext = os.path.splitext(parsed.path or "")[1].lower()
+                                    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
+                                    while True:
+                                        chunk = resp.read(8192)
+                                        if not chunk:
+                                            break
+                                        temp_file.write(chunk)
+                        
+                        # Add image from temporary file
+                        shape = ppt_utils.add_image(slide, temp_path, left, top, width, height)
+                        
+                        # Clean up temporary file
+                        if temp_path and os.path.exists(temp_path):
+                            os.unlink(temp_path)
+                        
+                        return {
+                            "message": f"Added image from URL to slide {slide_index}",
+                            "shape_index": len(slide.shapes) - 1
+                        }
+                    except Exception as e:
+                        # Best-effort cleanup if temp_path was created
+                        try:
+                            if temp_path and os.path.exists(temp_path):
+                                os.unlink(temp_path)
+                        except Exception:
+                            pass
+                        return {"error": f"Failed to process image URL: {str(e)}"}
                 else:
                     # Handle file path
                     if not os.path.exists(image_source):