lightpdf-aipdf-mcp 0.1.39__py3-none-any.whl → 0.1.40__py3-none-any.whl

lightpdf_aipdf_mcp/common.py

@@ -2,14 +2,11 @@
 import asyncio
 import json
 import os
-import tempfile
 import time
-import urllib.parse
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import List, Optional, Dict, Any, Tuple
 
 import httpx
-from mcp.types import TextContent, LoggingMessageNotification, LoggingMessageNotificationParams, LoggingLevel
 
 @dataclass
 class BaseResult:
@@ -40,7 +37,7 @@ class Logger:
         
         mcp_level = level_map.get(level.lower(), "info")
         
-        # 使用更简洁的send_log_message方法
+        # 直接调用session的send_log_message方法
         await self.context.session.send_log_message(mcp_level, message)
     
     async def error(self, message: str, error_class=RuntimeError):
@@ -61,6 +58,11 @@ class FileHandler:
     def is_url(path: str) -> bool:
         """检查路径是否为URL"""
         return path.startswith(("http://", "https://"))
+        
+    @staticmethod
+    def is_oss_path(path: str) -> bool:
+        """检查路径是否为OSS路径"""
+        return path.startswith("oss://")
 
     @staticmethod
     def get_file_extension(file_path: str) -> str:
@@ -89,20 +91,27 @@ class FileHandler:
         # 实际实现在converter.py
         return {}
 
-    async def validate_file_exists(self, file_path: str) -> Tuple[bool, bool]:
+    async def validate_file_exists(self, file_path: str) -> bool:
         """验证文件是否存在
         
         Args:
             file_path: 文件路径
             
         Returns:
-            tuple: (文件是否存在, 是否为URL)
+            bool: 文件是否存在
         """
         is_url = self.is_url(file_path)
-        if not is_url and not os.path.exists(file_path):
+        is_oss = self.is_oss_path(file_path)
+        
+        # 对于URL或OSS路径，假设它们是有效的
+        if is_url or is_oss:
+            return True
+            
+        if not os.path.exists(file_path):
             await self.logger.error(f"文件不存在：{file_path}", FileNotFoundError)
-            return False, is_url
-        return True, is_url
+            return False
+            
+        return True
 
 class BaseApiClient:
     """API客户端基类"""

lightpdf_aipdf_mcp/converter.py

@@ -171,43 +171,57 @@ class Converter(BaseApiClient):
         is_special_operation = format in ["doc-repair", "number-pdf"]
         actual_output_format = "pdf" if is_special_operation else format
 
-        # 验证输入文件格式
-        input_format = self.file_handler.get_input_format(file_path)
-        if not input_format and not is_special_operation:
-            await self.logger.error(f"不支持的输入文件格式: {self.file_handler.get_file_extension(file_path)}")
-
-        # 如果是去除水印操作，检查是否PDF文件
-        if format == "doc-repair" and input_format != InputFormat.PDF:
-            await self.logger.error("去除水印功能仅支持PDF文件")
+        # 检查是否为URL或OSS路径，如果是则跳过文件格式检查
+        is_remote_path = self.file_handler.is_url(file_path) or self.file_handler.is_oss_path(file_path)
+        
+        if not is_remote_path:
+            # 只对本地文件进行格式验证
             
-        # 如果是添加页码操作，检查是否PDF文件
-        if format == "number-pdf" and input_format != InputFormat.PDF:
-            await self.logger.error("添加页码功能仅支持PDF文件")
+            # 验证输入文件格式
+            input_format = self.file_handler.get_input_format(file_path)
+            if not input_format and not is_special_operation:
+                await self.logger.error(f"不支持的输入文件格式: {self.file_handler.get_file_extension(file_path)}")
 
-        # 验证输出格式（除去特殊操作外）
-        if not is_special_operation:
-            try:
-                output_format = OutputFormat(format)
-            except ValueError:
-                await self.logger.error(f"不支持的输出格式: {format}")
+            # 如果是去除水印操作，检查是否PDF文件
+            if format == "doc-repair" and input_format != InputFormat.PDF:
+                await self.logger.error("去除水印功能仅支持PDF文件")
+                
+            # 如果是添加页码操作，检查是否PDF文件
+            if format == "number-pdf" and input_format != InputFormat.PDF:
+                await self.logger.error("添加页码功能仅支持PDF文件")
+
+            # 验证输出格式（除去特殊操作外）
+            if not is_special_operation:
+                try:
+                    output_format = OutputFormat(format)
+                except ValueError:
+                    await self.logger.error(f"不支持的输出格式: {format}")
 
-            # 验证格式转换是否支持
-            if input_format:  # 确保input_format有效
-                available_formats = self.file_handler.get_available_output_formats(input_format)
-                if output_format not in available_formats:
-                    await self.logger.error(
-                        f"不支持从 {input_format.value} 格式转换为 {output_format.value} 格式。"
-                        f"支持的输出格式: {', '.join(f.value for f in available_formats)}"
-                    )
+                # 验证格式转换是否支持
+                if input_format:  # 确保input_format有效
+                    available_formats = self.file_handler.get_available_output_formats(input_format)
+                    if output_format not in available_formats:
+                        await self.logger.error(
+                            f"不支持从 {input_format.value} 格式转换为 {output_format.value} 格式。"
+                            f"支持的输出格式: {', '.join(f.value for f in available_formats)}"
+                        )
         else:
-            # 对于特殊操作，设置输出格式为PDF
-            output_format = OutputFormat.PDF
+            # 远程路径的情况，设置必要的变量以便后续使用
+            if not is_special_operation:
+                try:
+                    output_format = OutputFormat(format)
+                except ValueError:
+                    await self.logger.error(f"不支持的输出格式: {format}")
+            else:
+                output_format = OutputFormat.PDF
+            
+            # 对于远程路径，无法确定输入格式，但为了让后续代码能正常运行，设置一个默认值
+            input_format = None
 
         # 验证文件
-        file_exists_result = await self.file_handler.validate_file_exists(file_path)
-        if not file_exists_result[0]:
+        exists = await self.file_handler.validate_file_exists(file_path)
+        if not exists:
             return ConversionResult(success=False, file_path=file_path, error_message="文件不存在")
-        is_url = file_exists_result[1]
 
         # 操作描述
         if format == "doc-repair":
@@ -215,7 +229,13 @@ class Converter(BaseApiClient):
         elif format == "number-pdf":
             operation_desc = "添加页码"
         else:
-            operation_desc = f"将 {input_format.value.upper()} 转换为 {output_format.value.upper()} 格式"
+            if is_remote_path:
+                operation_desc = f"转换为 {output_format.value.upper()} 格式"
+            else:
+                if input_format:
+                    operation_desc = f"将 {input_format.value.upper()} 转换为 {output_format.value.upper()} 格式"
+                else:
+                    operation_desc = f"转换为 {output_format.value.upper()} 格式"
         await self.logger.log("info", f"正在{operation_desc}...")
 
         import httpx
@@ -230,7 +250,7 @@ class Converter(BaseApiClient):
                     extra_params["password"] = password
                 
                 # 创建转换任务
-                task_id = await self._create_task(client, file_path, format, is_url, extra_params)
+                task_id = await self._create_task(client, file_path, format, extra_params)
                 
                 # 等待任务完成
                 download_url = await self._wait_for_task(client, task_id, "转换")
@@ -253,14 +273,13 @@ class Converter(BaseApiClient):
                     download_url=None
                 )
 
-    async def _create_task(self, client: httpx.AsyncClient, file_path: str, format: str, is_url: bool, extra_params: dict = None) -> str:
+    async def _create_task(self, client: httpx.AsyncClient, file_path: str, format: str, extra_params: dict = None) -> str:
         """创建转换任务
         
         Args:
             client: HTTP客户端
             file_path: 文件路径
             format: 目标格式，特殊格式"doc-repair"用于去除水印，"number-pdf"用于添加页码
-            is_url: 是否URL路径
             extra_params: 额外API参数(可选)
         
         Returns:
@@ -275,7 +294,20 @@ class Converter(BaseApiClient):
         if extra_params:
             data.update(extra_params)
         
-        if is_url:
+        # 检查是否为OSS路径
+        if self.file_handler.is_oss_path(file_path):
+            # OSS路径处理方式，与URL类似，但提取resource_id
+            data["resource_id"] = file_path.split("oss://")[1]
+            # 使用JSON方式时添加Content-Type
+            headers["Content-Type"] = "application/json"
+            response = await client.post(
+                self.api_base_url,
+                json=data,
+                headers=headers
+            )
+        # 检查是否为URL路径
+        elif self.file_handler.is_url(file_path):
+            data["url"] = file_path
             # 使用JSON方式时添加Content-Type
             headers["Content-Type"] = "application/json"
             response = await client.post(

lightpdf_aipdf_mcp/editor.py

@@ -40,6 +40,10 @@ class Editor(BaseApiClient):
         Returns:
             bool: 如果是PDF文件则返回True，否则返回False
         """
+        # 对于URL或OSS路径，跳过文件格式检查
+        if self.file_handler.is_url(file_path) or self.file_handler.is_oss_path(file_path):
+            return True
+            
         input_format = self.file_handler.get_input_format(file_path)
         if input_format != InputFormat.PDF:
             await self.logger.error(f"此功能仅支持PDF文件，当前文件格式为: {self.file_handler.get_file_extension(file_path)}")
@@ -120,7 +124,8 @@ class Editor(BaseApiClient):
             if not await self._validate_pdf_file(pdf_file):
                 return EditResult(success=False, file_path=pdf_file, error_message="非PDF文件")
             
-            if not (await self.file_handler.validate_file_exists(pdf_file))[0]:
+            exists = await self.file_handler.validate_file_exists(pdf_file)
+            if not exists:
                 return EditResult(success=False, file_path=pdf_file, error_message="文件不存在")
         
         # 记录操作描述
@@ -368,10 +373,9 @@ class Editor(BaseApiClient):
             return EditResult(success=False, file_path=file_path, error_message="未找到API_KEY。请在客户端配置API_KEY环境变量。")
 
         # 验证文件
-        file_exists_result = await self.file_handler.validate_file_exists(file_path)
-        if not file_exists_result[0]:
+        exists = await self.file_handler.validate_file_exists(file_path)
+        if not exists:
             return EditResult(success=False, file_path=file_path, error_message="文件不存在")
-        is_url = file_exists_result[1]
 
         async with httpx.AsyncClient(timeout=120.0) as client:
             try:
@@ -384,7 +388,7 @@ class Editor(BaseApiClient):
                     extra_params["password"] = password
                 
                 # 创建编辑任务
-                task_id = await self._create_task(client, file_path, edit_type, is_url, extra_params)
+                task_id = await self._create_task(client, file_path, edit_type, extra_params)
                 
                 # 等待任务完成
                 download_url = await self._wait_for_task(client, task_id, "编辑")
@@ -407,14 +411,13 @@ class Editor(BaseApiClient):
                     download_url=None
                 )
 
-    async def _create_task(self, client: httpx.AsyncClient, file_path: str, edit_type: EditType, is_url: bool, extra_params: Dict[str, Any] = None) -> str:
+    async def _create_task(self, client: httpx.AsyncClient, file_path: str, edit_type: EditType, extra_params: Dict[str, Any] = None) -> str:
         """创建编辑任务
         
         Args:
             client: HTTP客户端
             file_path: 文件路径
             edit_type: 编辑操作类型
-            is_url: 是否URL路径
             extra_params: 额外API参数(可选)
         
         Returns:
@@ -429,7 +432,19 @@ class Editor(BaseApiClient):
         if extra_params:
             data.update(extra_params)
         
-        if is_url:
+        # 检查是否为OSS路径
+        if self.file_handler.is_oss_path(file_path):
+            # OSS路径处理方式，与URL类似，但提取resource_id
+            data["resource_id"] = file_path.split("oss://")[1]
+            # 使用JSON方式时添加Content-Type
+            headers["Content-Type"] = "application/json"
+            response = await client.post(
+                self.api_base_url,
+                json=data,
+                headers=headers
+            )
+        # 检查是否为URL路径
+        elif self.file_handler.is_url(file_path):
             data["url"] = file_path
             # 使用JSON方式时添加Content-Type
             headers["Content-Type"] = "application/json"
@@ -476,12 +491,19 @@ class Editor(BaseApiClient):
         files = {}
         
         for i, file_path in enumerate(file_paths):
+            # 检查是否为URL或OSS路径
             if self.file_handler.is_url(file_path):
-                # 对于URL，添加到inputs数组
+                # 对于URL或OSS路径，添加到inputs数组
                 input_item = {"url": file_path}
                 if password:
                     input_item["password"] = password
                 url_inputs.append(input_item)
+            elif self.file_handler.is_oss_path(file_path):
+                # 对于OSS路径，添加到inputs数组
+                input_item = {"resource_id": file_path.split("oss://")[1]}
+                if password:
+                    input_item["password"] = password
+                url_inputs.append(input_item)
             else:
                 # 记录本地文件，需要使用form方式
                 local_files.append(file_path)

{lightpdf_aipdf_mcp-0.1.39.dist-info → lightpdf_aipdf_mcp-0.1.40.dist-info}/METADATA

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

lightpdf_aipdf_mcp-0.1.40.dist-info/RECORD

@@ -0,0 +1,9 @@
+lightpdf_aipdf_mcp/__init__.py,sha256=PPnAgpvJLYLVOTxnHDmJAulFnHJD6wuTwS6tRGjqq6s,141
+lightpdf_aipdf_mcp/common.py,sha256=zhd_XxO7cBiQ7A6fc1JJjcpJfRWCQBi3pfBSsrBRusg,6568
+lightpdf_aipdf_mcp/converter.py,sha256=SbP5CpDn1suoq9QSApw6kgqJXEc4gwF7Po3oLo5namg,13313
+lightpdf_aipdf_mcp/editor.py,sha256=6ELqub8uOW6kwkVz52YdFUyDmkMsN1BkTApSw6Bi-lg,22802
+lightpdf_aipdf_mcp/server.py,sha256=jXAcfLWhef5E3cle28bytDTTuMiwTMYAglbAFVF6Wlw,35737
+lightpdf_aipdf_mcp-0.1.40.dist-info/METADATA,sha256=V8FmqYq5cSQU1BILhURaTMHRtEsHqawRUfhAI_wYwd8,7931
+lightpdf_aipdf_mcp-0.1.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lightpdf_aipdf_mcp-0.1.40.dist-info/entry_points.txt,sha256=X7TGUe52N4sYH-tYt0YUGApeJgw-efQlZA6uAZmlmr4,63
+lightpdf_aipdf_mcp-0.1.40.dist-info/RECORD,,

lightpdf_aipdf_mcp-0.1.39.dist-info/RECORD

@@ -1,9 +0,0 @@
-lightpdf_aipdf_mcp/__init__.py,sha256=PPnAgpvJLYLVOTxnHDmJAulFnHJD6wuTwS6tRGjqq6s,141
-lightpdf_aipdf_mcp/common.py,sha256=ZPm_Wzn7GpMLl9xJXOrTgNgd0hqdI931JVKm57WRa14,6433
-lightpdf_aipdf_mcp/converter.py,sha256=5oTLHxXOiZ9_PDatWiYbgPZ0LFFqE0L4qHvamX3g9lM,11732
-lightpdf_aipdf_mcp/editor.py,sha256=mbCGXd1Xzu-ibDWJnn11fOP5Xlf1Vqxi0yQ8Vs_yUKg,21787
-lightpdf_aipdf_mcp/server.py,sha256=jXAcfLWhef5E3cle28bytDTTuMiwTMYAglbAFVF6Wlw,35737
-lightpdf_aipdf_mcp-0.1.39.dist-info/METADATA,sha256=USG1KkrGGjJ75mf2hB0fuoFTas5noxVK0VcxlTN_Ooc,7931
-lightpdf_aipdf_mcp-0.1.39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lightpdf_aipdf_mcp-0.1.39.dist-info/entry_points.txt,sha256=X7TGUe52N4sYH-tYt0YUGApeJgw-efQlZA6uAZmlmr4,63
-lightpdf_aipdf_mcp-0.1.39.dist-info/RECORD,,