Merge branch '1Panel-dev:main' into main

Author: 2lipan

.github/workflows/pr-validate.yml

@@ -1,7 +1,7 @@
 name: PR Validation
 
 on:
-  pull_request:
+  pull_request_target: # 修改点 1：支持外部 Fork 获取写权限
     branches: [main]
     paths:
       - 'tools/**'
@@ -14,6 +14,7 @@ on:
 jobs:
   validate:
     runs-on: ubuntu-latest
+    # 显式声明权限
     permissions:
       pull-requests: write
       contents: read
@@ -22,9 +23,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          # 修改点 2：如果是 PR 触发，强制拉取 PR 的最新提交代码进行校验
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
           fetch-depth: 0
 
-      - name: Checkout PR branch
+      - name: Checkout PR branch (Manual)
         if: github.event_name == 'workflow_dispatch'
         run: |
           cp .github/scripts/validate_pr.py /tmp/validate_pr.py
@@ -39,7 +42,8 @@ jobs:
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             gh pr diff ${{ inputs.pr_number }} --name-only > changed_files.txt
           else
-            git diff --name-only origin/main...HEAD > changed_files.txt
+            # 使用 pull_request_target 时，对比基础分支
+            git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > changed_files.txt
           fi
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -56,24 +60,32 @@ jobs:
         id: validate
         working-directory: ${{ github.workspace }}
         run: |
+          # 确保脚本存在（如果是从 main 分支运行 pull_request_target，脚本默认就在）
           python .github/scripts/validate_pr.py changed_files.txt > result.txt 2>&1
           echo "exit_code=$?" >> $GITHUB_OUTPUT
           cat result.txt
 
       - name: Comment on PR
-        if: always() && (github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch')
+        if: always()
         uses: actions/github-script@v7
         with:
           script: |
             const fs = require('fs');
+            if (!fs.existsSync('result.txt')) {
+              console.log('No result.txt found');
+              return;
+            }
             const result = fs.readFileSync('result.txt', 'utf8');
             const exitCode = '${{ steps.validate.outputs.exit_code }}';
             const icon = exitCode === '0' ? '✅' : '❌';
             const status = exitCode === '0' ? '校验通过' : '校验失败，请修复后重新提交';
+            
+            // 获取正确的 PR 编号
             const prNumber = context.eventName === 'workflow_dispatch'
               ? parseInt('${{ inputs.pr_number }}')
               : context.payload.pull_request.number;
-            github.rest.issues.createComment({
+
+            await github.rest.issues.createComment({
               issue_number: prNumber,
               owner: context.repo.owner,
               repo: context.repo.repo,

tools/tool_mem0_add/1.0.0/Mem0记忆添加.tool

@@ -0,0 +1,26 @@
+# Mem0 记忆添加工具
+
+基于 mem0 API 的单入口工具，用于向指定用户写入一条记忆。
+
+## 功能说明
+- 添加一条用户或助手消息到 Mem0
+- 支持 metadata
+- 支持可选 agent_id
+- 使用官方 `POST /v1/memories/` 接口
+- 注意：Mem0 默认异步处理，写入后可能需要等待 2-3 秒再检索
+
+## 参数说明
+### 启动参数
+| 参数 | 组件类型 | 必填 | 说明 |
+| :--- | :--- | :--- | :--- |
+| `api_key` | 密码框 | 是 | Mem0 API Key |
+| `base_url` | 文本框 | 否 | API 地址，默认 `https://api.mem0.ai/v1` |
+
+### 输入参数
+| 参数名 | 数据类型 | 必填 | 来源 | 说明 |
+| :--- | :--- | :--- | :--- | :--- |
+| `user_id` | string | 是 | 引用参数 | 用户唯一标识 |
+| `content` | string | 是 | 引用参数 | 要写入的记忆内容 |
+| `role` | string | 否 | 引用参数 | 角色，默认 `user` |
+| `agent_id` | string | 否 | 引用参数 | agent 唯一标识 |
+| `metadata` | string | 否 | 引用参数 | JSON 字符串格式的元数据 |

tools/tool_mem0_add/README.md

@@ -0,0 +1,57 @@
+import json
+import requests
+
+
+def add_memory(user_id: str, content: str, role: str = "user", agent_id: str = "", metadata: str = "", api_key: str = "", base_url: str = "https://api.mem0.ai/v1"):
+    try:
+        if not user_id:
+            return json.dumps({"success": False, "message": "user_id 不能为空", "error": "missing_user_id"}, ensure_ascii=False)
+        if not content:
+            return json.dumps({"success": False, "message": "content 不能为空", "error": "missing_content"}, ensure_ascii=False)
+        if not api_key:
+            return json.dumps({"success": False, "message": "api_key 不能为空", "error": "missing_api_key"}, ensure_ascii=False)
+
+        payload = {
+            "messages": [{"role": role or "user", "content": content}],
+            "user_id": user_id,
+            "infer": True,
+            "version": "v2"
+        }
+        if agent_id:
+            payload["agent_id"] = agent_id
+        if metadata:
+            try:
+                payload["metadata"] = json.loads(metadata)
+            except Exception:
+                return json.dumps({"success": False, "message": "metadata 必须是合法 JSON 字符串", "error": "invalid_metadata_json"}, ensure_ascii=False)
+
+        rep = requests.post(
+            url=f"{base_url.rstrip('/')}/memories/",
+            headers={
+                "Content-Type": "application/json",
+                "Authorization": f"Token {api_key}",
+                "Accept": "application/json"
+            },
+            json=payload,
+            timeout=30
+        )
+        rep.raise_for_status()
+        data = rep.json()
+        return json.dumps({"success": True, "message": "记忆添加成功", "data": data}, ensure_ascii=False)
+    except requests.exceptions.HTTPError as e:
+        detail = None
+        try:
+            detail = e.response.json()
+        except Exception:
+            detail = e.response.text if e.response is not None else str(e)
+        return json.dumps({
+            "success": False,
+            "message": "添加记忆失败",
+            "error": str(e),
+            "status_code": e.response.status_code if e.response is not None else None,
+            "details": detail
+        }, ensure_ascii=False)
+    except requests.exceptions.RequestException as e:
+        return json.dumps({"success": False, "message": "添加记忆请求失败", "error": str(e)}, ensure_ascii=False)
+    except Exception as e:
+        return json.dumps({"success": False, "message": "处理添加记忆响应时发生错误", "error": str(e)}, ensure_ascii=False)

tools/tool_mem0_add/add_memory.py

@@ -0,0 +1,5 @@
+name: Mem0记忆添加
+tags:
+  - 模型记忆
+title: 添加内容到 Mem0 记忆库
+description: 添加内容到 Mem0 记忆库，支持附带 metadata 和 agent_id

tools/tool_mem0_add/data.yaml

@@ -0,0 +1,25 @@
+# Mem0 记忆获取工具
+
+基于 mem0 API 的单入口工具，用于获取指定范围内的记忆列表。
+
+## 功能说明
+- 获取记忆列表
+- 支持 user_id / agent_id / app_id / run_id 作用域过滤
+- 至少需要提供一个范围参数
+- 当提供多个范围参数时，内部使用 `OR` 过滤
+- 使用官方 `POST /v2/memories/` 接口
+
+## 参数说明
+### 启动参数
+| 参数 | 组件类型 | 必填 | 说明 |
+| :--- | :--- | :--- | :--- |
+| `api_key` | 密码框 | 是 | Mem0 API Key |
+| `base_url` | 文本框 | 否 | API 地址，默认 `https://api.mem0.ai` |
+
+### 输入参数
+| 参数名 | 数据类型 | 必填 | 来源 | 说明 |
+| :--- | :--- | :--- | :--- | :--- |
+| `user_id` | string | 否 | 引用参数 | 用户唯一标识 |
+| `agent_id` | string | 否 | 引用参数 | agent 唯一标识 |
+| `app_id` | string | 否 | 引用参数 | 应用唯一标识 |
+| `run_id` | string | 否 | 引用参数 | 运行/会话唯一标识 |

tools/tool_mem0_add/logo.png

@@ -0,0 +1,5 @@
+name: Mem0记忆获取
+tags:
+  - 模型记忆
+title: 获取用户在 Mem0 中的记忆列表
+description: 获取指定用户在 Mem0 中的记忆列表，可按关键词过滤

tools/tool_mem0_get/1.0.0/Mem0记忆获取.tool

@@ -0,0 +1,63 @@
+import json
+import requests
+
+
+def get_memories(user_id: str = "", agent_id: str = "", app_id: str = "", run_id: str = "", api_key: str = "", base_url: str = "https://api.mem0.ai"):
+    try:
+        if not api_key:
+            return json.dumps({"success": False, "message": "api_key 不能为空", "error": "missing_api_key"}, ensure_ascii=False)
+        if not any([user_id, agent_id, app_id, run_id]):
+            return json.dumps({
+                "success": False,
+                "message": "user_id、agent_id、app_id、run_id 至少需要提供一个",
+                "error": "missing_scope_filter"
+            }, ensure_ascii=False)
+
+        filters = []
+        if user_id:
+            filters.append({"user_id": user_id})
+        if agent_id:
+            filters.append({"agent_id": agent_id})
+        if app_id:
+            filters.append({"app_id": app_id})
+        if run_id:
+            filters.append({"run_id": run_id})
+
+        payload = {
+            "version": "v2"
+        }
+        if len(filters) == 1:
+            payload["filters"] = filters[0]
+        else:
+            payload["filters"] = {"OR": filters}
+
+        rep = requests.post(
+            url=f"{base_url.rstrip('/')}/v2/memories/",
+            headers={
+                "Content-Type": "application/json",
+                "Authorization": f"Token {api_key}",
+                "Accept": "application/json"
+            },
+            json=payload,
+            timeout=30
+        )
+        rep.raise_for_status()
+        data = rep.json()
+        return json.dumps({"success": True, "message": "记忆获取成功", "data": data}, ensure_ascii=False)
+    except requests.exceptions.HTTPError as e:
+        detail = None
+        try:
+            detail = e.response.json()
+        except Exception:
+            detail = e.response.text if e.response is not None else str(e)
+        return json.dumps({
+            "success": False,
+            "message": "获取记忆失败",
+            "error": str(e),
+            "status_code": e.response.status_code if e.response is not None else None,
+            "details": detail
+        }, ensure_ascii=False)
+    except requests.exceptions.RequestException as e:
+        return json.dumps({"success": False, "message": "获取记忆请求失败", "error": str(e)}, ensure_ascii=False)
+    except Exception as e:
+        return json.dumps({"success": False, "message": "处理获取记忆响应时发生错误", "error": str(e)}, ensure_ascii=False)