lightpdf-aipdf-mcp 0.1.86__py3-none-any.whl → 0.1.87__py3-none-any.whl

lightpdf_aipdf_mcp/converter.py

@@ -320,6 +320,13 @@ class Converter(BaseApiClient):
             )
         # 检查是否为URL路径
         elif self.file_handler.is_url(file_path):
+            # arxiv.org/pdf/特殊处理
+            if isinstance(file_path, str) and "arxiv.org/pdf/" in file_path:
+                from urllib.parse import urlparse, urlunparse
+                url_obj = urlparse(file_path)
+                if not url_obj.path.endswith(".pdf"):
+                    new_path = url_obj.path + ".pdf"
+                    file_path = urlunparse(url_obj._replace(path=new_path))
             data["url"] = file_path
             # 使用JSON方式时添加Content-Type
             headers["Content-Type"] = "application/json"

lightpdf_aipdf_mcp/editor.py

@@ -293,7 +293,7 @@ class Editor(BaseApiClient):
         # 调用edit_pdf方法处理API请求
         return await self.edit_pdf(file_path, EditType.DECRYPT, {}, password, original_name)
 
-    async def add_watermark(
+    async def add_text_watermark(
         self, 
         file_path: str, 
         text: str, 
@@ -359,6 +359,53 @@ class Editor(BaseApiClient):
         # 调用edit_pdf方法处理API请求
         return await self.edit_pdf(file_path, EditType.ADD_WATERMARK, extra_params, password, original_name)
 
+    async def add_image_watermark(
+        self,
+        file_path: str,
+        image_url: str,
+        position: str = "center",
+        opacity: float = 0.7,
+        range: str = "",
+        layout: Optional[str] = None,
+        password: Optional[str] = None,
+        original_name: Optional[str] = None
+    ) -> EditResult:
+        """为PDF文件添加图片水印
+        
+        Args:
+            file_path: 要添加水印的PDF文件路径
+            image_url: 水印图片的URL，必须包含协议（http/https/oss）
+            position: 水印位置，如"top", "center", "diagonal"等，默认"center"
+            opacity: 透明度，0.0-1.0，默认0.7
+            range: 页面范围，例如 "1,3,5-7" 或空字符串表示所有页面
+            layout: 布局方式："on"=在内容上，"under"=在内容下，默认"on"
+            password: 文档密码，如果文档受密码保护，则需要提供（可选）
+            original_name: 原始文件名（可选）
+        
+        Returns:
+            EditResult: 添加图片水印结果
+        """
+        # 验证输入文件是否为PDF
+        if not await self._validate_pdf_file(file_path):
+            return EditResult(success=False, file_path=file_path, error_message="非PDF文件", original_name=original_name)
+        if not image_url:
+            await self.logger.error("水印图片URL不能为空")
+            return EditResult(success=False, file_path=file_path, error_message="水印图片URL不能为空", original_name=original_name)
+        # 构建API参数
+        extra_params = {
+            "edit_type": "image",
+            "image_url": image_url,
+            "position": position,
+            "opacity": opacity,
+            "range": range
+        }
+        if layout:
+            extra_params["layout"] = layout
+        # 记录操作描述
+        await self._log_operation("为PDF添加图片水印", f"图片: {image_url}, 位置: {position}, 透明度: {opacity}")
+        # 调用edit_pdf方法处理API请求
+        return await self.edit_pdf(file_path, EditType.ADD_WATERMARK, extra_params, password, original_name)
+
     async def remove_margin(self, file_path: str, password: Optional[str] = None, original_name: Optional[str] = None) -> EditResult:
         """去除PDF文件的白边
         
@@ -523,6 +570,13 @@ class Editor(BaseApiClient):
             )
         # 检查是否为URL路径
         elif self.file_handler.is_url(file_path):
+            # arxiv.org/pdf/特殊处理
+            if isinstance(file_path, str) and "arxiv.org/pdf/" in file_path:
+                from urllib.parse import urlparse, urlunparse
+                url_obj = urlparse(file_path)
+                if not url_obj.path.endswith(".pdf"):
+                    new_path = url_obj.path + ".pdf"
+                    file_path = urlunparse(url_obj._replace(path=new_path))
             # 使用JSON方式时添加Content-Type
             headers["Content-Type"] = "application/json"
             data["url"] = file_path
@@ -580,6 +634,13 @@ class Editor(BaseApiClient):
                     input_item["password"] = password
                 url_inputs.append(input_item)
             elif self.file_handler.is_url(file_path):
+                # arxiv.org/pdf/特殊处理
+                if isinstance(file_path, str) and "arxiv.org/pdf/" in file_path:
+                    from urllib.parse import urlparse, urlunparse
+                    url_obj = urlparse(file_path)
+                    if not url_obj.path.endswith(".pdf"):
+                        new_path = url_obj.path + ".pdf"
+                        file_path = urlunparse(url_obj._replace(path=new_path))
                 # 对于URL或OSS路径，添加到inputs数组
                 input_item = {"url": file_path}
                 if password:

lightpdf_aipdf_mcp/server.py

@@ -154,10 +154,10 @@ async def process_edit_file(
     """处理单个文件编辑"""
     if edit_type == "decrypt":
         return await editor.decrypt_pdf(file_path, password, original_name)
-    elif edit_type == "add_watermark":
-        return await editor.add_watermark(
+    elif edit_type == "add_text_watermark":
+        return await editor.add_text_watermark(
             file_path=file_path,
-            text=extra_params.get("text", "水印"),
+            text=extra_params.get("text", "文本水印"),
             position=extra_params.get("position", "center"),
             opacity=extra_params.get("opacity", 1.0),
             range=extra_params.get("range", ""),
@@ -168,6 +168,17 @@ async def process_edit_file(
             password=password,
             original_name=original_name
         )
+    elif edit_type == "add_image_watermark":
+        return await editor.add_image_watermark(
+            file_path=file_path,
+            image_url=extra_params.get("image_url"),
+            position=extra_params.get("position", "center"),
+            opacity=extra_params.get("opacity", 0.7),
+            range=extra_params.get("range", ""),
+            layout=extra_params.get("layout", "on"),
+            password=password,
+            original_name=original_name
+        )
     elif edit_type == "encrypt":
         return await editor.encrypt_pdf(
             file_path=file_path,
@@ -276,7 +287,8 @@ async def process_tool_call(
         # 获取操作描述
         edit_map = {
             "decrypt": "解密", 
-            "add_watermark": "添加水印", 
+            "add_text_watermark": "添加文本水印", 
+            "add_image_watermark": "添加图片水印", 
             "encrypt": "加密", 
             "compress": "压缩", 
             "split": "拆分", 
@@ -509,7 +521,7 @@ async def handle_list_tools() -> list[types.Tool]:
             }
         ),
         types.Tool(
-            name="add_watermark",
+            name="add_text_watermark",
             description="Add text watermarks to PDF files.",
             inputSchema={
                 "type": "object",
@@ -521,7 +533,7 @@ async def handle_list_tools() -> list[types.Tool]:
                             "properties": {
                                 "path": {
                                     "type": "string",
-                                    "description": "PDF file URL to add watermark to, must include protocol, supports http/https/oss"
+                                    "description": "PDF file URL to add text watermark to, must include protocol, supports http/https/oss"
                                 },
                                 "password": {
                                     "type": "string",
@@ -534,7 +546,7 @@ async def handle_list_tools() -> list[types.Tool]:
                             },
                             "required": ["path"]
                         },
-                        "description": "List of PDF files to add watermarks to, each containing path and optional password"
+                        "description": "List of PDF files to add text watermarks to, each containing path and optional password"
                     },
                     "text": {
                         "type": "string",
@@ -542,7 +554,7 @@ async def handle_list_tools() -> list[types.Tool]:
                     },
                     "position": {
                         "type": "string",
-                        "description": "Watermark position: top-left(topleft), top-center(top), top-right(topright), left(left), center(center), right(right), bottom-left(bottomleft), bottom(bottom), bottom-right(bottomright), diagonal(diagonal, -45 degrees), reverse-diagonal(reverse-diagonal, 45 degrees)",
+                        "description": "Text watermark position: top-left(topleft), top-center(top), top-right(topright), left(left), center(center), right(right), bottom-left(bottomleft), bottom(bottom), bottom-right(bottomright), diagonal(diagonal, -45 degrees), reverse-diagonal(reverse-diagonal, 45 degrees)",
                         "enum": ["topleft", "top", "topright", "left", "center", "right", 
                                 "bottomleft", "bottom", "bottomright", "diagonal", "reverse-diagonal"],
                         "default": "center"
@@ -580,6 +592,66 @@ async def handle_list_tools() -> list[types.Tool]:
                 "required": ["files", "text", "position"]
             }
         ),
+        types.Tool(
+            name="add_image_watermark",
+            description="Add image watermarks to PDF files.",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "files": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "path": {
+                                    "type": "string",
+                                    "description": "PDF file URL to add image watermark to, must include protocol, supports http/https/oss"
+                                },
+                                "password": {
+                                    "type": "string",
+                                    "description": "PDF document password, required if the document is password-protected"
+                                },
+                                "name": {
+                                    "type": "string",
+                                    "description": "Original filename of the document"
+                                }
+                            },
+                            "required": ["path"]
+                        },
+                        "description": "List of PDF files to add image watermarks to, each containing path and optional password"
+                    },
+                    "image_url": {
+                        "type": "string",
+                        "description": "Image URL for the watermark, must include protocol, supports http/https/oss"
+                    },
+                    "position": {
+                        "type": "string",
+                        "description": "Image watermark position: top-left(topleft), top-center(top), top-right(topright), left(left), center(center), right(right), bottom-left(bottomleft), bottom(bottom), bottom-right(bottomright), diagonal(diagonal, -45 degrees), reverse-diagonal(reverse-diagonal, 45 degrees)",
+                        "enum": ["topleft", "top", "topright", "left", "center", "right", 
+                                "bottomleft", "bottom", "bottomright", "diagonal", "reverse-diagonal"],
+                        "default": "center"
+                    },
+                    "opacity": {
+                        "type": "number",
+                        "description": "Opacity, 0.0-1.0",
+                        "default": 0.7,
+                        "minimum": 0.0,
+                        "maximum": 1.0
+                    },
+                    "range": {
+                        "type": "string",
+                        "description": "Page range, e.g. '1,3,5-7' or '' (empty string or not set) for all pages"
+                    },
+                    "layout": {
+                        "type": "string",
+                        "description": "Layout position: on top of content(on) or under content(under)",
+                        "enum": ["on", "under"],
+                        "default": "on"
+                    }
+                },
+                "required": ["files", "image_url", "position"]
+            }
+        ),
         types.Tool(
             name="unlock_pdf",
             description="Remove password protection from PDF files.",
@@ -984,11 +1056,16 @@ async def handle_call_tool(name: str, arguments: dict | None) -> list[types.Text
             "edit_type": "decrypt",  # 编辑类型
             "is_edit_operation": True,  # 标记为编辑操作
         },
-        "add_watermark": {
-            "edit_type": "add_watermark",  # 编辑类型
+        "add_text_watermark": {
+            "edit_type": "add_text_watermark",  # 编辑类型，文本水印
             "is_edit_operation": True,  # 标记为编辑操作
             "param_keys": ["text", "position", "opacity", "range", "layout", 
-                          "font_family", "font_size", "font_color"]  # 需要从arguments获取的参数
+                          "font_family", "font_size", "font_color"]  # 需要从arguments获取的参数（文本水印）
+        },
+        "add_image_watermark": {
+            "edit_type": "add_image_watermark",
+            "is_edit_operation": True,
+            "param_keys": ["image_url", "position", "opacity", "range", "layout"]
         },
         "protect_pdf": {
             "edit_type": "encrypt",  # 编辑类型
@@ -1075,8 +1152,8 @@ async def handle_call_tool(name: str, arguments: dict | None) -> list[types.Text
                     if name == "add_page_numbers":
                         # 添加页码工具使用"5"作为position默认值
                         operation_config["extra_params"][key] = arguments.get(key, DEFAULTS.get("position_page_numbers"))
-                    elif name == "add_watermark":
-                        # 添加水印工具使用"center"作为position默认值
+                    elif name == "add_text_watermark":
+                        # 添加文本水印工具使用"center"作为position默认值
                         operation_config["extra_params"][key] = arguments.get(key, DEFAULTS.get("position_watermark"))
                     else:
                         # 其他工具使用通用默认值

{lightpdf_aipdf_mcp-0.1.86.dist-info → lightpdf_aipdf_mcp-0.1.87.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lightpdf-aipdf-mcp
-Version: 0.1.86
+Version: 0.1.87
 Summary: MCP Server for LightPDF AI-PDF
 Author: LightPDF Team
 License: Proprietary

lightpdf_aipdf_mcp-0.1.87.dist-info/RECORD

@@ -0,0 +1,9 @@
+lightpdf_aipdf_mcp/__init__.py,sha256=PPnAgpvJLYLVOTxnHDmJAulFnHJD6wuTwS6tRGjqq6s,141
+lightpdf_aipdf_mcp/common.py,sha256=_UO1f6S9Qr_3k6u5iBpdVDpvTK5U-tHEpu9KsDGqV8Y,6635
+lightpdf_aipdf_mcp/converter.py,sha256=f0gS8tAQlJ8uwJUVUmd9nAA4O9m558e9lAT2B_MxmIo,15135
+lightpdf_aipdf_mcp/editor.py,sha256=9teOqi2y2JbjcCI-kUhYpSXL-F75i7Mfr9E20KKyZP0,29909
+lightpdf_aipdf_mcp/server.py,sha256=rn9QvHr5E-IaCx2V1pXuKtiXKf1-b3zns-VoxH6x2UE,56220
+lightpdf_aipdf_mcp-0.1.87.dist-info/METADATA,sha256=4WUxVWAPL13KBXsEKfI3iHn4qBxof-GMBNVcXZtLmkQ,8119
+lightpdf_aipdf_mcp-0.1.87.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lightpdf_aipdf_mcp-0.1.87.dist-info/entry_points.txt,sha256=X7TGUe52N4sYH-tYt0YUGApeJgw-efQlZA6uAZmlmr4,63
+lightpdf_aipdf_mcp-0.1.87.dist-info/RECORD,,

lightpdf_aipdf_mcp-0.1.86.dist-info/RECORD

@@ -1,9 +0,0 @@
-lightpdf_aipdf_mcp/__init__.py,sha256=PPnAgpvJLYLVOTxnHDmJAulFnHJD6wuTwS6tRGjqq6s,141
-lightpdf_aipdf_mcp/common.py,sha256=_UO1f6S9Qr_3k6u5iBpdVDpvTK5U-tHEpu9KsDGqV8Y,6635
-lightpdf_aipdf_mcp/converter.py,sha256=f9YuDtOmXBGlMmS3O4Xn3rdWljY9XcNxu0CjftH4s0o,14726
-lightpdf_aipdf_mcp/editor.py,sha256=O7wF_HWs5l-IiXLbZYLNYjj1ygo2v4yGJEYMJtn7jpo,26916
-lightpdf_aipdf_mcp/server.py,sha256=sHFc2c7gLM6qh5sqbZREynoT53QZDvoXKCNEzWfnC6o,52200
-lightpdf_aipdf_mcp-0.1.86.dist-info/METADATA,sha256=jQKNGcg_UD18y2zd1SC4Mms3iGuE0bPW1lPp31tVw5Y,8119
-lightpdf_aipdf_mcp-0.1.86.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lightpdf_aipdf_mcp-0.1.86.dist-info/entry_points.txt,sha256=X7TGUe52N4sYH-tYt0YUGApeJgw-efQlZA6uAZmlmr4,63
-lightpdf_aipdf_mcp-0.1.86.dist-info/RECORD,,