feat: integrate PluginMCPRegistry and add MCP tools to all plugins

app/main.py

@@ -17,7 +17,9 @@ from app.config.settings import settings
 from app.api.routes import router as api_router
 from app.plugins.manager import plugin_manager, set_app_instance
 from app.plugins.loader import plugin_loader
-from app.mcp.server import mcp, get_mcp_app, get_temp_file
+from app.mcp.server import mcp, get_mcp_app
+from app.mcp.plugin_registry import init_plugin_registry, get_plugin_registry
+from app.mcp.admin_tools import *  # 确保管理工具被注册
 
 # 配置日志
 _LOG_CONFIG = {
@@ -112,24 +114,26 @@ async def register_plugin_routes():
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     """应用生命周期管理"""
-    # 启动时执行
     logger.info(f"{settings.PROJECT_NAME} v{settings.VERSION} 正在启动...")
     logger.info(f"插件目录: {settings.PLUGINS_DIR}")
-    logger.info(f"调试模式: {settings.DEBUG}")
 
-    # 注册插件路由
+    # 1. 注册插件路由（现有逻辑）
     await register_plugin_routes()
 
-    # 创建并挂载 MCP 服务
+    # 2. 初始化插件MCP注册器并注册工具
+    registry = init_plugin_registry(mcp)
+    tool_count = registry.scan_and_register_all(settings.PLUGINS_DIR)
+    logger.info(f"已注册 {tool_count} 个插件MCP工具")
+
+    # 3. 挂载 MCP 应用
     mcp_app = get_mcp_app()
     app.mount("/mcp", mcp_app)
     logger.info("MCP服务已挂载到 /mcp 路径")
 
-    # 启动 MCP session manager
+    # 4. 启动 MCP session manager
     async with mcp.session_manager.run():
         yield
 
-    # 关闭时执行
     logger.info(f"{settings.PROJECT_NAME} 正在关闭...")
 
 
@@ -152,29 +156,6 @@ app.include_router(api_router)
 set_app_instance(app)
 
 
-# MCP 临时文件下载端点
-@app.get("/mcp/file/{file_id}")
-async def download_mcp_temp_file(request: Request, file_id: str):
-    """下载 MCP 工具上传的临时文件。"""
-    from fastapi.responses import Response
-
-    result = await get_temp_file(file_id)
-    if result is None:
-        context = {
-            "request": request,
-            "error": "文件不存在或已过期",
-            "project_name": settings.PROJECT_NAME,
-        }
-        return templates.TemplateResponse(request, name="error.html", context=context, status_code=404)
-
-    content, filename = result
-    return Response(
-        content=content,
-        media_type="application/octet-stream",
-        headers={"Content-Disposition": f"attachment; filename={filename}"},
-    )
-
-
 # 异常处理 - 修复模板上下文
 @app.exception_handler(StarletteHTTPException)
 async def http_exception_handler(request: Request, exc: StarletteHTTPException):

plugins/document_merge_split_plugin/core.py

@@ -0,0 +1,58 @@
+"""
+文档合并拆分核心逻辑 - 供 mcp.py 和 api.py 共用
+"""
+
+import base64
+from typing import List
+
+
+async def do_merge(files_base64: List[str], output_format: str = "text") -> dict:
+    """合并多个文档。"""
+    contents = []
+    for f_b64 in files_base64:
+        try:
+            content = base64.b64decode(f_b64).decode('utf-8')
+            contents.append(content)
+        except Exception as e:
+            return {
+                "success": False,
+                "message": f"解码失败: {str(e)}"
+            }
+
+    separator = "\n\n---\n\n" if output_format == "markdown" else "\n\n"
+    merged = separator.join(contents)
+
+    output_base64 = base64.b64encode(merged.encode('utf-8')).decode('utf-8')
+
+    return {
+        "success": True,
+        "output_base64": output_base64,
+        "message": f"已合并 {len(files_base64)} 个文档"
+    }
+
+
+async def do_split(content_base64: str, split_by: str = "line", chunk_size: int = 100) -> dict:
+    """拆分文档。"""
+    try:
+        content = base64.b64decode(content_base64).decode('utf-8')
+    except Exception as e:
+        return {
+            "success": False,
+            "message": f"解码失败: {str(e)}"
+        }
+
+    chunks = []
+    if split_by == "line":
+        chunks = content.split('\n')
+    elif split_by == "paragraph":
+        chunks = content.split('\n\n')
+    elif split_by == "chunk":
+        chunks = [content[i:i+chunk_size] for i in range(0, len(content), chunk_size)]
+
+    chunks_base64 = [base64.b64encode(c.encode('utf-8')).decode('utf-8') for c in chunks]
+
+    return {
+        "success": True,
+        "chunks_base64": chunks_base64,
+        "message": f"已拆分为 {len(chunks)} 个片段"
+    }

plugins/document_merge_split_plugin/mcp.py

@@ -0,0 +1,48 @@
+"""
+文档合并拆分插件 MCP工具定义
+"""
+
+from app.mcp.decorators import mcp_tool
+from pydantic import BaseModel, Field
+from typing import List
+
+from .core import do_merge, do_split
+
+
+class MergeInput(BaseModel):
+    """文档合并输入参数"""
+    files_base64: List[str] = Field(description="待合并文件的Base64编码列表")
+    output_format: str = Field(default="text", description="输出格式：text、markdown")
+
+
+class SplitInput(BaseModel):
+    """文档拆分输入参数"""
+    content_base64: str = Field(description="待拆分文档的Base64编码")
+    split_by: str = Field(default="line", description="拆分方式：line、paragraph、chunk")
+    chunk_size: int = Field(default=100, ge=10, le=10000, description="chunk模式下的块大小")
+
+
+class MergeOutput(BaseModel):
+    """合并输出结果"""
+    success: bool = Field(description="操作是否成功")
+    output_base64: str | None = Field(description="合并结果的Base64编码")
+    message: str = Field(description="结果说明")
+
+
+class SplitOutput(BaseModel):
+    """拆分输出结果"""
+    success: bool = Field(description="操作是否成功")
+    chunks_base64: List[str] | None = Field(description="拆分片段的Base64编码列表")
+    message: str = Field(description="结果说明")
+
+
+@mcp_tool(name="merge", title="文档合并", description="合并多个文档内容")
+async def doc_merge(params: MergeInput) -> MergeOutput:
+    result = await do_merge(params.files_base64, params.output_format)
+    return MergeOutput(**result)
+
+
+@mcp_tool(name="split", title="文档拆分", description="拆分文档为多个片段")
+async def doc_split(params: SplitInput) -> SplitOutput:
+    result = await do_split(params.content_base64, params.split_by, params.chunk_size)
+    return SplitOutput(**result)

plugins/file_cache_plugin/core.py

@@ -0,0 +1,58 @@
+"""
+文件缓存核心逻辑 - 供 mcp.py 和 api.py 共用
+"""
+
+import time
+from typing import Optional
+
+# 简化的内存缓存存储
+_cache_store: dict = {}
+
+
+async def do_set(key: str, value_base64: str, ttl_seconds: int = 3600) -> dict:
+    """设置缓存值。"""
+    _cache_store[key] = {
+        "value": value_base64,
+        "expires_at": time.time() + ttl_seconds
+    }
+    return {
+        "success": True,
+        "message": f"缓存已设置，TTL {ttl_seconds}秒"
+    }
+
+
+async def do_get(key: str) -> dict:
+    """获取缓存值。"""
+    entry = _cache_store.get(key)
+    if not entry:
+        return {
+            "success": False,
+            "message": f"缓存键 {key} 不存在"
+        }
+
+    if time.time() > entry["expires_at"]:
+        del _cache_store[key]
+        return {
+            "success": False,
+            "message": f"缓存键 {key} 已过期"
+        }
+
+    return {
+        "success": True,
+        "value": entry["value"],
+        "message": "缓存获取成功"
+    }
+
+
+async def do_delete(key: str) -> dict:
+    """删除缓存值。"""
+    if key in _cache_store:
+        del _cache_store[key]
+        return {
+            "success": True,
+            "message": f"缓存键 {key} 已删除"
+        }
+    return {
+        "success": False,
+        "message": f"缓存键 {key} 不存在"
+    }

plugins/file_cache_plugin/mcp.py

@@ -0,0 +1,50 @@
+"""
+文件缓存插件 MCP工具定义
+"""
+
+from app.mcp.decorators import mcp_tool
+from pydantic import BaseModel, Field
+
+from .core import do_set, do_get, do_delete
+
+
+class SetInput(BaseModel):
+    """设置缓存输入参数"""
+    key: str = Field(description="缓存键名")
+    value_base64: str = Field(description="缓存值的Base64编码")
+    ttl_seconds: int = Field(default=3600, ge=60, le=86400, description="过期时间（秒）")
+
+
+class GetInput(BaseModel):
+    """获取缓存输入参数"""
+    key: str = Field(description="缓存键名")
+
+
+class DeleteInput(BaseModel):
+    """删除缓存输入参数"""
+    key: str = Field(description="缓存键名")
+
+
+class CacheOutput(BaseModel):
+    """缓存操作输出结果"""
+    success: bool = Field(description="操作是否成功")
+    value: str | None = Field(default=None, description="缓存值（仅get操作）")
+    message: str = Field(description="结果说明")
+
+
+@mcp_tool(name="set", title="设置缓存", description="设置缓存值，支持TTL")
+async def cache_set(params: SetInput) -> CacheOutput:
+    result = await do_set(params.key, params.value_base64, params.ttl_seconds)
+    return CacheOutput(**result)
+
+
+@mcp_tool(name="get", title="获取缓存", description="获取缓存值")
+async def cache_get(params: GetInput) -> CacheOutput:
+    result = await do_get(params.key)
+    return CacheOutput(**result)
+
+
+@mcp_tool(name="delete", title="删除缓存", description="删除缓存值")
+async def cache_delete(params: DeleteInput) -> CacheOutput:
+    result = await do_delete(params.key)
+    return CacheOutput(**result)

plugins/image_resizer_plugin/core.py

@@ -0,0 +1,56 @@
+"""
+图片缩放核心逻辑 - 供 mcp.py 和 api.py 共用
+"""
+
+import io
+import base64
+from PIL import Image
+
+
+async def do_resize(file_base64: str, width: int, height: int, format: str) -> dict:
+    """执行图片缩放操作。
+
+    Args:
+        file_base64: 图片的Base64编码
+        width: 目标宽度
+        height: 目标高度
+        format: 输出格式（PNG、JPEG、WEBP）
+
+    Returns:
+        包含缩放结果的字典
+    """
+    try:
+        # 解码Base64
+        image_data = base64.b64decode(file_base64)
+        image = Image.open(io.BytesIO(image_data))
+
+        # 检查源图片尺寸
+        if image.width < width or image.height < height:
+            return {
+                "success": False,
+                "message": f"源图片尺寸 ({image.width}x{image.height}) 小于目标尺寸 ({width}x{height})"
+            }
+
+        # 缩放图片
+        resized = image.resize((width, height), Image.Resampling.LANCZOS)
+
+        # 输出
+        output = io.BytesIO()
+        save_format = format.upper() if format.upper() != "JPEG" else "JPEG"
+        resized.save(output, format=save_format, quality=95)
+        output.seek(0)
+
+        # 编码输出
+        output_base64 = base64.b64encode(output.read()).decode('utf-8')
+
+        return {
+            "success": True,
+            "output_base64": output_base64,
+            "message": f"图片已缩放至 {width}x{height}"
+        }
+
+    except Exception as e:
+        return {
+            "success": False,
+            "message": f"缩放失败: {str(e)}"
+        }

plugins/image_resizer_plugin/mcp.py

@@ -0,0 +1,69 @@
+"""
+图片缩放插件 MCP工具定义
+"""
+
+from app.mcp.decorators import mcp_tool
+from pydantic import BaseModel, Field
+
+from .core import do_resize
+
+
+# ============================================================================
+# 输入输出模型
+# ============================================================================
+
+class ResizeInput(BaseModel):
+    """图片缩放工具输入参数"""
+    file_base64: str = Field(
+        description="图片文件的Base64编码",
+        examples=["iVBORw0KGgoAAAANSUhEUgAA..."]
+    )
+    width: int = Field(
+        ge=16, le=2048,
+        description="目标宽度（像素），范围16-2048"
+    )
+    height: int = Field(
+        ge=16, le=2048,
+        description="目标高度（像素），范围16-2048"
+    )
+    format: str = Field(
+        default="PNG",
+        description="输出格式：PNG、JPEG、WEBP"
+    )
+
+
+class ResizeOutput(BaseModel):
+    """图片缩放工具输出结果"""
+    success: bool = Field(description="操作是否成功")
+    output_base64: str | None = Field(description="缩放后图片的Base64编码")
+    output_url: str | None = Field(default=None, description="临时下载链接（可选）")
+    message: str = Field(description="结果说明")
+
+
+# ============================================================================
+# 工具定义
+# ============================================================================
+
+@mcp_tool(
+    name="resize",
+    title="图片缩放",
+    description="缩放图片到指定尺寸，支持PNG、JPEG、WEBP格式输出",
+    annotations={
+        "readOnlyHint": False,
+        "destructiveHint": False,
+    }
+)
+async def resize_image(params: ResizeInput) -> ResizeOutput:
+    """将图片缩放到指定的宽度和高度。
+
+    支持PNG、JPEG、WEBP格式输出。
+    输入图片尺寸必须大于目标尺寸。
+
+    Args:
+        params: 包含Base64图片数据、目标宽高、输出格式
+
+    Returns:
+        ResizeOutput: 包含缩放后的图片数据或错误信息
+    """
+    result = await do_resize(params.file_base64, params.width, params.height, params.format)
+    return ResizeOutput(**result)

plugins/text_cleaner_plugin/core.py

@@ -0,0 +1,34 @@
+"""
+文本清理核心逻辑 - 供 mcp.py 和 api.py 共用
+"""
+
+import re
+
+
+async def do_clean(text: str, operations: list) -> dict:
+    """执行文本清理操作。
+
+    Args:
+        text: 待清理的文本
+        operations: 清理操作列表（trim、remove_empty_lines、normalize_spaces等）
+
+    Returns:
+        包含清理结果的字典
+    """
+    result = text
+
+    for op in operations:
+        if op == "trim":
+            result = result.strip()
+        elif op == "remove_empty_lines":
+            result = re.sub(r'\n\s*\n', '\n', result)
+        elif op == "normalize_spaces":
+            result = re.sub(r'[ \t]+', ' ', result)
+        elif op == "remove_extra_newlines":
+            result = re.sub(r'\n+', '\n', result)
+
+    return {
+        "success": True,
+        "output": result,
+        "message": f"已执行 {len(operations)} 个清理操作"
+    }

plugins/text_cleaner_plugin/mcp.py

@@ -0,0 +1,53 @@
+"""
+文本清理插件 MCP工具定义
+"""
+
+from app.mcp.decorators import mcp_tool
+from pydantic import BaseModel, Field
+from typing import List
+
+from .core import do_clean
+
+
+class CleanInput(BaseModel):
+    """文本清理工具输入参数"""
+    text: str = Field(description="待清理的文本内容")
+    operations: List[str] = Field(
+        default=["trim", "normalize_spaces"],
+        description="清理操作列表：trim、remove_empty_lines、normalize_spaces、remove_extra_newlines"
+    )
+
+
+class CleanOutput(BaseModel):
+    """文本清理工具输出结果"""
+    success: bool = Field(description="操作是否成功")
+    output: str | None = Field(description="清理后的文本")
+    message: str = Field(description="结果说明")
+
+
+@mcp_tool(
+    name="clean",
+    title="文本清理",
+    description="清理文本内容，支持多种清理操作",
+    annotations={
+        "readOnlyHint": False,
+        "destructiveHint": False,
+    }
+)
+async def clean_text(params: CleanInput) -> CleanOutput:
+    """清理文本内容。
+
+    支持的清理操作：
+    - trim: 去除首尾空白
+    - remove_empty_lines: 移除空行
+    - normalize_spaces: 规范化空格
+    - remove_extra_newlines: 移除多余换行
+
+    Args:
+        params: 包含文本和清理操作列表
+
+    Returns:
+        CleanOutput: 清理后的文本
+    """
+    result = await do_clean(params.text, params.operations)
+    return CleanOutput(**result)