Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| af7a43a702 | |||
| a7baba7210 | |||
| 2e5a8d5eed | |||
| 6f958ded28 | |||
| 3bc15d1241 | |||
| c67079fb9e | |||
| dc4eecbb35 | |||
| 766d162245 | |||
| 35c20fc0f2 | |||
| 48a86e56f1 | |||
| 7136689efe | |||
| e366605299 | |||
| 707d97760f | |||
| d17804e45b |
13
.env.example
13
.env.example
@@ -1,4 +1,4 @@
|
|||||||
# ── 运行模式 / adapter 档位(见 references/ADAPTER.md)──
|
# ── 运行模式 / adapter 档位(见 development/ADAPTER.md)──
|
||||||
OPENCLAW_TEST_TARGET=mock # mock | simulator_rpa | real_api | real_rpa
|
OPENCLAW_TEST_TARGET=mock # mock | simulator_rpa | real_api | real_rpa
|
||||||
|
|
||||||
# ── 目标系统 ──
|
# ── 目标系统 ──
|
||||||
@@ -12,10 +12,19 @@ OPENCLAW_BROWSER_HEADLESS=0 # 0=有头(默认) 1=无头(CI)
|
|||||||
OPENCLAW_PLAYWRIGHT_STEALTH=1 # 1=开启反检测指纹(默认)
|
OPENCLAW_PLAYWRIGHT_STEALTH=1 # 1=开启反检测指纹(默认)
|
||||||
|
|
||||||
# ── 存证 ──
|
# ── 存证 ──
|
||||||
OPENCLAW_RECORD_VIDEO=1
|
OPENCLAW_RECORD_VIDEO=0 # 0=默认不录屏;1=启用录屏+字幕+旁白+背景音+MP4
|
||||||
OPENCLAW_ARTIFACTS_ON_FAILURE=1 # 1=失败截图(默认)
|
OPENCLAW_ARTIFACTS_ON_FAILURE=1 # 1=失败截图(默认)
|
||||||
|
|
||||||
# ── 节流 / 超时 ──
|
# ── 节流 / 超时 ──
|
||||||
STEP_DELAY_MIN=1.0 # 步骤间随机等待下限(秒)
|
STEP_DELAY_MIN=1.0 # 步骤间随机等待下限(秒)
|
||||||
STEP_DELAY_MAX=5.0 # 步骤间随机等待上限(秒)
|
STEP_DELAY_MAX=5.0 # 步骤间随机等待上限(秒)
|
||||||
HUMAN_WAIT_TIMEOUT=180 # 滑块/验证码/2FA 等人工超时(秒)
|
HUMAN_WAIT_TIMEOUT=180 # 滑块/验证码/2FA 等人工超时(秒)
|
||||||
|
|
||||||
|
# ── 数据目录子路径(见 development/DATA_PATHS.md;留空则用 skill 数据目录下默认子文件夹)──
|
||||||
|
# 相对路径相对于 {JIANGCHANG_DATA_ROOT}/{USER_ID}/{slug}/,不是 workspace / CWD
|
||||||
|
# SKILL_DOWNLOAD_DIR=downloads
|
||||||
|
# SKILL_IMPORT_DIR=imports
|
||||||
|
# SKILL_EXPORT_DIR=exports
|
||||||
|
# SKILL_UPLOAD_DIR=uploads
|
||||||
|
# SKILL_CACHE_DIR=cache
|
||||||
|
# SKILL_TEMP_DIR=temp
|
||||||
|
|||||||
5
.openclaw-skill-template
Normal file
5
.openclaw-skill-template
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# 此文件仅存在于 skill-template 源仓库。
|
||||||
|
# 用 tools/scaffold_skill 创建新技能时,脚本会从目标目录删除本文件。
|
||||||
|
# 若业务技能仓库中仍存在本文件,说明未正确 scaffold,tests 会失败。
|
||||||
|
template_slug: your-skill-slug
|
||||||
|
template_version: "1.0.32"
|
||||||
51
SKILL.md
51
SKILL.md
@@ -1,12 +1,12 @@
|
|||||||
---
|
---
|
||||||
name: 技能开发模板(通用业务版)
|
name: 技能开发模板(通用业务版)
|
||||||
description: "OpenClaw 通用业务技能开发模板,供复制后定制新业务 skill。定制步骤见 development/DEVELOPMENT.md。"
|
description: "OpenClaw 通用业务技能开发模板,供复制后定制新业务 skill。定制步骤见 development/DEVELOPMENT.md。"
|
||||||
version: 1.0.14
|
version: 1.0.40
|
||||||
author: 深圳匠厂科技有限公司
|
author: 深圳匠厂科技有限公司
|
||||||
metadata:
|
metadata:
|
||||||
openclaw:
|
openclaw:
|
||||||
slug: your-skill-slug
|
slug: your-skill-slug
|
||||||
platform_kit_min_version: "1.0.14"
|
platform_kit_min_version: "1.2.0"
|
||||||
emoji: "📦"
|
emoji: "📦"
|
||||||
category: "通用"
|
category: "通用"
|
||||||
developer_ids:
|
developer_ids:
|
||||||
@@ -20,6 +20,26 @@ allowed-tools:
|
|||||||
|
|
||||||
这是一个**用于复制的新技能模板**,不是业务 skill 本身。复制后请替换占位内容,实现你的真实业务逻辑。
|
这是一个**用于复制的新技能模板**,不是业务 skill 本身。复制后请替换占位内容,实现你的真实业务逻辑。
|
||||||
|
|
||||||
|
## Agent / 宿主编排(复制为业务技能后必改)
|
||||||
|
|
||||||
|
### 架构铁律(先读)
|
||||||
|
|
||||||
|
- **单业务内核、多入口**:数据管理 / 定时任务 / Agent / 技能详情 / 直接 CLI 必须复用同一 domain service;禁止按入口复制业务逻辑,禁止按 `source` 分叉业务行为。
|
||||||
|
- **`placements`**:只决定 Action 出现在哪里。
|
||||||
|
- **`bind.tables`**:只决定数据管理出现在哪些表;含 `toolbar` 时**必须**显式非空绑定。
|
||||||
|
- **`executionProfile`**:只决定 sync 等待还是 async Job;**必须**显式声明 `sync` 或 `async`;与 placements **正交**(任意合法组合均可)。
|
||||||
|
- **`async`**:宿主建 Job,立即返回 `jobId`,进度见**任务中心** / Skill Run Card。
|
||||||
|
- **同步数据**写技能本地库、不生成导出文件;**导出当前表**由宿主数据管理负责;特殊业务报告才另做 `export-*`。
|
||||||
|
|
||||||
|
### 编排要点
|
||||||
|
|
||||||
|
- **长耗时 / RPA / 浏览器任务**:必须通过宿主 **Skill Action**(`run_skill_action`)调用 `assets/actions.json` 中的 action;建议 `executionProfile: "async"`。
|
||||||
|
- **禁止**对长任务使用 `exec python …/scripts/main.py run` 或 `process poll` 干等 CLI 返回。
|
||||||
|
- 只读查询(`health` / `stats` 等)可用 `"sync"`,立即返回结果。
|
||||||
|
- 批量处理用参数化 `pickCount` / `--pick N` 顺序消费队列,**不要并发**同一 Profile。
|
||||||
|
- 详细契约:`development/SKILL_ACTION_RUNTIME.md`、`references/ACTIONS.md`、`references/SCHEMA.md`。
|
||||||
|
- 模板源仓库本身仅示范 `health` / `version` / `config-path`(sync);定制后按业务增加 Action,**一个能力一个 Action + 多 placements**。
|
||||||
|
|
||||||
## 面向用户问答(LLM 规则)
|
## 面向用户问答(LLM 规则)
|
||||||
|
|
||||||
- 本文(`SKILL.md`)是 LLM / OpenClaw 平台读取的技能入口,**不是**用户市场说明。
|
- 本文(`SKILL.md`)是 LLM / OpenClaw 平台读取的技能入口,**不是**用户市场说明。
|
||||||
@@ -38,6 +58,7 @@ allowed-tools:
|
|||||||
- **只有当**用户明确询问命令、参数、输出结构、开发、调试、集成或排错时,才读取 `references/` 或 `development/`。
|
- **只有当**用户明确询问命令、参数、输出结构、开发、调试、集成或排错时,才读取 `references/` 或 `development/`。
|
||||||
- 若 `README.md` 与 `SKILL.md` / `references` 表述冲突:对用户展示与市场说明以 `README.md` 为准;对执行契约、CLI、schema、运行约束以 `SKILL.md` / `references` 为准。
|
- 若 `README.md` 与 `SKILL.md` / `references` 表述冲突:对用户展示与市场说明以 `README.md` 为准;对执行契约、CLI、schema、运行约束以 `SKILL.md` / `references` 为准。
|
||||||
- 回答用户时**不要**暴露 Playwright、DOM、Python、RPA 等实现细节,除非用户明确询问技术实现。
|
- 回答用户时**不要**暴露 Playwright、DOM、Python、RPA 等实现细节,除非用户明确询问技术实现。
|
||||||
|
- 用户未问技术实现时,**不要**讨论 slug 命名规则;开发者问命名或 slug 时,读取 `development/NAMING.md`。
|
||||||
|
|
||||||
## 文档分工
|
## 文档分工
|
||||||
|
|
||||||
@@ -64,24 +85,36 @@ python {baseDir}/scripts/main.py config-path
|
|||||||
python {baseDir}/scripts/main.py version
|
python {baseDir}/scripts/main.py version
|
||||||
```
|
```
|
||||||
|
|
||||||
配置:仓库 `.env.example` 为模板;用户 `.env` 在 `{CLAW_DATA_ROOT}/{CLAW_USER_ID}/{slug}/.env`,启动时自动 bootstrap。优先级:进程环境变量 > 用户 `.env` > `.env.example`。
|
配置:仓库 `.env.example` 为模板;用户 `.env` 在 `{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/{slug}/.env`,启动时自动 bootstrap。优先级:进程环境变量 > 用户 `.env` > `.env.example`。
|
||||||
|
|
||||||
## 运行依赖
|
## 运行依赖
|
||||||
|
|
||||||
- Python 运行环境由匠厂宿主注入**共享 runtime**:`{JIANGCHANG_DATA_ROOT}/python-runtime/.venv`。
|
- Python 运行环境由匠厂宿主注入**共享 runtime**:`{JIANGCHANG_DATA_ROOT}/python-runtime/.venv`。
|
||||||
- 公共能力来自共享 runtime 安装的 `jiangchang-platform-kit>=1.0.14`(`jiangchang_skill_core` 包);**不要 vendor** `scripts/jiangchang_skill_core/`,新技能不得在仓库内保留该目录副本。
|
- 公共能力来自共享 runtime 安装的 `jiangchang-platform-kit>=1.2.0`(`jiangchang_skill_core` 包);**不要 vendor** `scripts/jiangchang_skill_core/`,新技能不得在仓库内保留该目录副本。
|
||||||
- config、logging、runtime_env、rpa、media-assets、video_session、runtime_diagnostics 等均从共享 venv 的 `jiangchang_skill_core` import,而非技能目录副本。
|
- config、logging、runtime_env、rpa、media-assets、video_session、runtime_diagnostics 等均从共享 venv 的 `jiangchang_skill_core` import,而非技能目录副本。
|
||||||
- 根目录 `requirements.txt` **只声明技能特有** Python 三方依赖;`jiangchang-platform-kit`、`playwright` 等公共能力由宿主共享 runtime 提供,**不要**写入技能 requirements。
|
- 根目录 `requirements.txt` **只声明技能特有** Python 三方依赖;`jiangchang-platform-kit`、`playwright` 等公共能力由宿主共享 runtime 提供,**不要**写入技能 requirements。
|
||||||
- `metadata.openclaw.platform_kit_min_version`(当前 `1.0.14`)是运行契约/兼容性声明,供宿主安装与启用时校验,**不是**技能 pip 依赖声明。
|
- `metadata.openclaw.platform_kit_min_version`(当前 `1.2.0`)是运行契约/兼容性声明,供宿主安装与启用时校验,**不是**技能 pip 依赖声明。
|
||||||
- Skill 代码**不要**自行 `pip install`;系统级依赖(如 VC++ Runtime)仅在 `health` / preflight 中提示用户安装。
|
- Skill 代码**不要**自行 `pip install`;系统级依赖(如 VC++ Runtime)仅在 `health` / preflight 中提示用户安装。
|
||||||
- `health` 使用 `collect_runtime_diagnostics` 输出统一 runtime 诊断(只读,不下载/修复 media-assets)。
|
- `health` 使用 `collect_runtime_diagnostics` 输出统一 runtime 诊断(只读,不下载/修复 media-assets)。
|
||||||
|
|
||||||
## 定制入口
|
## 定制入口
|
||||||
|
|
||||||
1. 复制目录为你的新 skill 仓库,全局替换 `your-skill-slug` 等占位词。
|
1. 从本模板创建新业务技能时,**不得保留模板 `.git`**;优先使用 [`tools/scaffold_skill.ps1`](tools/scaffold_skill.ps1)(见 [`tools/README.md`](tools/README.md))。
|
||||||
2. 按 `development/DEVELOPMENT.md` 完成开发与文档定制。
|
2. 业务技能仓库中**不得**存在 `.openclaw-skill-template`(仅 template 源仓库保留)。
|
||||||
3. 用户市场说明写入根 `README.md`;Agent 调用契约见 `references/CLI.md`、`references/SCHEMA.md`。
|
3. 复制目录为你的新 skill 仓库,全局替换 `your-skill-slug` 等占位词。
|
||||||
4. 同步修改 `scripts/util/constants.py` 中的 `SKILL_SLUG` / `SKILL_VERSION`。
|
4. 按 `development/DEVELOPMENT.md` 完成开发与文档定制。
|
||||||
|
5. 用户市场说明写入根 `README.md`;Agent 调用契约见 `references/CLI.md`、`references/SCHEMA.md`、`references/ACTIONS.md`;长任务 / 任务中心见 `development/SKILL_ACTION_RUNTIME.md`。
|
||||||
|
6. 同步修改 `scripts/util/constants.py` 中的 `SKILL_SLUG` / `SKILL_VERSION`。
|
||||||
|
7. 本地 SQLite 的中文表名/字段名、标准时间字段与字段顺序规范见 `references/SCHEMA.md`(元数据表 `_jiangchang_*` + `CREATE TABLE` 物理顺序)。
|
||||||
|
|
||||||
|
## 技能命名与 slug
|
||||||
|
|
||||||
|
- 标准格式:`{verb}-{noun-phrase}-{platform}`(详见 `development/NAMING.md`)。
|
||||||
|
- slug / repo / 目录 / `SKILL_SLUG` / DB 文件名:**英文** kebab-case;`name`、`description`、根 `README.md`:**中文**。
|
||||||
|
- 复制为新业务技能前**必须**阅读 `development/NAMING.md`。
|
||||||
|
- `name`(frontmatter):**用户可见的中文业务名称**;`description` 是说明,不是名称。
|
||||||
|
- `metadata.openclaw.slug`:**英文 kebab-case** 机器标识;目录名、默认 `{slug}.db` 使用 slug,不使用中文。
|
||||||
|
- 复制后全局替换 `your-skill-slug` 与 `your_skill_slug`(脚手架会自动处理);正式技能不得保留英文占位 `name` 或 slug。
|
||||||
|
|
||||||
## 平台元数据
|
## 平台元数据
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
# assets
|
# assets
|
||||||
|
|
||||||
|
- `actions.json`:Skill Action manifest 最小示例(**可选**;不需要宿主入口时可删除)。每个 action **必须**显式声明 `executionProfile`(`sync` \| `async`)。默认仅 `health` / `version` / `config-path`,不放 toolbar,故无 `bind` 示例。
|
||||||
- `examples/`:CLI 成功输出形状示例(虚构路径与数据)。
|
- `examples/`:CLI 成功输出形状示例(虚构路径与数据)。
|
||||||
- `schemas/`:轻量 JSON Schema 示例(`additionalProperties: true` 允许扩展字段)。
|
- `schemas/`:轻量 JSON Schema(`skill-actions.schema.json` 为**新技能严格规范**;`task-log-record.schema.json` 等)。
|
||||||
|
|
||||||
|
`skill-actions.schema.json` 使用 `additionalProperties: false`。正式支持 `bind.tables`(toolbar Action 必填);`row`/`batch` placements 与 `concurrency`/`locks` 仍为预留。`placements` 与 `executionProfile` 正交。表级 Action 示例见 [`references/ACTIONS.md`](../references/ACTIONS.md);运行时见 [`development/SKILL_ACTION_RUNTIME.md`](../development/SKILL_ACTION_RUNTIME.md)。
|
||||||
|
|
||||||
- 用户市场说明见根目录 [`README.md`](../README.md)
|
- 用户市场说明见根目录 [`README.md`](../README.md)
|
||||||
- Agent 调用/编排参考见 [`references/`](../references/)
|
- Agent 调用/编排参考见 [`references/`](../references/)(含 [`ACTIONS.md`](../references/ACTIONS.md))
|
||||||
- 开发规范见 [`development/`](../development/)
|
- 开发规范见 [`development/`](../development/)
|
||||||
|
|||||||
42
assets/actions.json
Normal file
42
assets/actions.json
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
"schemaVersion": 1,
|
||||||
|
"skill": "your-skill-slug",
|
||||||
|
"actions": [
|
||||||
|
{
|
||||||
|
"id": "health",
|
||||||
|
"label": "运行检查",
|
||||||
|
"description": "检查技能运行环境并返回结构化结果,不启动浏览器。",
|
||||||
|
"placements": ["skill-detail", "agent"],
|
||||||
|
"executionProfile": "sync",
|
||||||
|
"entrypoint": {
|
||||||
|
"type": "cli",
|
||||||
|
"command": "health",
|
||||||
|
"args": []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "version",
|
||||||
|
"label": "查看版本",
|
||||||
|
"description": "返回技能版本和机器标识。",
|
||||||
|
"placements": ["skill-detail"],
|
||||||
|
"executionProfile": "sync",
|
||||||
|
"entrypoint": {
|
||||||
|
"type": "cli",
|
||||||
|
"command": "version",
|
||||||
|
"args": []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "config-path",
|
||||||
|
"label": "查看配置位置",
|
||||||
|
"description": "返回技能配置文件位置。",
|
||||||
|
"placements": ["skill-detail"],
|
||||||
|
"executionProfile": "sync",
|
||||||
|
"entrypoint": {
|
||||||
|
"type": "cli",
|
||||||
|
"command": "config-path",
|
||||||
|
"args": []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
13
assets/naming/platforms.txt
Normal file
13
assets/naming/platforms.txt
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
amazon
|
||||||
|
shopee
|
||||||
|
xinghang
|
||||||
|
alibaba
|
||||||
|
kingdee
|
||||||
|
icbc
|
||||||
|
pingpong
|
||||||
|
worldfirst
|
||||||
|
paypal
|
||||||
|
lianlian
|
||||||
|
single-window
|
||||||
|
export-rebate
|
||||||
|
etax
|
||||||
4
assets/naming/scopes.txt
Normal file
4
assets/naming/scopes.txt
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
all
|
||||||
|
batch
|
||||||
|
multi
|
||||||
|
default
|
||||||
25
assets/naming/verbs.txt
Normal file
25
assets/naming/verbs.txt
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
scrape
|
||||||
|
receive
|
||||||
|
download
|
||||||
|
export
|
||||||
|
add
|
||||||
|
fill
|
||||||
|
enter
|
||||||
|
bind
|
||||||
|
withdraw
|
||||||
|
reconcile
|
||||||
|
verify
|
||||||
|
submit
|
||||||
|
query
|
||||||
|
process
|
||||||
|
reply
|
||||||
|
generate
|
||||||
|
draft
|
||||||
|
review
|
||||||
|
confirm
|
||||||
|
track
|
||||||
|
upload
|
||||||
|
match
|
||||||
|
triage
|
||||||
|
ship
|
||||||
|
reprice
|
||||||
166
assets/schemas/skill-actions.schema.json
Normal file
166
assets/schemas/skill-actions.schema.json
Normal file
@@ -0,0 +1,166 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
|
"$id": "https://openclaw.local/skill-template/skill-actions.schema.json",
|
||||||
|
"title": "SkillActionManifest",
|
||||||
|
"description": "匠厂 skill-template 对新技能的严格 Action manifest 规范(schemaVersion 1)。additionalProperties=false 表示模板推荐契约;宿主运行时可能为兼容历史 manifest 接受部分缺省字段,但新技能不应依赖缺省行为。",
|
||||||
|
"type": "object",
|
||||||
|
"required": ["schemaVersion", "skill", "actions"],
|
||||||
|
"additionalProperties": false,
|
||||||
|
"properties": {
|
||||||
|
"schemaVersion": {
|
||||||
|
"type": "integer",
|
||||||
|
"const": 1
|
||||||
|
},
|
||||||
|
"skill": {
|
||||||
|
"type": "string",
|
||||||
|
"pattern": "^[a-z0-9]+(-[a-z0-9]+)*$",
|
||||||
|
"description": "与 SKILL.md metadata.openclaw.slug 一致"
|
||||||
|
},
|
||||||
|
"actions": {
|
||||||
|
"type": "array",
|
||||||
|
"minItems": 1,
|
||||||
|
"items": { "$ref": "#/$defs/action" }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"$defs": {
|
||||||
|
"placement": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": ["toolbar", "row", "batch", "cron", "agent", "skill-detail"],
|
||||||
|
"description": "稳定支持 toolbar/cron/agent/skill-detail;row/batch 为预留入口,新技能示例不得使用。placements 与 executionProfile 正交,不做条件限制。"
|
||||||
|
},
|
||||||
|
"scalarArg": {
|
||||||
|
"type": ["string", "number", "boolean"]
|
||||||
|
},
|
||||||
|
"inputProperty": {
|
||||||
|
"type": "object",
|
||||||
|
"required": ["type"],
|
||||||
|
"additionalProperties": true,
|
||||||
|
"properties": {
|
||||||
|
"type": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": ["string", "number", "boolean", "object"],
|
||||||
|
"description": "模板 Phase 1 仅推荐 string/number/boolean;根 inputSchema.type=object 的 properties 使用基础标量类型"
|
||||||
|
},
|
||||||
|
"title": { "type": "string" },
|
||||||
|
"description": { "type": "string" },
|
||||||
|
"default": {},
|
||||||
|
"enum": {
|
||||||
|
"type": "array",
|
||||||
|
"minItems": 1
|
||||||
|
},
|
||||||
|
"sensitive": { "type": "boolean" }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"inputSchema": {
|
||||||
|
"type": "object",
|
||||||
|
"required": ["type", "properties"],
|
||||||
|
"additionalProperties": false,
|
||||||
|
"properties": {
|
||||||
|
"type": { "const": "object" },
|
||||||
|
"required": {
|
||||||
|
"type": "array",
|
||||||
|
"items": { "type": "string" }
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"type": "object",
|
||||||
|
"additionalProperties": { "$ref": "#/$defs/inputProperty" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"entrypoint": {
|
||||||
|
"type": "object",
|
||||||
|
"required": ["type", "command", "args"],
|
||||||
|
"additionalProperties": false,
|
||||||
|
"properties": {
|
||||||
|
"type": { "const": "cli" },
|
||||||
|
"command": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1
|
||||||
|
},
|
||||||
|
"args": {
|
||||||
|
"type": "array",
|
||||||
|
"items": { "$ref": "#/$defs/scalarArg" },
|
||||||
|
"description": "仅允许 string/number/boolean 标量数组"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"confirmation": {
|
||||||
|
"type": "object",
|
||||||
|
"required": ["message"],
|
||||||
|
"additionalProperties": false,
|
||||||
|
"properties": {
|
||||||
|
"message": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"bind": {
|
||||||
|
"type": "object",
|
||||||
|
"required": ["tables"],
|
||||||
|
"additionalProperties": false,
|
||||||
|
"properties": {
|
||||||
|
"tables": {
|
||||||
|
"type": "array",
|
||||||
|
"minItems": 1,
|
||||||
|
"uniqueItems": true,
|
||||||
|
"items": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1,
|
||||||
|
"pattern": "^[a-z][a-z0-9_]*$",
|
||||||
|
"description": "英文 snake_case 业务表名;须真实存在于技能 SQLite / _jiangchang_tables"
|
||||||
|
},
|
||||||
|
"description": "数据管理表级绑定:决定 toolbar Action 出现在哪些表。宿主兼容旧技能时,缺失 bind 可视为全表展示;新技能 toolbar Action 必须显式声明。"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"description": "Phase 1 仅沉淀 bind.tables;不包含 selection/inputMapping/columns/row/concurrency/locks"
|
||||||
|
},
|
||||||
|
"action": {
|
||||||
|
"type": "object",
|
||||||
|
"required": ["id", "label", "description", "placements", "entrypoint", "executionProfile"],
|
||||||
|
"additionalProperties": false,
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"type": "string",
|
||||||
|
"pattern": "^[a-z0-9]+(?:-[a-z0-9]+)*$",
|
||||||
|
"minLength": 1
|
||||||
|
},
|
||||||
|
"label": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1
|
||||||
|
},
|
||||||
|
"placements": {
|
||||||
|
"type": "array",
|
||||||
|
"minItems": 1,
|
||||||
|
"items": { "$ref": "#/$defs/placement" },
|
||||||
|
"description": "决定 Action 出现在哪里;与 executionProfile 正交"
|
||||||
|
},
|
||||||
|
"entrypoint": { "$ref": "#/$defs/entrypoint" },
|
||||||
|
"inputSchema": { "$ref": "#/$defs/inputSchema" },
|
||||||
|
"confirmation": { "$ref": "#/$defs/confirmation" },
|
||||||
|
"executionProfile": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": ["sync", "async"],
|
||||||
|
"description": "sync=调用方等待结构化结果(不建 Job);async=宿主建后台 Job 并进任务中心。必须显式写出;长耗时建议 async,但不限制 placements。"
|
||||||
|
},
|
||||||
|
"bind": { "$ref": "#/$defs/bind" }
|
||||||
|
},
|
||||||
|
"if": {
|
||||||
|
"properties": {
|
||||||
|
"placements": {
|
||||||
|
"contains": { "const": "toolbar" }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"required": ["placements"]
|
||||||
|
},
|
||||||
|
"then": {
|
||||||
|
"required": ["bind"]
|
||||||
|
},
|
||||||
|
"description": "concurrency/locks 为未稳定预留字段,勿写入新技能 manifest。placements 含 toolbar 时必须声明 bind.tables。"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,17 +37,22 @@ scripts/service/<domain>_adapter/
|
|||||||
base.py # 数据契约(dataclass)+ AdapterBase 接口
|
base.py # 数据契约(dataclass)+ AdapterBase 接口
|
||||||
mock.py # 离线仿真,给 CI/单测
|
mock.py # 离线仿真,给 CI/单测
|
||||||
real_api.py # 真实系统 API
|
real_api.py # 真实系统 API
|
||||||
sim_rpa.py # 仿真平台 RPA
|
sim_rpa.py # 薄仿真平台 RPA adapter(委托 *_playwright.py)
|
||||||
real_rpa.py # 真实系统 RPA(占位,谨慎实现)
|
real_rpa.py # 真实系统 RPA(占位,谨慎实现)
|
||||||
|
|
||||||
|
scripts/service/
|
||||||
|
<platform>_playwright.py # RPA 主流程(厚);与薄 sim_rpa.py 并列
|
||||||
|
account_client.py # account-manager subprocess 唯一封装
|
||||||
|
browser_session.py # async persistent context 启动
|
||||||
```
|
```
|
||||||
|
|
||||||
模板示例(均在 `examples/`,**不在** `scripts/`):
|
模板示例(均在 `examples/`,**不在** `scripts/`):
|
||||||
|
|
||||||
- **仿真浏览器 RPA 完整案例**:`examples/simulator_browser_rpa/` — mock + simulator_rpa + sandbox 页面 + adapter 分层 + 测试
|
- **仿真浏览器 RPA 完整案例**:`examples/simulator_browser_rpa/` — async mock + simulator_rpa + `simulator_playwright.py` + sandbox 页面 + adapter 分层 + 测试
|
||||||
- **真实浏览器 RPA 完整案例**:`examples/real_browser_rpa/` — 登录/验证码/滚动采集
|
- **真实浏览器 RPA 完整案例**:`examples/real_browser_rpa/` — 登录/验证码/滚动采集 + `account_client.py`
|
||||||
- **真实 API / 仿真 API**:`examples/real_api/`、`examples/simulator_api/` — 当前为规划占位,尚未沉淀可复制实现
|
- **真实 API / 仿真 API**:`examples/real_api/`、`examples/simulator_api/` — 当前为规划占位,尚未沉淀可复制实现
|
||||||
|
|
||||||
复制 adapter 分层时,以 `examples/simulator_browser_rpa/scripts/service/adapter/` 为权威参考,在新技能中创建 `scripts/service/<domain>_adapter/` 并按 README copy map 选择性复制。
|
复制 adapter 分层时,以修正后的 `examples/simulator_browser_rpa/`(薄 adapter + `simulator_playwright.py`)与 `examples/real_browser_rpa/scripts/service/account_client.py` 为权威参考,在新技能中创建 `scripts/service/<domain>_adapter/` 并按 README copy map 选择性复制。
|
||||||
|
|
||||||
> 先判断属于四象限哪一种(`real_browser_rpa` / `real_api` / `simulator_browser_rpa` / `simulator_api`),再读对应 `examples/*/README.md`。示例是**参考架构与边界**,不是业务代码原样复制。
|
> 先判断属于四象限哪一种(`real_browser_rpa` / `real_api` / `simulator_browser_rpa` / `simulator_api`),再读对应 `examples/*/README.md`。示例是**参考架构与边界**,不是业务代码原样复制。
|
||||||
|
|
||||||
@@ -93,7 +98,7 @@ def get_adapter():
|
|||||||
|
|
||||||
1. 在 `SKILL.md` 的 `metadata.openclaw.dependencies.required` 声明。
|
1. 在 `SKILL.md` 的 `metadata.openclaw.dependencies.required` 声明。
|
||||||
2. **普通兄弟技能调用**,优先走统一 **`service.sibling_bridge`**(`call_sibling_json`),**不要**在 `task_service.py`、`task_rpa.py` 等业务流程文件中到处散落 `subprocess.run`。
|
2. **普通兄弟技能调用**,优先走统一 **`service.sibling_bridge`**(`call_sibling_json`),**不要**在 `task_service.py`、`task_rpa.py` 等业务流程文件中到处散落 `subprocess.run`。
|
||||||
3. **account-manager 账号/租约能力**是例外:可参考 `examples/real_browser_rpa/scripts/service/account_client.py`,封装为**单一** `account_client.py`;允许在该文件内部集中通过 subprocess 调 account-manager CLI。
|
3. **account-manager 账号/租约能力**是例外:可参考 `examples/real_browser_rpa/scripts/service/account_client.py` 与 `examples/simulator_browser_rpa/scripts/service/account_client.py`,封装为**单一** `account_client.py`;允许在该文件内部集中通过 subprocess 调 account-manager CLI。**禁止** import `rpa_helpers` 等 account-manager 内部模块;`simulator_rpa` 与 `real_rpa` 均走同一 `pick_web_account` / `release_lease` 模式。
|
||||||
4. **不允许**直接 `import account-manager` 的内部 Python 模块(如 `service/`、`util/`、`db/`)。
|
4. **不允许**直接 `import account-manager` 的内部 Python 模块(如 `service/`、`util/`、`db/`)。
|
||||||
5. **pick lease 后必须 `finally release lease`**;进程被 kill 后可能残留 lease,需在运维文档说明排查方式(查 account-manager lease 列表 / 手动释放)。
|
5. **pick lease 后必须 `finally release lease`**;进程被 kill 后可能残留 lease,需在运维文档说明排查方式(查 account-manager lease 列表 / 手动释放)。
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
1. **三层优先级**:`进程环境变量` > `{数据目录}/.env` > 仓库 `.env.example` 默认值。
|
1. **三层优先级**:`进程环境变量` > `{数据目录}/.env` > 仓库 `.env.example` 默认值。
|
||||||
2. **`.env.example` 进仓库**:带注释的全量默认配置,是配置项的"单一事实来源"。
|
2. **`.env.example` 进仓库**:带注释的全量默认配置,是配置项的"单一事实来源"。
|
||||||
3. **首次运行自动 copy(bootstrap)**:`scripts/main.py` 启动与 `cli.app.main()` 均会调用 `util.config_bootstrap.bootstrap_skill_config()`,把仓库根目录 `.env.example` 复制到
|
3. **首次运行自动 copy(bootstrap)**:`scripts/main.py` 启动与 `cli.app.main()` 均会调用 `util.config_bootstrap.bootstrap_skill_config()`,把仓库根目录 `.env.example` 复制到
|
||||||
`{CLAW_DATA_ROOT}/{user}/{slug}/.env`(**已存在则不整体覆盖**,保护用户改过的值)。
|
`{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/{slug}/.env`(**已存在则不整体覆盖**,保护用户改过的值)。
|
||||||
4. **技能升级合并缺失项**:`merge_missing_env_keys` 会把 `.env.example` 中新增、但用户 `.env` 尚未包含的 key **追加**进去(带注释块)。
|
4. **技能升级合并缺失项**:`merge_missing_env_keys` 会把 `.env.example` 中新增、但用户 `.env` 尚未包含的 key **追加**进去(带注释块)。
|
||||||
5. **敏感信息绝不进 `.env`**:密码/密钥/口令走 account-manager 的 `secret-ref`(见下"红线")。
|
5. **敏感信息绝不进 `.env`**:密码/密钥/口令走 account-manager 的 `secret-ref`(见下"红线")。
|
||||||
|
|
||||||
@@ -23,6 +23,7 @@ OPENCLAW_TEST_TARGET=mock # mock | simulator_rpa | real_api | real_
|
|||||||
TARGET_BASE_URL=https://sandbox.jc2009.com
|
TARGET_BASE_URL=https://sandbox.jc2009.com
|
||||||
|
|
||||||
# ── 默认账号(仅非敏感标识;密码走 account-manager)──
|
# ── 默认账号(仅非敏感标识;密码走 account-manager)──
|
||||||
|
# 浏览器 RPA simulator_rpa 联调账号来自 account-manager(platform + profile_dir),不是此处的 DEFAULT_LOGIN_ID
|
||||||
DEFAULT_LOGIN_ID=04110001
|
DEFAULT_LOGIN_ID=04110001
|
||||||
|
|
||||||
# ── 浏览器 / RPA ──
|
# ── 浏览器 / RPA ──
|
||||||
@@ -30,7 +31,7 @@ OPENCLAW_BROWSER_HEADLESS=0 # 0=有头(默认) 1=无头(CI)
|
|||||||
OPENCLAW_PLAYWRIGHT_STEALTH=1 # 1=开启反检测指纹(默认)
|
OPENCLAW_PLAYWRIGHT_STEALTH=1 # 1=开启反检测指纹(默认)
|
||||||
|
|
||||||
# ── 录屏与失败存证 ──
|
# ── 录屏与失败存证 ──
|
||||||
OPENCLAW_RECORD_VIDEO=1 # 1=录屏+字幕+旁白+背景音+MP4(RPA 默认开,见 RPA.md)
|
OPENCLAW_RECORD_VIDEO=0 # 0=默认不录屏;1=启用录屏+字幕+旁白+背景音+MP4(见 RPA.md)
|
||||||
OPENCLAW_ARTIFACTS_ON_FAILURE=1 # 1=失败截图(默认)
|
OPENCLAW_ARTIFACTS_ON_FAILURE=1 # 1=失败截图(默认)
|
||||||
|
|
||||||
# ── 节流 / 超时 ──
|
# ── 节流 / 超时 ──
|
||||||
@@ -39,7 +40,22 @@ STEP_DELAY_MAX=5.0
|
|||||||
HUMAN_WAIT_TIMEOUT=180 # 滑块/验证码/2FA 等人工超时(秒)
|
HUMAN_WAIT_TIMEOUT=180 # 滑块/验证码/2FA 等人工超时(秒)
|
||||||
```
|
```
|
||||||
|
|
||||||
**业务专属配置必须带技能前缀**(如 `DEMO_XXX`、`MY_SKILL_XXX`),**不要污染全局命名空间**(禁止 `SCRAPE_1688_*`、`RECEIVE_ORDER_*` 等跨技能前缀写入模板)。
|
**业务专属配置必须带技能前缀**(如 `DEMO_XXX`、`MY_SKILL_XXX`、`SKILL_DOWNLOAD_DIR`),**不要污染全局命名空间**(禁止 `SCRAPE_1688_*`、`RECEIVE_ORDER_*` 等跨技能前缀写入模板)。
|
||||||
|
|
||||||
|
### 数据目录子路径(下载 / 导入 / 导出)
|
||||||
|
|
||||||
|
技能**自己写入**的文件默认在 `{JIANGCHANG_DATA_ROOT}/{USER_ID}/{slug}/` 下标准子目录(`downloads/`、`imports/`、`exports/` 等)。须通过 `util.runtime_paths.resolve_data_path()` 或 `get_*_dir()` 解析,**禁止** `os.path.abspath(config.get(...))` 相对 CWD。
|
||||||
|
|
||||||
|
- 权威说明:[`DATA_PATHS.md`](DATA_PATHS.md)
|
||||||
|
- `.env.example` 中路径类配置**留空即用默认**;若写相对路径,必须相对 **skill 数据目录**,**禁止** `./outputs/...` 这类相对 workspace 的写法
|
||||||
|
- 可选 env:`SKILL_DOWNLOAD_DIR`、`SKILL_IMPORT_DIR`、`SKILL_EXPORT_DIR` 等(见 DATA_PATHS.md)
|
||||||
|
|
||||||
|
### 录屏开关(`OPENCLAW_RECORD_VIDEO`)
|
||||||
|
|
||||||
|
- **模板默认 `OPENCLAW_RECORD_VIDEO=0`**,降低本地开发 / 调试成本(不启 ffmpeg、不生成 MP4)。
|
||||||
|
- 需要**生产留证、合规记录、客户现场复现或排障**时,可在用户 `.env` 或进程环境变量中设为 `OPENCLAW_RECORD_VIDEO=1`。
|
||||||
|
- **默认关闭不代表可以删除录屏接入**:RPA / 长任务代码仍须保留 `RpaVideoSession`、`video.add_step` 与 video artifact 写入 `result_summary`(见 `RPA.md` §5.3)。
|
||||||
|
- **已落盘的用户 `.env` 不会被模板整体覆盖**;老用户保留原值,技能升级时仅通过 `merge_missing_env_keys` **追加** `.env.example` 中新增的 key。
|
||||||
|
|
||||||
## 🚫 红线:敏感信息不进 `.env`
|
## 🚫 红线:敏感信息不进 `.env`
|
||||||
|
|
||||||
@@ -83,7 +99,7 @@ config.get_float("STEP_DELAY_MIN", 1.0)
|
|||||||
## health / config-path
|
## health / config-path
|
||||||
|
|
||||||
- **`health`**:输出 `collect_runtime_diagnostics` 字段(`platform_kit_version_ok`、`ffmpeg_path` 等),**不打印敏感值**;补充 `env_path` / `env_exists` / `example_path`。
|
- **`health`**:输出 `collect_runtime_diagnostics` 字段(`platform_kit_version_ok`、`ffmpeg_path` 等),**不打印敏感值**;补充 `env_path` / `env_exists` / `example_path`。
|
||||||
- **`config-path`**:输出 JSON,包含 `skill`、`env_path`(用户数据目录 `.env`)、`example_path`(仓库 `.env.example` 绝对路径),便于排查落盘位置。
|
- **`config-path`**:输出 JSON,包含 `skill`、`env_path`(用户数据目录 `.env`)、`example_path`(仓库 `.env.example` 绝对路径),便于排查落盘位置;业务 skill 建议附加 `list_resolved_data_paths()` 中的子目录路径(见 [`DATA_PATHS.md`](DATA_PATHS.md))。
|
||||||
|
|
||||||
## doctor / setup 命令(可选)
|
## doctor / setup 命令(可选)
|
||||||
|
|
||||||
@@ -96,4 +112,5 @@ config.get_float("STEP_DELAY_MIN", 1.0)
|
|||||||
|
|
||||||
- `RPA.md` — 三端 RPA 标准与各开关含义
|
- `RPA.md` — 三端 RPA 标准与各开关含义
|
||||||
- `ADAPTER.md` — `OPENCLAW_TEST_TARGET` 四档模式
|
- `ADAPTER.md` — `OPENCLAW_TEST_TARGET` 四档模式
|
||||||
- `RUNTIME.md` — `CLAW_*` 环境变量与数据目录约定
|
- `RUNTIME.md` — `JIANGCHANG_DATA_ROOT` 与数据根约定
|
||||||
|
- `DATA_PATHS.md` — 下载/导入/导出等子目录与 `resolve_data_path` 规范
|
||||||
|
|||||||
160
development/DATA_PATHS.md
Normal file
160
development/DATA_PATHS.md
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
# 用户数据目录与文件路径黄金标准
|
||||||
|
|
||||||
|
> 本文是 skill **读写本地文件** 的权威约定。凡涉及下载、导入、导出、缓存、RPA 存证等路径,复制模板后须遵守本文;Agent 实现业务 skill 时也应先读本文。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 根目录
|
||||||
|
|
||||||
|
所有技能持久化数据(配置、数据库、业务文件)默认落在:
|
||||||
|
|
||||||
|
```text
|
||||||
|
{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/{skill_slug}/
|
||||||
|
```
|
||||||
|
|
||||||
|
示例:
|
||||||
|
|
||||||
|
```text
|
||||||
|
D:\jiangchang-data\12500\download-video-baidu-haokan\
|
||||||
|
```
|
||||||
|
|
||||||
|
实现:`util.runtime_paths.get_skill_data_dir()`。
|
||||||
|
|
||||||
|
**禁止**把技能自己写入的文件落到:
|
||||||
|
|
||||||
|
- Agent / 宿主 **workspace**(进程 CWD)
|
||||||
|
- 技能安装目录(含 `.openclaw/skills/...`)
|
||||||
|
- 未在本文声明的任意相对 CWD 路径
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 标准子目录树
|
||||||
|
|
||||||
|
| 子目录 | 用途 | 默认 helper |
|
||||||
|
|--------|------|-------------|
|
||||||
|
| `downloads/` | 从外部拉取的原始文件(视频、回单、PDF…) | `get_downloads_dir()` |
|
||||||
|
| `imports/` | 用户/Agent 放入的待处理清单(urls.txt、batch.json、CSV) | `get_imports_dir()` |
|
||||||
|
| `exports/` | 导出给用户的结果(xlsx/csv/json) | `get_exports_dir()` |
|
||||||
|
| `uploads/` | 待发布到外部平台的 staging(可选) | `get_uploads_dir()` |
|
||||||
|
| `cache/` | 可再生缓存(页面快照、解析中间结果) | `get_cache_dir()` |
|
||||||
|
| `temp/` | 单次任务 scratch,任务结束可删 | `get_temp_dir()` |
|
||||||
|
| `rpa-artifacts/` | RPA 失败截图、录屏中间产物 | `get_rpa_artifacts_dir(batch_id)` |
|
||||||
|
| `videos/` | RPA 录屏成片 MP4 | `get_videos_dir()` |
|
||||||
|
| `{skill_slug}.db` | SQLite | `get_db_path()` |
|
||||||
|
| `.env` | 用户配置 | `config.get_env_file_path()` |
|
||||||
|
|
||||||
|
复制后若业务不需要某目录,可不创建;**但一旦写入该类文件,必须走对应 helper**。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 两类路径
|
||||||
|
|
||||||
|
### A. 技能拥有(skill-owned)
|
||||||
|
|
||||||
|
技能**创建或更新**的文件:下载结果、导出报表、失败截图、队列 sidecar 等。
|
||||||
|
|
||||||
|
- **默认**必须在 `{skill_data_dir}/<子目录>/` 下。
|
||||||
|
- **必须**通过 `resolve_data_path()` 或 `get_*_dir()` 解析,**禁止** `os.path.abspath(config.get(...))` 相对 CWD。
|
||||||
|
|
||||||
|
### B. 用户显式输入(user-owned)
|
||||||
|
|
||||||
|
用户在 CLI / Agent 对话中给出的**已有文件**绝对路径,例如「发布这个视频 `D:\素材\x.mp4`」。
|
||||||
|
|
||||||
|
- 技能**只读**,路径可以是用户磁盘任意位置。
|
||||||
|
- 使用 `resolve_input_path()`:绝对路径原样;**相对路径**解析为 `{skill_data_dir}/imports/<相对路径>`,**不**相对 workspace/CWD。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 配置项(`.env`)
|
||||||
|
|
||||||
|
可选覆盖项(**留空则用默认子目录**):
|
||||||
|
|
||||||
|
```ini
|
||||||
|
# ── 数据目录子路径(见 development/DATA_PATHS.md)──
|
||||||
|
# 相对路径相对于 {JIANGCHANG_DATA_ROOT}/{USER_ID}/{slug}/,不是 workspace
|
||||||
|
# SKILL_DOWNLOAD_DIR=downloads/videos
|
||||||
|
# SKILL_IMPORT_DIR=imports
|
||||||
|
# SKILL_EXPORT_DIR=exports
|
||||||
|
# SKILL_UPLOAD_DIR=uploads
|
||||||
|
# SKILL_CACHE_DIR=cache
|
||||||
|
# SKILL_TEMP_DIR=temp
|
||||||
|
```
|
||||||
|
|
||||||
|
| 规则 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| 未配置 | `{skill_data_dir}/{default_subdir}` |
|
||||||
|
| 相对值 `downloads/videos` | `{skill_data_dir}/downloads/videos` |
|
||||||
|
| 绝对值 `D:\nas\exports` | 高级用户/NAS 挂载,原样使用 |
|
||||||
|
| **禁止** `./outputs/...` | 会随 CWD 漂移,不得作为 `.env.example` 活跃配置行 |
|
||||||
|
|
||||||
|
业务专属路径 env key 须带 **`SKILL_` 前缀**(或技能 slug 前缀),避免污染全局命名空间。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 代码用法
|
||||||
|
|
||||||
|
```python
|
||||||
|
from util.runtime_paths import (
|
||||||
|
get_downloads_dir,
|
||||||
|
get_imports_dir,
|
||||||
|
resolve_data_path,
|
||||||
|
resolve_input_path,
|
||||||
|
list_resolved_data_paths,
|
||||||
|
)
|
||||||
|
|
||||||
|
# 下载保存(A 类)
|
||||||
|
dest = os.path.join(get_downloads_dir(), f"{vid}.mp4")
|
||||||
|
|
||||||
|
# 或带 env 覆盖
|
||||||
|
out_dir = resolve_data_path("SKILL_DOWNLOAD_DIR", "downloads")
|
||||||
|
|
||||||
|
# CLI -i urls.txt(B 类,相对路径 → imports/)
|
||||||
|
manifest = resolve_input_path(args.input_path)
|
||||||
|
|
||||||
|
# health 诊断
|
||||||
|
paths = list_resolved_data_paths()
|
||||||
|
```
|
||||||
|
|
||||||
|
**反模式(禁止):**
|
||||||
|
|
||||||
|
```python
|
||||||
|
# ❌ 相对 CWD,Agent 从 workspace 执行时会写错盘
|
||||||
|
os.path.abspath(config.get("DOWNLOAD_OUTPUT_DIR"))
|
||||||
|
|
||||||
|
# ❌ .env.example 里写 ./outputs/videos
|
||||||
|
DOWNLOAD_OUTPUT_DIR=./outputs/videos
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. health / config-path
|
||||||
|
|
||||||
|
`health` 或 `config-path` 建议输出 `list_resolved_data_paths()` 中的路径,便于排查「文件写到哪里去了」。展示路径须与 `run` 实际使用的一致。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. 与 RPA 存证的关系
|
||||||
|
|
||||||
|
- 失败截图、录屏中间文件:`rpa-artifacts/{batch_id}/`(见 [`RPA.md`](RPA.md) §5.1)
|
||||||
|
- 录屏成片:`videos/`(见 [`RPA.md`](RPA.md) §5.3)
|
||||||
|
|
||||||
|
业务 `downloads/` 与 RPA `videos/` **分工不同**:前者是业务产出文件,后者是操作过程录屏。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. 测试
|
||||||
|
|
||||||
|
- 单元测试须用 `IsolatedDataRoot`,断言路径落在临时数据根下。
|
||||||
|
- `tests/test_runtime_paths.py` 覆盖 `resolve_data_path` / `resolve_input_path`。
|
||||||
|
- `POLICY-DATA-PATH-001`:禁止 `.env.example` 中 `./` 路径;禁止业务代码 `abspath(config.get(...))`。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. 相关文档
|
||||||
|
|
||||||
|
| 文档 | 内容 |
|
||||||
|
|------|------|
|
||||||
|
| [`RUNTIME.md`](RUNTIME.md) | 数据根、共享 runtime、编码 |
|
||||||
|
| [`CONFIG.md`](CONFIG.md) | `.env` bootstrap 与三层优先级 |
|
||||||
|
| [`RPA.md`](RPA.md) | rpa-artifacts / videos 存证 |
|
||||||
|
| [`POLICY_MATRIX.md`](POLICY_MATRIX.md) | POLICY-DATA-PATH-001 |
|
||||||
@@ -79,11 +79,14 @@
|
|||||||
|
|
||||||
你不应该直接在这个仓库里开发业务,而应该:
|
你不应该直接在这个仓库里开发业务,而应该:
|
||||||
|
|
||||||
1. 复制这个目录
|
0. 按 [`NAMING.md`](NAMING.md) 确定 slug(`{verb}-{noun-phrase}-{platform}`)
|
||||||
2. 改成新 skill 的目录名
|
1. **优先**用 [`tools/scaffold_skill.ps1`](../tools/scaffold_skill.ps1) 创建新目录(见 [`tools/README.md`](../tools/README.md))
|
||||||
|
2. 在新目录内 `git init` 并绑定**本技能**远端(**不得**保留模板 `.git`)
|
||||||
3. 把占位内容替换掉
|
3. 把占位内容替换掉
|
||||||
4. 再开始写业务逻辑
|
4. 再开始写业务逻辑
|
||||||
|
|
||||||
|
> **Git 红线**:禁止资源管理器整文件夹复制后保留模板 `.git`;`git remote -v` 必须指向新技能仓库,不能仍是 skill-template。
|
||||||
|
|
||||||
## 2. 新 skill 的标准目录结构
|
## 2. 新 skill 的标准目录结构
|
||||||
|
|
||||||
复制模板后,你应该保留下面这套结构:
|
复制模板后,你应该保留下面这套结构:
|
||||||
@@ -149,11 +152,13 @@ scripts/
|
|||||||
- `service/`
|
- `service/`
|
||||||
作用:核心业务逻辑
|
作用:核心业务逻辑
|
||||||
比如任务编排、调用兄弟技能、外部 API、可选浏览器自动化
|
比如任务编排、调用兄弟技能、外部 API、可选浏览器自动化
|
||||||
|
**负责业务关键节点日志**(`task_start` / 外部调用 / `task_failed` 等,见 [`LOGGING.md`](LOGGING.md))
|
||||||
|
|
||||||
- `util/`
|
- `util/`
|
||||||
作用:常量、日志、路径、时间工具、通用帮助函数
|
作用:常量、日志、路径、时间工具、通用帮助函数
|
||||||
|
`util/logging_config.py` 是 `jiangchang_skill_core.unified_logging` 的**薄封装**,业务代码应通过它获取 logger
|
||||||
|
|
||||||
公共能力(config、logging、runtime_env、rpa、media_assets、video_session、runtime_diagnostics)从共享 runtime 的 `jiangchang-platform-kit>=1.0.14` import,**不得**在 `scripts/` 下保留 `jiangchang_skill_core/` 副本。
|
公共能力(config、logging、runtime_env、rpa、media_assets、video_session、runtime_diagnostics、activity/SRCP)从共享 runtime 的 `jiangchang-platform-kit>=1.2.0` import,**不得**在 `scripts/` 下保留 `jiangchang_skill_core/` 副本。
|
||||||
|
|
||||||
## 3.2 开发 RPA 类 skill
|
## 3.2 开发 RPA 类 skill
|
||||||
|
|
||||||
@@ -167,10 +172,13 @@ scripts/
|
|||||||
- `examples/real_browser_rpa/scripts/service/task_rpa.py`
|
- `examples/real_browser_rpa/scripts/service/task_rpa.py`
|
||||||
- `examples/real_browser_rpa/scripts/service/account_client.py`
|
- `examples/real_browser_rpa/scripts/service/account_client.py`
|
||||||
- 若是 **仿真浏览器 RPA**(自有 sandbox、表单批量提交、可控 DOM),**必须先读** `examples/simulator_browser_rpa/README.md`,再按需复制到 `scripts/service/`:
|
- 若是 **仿真浏览器 RPA**(自有 sandbox、表单批量提交、可控 DOM),**必须先读** `examples/simulator_browser_rpa/README.md`,再按需复制到 `scripts/service/`:
|
||||||
- `examples/simulator_browser_rpa/scripts/service/browser_session.py`
|
- `examples/simulator_browser_rpa/scripts/service/browser_session.py`(async)
|
||||||
- `examples/simulator_browser_rpa/scripts/service/adapter/`
|
- `examples/simulator_browser_rpa/scripts/service/account_client.py`(subprocess,对齐 `real_browser_rpa`)
|
||||||
- `examples/simulator_browser_rpa/scripts/service/task_service.py`
|
- `examples/simulator_browser_rpa/scripts/service/simulator_playwright.py`(RPA 主流程,复制后改名为 `<platform>_playwright.py`)
|
||||||
|
- `examples/simulator_browser_rpa/scripts/service/adapter/`(薄 `simulator_rpa` + mock)
|
||||||
|
- `examples/simulator_browser_rpa/scripts/service/task_service.py`(async 编排)
|
||||||
- `sandbox/demo_app.html` 仅留在 examples,不进入生产 skill
|
- `sandbox/demo_app.html` 仅留在 examples,不进入生产 skill
|
||||||
|
- **禁止**:`rpa_helpers`、sync Playwright 用于完整技能 RPA 主路径、`task_service` 散落 account-manager subprocess
|
||||||
3. **只用共享库,不在 skill 里重写反反爬**:
|
3. **只用共享库,不在 skill 里重写反反爬**:
|
||||||
```python
|
```python
|
||||||
from jiangchang_skill_core import config
|
from jiangchang_skill_core import config
|
||||||
@@ -187,7 +195,7 @@ scripts/
|
|||||||
技能根目录的 `requirements.txt` 是**标准文件**,用于声明本技能**特有** Python 三方依赖。
|
技能根目录的 `requirements.txt` 是**标准文件**,用于声明本技能**特有** Python 三方依赖。
|
||||||
|
|
||||||
- **公共依赖**(`jiangchang-platform-kit`、`playwright`、config、runtime diagnostics、RPA 公共能力等)由**宿主共享 runtime** 提供,**不要**写入技能 `requirements.txt`。
|
- **公共依赖**(`jiangchang-platform-kit`、`playwright`、config、runtime diagnostics、RPA 公共能力等)由**宿主共享 runtime** 提供,**不要**写入技能 `requirements.txt`。
|
||||||
- `SKILL.md` 的 `metadata.openclaw.platform_kit_min_version`(当前 `1.0.14`)是运行契约/兼容性声明,供宿主安装与启用时校验,**不是** pip 依赖声明。
|
- `SKILL.md` 的 `metadata.openclaw.platform_kit_min_version`(当前 `1.2.0`)是运行契约/兼容性声明,供宿主安装与启用时校验,**不是** pip 依赖声明。
|
||||||
- 匠厂宿主安装/更新技能后,会将技能 `requirements.txt` 安装到共享 venv:`{JIANGCHANG_DATA_ROOT}/python-runtime/.venv`。
|
- 匠厂宿主安装/更新技能后,会将技能 `requirements.txt` 安装到共享 venv:`{JIANGCHANG_DATA_ROOT}/python-runtime/.venv`。
|
||||||
- **不要**在业务代码中 `subprocess` / `pip install`;缺依赖由 `health` 报错,由宿主负责安装。
|
- **不要**在业务代码中 `subprocess` / `pip install`;缺依赖由 `health` 报错,由宿主负责安装。
|
||||||
- **版本约束尽量收窄**,降低多技能共享 venv 时的冲突风险。推荐范围写法:
|
- **版本约束尽量收窄**,降低多技能共享 venv 时的冲突风险。推荐范围写法:
|
||||||
@@ -243,12 +251,52 @@ release workflow 会对 `scripts/` 下的 Python 源码做加密/打包。当前
|
|||||||
|
|
||||||
### 第一步:复制模板并改目录名
|
### 第一步:复制模板并改目录名
|
||||||
|
|
||||||
例如你要开发 `your-skill-slug`(或 `disburse-payroll-icbc` 一类领域 skill):
|
例如你要开发 `disburse-payroll-icbc` 一类领域 skill(目录名 = slug):
|
||||||
|
|
||||||
1. 复制 `skill-template`
|
#### 推荐方式(首选)
|
||||||
2. 新目录改成与 `slug` 一致的名称(如 `your-skill-slug`)
|
|
||||||
3. 初始化为独立 git 仓库
|
在 **skill-template 仓库根目录**执行:
|
||||||
4. 关联它自己的远端仓库
|
|
||||||
|
```powershell
|
||||||
|
.\tools\scaffold_skill.ps1 -Slug disburse-payroll-icbc -Destination D:\OpenClaw\client-gdcm\disburse-payroll-icbc
|
||||||
|
cd D:\OpenClaw\client-gdcm\disburse-payroll-icbc
|
||||||
|
git init
|
||||||
|
git remote add origin <你的新技能 Gitea/Git 仓库 URL>
|
||||||
|
git remote -v # 确认 origin 不是 skill-template
|
||||||
|
```
|
||||||
|
|
||||||
|
跨平台可用 `python tools/scaffold_skill.py --slug ... --destination ...`(见 [`tools/README.md`](../tools/README.md))。
|
||||||
|
|
||||||
|
脚手架会排除 `.git`、缓存与 `.env`,并删除 `.openclaw-skill-template` 标记;**不会**自动 `git init`。
|
||||||
|
|
||||||
|
#### 禁止方式
|
||||||
|
|
||||||
|
| 做法 | 后果 |
|
||||||
|
|------|------|
|
||||||
|
| ❌ 资源管理器整文件夹复制后不做 Git 清理 | 隐藏 `.git` 被带走,push 串到 template |
|
||||||
|
| ❌ 保留模板 `.git` 只改 `remote url` | 历史、分支、对象库仍属 template |
|
||||||
|
| ❌ 未删 `.git` 就 `git init` | 嵌套/混乱仓库,难以排查 |
|
||||||
|
|
||||||
|
#### 若已手工复制(补救)
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
cd <新技能目录>
|
||||||
|
Remove-Item -Recurse -Force .git
|
||||||
|
Remove-Item -Recurse -Force .pytest_cache -ErrorAction SilentlyContinue
|
||||||
|
Remove-Item -Force .openclaw-skill-template -ErrorAction SilentlyContinue
|
||||||
|
git init
|
||||||
|
git remote add origin <新技能仓库 URL>
|
||||||
|
git remote -v
|
||||||
|
```
|
||||||
|
|
||||||
|
#### AI / 编程代理复制红线
|
||||||
|
|
||||||
|
| 禁止 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| 保留模板 `.git` | 必须先 `Remove-Item -Recurse -Force .git` 再 `git init` |
|
||||||
|
| `origin` 仍指向 skill-template | 复制后必须 `git remote -v` 自检 |
|
||||||
|
| 保留 `.openclaw-skill-template` | 仅 template 源仓库可有;业务技能不得保留 |
|
||||||
|
| 复制 `.pytest_cache` / `__pycache__` | 用 scaffold 已排除;手工复制应删 |
|
||||||
|
|
||||||
目录名要和 skill slug 对齐,后面很多地方都依赖这个命名。
|
目录名要和 skill slug 对齐,后面很多地方都依赖这个命名。
|
||||||
|
|
||||||
@@ -366,7 +414,8 @@ metadata:
|
|||||||
|
|
||||||
- `README.md` — Agent 参考索引(**不是**市场说明;不得含 YAML frontmatter 或 `description`)
|
- `README.md` — Agent 参考索引(**不是**市场说明;不得含 YAML frontmatter 或 `description`)
|
||||||
- `CLI.md` — 命令、参数、默认值、兄弟技能调用方式
|
- `CLI.md` — 命令、参数、默认值、兄弟技能调用方式
|
||||||
- `SCHEMA.md` — 数据库路径、核心表结构、日志表结构
|
- `SCHEMA.md` — 数据库路径、`_jiangchang_*` 数据管理契约、日志表结构
|
||||||
|
- `ACTIONS.md` — Skill Action manifest、宿主入口、参数与执行契约
|
||||||
- 可按需增加 `ERRORS.md`、`INTEGRATION.md` 等编排向补充
|
- 可按需增加 `ERRORS.md`、`INTEGRATION.md` 等编排向补充
|
||||||
|
|
||||||
**`development/`**(开发者 / AI 编程代理)
|
**`development/`**(开发者 / AI 编程代理)
|
||||||
@@ -374,6 +423,7 @@ metadata:
|
|||||||
- `REQUIREMENTS.md` — 需求与验收
|
- `REQUIREMENTS.md` — 需求与验收
|
||||||
- `DEVELOPMENT.md` — 开发教程(本文档)
|
- `DEVELOPMENT.md` — 开发教程(本文档)
|
||||||
- `TESTING.md` — 测试分层与隔离(详见 [`TESTING.md`](TESTING.md))
|
- `TESTING.md` — 测试分层与隔离(详见 [`TESTING.md`](TESTING.md))
|
||||||
|
- `LOGGING.md` — 日志分层、必打节点、敏感信息红线
|
||||||
- `ADAPTER.md`、`RPA.md`、`CONFIG.md`、`RUNTIME.md` — 技术规范
|
- `ADAPTER.md`、`RPA.md`、`CONFIG.md`、`RUNTIME.md` — 技术规范
|
||||||
|
|
||||||
## 8. `assets/` 应该放什么
|
## 8. `assets/` 应该放什么
|
||||||
@@ -382,11 +432,14 @@ metadata:
|
|||||||
|
|
||||||
建议放:
|
建议放:
|
||||||
|
|
||||||
|
- `actions.json`
|
||||||
|
宿主 Action 入口 manifest(可选;见 `references/ACTIONS.md`)
|
||||||
|
|
||||||
- `examples/`
|
- `examples/`
|
||||||
比如 `version` 输出示例、`log-get` 输出示例
|
比如 `version` 输出示例、`log-get` 输出示例
|
||||||
|
|
||||||
- `schemas/`
|
- `schemas/`
|
||||||
比如日志记录、机读 JSON 的 schema
|
比如 `skill-actions.schema.json`、日志记录、机读 JSON 的 schema
|
||||||
|
|
||||||
不要把正式研发文档放到 `assets/`。
|
不要把正式研发文档放到 `assets/`。
|
||||||
用户说明进根 `README.md`;Agent 编排资料进 `references/`;开发规范进 `development/`。
|
用户说明进根 `README.md`;Agent 编排资料进 `references/`;开发规范进 `development/`。
|
||||||
@@ -401,40 +454,60 @@ metadata:
|
|||||||
也就是说,`cli/app.py` 的职责是:
|
也就是说,`cli/app.py` 的职责是:
|
||||||
|
|
||||||
1. 打印帮助
|
1. 打印帮助
|
||||||
2. 定义 `run / logs / log-get / health / version`
|
2. 定义 `run / logs / log-get / health / version`(及业务子命令)
|
||||||
3. 把参数转交给 `service.task_service`
|
3. 把参数转交给 `service.task_service`(或薄适配后再进 domain service)
|
||||||
|
|
||||||
不要在 `cli/app.py` 里直接写:
|
不要在 `cli/app.py` 里直接写:
|
||||||
|
|
||||||
- 浏览器自动化
|
- 浏览器自动化
|
||||||
- 子进程调用兄弟技能
|
- 子进程调用兄弟技能
|
||||||
- SQLite 逻辑
|
- SQLite 逻辑
|
||||||
|
- 与 toolbar / cron / agent 来源相关的业务分叉
|
||||||
|
|
||||||
## 10. `service` 层怎么写
|
## 10. `service` 层怎么写
|
||||||
|
|
||||||
`service` 是核心层。
|
`service` 是核心层。推荐拆分(**单业务内核、多入口**):
|
||||||
|
|
||||||
通常可以这样拆:
|
```text
|
||||||
|
cli/app.py → 只解析参数
|
||||||
|
service/task_service.py → job_context / emit / checkpoint / finish / 错误转换
|
||||||
|
service/<domain>_service.py → 唯一业务内核(同步、处理、统计等)
|
||||||
|
db/*_repository.py → 事务与读写
|
||||||
|
assets/actions.json → placements / bind / executionProfile / entrypoint
|
||||||
|
```
|
||||||
|
|
||||||
- `task_service.py`
|
通常还可以有:
|
||||||
放命令编排、参数兜底、结果分流(例如 `cmd_run`)
|
|
||||||
|
|
||||||
- `sibling_bridge.py`
|
- `sibling_bridge.py`
|
||||||
放通用兄弟技能子进程工具(`call_sibling_json`);**具体调用哪个 slug 由业务在 `task_service.py` 决定**,不要在本文件硬编码发布类专用 helper
|
放通用兄弟技能子进程工具(`call_sibling_json`);**具体调用哪个 slug 由业务在 `task_service.py` 或 domain service 决定**,不要在本文件硬编码发布类专用 helper
|
||||||
|
|
||||||
- `xxx_playwright.py`(按需新建)
|
- `xxx_playwright.py`(按需新建)
|
||||||
浏览器后台自动化 **不在模板默认结构中**;若确有需要,按命名约定自建模块并在 `task_service.py` 引用
|
浏览器后台自动化 **不在模板默认结构中**;若确有需要,按命名约定自建模块并由 domain / task_service 引用
|
||||||
|
|
||||||
- `entitlement_service.py`
|
- `entitlement_service.py`
|
||||||
放鉴权逻辑
|
放鉴权逻辑
|
||||||
|
|
||||||
|
禁止:toolbar / cron / Agent / CLI 各自复制一套采集或同步实现;为兼容旧命令再写第二套内核。
|
||||||
|
|
||||||
|
### 日志要求(`cmd_run` / 核心业务)
|
||||||
|
|
||||||
|
`service` 层是**关键业务日志**的落点,须遵循 [`LOGGING.md`](LOGGING.md):
|
||||||
|
|
||||||
|
- `cmd_run` 及主任务入口必须:`log.info("task_start ...")`、`log.info("task_log_saved ...")`;失败路径必须 `log.exception("task_failed ...")`。
|
||||||
|
- 外部 API、兄弟技能、RPA 操作须记录**开始 / 结束 / 耗时 / 状态**(`external_call_start` / `external_call_done elapsed_ms=...`)。
|
||||||
|
- 长任务 / RPA 须配合 `activity.emit` 或 `RpaVideoSession.add_step` 输出用户可见进度;`cmd_run` 须 `job_context` + 各出口 `finish`(见 [`LOGGING.md`](LOGGING.md) §2.5)。
|
||||||
|
- 使用 `from util.logging_config import get_skill_logger`,**不要**用 `print` 替代 logger 做排障日志。
|
||||||
|
- **禁止**在日志中写入 password、token、cookie 等敏感明文(见 `LOGGING.md` §敏感信息红线)。
|
||||||
|
|
||||||
### 一个很重要的原则
|
### 一个很重要的原则
|
||||||
|
|
||||||
不要把所有逻辑都堆进一个文件。
|
不要把所有逻辑都堆进一个文件。
|
||||||
|
|
||||||
推荐流向是:
|
推荐流向是:
|
||||||
|
|
||||||
`cli.app` -> `service.task_service` -> `service.sibling_bridge` / (可选)`service.xxx_playwright` -> `db`
|
`cli.app` -> `service.task_service` -> `service.<domain>_service` -> `db`
|
||||||
|
|
||||||
|
(旁路:`sibling_bridge` / 可选 `xxx_playwright` 仅由 service 调用)
|
||||||
|
|
||||||
## 11. `db` 层怎么写
|
## 11. `db` 层怎么写
|
||||||
|
|
||||||
@@ -445,6 +518,12 @@ metadata:
|
|||||||
|
|
||||||
- `db/task_logs_repository.py`
|
- `db/task_logs_repository.py`
|
||||||
只做增删查改(模板默认表:`task_logs`)
|
只做增删查改(模板默认表:`task_logs`)
|
||||||
|
- `db/display_metadata.py`
|
||||||
|
创建 `_jiangchang_tables` / `_jiangchang_columns` 并幂等写入中文展示名(见 `references/SCHEMA.md`)
|
||||||
|
- `db/display_metadata_validator.py`
|
||||||
|
元数据完整性、editable 权限、options_json 等自检
|
||||||
|
- `db/timestamp_columns.py`
|
||||||
|
标准时间字段 trigger 与维护约定(`created_at` / `updated_at`,Unix 秒级)
|
||||||
|
|
||||||
不要在 `db` 层里:
|
不要在 `db` 层里:
|
||||||
|
|
||||||
@@ -452,6 +531,55 @@ metadata:
|
|||||||
- 打印用户提示
|
- 打印用户提示
|
||||||
- 拼接业务流程
|
- 拼接业务流程
|
||||||
|
|
||||||
|
## 11.5 Skill Action manifest(可选)
|
||||||
|
|
||||||
|
若技能需要出现在宿主**数据管理按钮**、**技能详情**、**定时任务**或 **Agent 直接调用**中,提供 `assets/actions.json`。
|
||||||
|
|
||||||
|
- **运行时金标准**见 [`SKILL_ACTION_RUNTIME.md`](SKILL_ACTION_RUNTIME.md)
|
||||||
|
- 字段契约见 [`references/ACTIONS.md`](../references/ACTIONS.md)(`placements` / `bind.tables` / `executionProfile` 正交)
|
||||||
|
- JSON Schema 见 [`assets/schemas/skill-actions.schema.json`](../assets/schemas/skill-actions.schema.json)
|
||||||
|
- 模板最小示例仅暴露 `health` / `version` / `config-path`(均显式 `executionProfile: "sync"`;**不**自动加 toolbar)
|
||||||
|
- 含 `toolbar` 的 Action:**必须**声明合法 `bind.tables`(`POLICY-SKILL-ACTION-003`)
|
||||||
|
- 含浏览器 RPA / 长耗时的业务技能:**必须**增加至少一条 `"executionProfile": "async"` 且 `placements` 含 `agent` 的 action(`POLICY-SKILL-ACTION-001`)
|
||||||
|
- 没有宿主直接操作需求时,**可以删除** `actions.json`;删除后勿保留失效引用
|
||||||
|
- scaffold **不会**移除 Schema 中的 `bind` 支持,**不会**生成平台业务 Action 或业务表名;仅替换占位 slug
|
||||||
|
|
||||||
|
宿主执行方式:
|
||||||
|
|
||||||
|
```text
|
||||||
|
python {skillRoot}/scripts/main.py <command> <args...>
|
||||||
|
```
|
||||||
|
|
||||||
|
CLI 必须提供稳定退出码、结构化成功输出,以及 `ERROR:<CODE>:` / `HINT:` 错误契约(详见 `references/ACTIONS.md`)。
|
||||||
|
|
||||||
|
### 编排范式:单内核 + 多入口
|
||||||
|
|
||||||
|
长任务 / RPA / 数据同步技能推荐拆分(勿把 `job_context` 塞进纯业务内核):
|
||||||
|
|
||||||
|
```text
|
||||||
|
<domain>_service.sync_*(...) # 唯一业务内核:读外源 → 写本地库(或核心处理)
|
||||||
|
cmd_sync_* (...) # 编排:job_context + 调用内核 + emit/finish(async 时)
|
||||||
|
CLI / Action / cron / Agent # 全部进入同一 cmd_* → 同一内核
|
||||||
|
```
|
||||||
|
|
||||||
|
RPA 批量亦可:
|
||||||
|
|
||||||
|
```text
|
||||||
|
execute_single_<biz>(...) # 鉴权 + 业务 + task_log;无 job_context
|
||||||
|
cmd_run(...) # 单条:job_context + execute_single + finish
|
||||||
|
cmd_run_pick(N, ...) # 批量顺序:job_context + for-loop + emit(progress) + finish
|
||||||
|
cmd_stats() # 只读 sync:JSON,无 job_context
|
||||||
|
```
|
||||||
|
|
||||||
|
- 批量数量用 **`pickCount` / `--pick N` 参数**(任意正整数),不写死条数。
|
||||||
|
- **顺序执行、不并发**同一浏览器 Profile / account lease。
|
||||||
|
- **同步数据**与**宿主表导出**职责分离:同步不写 CSV/Excel;表导出交给数据管理。
|
||||||
|
- 详情见 [`SKILL_ACTION_RUNTIME.md`](SKILL_ACTION_RUNTIME.md);契约样例见 `tests/samples/test_sync_contract.py.sample`、`tests/samples/test_action_core_contract.py.sample`。
|
||||||
|
|
||||||
|
### 队列 + pick(可选)
|
||||||
|
|
||||||
|
有「待处理列表」时:队列表 `pending → processing → success/failed`;数据管理录入或 `import-*` 入库;`run --pick N` 消费;失败用 `reset` 回 `pending`(不自动重试)。Manifest 上配置 `*-run-pick`(常见为 async + toolbar/cron/agent;有 toolbar 则须 `bind.tables`)。
|
||||||
|
|
||||||
## 12. 如何接兄弟技能
|
## 12. 如何接兄弟技能
|
||||||
|
|
||||||
如果 skill 要依赖兄弟 skill,不要在业务代码里写死绝对路径。
|
如果 skill 要依赖兄弟 skill,不要在业务代码里写死绝对路径。
|
||||||
@@ -528,6 +656,14 @@ python scripts/main.py logs
|
|||||||
python scripts/main.py log-get 1
|
python scripts/main.py log-get 1
|
||||||
```
|
```
|
||||||
|
|
||||||
|
除 `health` / `version` / `logs` 外,执行一次 `run`(或你的主任务命令)后,应确认**统一日志文件**已生成并可检索:
|
||||||
|
|
||||||
|
```text
|
||||||
|
{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/logs/jiangchang.log
|
||||||
|
```
|
||||||
|
|
||||||
|
其中应能看到 `cli_start`、`task_start` 等带 `trace_id` / `skill_slug` 的行。路径与分层说明见 [`LOGGING.md`](LOGGING.md)。
|
||||||
|
|
||||||
### 4. 最后再验证真实业务
|
### 4. 最后再验证真实业务
|
||||||
|
|
||||||
比如:
|
比如:
|
||||||
@@ -566,6 +702,10 @@ uses: client-jiangchang/jiangchang-platform-kit/.github/workflows/reusable-relea
|
|||||||
|
|
||||||
在执行 `release.ps1` 之前,必须先在本地确认 `python tests/run_tests.py -v` 通过。测试不通过不得发起正式发布。
|
在执行 `release.ps1` 之前,必须先在本地确认 `python tests/run_tests.py -v` 通过。测试不通过不得发起正式发布。
|
||||||
|
|
||||||
|
`release.ps1` 会在 **auto commit 之前**、推送 tag 之前,对**当前工作区**自动执行默认测试(`python tests/run_tests.py -v`);失败则中止 release,不会留下失败状态的自动提交。仅紧急排障可使用 `-SkipTests` 跳过(会打印黄色警告)。`-DryRun` 预览发布时**仍会实际运行**默认测试,便于在不打 tag 的情况下验证门禁。
|
||||||
|
|
||||||
|
新增或调整开发规范时,须同步 [`development/POLICY_MATRIX.md`](POLICY_MATRIX.md) 与 [`tests/test_development_policy_guard.py`](../tests/test_development_policy_guard.py)(或注明由既有测试覆盖)。
|
||||||
|
|
||||||
当本地开发、自测和联调完成后,还需要把 skill 发布到正式环境做一次完整验证。建议技术人员严格按下面顺序执行,不要跳步。
|
当本地开发、自测和联调完成后,还需要把 skill 发布到正式环境做一次完整验证。建议技术人员严格按下面顺序执行,不要跳步。
|
||||||
|
|
||||||
### 第一步:在 skill 根目录执行 `release.ps1`
|
### 第一步:在 skill 根目录执行 `release.ps1`
|
||||||
@@ -678,6 +818,8 @@ uses: client-jiangchang/jiangchang-platform-kit/.github/workflows/reusable-relea
|
|||||||
每个新 skill 发布前,建议技术人员逐条确认:
|
每个新 skill 发布前,建议技术人员逐条确认:
|
||||||
|
|
||||||
- [ ] 目录结构符合当前模板
|
- [ ] 目录结构符合当前模板
|
||||||
|
- [ ] slug 符合 [`NAMING.md`](NAMING.md)(verb-noun-platform)
|
||||||
|
- [ ] 目录名、`SKILL.md` slug、`constants.SKILL_SLUG` 三者一致
|
||||||
- [ ] `SKILL.md` 中 slug、名称、描述都已替换
|
- [ ] `SKILL.md` 中 slug、名称、描述都已替换
|
||||||
- [ ] `scripts/util/constants.py` 已修改
|
- [ ] `scripts/util/constants.py` 已修改
|
||||||
- [ ] `../references/CLI.md` 示例命令已改成真实命令
|
- [ ] `../references/CLI.md` 示例命令已改成真实命令
|
||||||
@@ -685,13 +827,19 @@ uses: client-jiangchang/jiangchang-platform-kit/.github/workflows/reusable-relea
|
|||||||
- [ ] 没有残留旧平台名
|
- [ ] 没有残留旧平台名
|
||||||
- [ ] `health` / `version` 可运行
|
- [ ] `health` / `version` 可运行
|
||||||
- [ ] `.gitignore` 生效,没有把 `__pycache__` 提交进去
|
- [ ] `.gitignore` 生效,没有把 `__pycache__` 提交进去
|
||||||
- [ ] `release.ps1` 存在
|
- [ ] `release.ps1` 存在(发布前会自动跑 `python tests/run_tests.py -v`;失败不得打 tag)
|
||||||
- [ ] `.github/workflows/release_skill.yaml` 存在
|
- [ ] `.github/workflows/release_skill.yaml` 存在
|
||||||
- [ ] `python tests/run_tests.py -v` 全部通过
|
- [ ] `python tests/run_tests.py -v` 全部通过(含 `test_development_policy_guard.py`)
|
||||||
|
- [ ] 主任务入口(如 `cmd_run`)有关键日志:`task_start`、`task_log_saved`;失败路径使用 `logger.exception`
|
||||||
|
- [ ] 日志不泄露 password / token / cookie 等敏感明文(见 [`LOGGING.md`](LOGGING.md))
|
||||||
|
- [ ] 新增 hard 规范已写入 `development/POLICY_MATRIX.md` 并有对应自动检测
|
||||||
- [ ] `scripts/**/*.py` 单文件 **< 1000 行**(PyArmor 试用/免费模式限制;推荐 < 900 行)
|
- [ ] `scripts/**/*.py` 单文件 **< 1000 行**(PyArmor 试用/免费模式限制;推荐 < 900 行)
|
||||||
- [ ] 源码/文档/配置为 **UTF-8 without BOM**(Python 文件不得含 `U+FEFF`)
|
- [ ] 源码/文档/配置为 **UTF-8 without BOM**(Python 文件不得含 `U+FEFF`)
|
||||||
- [ ] 没有新增默认必跑测试访问真实网络或浏览器
|
- [ ] 没有新增默认必跑测试访问真实网络或浏览器
|
||||||
- [ ] 如有 integration 测试需求,已写在 `tests/integration/` 下并保持 `.sample` 后缀
|
- [ ] 如有 integration 测试需求,已写在 `tests/integration/` 下并保持 `.sample` 后缀
|
||||||
|
- [ ] 本仓库**不是** skill-template 的误复制(根目录**无** `.openclaw-skill-template`)
|
||||||
|
- [ ] `git remote -v` 指向**本技能**远端,URL 不含 skill-template 仓库名
|
||||||
|
- [ ] `git log` 首条提交属于本技能(非模板历史)
|
||||||
|
|
||||||
## 17. 常见错误
|
## 17. 常见错误
|
||||||
|
|
||||||
@@ -747,11 +895,65 @@ uses: client-jiangchang/jiangchang-platform-kit/.github/workflows/reusable-relea
|
|||||||
- 用户说明在根 `README.md`,Agent 资料在 `references/`,开发规范在 `development/`
|
- 用户说明在根 `README.md`,Agent 资料在 `references/`,开发规范在 `development/`
|
||||||
- 统一走 `scripts/main.py` 作为 CLI 入口
|
- 统一走 `scripts/main.py` 作为 CLI 入口
|
||||||
|
|
||||||
|
### 错误 5:平台放 slug 最前
|
||||||
|
|
||||||
|
表现:
|
||||||
|
|
||||||
|
- slug 形如 `erp-download-settlement-report`(平台段错误地放在最前)
|
||||||
|
- 语义校验或 `test_slug_naming` 失败
|
||||||
|
|
||||||
|
要改:
|
||||||
|
|
||||||
|
- 动词放首段,平台放末段,例如 `download-settlement-report-erp`
|
||||||
|
- 见 [`NAMING.md`](NAMING.md)
|
||||||
|
|
||||||
|
### 错误 6:noun 段过长导致超 48 字符
|
||||||
|
|
||||||
|
表现:
|
||||||
|
|
||||||
|
- slug 超过 48 字符
|
||||||
|
- 中间名词段堆砌过多
|
||||||
|
|
||||||
|
要改:
|
||||||
|
|
||||||
|
- 精简 noun-phrase,保留核心业务含义
|
||||||
|
- 见 [`NAMING.md`](NAMING.md) §3 硬约束
|
||||||
|
|
||||||
|
### 错误 7:只改目录名未改 slug
|
||||||
|
|
||||||
|
表现:
|
||||||
|
|
||||||
|
- 与「错误 1」相同,但目录已改名而 `SKILL.md` / `constants.py` 仍为占位
|
||||||
|
|
||||||
|
要检查:
|
||||||
|
|
||||||
|
- `SKILL.md` 的 `metadata.openclaw.slug`
|
||||||
|
- `scripts/util/constants.py` 的 `SKILL_SLUG`
|
||||||
|
|
||||||
|
### 错误 8:复制模板时带走了 `.git`
|
||||||
|
|
||||||
|
表现:
|
||||||
|
|
||||||
|
- `git remote -v` 仍显示 skill-template 的 origin
|
||||||
|
- push 到错误仓库,或 log 里全是模板历史
|
||||||
|
- 新技能目录里仍有 `.openclaw-skill-template`
|
||||||
|
|
||||||
|
修复:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
Remove-Item -Recurse -Force .git
|
||||||
|
Remove-Item -Force .openclaw-skill-template -ErrorAction SilentlyContinue
|
||||||
|
git init
|
||||||
|
git remote add origin <新技能仓库 URL>
|
||||||
|
```
|
||||||
|
|
||||||
|
以后复制请优先用 `tools/scaffold_skill.ps1`(见 [`tools/README.md`](../tools/README.md))。
|
||||||
|
|
||||||
## 18. 推荐开发顺序总结
|
## 18. 推荐开发顺序总结
|
||||||
|
|
||||||
如果让一个新人照着做,我建议他按这个顺序:
|
如果让一个新人照着做,我建议他按这个顺序:
|
||||||
|
|
||||||
1. 复制模板并改目录名
|
1. 按 [`NAMING.md`](NAMING.md) 确定 slug,复制模板并改目录名
|
||||||
2. 改 `SKILL.md` 与根 `README.md`
|
2. 改 `SKILL.md` 与根 `README.md`
|
||||||
3. 改 `scripts/util/constants.py`
|
3. 改 `scripts/util/constants.py`
|
||||||
4. 改 `references/` 与 `development/`
|
4. 改 `references/` 与 `development/`
|
||||||
|
|||||||
312
development/LOGGING.md
Normal file
312
development/LOGGING.md
Normal file
@@ -0,0 +1,312 @@
|
|||||||
|
# 日志规范
|
||||||
|
|
||||||
|
本文件是 skill 日志规范的**权威入口**,面向技术人员与 AI 编程代理。涉及长任务、RPA、外部系统对接的技能,**必须**在实现前通读本文,并在 code review 时对照「必打日志节点清单」人工检查。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 为什么日志是必需的
|
||||||
|
|
||||||
|
OpenClaw 技能常在客户电脑上异步执行,且大量依赖 RPA、浏览器、ERP、微信等外部系统。这类任务具备以下特征:
|
||||||
|
|
||||||
|
- **耗时长**:单次 run 可能数分钟甚至更久,stdout 长时间无输出不代表卡死。
|
||||||
|
- **失败点多**:网络抖动、页面改版、登录态失效、验证码、U 盾等都会导致中途失败。
|
||||||
|
- **环境差异大**:客户 OS、浏览器版本、代理、杀毒软件、屏幕分辨率各不相同,无法复现开发机行为。
|
||||||
|
- **必须离线排查**:技术支持往往无法远程登录客户电脑,只能依赖本地落盘的日志与 artifacts。
|
||||||
|
|
||||||
|
日志用于定位:
|
||||||
|
|
||||||
|
| 维度 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| 失败阶段 | 任务停在鉴权、取号、打开页面、提交还是等待结果 |
|
||||||
|
| 输入范围 | `task_type`、`target_id`、`input_id`、`batch_id` |
|
||||||
|
| 外部系统状态 | HTTP 状态、RPA 步骤、兄弟技能返回码 |
|
||||||
|
| 耗时 | `elapsed_ms`、批量 `current/total` |
|
||||||
|
| 重试与人工介入 | 第几次重试、是否等待验证码 / U 盾 |
|
||||||
|
| 存证路径 | 截图、录屏、`video_log`、失败 artifacts |
|
||||||
|
|
||||||
|
**没有关键节点日志 = 客户现场不可排障。** 不要把 `print` 当作日志;stdout 面向用户与 Agent,文件日志与 Run Journal 面向运维。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 日志分层
|
||||||
|
|
||||||
|
技能日志分四层,职责互不替代:
|
||||||
|
|
||||||
|
### 2.1 统一文件日志(开发 / 运维排查)
|
||||||
|
|
||||||
|
**来源**:`jiangchang_skill_core.unified_logging`(技能内通过 `util.logging_config` 薄封装 import)。
|
||||||
|
|
||||||
|
| API | 用途 |
|
||||||
|
|-----|------|
|
||||||
|
| `setup_skill_logging` | CLI 入口启动时初始化(`cli/app.py` 的 `main()`) |
|
||||||
|
| `get_skill_logger` | 获取带 `skill_slug` 的 logger |
|
||||||
|
| `subprocess_env_with_trace` | 子进程 / 兄弟技能调用时传递 `trace_id` |
|
||||||
|
|
||||||
|
**路径**:
|
||||||
|
|
||||||
|
```text
|
||||||
|
{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/logs/jiangchang.log
|
||||||
|
```
|
||||||
|
|
||||||
|
**特征**:每行带 `trace_id`、`skill_slug`;适合 grep、离线打包发给技术支持。
|
||||||
|
|
||||||
|
### 2.2 Activity / Run Journal(宿主 UI 与用户可见进度)
|
||||||
|
|
||||||
|
**来源**:`jiangchang_skill_core.activity`
|
||||||
|
|
||||||
|
| API | 用途 |
|
||||||
|
|-----|------|
|
||||||
|
| `emit` | 推送用户可读进度(不写 stdout);进入步骤前自动步骤闸门(SRCP) |
|
||||||
|
| `step` | 结构化步骤 |
|
||||||
|
| `finish` | 任务结束;**唯一**写单行 result JSON 到 stdout 的场景 |
|
||||||
|
| `job_context` | 包裹 `cmd_run`;未捕获异常 / `JobStopped` 时自动 `finish` |
|
||||||
|
| `rpa_step` | RPA 专用步骤:闸门 + ▶/✓ emit |
|
||||||
|
| `interruptible_sleep` | RPA 等待(替代裸 `asyncio.sleep`),可暂停/停止 |
|
||||||
|
| `checkpoint` | 长循环内 consult control(一般由 kit 自动调用) |
|
||||||
|
|
||||||
|
**路径**:
|
||||||
|
|
||||||
|
```text
|
||||||
|
{JIANGCHANG_DATA_ROOT}/.jiangchang/runs/{job_id}.jsonl
|
||||||
|
```
|
||||||
|
|
||||||
|
**约定**:
|
||||||
|
|
||||||
|
- `emit` **不写 stdout**;长任务应持续 emit,避免用户以为卡死。
|
||||||
|
- `finish` 才输出单行 result JSON 供宿主解析。
|
||||||
|
- RPA 类技能:`RpaVideoSession.add_step` 会自动同步 activity(无需重复手写每步 emit)。
|
||||||
|
- **禁止**自建 `scripts/util/progress.py` 或向 stdout 打印 `type:progress` JSON;进度只走 Run Journal。
|
||||||
|
- 宿主通过 `{job_id}.control.json` 下发暂停/继续/停止;技能侧由 platform-kit 在步骤闸门自动处理(见 §2.5)。
|
||||||
|
|
||||||
|
### 2.5 步骤控制(SRCP v1,platform-kit >= 1.2.0)
|
||||||
|
|
||||||
|
**权威行为定义在本文**;platform-kit README 为实现细节参考。
|
||||||
|
|
||||||
|
| 通道 | 方向 | 载体 |
|
||||||
|
|------|------|------|
|
||||||
|
| 进度 | 技能 → 宿主 | Run Journal(`emit` / `rpa_step` / `add_step`) |
|
||||||
|
| 结果 | 技能 → 宿主 | `finish()` → Journal 终态 + stdout 一行 result |
|
||||||
|
| 控制 | 宿主 → 技能 | `{JIANGCHANG_DATA_ROOT}/.jiangchang/runs/{job_id}.control.json` |
|
||||||
|
|
||||||
|
`control.json` 的 `command` 只认:`none` | `pause` | `resume` | `stop`。
|
||||||
|
|
||||||
|
技能作者三件事:
|
||||||
|
|
||||||
|
1. `cmd_run` 外包 `with job_context(skill=SKILL_SLUG):`
|
||||||
|
2. 关键步骤 `emit(...)` 或 `@rpa_step` / `video.add_step`
|
||||||
|
3. 每个出口 `finish(status=..., message=..., skill=SKILL_SLUG, **fields)` — **不要**手写多行 JSON 结果
|
||||||
|
|
||||||
|
**单内核多入口**:`execute_single_*` 不含 `job_context`;仅 `cmd_run` / `cmd_run_pick` 包裹。批量 pick 循环内 `checkpoint()` + `emit(..., progress=...)`;部分失败用 `finish(status="partial")`。完整范式见 [`SKILL_ACTION_RUNTIME.md`](SKILL_ACTION_RUNTIME.md)。
|
||||||
|
|
||||||
|
RPA 等待用 `interruptible_sleep`,**不要**裸 `asyncio.sleep`(否则暂停响应滞后)。
|
||||||
|
|
||||||
|
暂停在**步骤边界**生效(当前 `@rpa_step` / `emit` 执行完后、下一步开始前),与影刀「当前指令完成后暂停」一致。
|
||||||
|
|
||||||
|
Journal 会写入 `type: lifecycle` 事件(`paused` / `resumed` / `stopping`),供宿主任务中心显示状态。
|
||||||
|
|
||||||
|
|
||||||
|
### 2.3 `task_logs`(任务结果审计)
|
||||||
|
|
||||||
|
**来源**:`db/task_logs_repository.save_task_log`
|
||||||
|
|
||||||
|
- 适合 `python scripts/main.py logs` / `log-get <id>` 查询。
|
||||||
|
- 记录任务最终状态、`result_summary`(可含 `video_path`、`video_log` 等)。
|
||||||
|
- 面向「这次任务成功还是失败、摘要是什么」,不是逐步 trace。
|
||||||
|
- **鉴权失败与未捕获异常也必须写入 `task_logs`**,保证 `logs` / `log-get` 排查链不断(见模板 `cmd_run` 示范)。
|
||||||
|
|
||||||
|
表结构与字段见 [`references/SCHEMA.md`](../references/SCHEMA.md)。
|
||||||
|
|
||||||
|
### 2.4 RPA video step / artifacts(用户可见动作与存证)
|
||||||
|
|
||||||
|
**来源**:`RpaVideoSession`、`rpa-artifacts/` 目录
|
||||||
|
|
||||||
|
- video artifact 是**标准可启用能力**,**不保证默认每次生成 MP4**(模板默认 `OPENCLAW_RECORD_VIDEO=0`)。
|
||||||
|
- **`OPENCLAW_RECORD_VIDEO=0`**:不生成最终录屏,但 RPA / 长任务仍须保留 `RpaVideoSession`、`video.add_step` 与 Activity 进度同步。
|
||||||
|
- **`OPENCLAW_RECORD_VIDEO=1`**:`result_summary` 应包含 `video_path`、`raw_video`、`video_log`、`video_warnings` 等字段;CLI 可打印录屏路径与诊断。
|
||||||
|
- 用户可见的中文步骤(「打开登录页」「点击提交」)。
|
||||||
|
- 失败截图:`{数据目录}/rpa-artifacts/{batch_id}/...`(受 `OPENCLAW_ARTIFACTS_ON_FAILURE` 控制,默认开)
|
||||||
|
|
||||||
|
详见 [`RPA.md`](RPA.md) §5 存证与录屏规范。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 必打日志节点清单
|
||||||
|
|
||||||
|
以下节点应在**生产代码**中有对应 `log.info` / `log.warning` / `log.exception`(或 Activity / RPA step)。复制模板后按业务增删,但**不可整体省略**。
|
||||||
|
|
||||||
|
| 阶段 | 建议日志 / emit |
|
||||||
|
|------|-----------------|
|
||||||
|
| CLI 入口启动 | `cli_start`(`cli/app.py`,已由模板提供) |
|
||||||
|
| 参数解析完成 | `run_args target_id=... input_id=...` |
|
||||||
|
| 鉴权开始 | `entitlement_check_start` |
|
||||||
|
| 鉴权成功 | `entitlement_ok` |
|
||||||
|
| 鉴权失败 | `entitlement_failed`(`warning`) |
|
||||||
|
| 任务开始 | `task_start task_type=... target_id=... input_id=... batch_id=...` + `emit("开始处理任务")` |
|
||||||
|
| adapter / test target 选择 | `adapter_selected adapter=... system=...` |
|
||||||
|
| 账号 / profile / lease 获取 | `account_acquired account_id=...` |
|
||||||
|
| 账号 / lease 释放 | `account_released account_id=...` |
|
||||||
|
| 外部 API 开始 | `external_call_start system=... operation=...` |
|
||||||
|
| 外部 API 结束 | `external_call_done system=... operation=... elapsed_ms=... status=...` |
|
||||||
|
| 兄弟技能调用开始 / 结束 | 同上,或 `sibling_call_start/done skill_slug=...` |
|
||||||
|
| RPA 操作开始 / 结束 | `rpa_start` / `rpa_done` + `video.add_step` 中文步骤 |
|
||||||
|
| 打开页面 | step:「打开 xxx 页面」 |
|
||||||
|
| 检查登录 | step + log |
|
||||||
|
| 定位输入框 / 点击提交 | step + log |
|
||||||
|
| 等待结果 | step + log(含 timeout 预期) |
|
||||||
|
| 批量循环 | `batch_progress current=... total=...` |
|
||||||
|
| 重试 | `retry_attempt n=... reason=...`(`warning`) |
|
||||||
|
| 跳过 / 部分失败 | `skipped` / `partial_failure`(`warning`) |
|
||||||
|
| 人工介入 | `human_intervention type=captcha|login|ukey|otp`(`warning`) |
|
||||||
|
| 失败截图 / 视频 | `artifact_saved artifact_path=...` / `video_path=...` |
|
||||||
|
| 任务成功 | `task_success ...` + `task_log_saved status=success` |
|
||||||
|
| 任务失败 | `task_failed ...`(`exception` 保留 traceback)+ `task_log_saved status=failed` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 字段规范
|
||||||
|
|
||||||
|
推荐在 `log.info` 等消息中使用 **key=value** 结构化字段,便于 grep:
|
||||||
|
|
||||||
|
| 字段 | 含义 |
|
||||||
|
|------|------|
|
||||||
|
| `task_type` | 任务类型(与 `task_logs.task_type` 对齐) |
|
||||||
|
| `target_id` | 目标标识(平台、店铺、报表类型等) |
|
||||||
|
| `input_id` | 输入记录 ID |
|
||||||
|
| `batch_id` | 批次 / 录屏批次 |
|
||||||
|
| `stage` | 阶段:`auth` / `run` / `cleanup` |
|
||||||
|
| `system` | 外部系统名:`erp` / `wechat` / `1688` |
|
||||||
|
| `operation` | 操作名:`submit_order` / `fetch_report` |
|
||||||
|
| `adapter` | adapter 档位:`mock` / `simulator_api` / `real_api` |
|
||||||
|
| `elapsed_ms` | 耗时毫秒 |
|
||||||
|
| `status` | `ok` / `failed` / `timeout` / `skipped` |
|
||||||
|
| `error_code` | 业务错误码(非 Python 异常名) |
|
||||||
|
| `artifact_path` | 截图 / 附件路径 |
|
||||||
|
| `video_path` | 录屏成品路径 |
|
||||||
|
|
||||||
|
示例:
|
||||||
|
|
||||||
|
```text
|
||||||
|
external_call_done system=erp operation=download_report elapsed_ms=4523 status=ok
|
||||||
|
batch_progress current=7 total=20 target_id=store-001
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 日志级别规范
|
||||||
|
|
||||||
|
| 级别 | 使用场景 |
|
||||||
|
|------|----------|
|
||||||
|
| **info** | 关键阶段、成功路径、外部调用开始/结束、批量进度、`task_log_saved` |
|
||||||
|
| **warning** | 可恢复问题、重试、跳过、人工介入、部分失败、鉴权失败(业务可预期) |
|
||||||
|
| **exception** | 异常路径;**必须**用 `log.exception(...)` 保留 traceback |
|
||||||
|
| **debug** | 低频诊断;**默认不依赖 debug 才能排查问题** |
|
||||||
|
|
||||||
|
原则:**生产排障应主要靠 info + warning + exception**,不要把 debug 当作唯一线索。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 敏感信息红线
|
||||||
|
|
||||||
|
### 禁止记录原始值
|
||||||
|
|
||||||
|
以下字段**不得**以明文出现在日志、Activity、task_logs 的 `error_msg` / `result_summary`、stdout:
|
||||||
|
|
||||||
|
- `password`、`token`、`cookie`、`secret`、`api_key`、`authorization`
|
||||||
|
- 验证码、动态口令全文
|
||||||
|
- 身份证、银行卡、手机号**完整值**
|
||||||
|
|
||||||
|
### 建议记录的安全替代
|
||||||
|
|
||||||
|
| 替代字段 | 示例 |
|
||||||
|
|----------|------|
|
||||||
|
| `credential_ref` | vault / account-manager 引用 ID |
|
||||||
|
| `account_id` | 账号表主键 |
|
||||||
|
| `masked_user` | `138****8000` |
|
||||||
|
| `domain` | `erp.example.com` |
|
||||||
|
| `last4` | 卡号后四位 |
|
||||||
|
| `hash` / `short_id` | 内容摘要 |
|
||||||
|
|
||||||
|
变量名可以叫 `token`,但日志里不能出现 `token=eyJhbG...` 或 f-string 拼接明文。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. 推荐代码示例(service 层)
|
||||||
|
|
||||||
|
```python
|
||||||
|
from util.logging_config import get_skill_logger
|
||||||
|
from jiangchang_skill_core.activity import emit, finish, job_context, rpa_step, interruptible_sleep
|
||||||
|
|
||||||
|
from util.constants import SKILL_SLUG
|
||||||
|
|
||||||
|
log = get_skill_logger()
|
||||||
|
|
||||||
|
def cmd_run(target=None, input_id=None):
|
||||||
|
task_type = "your_task"
|
||||||
|
with job_context(skill=SKILL_SLUG):
|
||||||
|
log.info(
|
||||||
|
"task_start task_type=%s target_id=%s input_id=%s",
|
||||||
|
task_type, target, input_id,
|
||||||
|
)
|
||||||
|
emit("开始处理任务", skill=SKILL_SLUG, stage="run")
|
||||||
|
try:
|
||||||
|
ok, reason = check_entitlement(SKILL_SLUG)
|
||||||
|
if not ok:
|
||||||
|
log.warning("entitlement_failed task_type=%s reason=%s", task_type, reason)
|
||||||
|
finish(status="failed", message=reason, skill=SKILL_SLUG, error_code="ENTITLEMENT_DENIED")
|
||||||
|
return 1
|
||||||
|
|
||||||
|
t0 = time.monotonic()
|
||||||
|
# ... 外部调用 / RPA:@rpa_step 或 video.add_step;等待用 interruptible_sleep ...
|
||||||
|
elapsed_ms = int((time.monotonic() - t0) * 1000)
|
||||||
|
log.info(
|
||||||
|
"external_call_done system=%s operation=%s elapsed_ms=%d status=%s",
|
||||||
|
"erp", "submit", elapsed_ms, "ok",
|
||||||
|
)
|
||||||
|
|
||||||
|
tlr.save_task_log(..., status="success", ...)
|
||||||
|
log.info("task_log_saved task_type=%s status=success", task_type)
|
||||||
|
finish(status="success", message="任务完成", skill=SKILL_SLUG)
|
||||||
|
return 0
|
||||||
|
except Exception:
|
||||||
|
log.exception(
|
||||||
|
"task_failed task_type=%s target_id=%s input_id=%s",
|
||||||
|
task_type, target, input_id,
|
||||||
|
)
|
||||||
|
emit("任务失败,已记录诊断信息", type="warn", skill=SKILL_SLUG, stage="run")
|
||||||
|
tlr.save_task_log(..., status="failed", error_msg="...", ...)
|
||||||
|
finish(status="failed", message="任务执行异常", skill=SKILL_SLUG)
|
||||||
|
return 1
|
||||||
|
```
|
||||||
|
|
||||||
|
模板示范见 [`scripts/service/task_service.py`](../scripts/service/task_service.py) 的 `cmd_run`。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. 错误排查顺序
|
||||||
|
|
||||||
|
客户现场或测试机排障,建议按以下顺序(由快到慢、由用户可见到运维细节):
|
||||||
|
|
||||||
|
1. **CLI stdout** — 是否有 `ERROR:<CODE>:`、`HINT:`、模板提示文案。
|
||||||
|
2. **`python scripts/main.py logs`** — 最近任务是否写入 `task_logs`、status 与 `error_msg`。
|
||||||
|
3. **`python scripts/main.py log-get <id>`** — 单条 JSON,含 `result_summary`(video 路径等)。
|
||||||
|
4. **统一日志文件** — `{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/logs/jiangchang.log`(grep `trace_id`、`task_failed`)。
|
||||||
|
5. **Run Journal** — `{JIANGCHANG_DATA_ROOT}/.jiangchang/runs/{job_id}.jsonl`(宿主 UI 进度来源)。
|
||||||
|
6. **RPA artifacts** — `rpa-artifacts/` 失败截图;若 `OPENCLAW_RECORD_VIDEO=1` 还有录屏 MP4、`video_log`。未开启录屏时可能只有截图或日志,需要完整录屏请在用户 `.env` 中设置 `OPENCLAW_RECORD_VIDEO=1`。
|
||||||
|
|
||||||
|
长时间无 stdout **不代表卡死**;先看 Run Journal / Activity,再看统一日志。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. 与现有文档关系
|
||||||
|
|
||||||
|
| 文档 | 关系 |
|
||||||
|
|------|------|
|
||||||
|
| [`RUNTIME.md`](RUNTIME.md) | 统一日志能力来源、`util.logging_config` 薄封装、数据根约定 |
|
||||||
|
| [`TESTING.md`](TESTING.md) | 日志相关 hard policy 测试(`test_development_policy_guard.py`) |
|
||||||
|
| [`RPA.md`](RPA.md) | RPA step、`RpaVideoSession`、video / artifacts 标准 |
|
||||||
|
| [`SCHEMA.md`](../references/SCHEMA.md) | `task_logs` 表结构与查询命令 |
|
||||||
|
| [`CLI.md`](../references/CLI.md) | `logs` / `log-get` 命令与手工排查入口 |
|
||||||
|
| [`CONFIG.md`](CONFIG.md) | 敏感配置不进日志;`.env` 边界 |
|
||||||
|
| [`DEVELOPMENT.md`](DEVELOPMENT.md) | `service/` 层日志职责与发布前检查清单 |
|
||||||
|
| [`SKILL_ACTION_RUNTIME.md`](SKILL_ACTION_RUNTIME.md) | 任务中心 / async Job 与 `job_context` 边界 |
|
||||||
|
| [`POLICY_MATRIX.md`](POLICY_MATRIX.md) | 可自动检测的 logging hard policy 索引 |
|
||||||
237
development/NAMING.md
Normal file
237
development/NAMING.md
Normal file
@@ -0,0 +1,237 @@
|
|||||||
|
# 技能 slug 命名规范(verb-noun-platform)
|
||||||
|
|
||||||
|
> 本文是匠厂**新业务 skill** 的 slug / Git 仓库名 / 目录名命名权威说明。复制 `skill-template` 出去开发新技能前**必读**;Agent 在开发者询问命名或 slug 时也应先读本文。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 适用范围
|
||||||
|
|
||||||
|
| 范围 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| ✅ **适用** | 从 `skill-template` **复制出去的新技能** |
|
||||||
|
| ❌ **不追溯** | 已上线历史技能(如 `account-manager`、`reconcile-finance`、`scrape-contacts-lianjia` 等)保持不动 |
|
||||||
|
| ❌ **不修改** | 其他仓库(尤其 `account-manager`)不在本文约束范围内 |
|
||||||
|
| ✅ **模板占位** | 模板本体的 `your-skill-slug` 占位必须继续通过全部测试 |
|
||||||
|
|
||||||
|
**新技能勿仿**历史 2 段无平台形态(如 `reconcile-finance`)或不符合 verb-noun-platform 的旧 repo 名;校验器对历史 repo **不追溯**,但规范中明确标注为反模式。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 命名格式
|
||||||
|
|
||||||
|
标准形态(约 95% 新技能):
|
||||||
|
|
||||||
|
```text
|
||||||
|
{verb}-{noun-phrase}-{platform}
|
||||||
|
```
|
||||||
|
|
||||||
|
| 部分 | 规则 |
|
||||||
|
|------|------|
|
||||||
|
| **verb** | 1 个词,来自 [动词白名单](#5-动词白名单) |
|
||||||
|
| **noun-phrase** | 1~3 个词(按 `-` 分段),描述业务对象 |
|
||||||
|
| **platform** | 1 个词,来自 [平台白名单](#6-平台白名单);可含连字符(如 `single-window`) |
|
||||||
|
|
||||||
|
**展示层分工不变:**
|
||||||
|
|
||||||
|
| 字段 | 语言 | 示例 |
|
||||||
|
|------|------|------|
|
||||||
|
| slug / repo / 目录 / `SKILL_SLUG` / DB 文件名 | **英文** kebab-case | `download-settlement-report-amazon` |
|
||||||
|
| `SKILL.md` 的 `name`、`description`、根 `README.md` | **中文** | `亚马逊结算报表下载` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 硬约束(新技能强制校验)
|
||||||
|
|
||||||
|
| 约束 | 值 |
|
||||||
|
|------|-----|
|
||||||
|
| 格式 | `{verb}-{noun-phrase}-{platform}`(标准型,默认) |
|
||||||
|
| 总段数(按 `-` 分割) | **3~5 段**(标准型);scope 型见 [§4](#4-三类合法形态) |
|
||||||
|
| 总长度 | **≤ 48 字符** |
|
||||||
|
| 字符集 | 小写字母、数字、连字符;kebab-case |
|
||||||
|
| 禁止 | 中文 slug、下划线、**平台放最前**(如 `amazon-download-xxx`) |
|
||||||
|
|
||||||
|
实现校验见 `scripts/util/slug_naming.py`;`scripts/db/display_metadata_validator.py` 在 `SKILL.md` frontmatter 自检时调用。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 三类合法形态
|
||||||
|
|
||||||
|
### 4.1 标准型(95%)
|
||||||
|
|
||||||
|
`verb-noun-platform` 或 `verb-noun-noun-platform`(3~5 段)
|
||||||
|
|
||||||
|
- 第 1 段 ∈ 动词白名单
|
||||||
|
- 最后 1 段(或 hyphenated 平台的最后 2 段)∈ 平台白名单
|
||||||
|
- 中间为 noun-phrase(1~3 段)
|
||||||
|
|
||||||
|
示例:
|
||||||
|
|
||||||
|
- `download-settlement-report-amazon`
|
||||||
|
- `add-product-shopee`
|
||||||
|
- `enter-sales-receipt-kingdee`
|
||||||
|
- `fill-export-declaration-single-window`
|
||||||
|
|
||||||
|
### 4.2 scope 型(少见)
|
||||||
|
|
||||||
|
`verb-noun-scope`
|
||||||
|
|
||||||
|
- 最后 1 段 ∈ scope 白名单:`all` | `batch` | `multi` | `default`
|
||||||
|
- 第 1 段 ∈ 动词白名单
|
||||||
|
- 总段数 3~5
|
||||||
|
|
||||||
|
示例:`generate-article-all`
|
||||||
|
|
||||||
|
> 说明:`geo-generate-article-all` 若作为新技能且不在豁免表、首段 `geo` 不在动词表,应写为 `generate-article-all`。
|
||||||
|
|
||||||
|
### 4.3 历史豁免(不校验语义)
|
||||||
|
|
||||||
|
以下 slug 跳过 verb/platform 语义校验(见 `LEGACY_EXEMPT_SLUGS`):
|
||||||
|
|
||||||
|
- `account-manager`
|
||||||
|
- `skill-template`
|
||||||
|
- `your-skill-slug` / `your_skill_slug`(模板占位)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 动词白名单
|
||||||
|
|
||||||
|
词表文件:[`assets/naming/verbs.txt`](../assets/naming/verbs.txt)(每行一词,便于后续扩展)
|
||||||
|
|
||||||
|
| 动词 | 动词 | 动词 | 动词 |
|
||||||
|
|------|------|------|------|
|
||||||
|
| scrape | receive | download | export |
|
||||||
|
| add | fill | enter | bind |
|
||||||
|
| withdraw | reconcile | verify | submit |
|
||||||
|
| query | process | reply | generate |
|
||||||
|
| draft | review | confirm | track |
|
||||||
|
| upload | match | triage | ship |
|
||||||
|
| reprice | | | |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 平台白名单
|
||||||
|
|
||||||
|
词表文件:[`assets/naming/platforms.txt`](../assets/naming/platforms.txt)
|
||||||
|
|
||||||
|
| 平台 | 平台 | 平台 |
|
||||||
|
|------|------|------|
|
||||||
|
| amazon | shopee | xinghang |
|
||||||
|
| alibaba | kingdee | icbc |
|
||||||
|
| pingpong | worldfirst | paypal |
|
||||||
|
| lianlian | single-window | export-rebate |
|
||||||
|
| etax | | |
|
||||||
|
|
||||||
|
scope 词表:[`assets/naming/scopes.txt`](../assets/naming/scopes.txt) — `all`、`batch`、`multi`、`default`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. slug 与展示字段分工
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
---
|
||||||
|
name: 亚马逊结算报表下载 # 中文,用户可见
|
||||||
|
description: "从卖家中心下载结算报表并入库" # 中文说明
|
||||||
|
metadata:
|
||||||
|
openclaw:
|
||||||
|
slug: download-settlement-report-amazon # 英文机器标识
|
||||||
|
---
|
||||||
|
```
|
||||||
|
|
||||||
|
同步修改:
|
||||||
|
|
||||||
|
- 目录名
|
||||||
|
- `metadata.openclaw.slug`
|
||||||
|
- `scripts/util/constants.py` 中的 `SKILL_SLUG`
|
||||||
|
- 默认数据库路径 `{slug}/{slug}.db`
|
||||||
|
|
||||||
|
三者必须一致。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. 与 account-manager 的关系
|
||||||
|
|
||||||
|
slug **末段 platform** 与 `account-manager` 中的 `platform_key` **语义对应**,但**不要求字符串完全相等**。
|
||||||
|
|
||||||
|
| slug 末段 (platform) | account-manager platform_key(示例) |
|
||||||
|
|----------------------|--------------------------------------|
|
||||||
|
| amazon | `amazon_sim` / `amazon` |
|
||||||
|
| shopee | `shopee` |
|
||||||
|
| kingdee | `kingdee` |
|
||||||
|
|
||||||
|
新技能若需账号下发,在 `REQUIREMENTS.md` §0 填写拟用的 `platform_key`,并与兄弟技能调用参数对齐。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. 复制新技能流程
|
||||||
|
|
||||||
|
1. **先定 slug** — 按本文规范拟定 `{verb}-{noun-phrase}-{platform}`,确认在白名单内且 ≤ 48 字符
|
||||||
|
2. **复制目录** — **推荐** [`tools/scaffold_skill.ps1`](../tools/scaffold_skill.ps1)(`-Slug` 与目录名一致);勿整包复制带走 `.git`
|
||||||
|
2.5. **清理 Git(若未用 scaffold)** — 删除 `.git`、`.openclaw-skill-template`、`.pytest_cache`;再 `git init` 与 `git remote add origin`
|
||||||
|
3. **全局替换** — `your-skill-slug` → 新 slug;更新 `SKILL.md`、`constants.py`、文档中的占位
|
||||||
|
4. **填写 REQUIREMENTS** — 完成 [`REQUIREMENTS.md`](REQUIREMENTS.md) §0 技能标识
|
||||||
|
5. **开发 & 自检** — `python tests/run_tests.py -v`,含 slug 语义测试;`git remote -v` 确认非 template
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 10. 正例 / 反例
|
||||||
|
|
||||||
|
### ✅ 正例
|
||||||
|
|
||||||
|
| slug | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| `download-settlement-report-amazon` | 标准型,4 段 |
|
||||||
|
| `add-product-shopee` | 标准型,3 段 |
|
||||||
|
| `enter-sales-receipt-kingdee` | 标准型 |
|
||||||
|
| `fill-export-declaration-single-window` | 标准型,平台含连字符 |
|
||||||
|
| `generate-article-all` | scope 型 |
|
||||||
|
|
||||||
|
### ❌ 反例
|
||||||
|
|
||||||
|
| slug | 原因 |
|
||||||
|
|------|------|
|
||||||
|
| `amazon-download-settlement-report` | 平台在最前 |
|
||||||
|
| `enter-cross-border-sales-receipt-voucher-kingdee` | 过长、noun 臃肿 |
|
||||||
|
| `reconcile-finance` | 新技能禁止 2 段无平台 |
|
||||||
|
| `download_settlement_amazon` | 非 kebab-case(下划线) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 11. 反模式
|
||||||
|
|
||||||
|
- **平台前置**:`amazon-download-...`、`shopee-add-...`
|
||||||
|
- **英文占位 name**:复制后仍保留 `My Skill` 或纯英文 slug 风格名称
|
||||||
|
- **只改目录名**:`SKILL.md` slug 与 `constants.SKILL_SLUG` 未同步
|
||||||
|
- **noun 堆砌**:中间段过多导致超 48 字符或难以阅读
|
||||||
|
- **仿历史 2 段 repo**:`reconcile-finance`、`content-manager` 等
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 12. 演进说明(当前不启用)
|
||||||
|
|
||||||
|
当技能库规模 **> 200** 时,可再评估引入 `{domain}-verb-noun-platform` 前缀形态。**当前不启用**,新技能一律使用本文 verb-noun-platform 标准型或 scope 型。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 13. 历史形态说明
|
||||||
|
|
||||||
|
以下为代表性**历史 repo**,新技能**勿仿**:
|
||||||
|
|
||||||
|
| 历史 slug | 说明 |
|
||||||
|
|-----------|------|
|
||||||
|
| `account-manager` | 跨平台账号管理,非 verb-noun-platform |
|
||||||
|
| `reconcile-finance` | 2 段无 platform |
|
||||||
|
| `scrape-contacts-lianjia` | 平台名不在当前白名单(链家) |
|
||||||
|
| `skill-template` | 模板仓库本身 |
|
||||||
|
|
||||||
|
校验器通过 `LEGACY_EXEMPT_SLUGS` 对模板占位与少数豁免 slug 跳过语义检查;**新复制出去的业务 skill 不在豁免表内**,必须满足 §3 硬约束。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 14. 相关文档
|
||||||
|
|
||||||
|
| 文档 | 内容 |
|
||||||
|
|------|------|
|
||||||
|
| [`DEVELOPMENT.md`](DEVELOPMENT.md) | 复制模板步骤、发布前检查清单 |
|
||||||
|
| [`REQUIREMENTS.md`](REQUIREMENTS.md) | §0 技能标识必填项 |
|
||||||
|
| [`../references/SCHEMA.md`](../references/SCHEMA.md) | kebab-case 与数据库路径 |
|
||||||
|
| [`../SKILL.md`](../SKILL.md) | frontmatter 命名摘要 |
|
||||||
59
development/POLICY_MATRIX.md
Normal file
59
development/POLICY_MATRIX.md
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
# 开发规范 → 自动检测索引
|
||||||
|
|
||||||
|
本文件是 **development/*.md 规范到机器检测的追溯表**,不是另一份长规范。新增或调整 hard 规则时,须同步更新本矩阵与 `tests/test_development_policy_guard.py`(或注明已有测试覆盖)。
|
||||||
|
|
||||||
|
| policy_id | 规则摘要 | 来源 | 强制级别 | 自动检测 | 对应测试 |
|
||||||
|
|-----------|----------|------|----------|----------|----------|
|
||||||
|
| POLICY-STRUCTURE-001 | 标准 `scripts/` 分层:`main.py`、`cli/`、`service/`、`db/`、`util/` 必须存在 | development/DEVELOPMENT.md §2 新 skill 的标准目录结构;development/RUNTIME.md §目录结构 | hard | 目录存在性检查 | `tests/test_development_policy_guard.py::TestPolicyStructure001` |
|
||||||
|
| POLICY-RUNTIME-001 | 不得 vendored `scripts/jiangchang_skill_core/` | development/RUNTIME.md §共享 Python Runtime、§明确禁止 | hard | 目录不存在检查 | `tests/test_development_policy_guard.py::TestPolicyRuntime001`(另见 `tests/test_platform_import.py`) |
|
||||||
|
| POLICY-RUNTIME-002 | `requirements.txt` 非注释依赖行不得声明 `jiangchang-platform-kit` / `playwright` | development/RUNTIME.md §共享 Python Runtime;development/DEVELOPMENT.md §3.1 requirements.txt 依赖规范 | hard | 解析依赖行 | `tests/test_development_policy_guard.py::TestPolicyRuntime002`(另见 `tests/test_platform_import.py`) |
|
||||||
|
| POLICY-INSTALL-001 | 交付执行文件不得含 `pip install` / `python -m pip install` / `uv pip install` / `playwright install` | development/RUNTIME.md §共享 Python Runtime;development/RPA.md §1.4 Playwright 与安装边界;development/DEVELOPMENT.md §3.1 | hard | 扫描 `scripts/**/*.py`、`*.ps1`、`*.sh`、`requirements.txt`、`.github/workflows/*`(不扫 `development/*.md`) | `tests/test_development_policy_guard.py::TestPolicyInstall001` |
|
||||||
|
| POLICY-CONFIG-001 | 仓库根目录必须存在 `.env.example` | development/CONFIG.md §核心原则、§标准配置项 | hard | 文件存在性 | `tests/test_development_policy_guard.py::TestPolicyConfig001` |
|
||||||
|
| POLICY-CONFIG-002 | `.gitignore` 必须忽略 `.env` 与 `*.env.local` | development/CONFIG.md §红线:敏感信息不进 .env | hard | 解析 `.gitignore` 行 | `tests/test_development_policy_guard.py::TestPolicyConfig002` |
|
||||||
|
| POLICY-CONFIG-003 | 业务代码不得直接 `os.environ` / `os.getenv` / `os.putenv` / `environ.get`;须经 `jiangchang_skill_core.config.get*`(允许 `main.py`、测试、config_bootstrap/runtime 边界文件) | development/CONFIG.md §配置 bootstrap;development/ADAPTER.md §档位 dispatch | hard | 扫描 `scripts/**/*.py` 并排除边界文件 | `tests/test_development_policy_guard.py::TestPolicyConfig003` |
|
||||||
|
| POLICY-TESTING-001 | 默认根目录 `tests/test_*.py` 不得硬编码 `real_api` / `real_rpa` / `OPENCLAW_TEST_TARGET`(白名单仅 `test_adapter_profile_policy.py`,用于档位 helper 自测) | development/TESTING.md §默认必跑测试要做什么、§4 测试目标档位 | hard | 扫描 `tests/test_*.py` 非注释行;白名单外禁止上述文本 | `tests/test_development_policy_guard.py::TestPolicyTesting001` |
|
||||||
|
| POLICY-TESTING-002 | `tests/integration/` 下 Python 测试文件若存在,默认应为 `.sample`,不得进入默认套件 | development/TESTING.md §7 真实联调测试的安全约束、§8 新 skill 的最小测试清单 | hard | 检查 `tests/integration/*.py` 无 `.sample` 后缀 | `tests/test_development_policy_guard.py::TestPolicyTesting002` |
|
||||||
|
| POLICY-RPA-001 | 不得 import/use account-manager 内部 `rpa_helpers` / `inject_account_manager_scripts_path` / `get_account_credential` | development/ADAPTER.md §兄弟依赖;development/RPA.md §1.7 | hard | 扫描 `scripts/**/*.py` 禁止模式 | `tests/test_development_policy_guard.py::TestPolicyRpa001`(另见 `tests/test_no_rpa_helpers_import.py`) |
|
||||||
|
| POLICY-RPA-002 | RPA 交付代码不得直接执行 ffmpeg 拼 MP4;应使用 `RpaVideoSession`(允许 `ffmpeg_path` 等诊断字段) | development/RPA.md §5.3 录屏成片标准 | hard | 扫描 `scripts/**/*.py` 禁止 `subprocess` / `os.system` / `os.popen` 直接调用 ffmpeg(`task_run_support.py` 保留豁免) | `tests/test_development_policy_guard.py::TestPolicyRpa002` |
|
||||||
|
| POLICY-RPA-003 | 即使默认 `OPENCLAW_RECORD_VIDEO=0`,RPA / 长任务模板也必须保留录屏能力:`RpaVideoSession`、`video.add_step`、video artifact merge 到 `result_summary` | development/RPA.md §5.3;development/LOGGING.md;development/CONFIG.md | hard | 扫描 `scripts/service/*.py`(service 层整体须含上述接入) | `tests/test_development_policy_guard.py::TestPolicyRpa003` |
|
||||||
|
| POLICY-PACKAGING-001 | `scripts/**/*.py` 单文件 < 1000 行 | development/DEVELOPMENT.md §3.4 发布打包约束;development/RUNTIME.md §发布打包约束 | hard | 行数统计 | **已有测试覆盖**:`tests/test_release_packaging_constraints.py::test_scripts_py_files_under_pyarmor_line_limit` |
|
||||||
|
| POLICY-PACKAGING-002 | 文本文件 UTF-8 without BOM,无 `U+FEFF` | development/DEVELOPMENT.md §3.4;development/RUNTIME.md §编码与输出 | hard | BOM / 解码检查 | **已有测试覆盖**:`tests/test_release_packaging_constraints.py::test_text_files_are_utf8_without_bom` |
|
||||||
|
| POLICY-DOCS-001 | 本矩阵存在且包含上述全部 `policy_id` | 本次规范化约定 | hard | 解析 `development/POLICY_MATRIX.md` | `tests/test_development_policy_guard.py::TestPolicyDocs001` |
|
||||||
|
| POLICY-LOGGING-001 | CLI 入口必须调用 `setup_skill_logging` | development/LOGGING.md;development/RUNTIME.md | hard | 扫描 `scripts/cli/app.py` 含 `setup_skill_logging` 与 logger info | `tests/test_development_policy_guard.py::TestPolicyLogging001` |
|
||||||
|
| POLICY-LOGGING-002 | service 主任务入口必须使用 `get_skill_logger` | development/LOGGING.md;development/DEVELOPMENT.md | hard | 扫描 `scripts/service/task_service.py` | `tests/test_development_policy_guard.py::TestPolicyLogging002` |
|
||||||
|
| POLICY-LOGGING-003 | 主任务入口须含 `log.info`/`logger.info`、`log.exception`/`logger.exception`,并写入 `save_task_log` | development/LOGGING.md | hard | 扫描 `scripts/service/task_service.py` | `tests/test_development_policy_guard.py::TestPolicyLogging003` |
|
||||||
|
| POLICY-LOGGING-004 | 长任务 / RPA 模板须使用 Activity 或 RPA video step 输出进度 | development/LOGGING.md;development/RPA.md | hard | 扫描 `scripts/service/task_service.py` 含 `emit(` / `activity.emit` / `video.add_step` | `tests/test_development_policy_guard.py::TestPolicyLogging004` |
|
||||||
|
| POLICY-LOGGING-005 | 交付代码不得在 logging 调用行以 `key=value` 形式记录明显敏感字段 | development/LOGGING.md;development/CONFIG.md | hard | 扫描 `scripts/**/*.py` 的 logging 调用行(不含注释) | `tests/test_development_policy_guard.py::TestPolicyLogging005` |
|
||||||
|
| POLICY-CONTROL-001 | 不得存在 `scripts/util/progress.py` 或自建 stdout 进度模块 | development/LOGGING.md §2.5;development/RPA.md §0.1 | hard | 文件不存在检查 | `tests/test_development_policy_guard.py::TestPolicyControl001` |
|
||||||
|
| POLICY-CONTROL-002 | `task_service.py` 须使用 `job_context(` 与 `finish(` | development/LOGGING.md §2.5、§7 | hard | 扫描 `scripts/service/task_service.py` | `tests/test_development_policy_guard.py::TestPolicyControl002` |
|
||||||
|
| POLICY-CONTROL-003 | `scripts/service/*.py` 不得裸 `asyncio.sleep`(RPA 等待须 `interruptible_sleep`) | development/RPA.md §0.1 | hard | 扫描 service 层 Python | `tests/test_development_policy_guard.py::TestPolicyControl003` |
|
||||||
|
| POLICY-DATA-PATH-001 | 技能拥有路径须经 `resolve_data_path` / `get_*_dir`;`.env.example` 禁止 `./` CWD 相对路径;业务代码禁止 `abspath(config.get(...))` | development/DATA_PATHS.md | hard | 扫描 `.env.example` 与 `scripts/**/*.py` | `tests/test_development_policy_guard.py::TestPolicyDataPath001` |
|
||||||
|
| POLICY-SKILL-ACTION-001 | 存在 `development/SKILL_ACTION_RUNTIME.md`;schema 含 `executionProfile`;业务技能(非模板占位 slug)若 service 含 `RpaVideoSession` 则 `actions.json` 须有 `executionProfile=async` 且 placements 含 `agent` 的 action | development/SKILL_ACTION_RUNTIME.md;references/ACTIONS.md | hard | 文档/schema/manifest 检查 | `tests/test_development_policy_guard.py::TestPolicySkillAction001` |
|
||||||
|
| POLICY-SKILL-ACTION-002 | 每个 Action 必须显式声明 `executionProfile`,且只能是 `sync` 或 `async` | development/SKILL_ACTION_RUNTIME.md;references/ACTIONS.md;assets/schemas/skill-actions.schema.json | hard | schema required + manifest 扫描 | `tests/test_development_policy_guard.py::TestPolicySkillAction002`;`tests/test_actions_manifest.py` |
|
||||||
|
| POLICY-SKILL-ACTION-003 | toolbar Action 必须声明合法非空 `bind.tables`(snake_case、唯一) | references/ACTIONS.md;assets/schemas/skill-actions.schema.json | hard | schema if/then + manifest 扫描 | `tests/test_development_policy_guard.py::TestPolicySkillAction003`;`tests/test_actions_manifest.py` |
|
||||||
|
| POLICY-SKILL-ACTION-004 | `placements` 与 `executionProfile` 正交;文档不得把数据管理入口与异步执行方式硬绑定;Schema 须接受 toolbar/cron/agent/skill-detail × sync/async 全部组合 | development/SKILL_ACTION_RUNTIME.md;references/ACTIONS.md;assets/schemas/skill-actions.schema.json | hard | Schema 4×2 矩阵校验 + 文档禁止短语扫描 | `tests/test_actions_manifest.py::test_schema_allows_all_placement_execution_profile_combinations`;`tests/test_development_policy_guard.py::TestPolicySkillAction004` |
|
||||||
|
| POLICY-ARCH-CORE-001 | 同一业务能力的 Action、CLI、Agent、cron、数据管理入口复用同一业务内核(文档要求已声明) | development/DEVELOPMENT.md;development/SKILL_ACTION_RUNTIME.md | hard(文档标记) / soft(语义) | 文档关键表述存在性;真实复用靠 sample/review | `tests/test_development_policy_guard.py::TestPolicyArchCore001`;`tests/samples/test_action_core_contract.py.sample` |
|
||||||
|
| POLICY-DATA-SYNC-001 | 同步型业务须遵循幂等、事务、完整性与空结果保护(文档已声明) | references/SCHEMA.md;development/SKILL_ACTION_RUNTIME.md | hard(文档标记) / soft(语义) | 文档关键表述存在性;完整语义靠 sample/review | `tests/test_development_policy_guard.py::TestPolicyDataSync001`;`tests/samples/test_sync_contract.py.sample` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 暂不自动检测(软规则)
|
||||||
|
|
||||||
|
以下规范仍须人工遵守或依赖 code review / AI 提示词 / sample 契约,**不**做成脆弱关键字扫描:
|
||||||
|
|
||||||
|
| 规则摘要 | 来源 | 原因 |
|
||||||
|
|----------|------|------|
|
||||||
|
| `cli/` 只解析参数、不写业务逻辑 | development/DEVELOPMENT.md §9 | 需语义理解,无法可靠静态判定 |
|
||||||
|
| `service/` 编排流向与模块拆分粒度 | development/DEVELOPMENT.md §10 | 架构软约束;见 `test_action_core_contract.py.sample` |
|
||||||
|
| 是否真正复用同一业务内核 / 是否按 source 分叉 | development/SKILL_ACTION_RUNTIME.md §5 | 需调用图与人工审查 |
|
||||||
|
| 是否满足完整快照语义 / 空结果保护实现 | references/SCHEMA.md | 见 `test_sync_contract.py.sample` |
|
||||||
|
| 是否把系统导出与业务同步混淆 | references/ACTIONS.md;SCHEMA.md | 文档 + sample;勿做源码关键词误报扫描 |
|
||||||
|
| `db/` 层不得调浏览器或拼业务流程 | development/DEVELOPMENT.md §11 | 需跨文件调用图 |
|
||||||
|
| slug 命名语义(verb-noun-platform) | development/NAMING.md | 部分覆盖于 `tests/test_slug_naming.py`,非本矩阵 hard policy |
|
||||||
|
| 复制模板不得保留 `.git` / template marker | development/DEVELOPMENT.md §4 | 由 `tests/test_scaffold_guard.py` 守护,属脚手架场景 |
|
||||||
|
| 共享 runtime 导入来源非技能目录 | development/RUNTIME.md | 运行时依赖已安装包,见 `tests/test_platform_import.py` |
|
||||||
|
| RPA 拟人操作、选择器纪律、HITL 超时 | development/RPA.md §0–§1 | 行为与 DOM 质量,无法静态扫描 |
|
||||||
|
| adapter 四档契约测试覆盖 timeout/unauthorized 等 | development/ADAPTER.md §contract tests | 需业务实现后人工补测 |
|
||||||
|
| `SKILL.md` / `constants.SKILL_SLUG` 一致性 | development/DEVELOPMENT.md §16 | 已有 `tests/test_skill_metadata.py` |
|
||||||
|
| platform_kit_min_version >= 1.2.0 | development/RUNTIME.md | 已有 `tests/test_platform_import.py` |
|
||||||
|
| 宿主按 `bind.tables` 过滤 toolbar 按钮 | references/ACTIONS.md | 待宿主升级后完整生效;模板侧已强制显式绑定 |
|
||||||
@@ -3,12 +3,18 @@
|
|||||||
本目录面向**人类开发者**与 **AI 编程代理**。开始定制 skill 前,建议按以下顺序阅读:
|
本目录面向**人类开发者**与 **AI 编程代理**。开始定制 skill 前,建议按以下顺序阅读:
|
||||||
|
|
||||||
1. [`REQUIREMENTS.md`](REQUIREMENTS.md) — 需求文档模板与验收标准
|
1. [`REQUIREMENTS.md`](REQUIREMENTS.md) — 需求文档模板与验收标准
|
||||||
2. [`DEVELOPMENT.md`](DEVELOPMENT.md) — 完整开发步骤与目录规范
|
2. [`NAMING.md`](NAMING.md) — slug / 仓库名命名规范(复制模板前必读)
|
||||||
3. [`TESTING.md`](TESTING.md) — 测试分层、隔离数据根与档位开关
|
3. [`DEVELOPMENT.md`](DEVELOPMENT.md) — 完整开发步骤与目录规范
|
||||||
4. [`ADAPTER.md`](ADAPTER.md) — 涉及外部系统对接时
|
4. [`TESTING.md`](TESTING.md) — 测试分层、隔离数据根与档位开关
|
||||||
5. [`RPA.md`](RPA.md) — 涉及浏览器 / 桌面 / 手机自动化时
|
5. [`LOGGING.md`](LOGGING.md) — 日志分层、必打节点、敏感信息红线(**涉及长任务、RPA、外部系统时必读**)
|
||||||
6. [`CONFIG.md`](CONFIG.md) — `.env` 规范与 bootstrap 机制
|
6. [`ADAPTER.md`](ADAPTER.md) — 涉及外部系统对接时
|
||||||
7. [`RUNTIME.md`](RUNTIME.md) — 共享 runtime、数据路径、发布打包与编码约定
|
7. [`RPA.md`](RPA.md) — 涉及浏览器 / 桌面 / 手机自动化时
|
||||||
|
8. [`CONFIG.md`](CONFIG.md) — `.env` 规范与 bootstrap 机制
|
||||||
|
9. [`DATA_PATHS.md`](DATA_PATHS.md) — 下载/导入/导出等本地文件路径标准(涉及文件读写时必读)
|
||||||
|
10. [`SKILL_ACTION_RUNTIME.md`](SKILL_ACTION_RUNTIME.md) — Skill Action sync/async、任务中心、Agent 禁令、队列 pick(涉及 RPA / 长任务 / 数据管理按钮 / Cron / Agent 时必读)
|
||||||
|
11. [`RUNTIME.md`](RUNTIME.md) — 共享 runtime、数据路径、发布打包与编码约定
|
||||||
|
|
||||||
Agent 调用契约见 [`../references/CLI.md`](../references/CLI.md)、[`../references/SCHEMA.md`](../references/SCHEMA.md)。
|
脚手架与 Git 防串库:[`../tools/README.md`](../tools/README.md)(`scaffold_skill.ps1`)。
|
||||||
|
|
||||||
|
Agent 调用契约见 [`../references/CLI.md`](../references/CLI.md)、[`../references/SCHEMA.md`](../references/SCHEMA.md)、[`../references/ACTIONS.md`](../references/ACTIONS.md)。
|
||||||
用户市场说明见根目录 [`README.md`](../README.md),不要写进本目录。
|
用户市场说明见根目录 [`README.md`](../README.md),不要写进本目录。
|
||||||
|
|||||||
@@ -15,6 +15,14 @@
|
|||||||
|
|
||||||
# REQUIREMENTS
|
# REQUIREMENTS
|
||||||
|
|
||||||
|
## 0. 技能标识(复制 REQUIREMENTS 时必填)
|
||||||
|
|
||||||
|
- 拟定 slug(英文,符合 `development/NAMING.md`):
|
||||||
|
- 中文 name:
|
||||||
|
- 中文 description(一句话):
|
||||||
|
- account-manager platform_key(如有):
|
||||||
|
- 命名形态:标准型 / scope 型
|
||||||
|
|
||||||
## 1. 文档目标
|
## 1. 文档目标
|
||||||
|
|
||||||
说明这份需求文档的作用,以及它解决什么问题。
|
说明这份需求文档的作用,以及它解决什么问题。
|
||||||
@@ -149,7 +157,10 @@
|
|||||||
- `health`、`version` 命令执行正常
|
- `health`、`version` 命令执行正常
|
||||||
- 主命令(如 `run`)在 mock / simulator 档位可重复验证
|
- 主命令(如 `run`)在 mock / simulator 档位可重复验证
|
||||||
- `python tests/run_tests.py -v` 必跑测试全部通过
|
- `python tests/run_tests.py -v` 必跑测试全部通过
|
||||||
- `task_logs` 写入和查询符合 `references/SCHEMA.md`
|
- `task_logs` 写入和查询符合 `references/SCHEMA.md`(含 `created_at` / `updated_at` Unix 秒级规范)
|
||||||
|
- `init_db()` 已写入 `_jiangchang_tables` / `_jiangchang_columns`;用户可见表/字段具备中文 `display_name`
|
||||||
|
- 字段展示顺序与 `PRAGMA table_info(task_logs)` 的 cid 一致;不依赖 `display_order`
|
||||||
|
- `tests/test_display_metadata.py` 通过
|
||||||
- 真实联调(如有)放在 `tests/integration/`,且默认套件不包含真实外联
|
- 真实联调(如有)放在 `tests/integration/`,且默认套件不包含真实外联
|
||||||
- 发布后 Gitea 工作流成功;匠厂技能市场可见最新版本;安装后可在“新建任务”中调用
|
- 发布后 Gitea 工作流成功;匠厂技能市场可见最新版本;安装后可在“新建任务”中调用
|
||||||
|
|
||||||
|
|||||||
@@ -20,10 +20,30 @@
|
|||||||
| **失败存证** | 失败必截图,合规场景全程录屏,统一存 `{数据目录}/rpa-artifacts/{batch_id}/{tag}_{ts}.png` |
|
| **失败存证** | 失败必截图,合规场景全程录屏,统一存 `{数据目录}/rpa-artifacts/{batch_id}/{tag}_{ts}.png` |
|
||||||
| **选择器纪律** | 语义选择器优先(id/name/text/aria);**F12 确认后再写,严禁凭记忆猜 DOM** |
|
| **选择器纪律** | 语义选择器优先(id/name/text/aria);**F12 确认后再写,严禁凭记忆猜 DOM** |
|
||||||
| **统一错误码** | `ERROR:REQUIRE_LOGIN` / `ERROR:CAPTCHA_NEED_HUMAN` / `ERROR:RATE_LIMITED` / `ERROR:LOGIN_TIMEOUT` 等,见下方错误码表 |
|
| **统一错误码** | `ERROR:REQUIRE_LOGIN` / `ERROR:CAPTCHA_NEED_HUMAN` / `ERROR:RATE_LIMITED` / `ERROR:LOGIN_TIMEOUT` 等,见下方错误码表 |
|
||||||
|
| **步骤可控制** | 每条 RPA 指令 = 一个 `@rpa_step` 或 `video.add_step`;等待用 `interruptible_sleep`;宿主通过 control.json 暂停/继续/停止(SRCP,见 [`LOGGING.md`](LOGGING.md) §2.5) |
|
||||||
| **幂等 / 断点续跑** | 批量操作记录"已处理到第几条",崩溃后能续跑、不重复提交 |
|
| **幂等 / 断点续跑** | 批量操作记录"已处理到第几条",崩溃后能续跑、不重复提交 |
|
||||||
|
|
||||||
> 三端各自实现一个会话抽象 `RpaSession`(launch / login / act / screenshot / close),上层 skill 不感知是浏览器还是手机。
|
> 三端各自实现一个会话抽象 `RpaSession`(launch / login / act / screenshot / close),上层 skill 不感知是浏览器还是手机。
|
||||||
|
|
||||||
|
### 0.1 步骤控制与进度(SRCP,platform-kit >= 1.2.0)
|
||||||
|
|
||||||
|
- **禁止** `scripts/util/progress.py` 或 `print({"type":"progress",...})`;进度只走 `emit` / Run Journal。
|
||||||
|
- **禁止** RPA 主路径裸 `asyncio.sleep`;用 `jiangchang_skill_core.activity.interruptible_sleep`。
|
||||||
|
- RPA 函数用 `@rpa_step("中文步骤名")` 拆分;或在 `RpaVideoSession` 内 `video.add_step("中文步骤")`。
|
||||||
|
- `cmd_run` 须 `with job_context(skill=SKILL_SLUG):`,所有出口 `finish(...)`。
|
||||||
|
- 暂停在步骤边界生效;浏览器会话暂停时不强制关闭,恢复后同进程继续。
|
||||||
|
|
||||||
|
```python
|
||||||
|
from jiangchang_skill_core.activity import emit, finish, job_context, interruptible_sleep, rpa_step
|
||||||
|
|
||||||
|
@rpa_step("打开登录页")
|
||||||
|
async def open_login(page):
|
||||||
|
await page.goto("https://example.com")
|
||||||
|
await interruptible_sleep(1.5)
|
||||||
|
```
|
||||||
|
|
||||||
|
规范权威定义:[`LOGGING.md`](LOGGING.md) §2.5。金样代码:[`scripts/service/task_service.py`](../scripts/service/task_service.py)。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 1. 浏览器(标准已成熟)
|
## 1. 浏览器(标准已成熟)
|
||||||
@@ -51,7 +71,7 @@
|
|||||||
6. **可以** `ignore_default_args=["--enable-automation"]`(platform-kit `launch_persistent_browser` 已处理)。
|
6. **可以** `ignore_default_args=["--enable-automation"]`(platform-kit `launch_persistent_browser` 已处理)。
|
||||||
7. **强风控平台**:优先真实点击、键盘、鼠标、地址栏、持久 profile;**不要**直接拼接搜索结果 URL 或 DOM 注入。
|
7. **强风控平台**:优先真实点击、键盘、鼠标、地址栏、持久 profile;**不要**直接拼接搜索结果 URL 或 DOM 注入。
|
||||||
|
|
||||||
指纹淡化(stealth)典型项:`navigator.webdriver=undefined`、`chrome.runtime`、`permissions.query`、`plugins`、`languages` 等。共享实现见 `jiangchang_skill_core.rpa`(platform-kit **>= 1.0.14**)。
|
指纹淡化(stealth)典型项:`navigator.webdriver=undefined`、`chrome.runtime`、`permissions.query`、`plugins`、`languages` 等。共享实现见 `jiangchang_skill_core.rpa`(platform-kit **>= 1.2.0**)。
|
||||||
|
|
||||||
**拟人操作**(必做):
|
**拟人操作**(必做):
|
||||||
|
|
||||||
@@ -124,7 +144,7 @@ from jiangchang_skill_core.rpa import (
|
|||||||
from jiangchang_skill_core.rpa.stealth import stealth_enabled, STEALTH_INIT_SCRIPT
|
from jiangchang_skill_core.rpa.stealth import stealth_enabled, STEALTH_INIT_SCRIPT
|
||||||
```
|
```
|
||||||
|
|
||||||
- `RpaVideoSession` 来自 platform-kit **>= 1.0.14**;ffmpeg、背景音乐、media-assets 由 platform-kit 统一解析;已提供前置/后置缓冲、字幕、TTS 旁白、背景音乐循环、结尾淡出。
|
- `RpaVideoSession` 来自 platform-kit **>= 1.2.0**;ffmpeg、背景音乐、media-assets 由 platform-kit 统一解析;已提供前置/后置缓冲、字幕、TTS 旁白、背景音乐循环、结尾淡出。
|
||||||
- `health` 对上述资源做只读诊断,不下载、不修复。
|
- `health` 对上述资源做只读诊断,不下载、不修复。
|
||||||
|
|
||||||
### 1.5 真实浏览器 RPA 示例(必读)
|
### 1.5 真实浏览器 RPA 示例(必读)
|
||||||
@@ -138,7 +158,7 @@ from jiangchang_skill_core.rpa.stealth import stealth_enabled, STEALTH_INIT_SCRI
|
|||||||
- `examples/real_browser_rpa/scripts/service/task_rpa.py` — RPA 主流程
|
- `examples/real_browser_rpa/scripts/service/task_rpa.py` — RPA 主流程
|
||||||
- `examples/real_browser_rpa/scripts/service/account_client.py` — account-manager CLI 封装
|
- `examples/real_browser_rpa/scripts/service/account_client.py` — account-manager CLI 封装
|
||||||
|
|
||||||
仿真浏览器 RPA 的 adapter 分层权威参考见 `examples/simulator_browser_rpa/scripts/service/adapter/`,**不能**替代真实浏览器 RPA 规范。
|
仿真浏览器 RPA 的 adapter 分层权威参考见 `examples/simulator_browser_rpa/`(含 async `simulator_playwright.py`、薄 `simulator_rpa` adapter、`account_client.py` subprocess),**不能**替代真实浏览器 RPA 规范。
|
||||||
|
|
||||||
### 1.6 仿真浏览器 RPA 示例(必读)
|
### 1.6 仿真浏览器 RPA 示例(必读)
|
||||||
|
|
||||||
@@ -146,12 +166,32 @@ from jiangchang_skill_core.rpa.stealth import stealth_enabled, STEALTH_INIT_SCRI
|
|||||||
|
|
||||||
1. **必须先阅读** `examples/simulator_browser_rpa/README.md`
|
1. **必须先阅读** `examples/simulator_browser_rpa/README.md`
|
||||||
2. 再参考:
|
2. 再参考:
|
||||||
- `examples/simulator_browser_rpa/scripts/service/browser_session.py`
|
- `examples/simulator_browser_rpa/scripts/service/browser_session.py` — async persistent context(**不含 goto**)
|
||||||
- `examples/simulator_browser_rpa/scripts/service/adapter/`(base / mock / simulator_rpa / dispatch)
|
- `examples/simulator_browser_rpa/scripts/service/simulator_playwright.py` — RPA 主流程(厚)
|
||||||
- `examples/simulator_browser_rpa/scripts/service/task_service.py`
|
- `examples/simulator_browser_rpa/scripts/service/adapter/`(薄 `simulator_rpa` + mock + dispatch)
|
||||||
|
- `examples/simulator_browser_rpa/scripts/service/account_client.py` — account-manager subprocess
|
||||||
|
- `examples/simulator_browser_rpa/scripts/service/task_service.py` — async 编排
|
||||||
- `examples/simulator_browser_rpa/sandbox/demo_app.html`
|
- `examples/simulator_browser_rpa/sandbox/demo_app.html`
|
||||||
|
|
||||||
> **先选类型再写代码**:真实第三方网站 → `real_browser_rpa`;自有 sandbox → `simulator_browser_rpa`。不要跨类型照抄 selector 或业务流程。
|
> **先选类型再写代码**:真实第三方网站 → `real_browser_rpa`;自有 sandbox / 行业仿真 → `simulator_browser_rpa`。不要跨类型照抄 selector 或业务流程。
|
||||||
|
|
||||||
|
### 1.7 行业仿真平台浏览器 RPA(jc2009 类)
|
||||||
|
|
||||||
|
适用:**自有或共享 `sandbox.jc2009.com` 等行业仿真平台**,不是真实高风控第三方站。
|
||||||
|
|
||||||
|
工程范式与 §1.5 相同:
|
||||||
|
|
||||||
|
| 项 | 标准 |
|
||||||
|
|----|------|
|
||||||
|
| Playwright | **async** 贯穿;禁止 sync Playwright 用于完整 RPA 主路径 |
|
||||||
|
| 分层 | **薄 adapter** + `{domain}_playwright.py`(示例:`simulator_playwright.py`)+ `account_client.py` subprocess |
|
||||||
|
| 登录 | **双层**:门户 HITL(`#portal-user` / `#portal-pass` 类泛化 DOM)+ 业务系统登录(技能内自写) |
|
||||||
|
| 账号 | `url` 用行业根,不用 `/login`;`auth_strategy=per_session_manual`;`pick_web_account` + `release_lease` |
|
||||||
|
| 禁止 | **不要** `import account-manager` 的 `rpa_helpers` 等内部模块 |
|
||||||
|
| Selector | 用户可见文案 / `get_by_role` / `name` 优先;`data-testid` 有则用、无则 fallback;共享 sandbox **不要求**为技能加 testid |
|
||||||
|
| Profile | Chrome persistent profile 可能缓存旧 SPA → 联调排障:手工 `--user-data-dir` 清站点数据 |
|
||||||
|
|
||||||
|
权威 example:**修正后的** `examples/simulator_browser_rpa/`(不是任何生产技能仓库)。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -234,7 +274,7 @@ skill 退出/抛错统一用 `ERROR:` 前缀 + 稳定码,方便宿主与上层
|
|||||||
|
|
||||||
### 5.1 截图存证
|
### 5.1 截图存证
|
||||||
|
|
||||||
- **路径**:`{CLAW_DATA_ROOT}/{user}/{slug}/rpa-artifacts/{batch_id}/{tag}_{timestamp}.png`
|
- **路径**:`{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/{slug}/rpa-artifacts/{batch_id}/{tag}_{timestamp}.png`
|
||||||
- **失败必截图**:受 `OPENCLAW_ARTIFACTS_ON_FAILURE`(默认开)控制。
|
- **失败必截图**:受 `OPENCLAW_ARTIFACTS_ON_FAILURE`(默认开)控制。
|
||||||
- **Playwright 不负责录屏**,仅浏览器自动化。
|
- **Playwright 不负责录屏**,仅浏览器自动化。
|
||||||
- **常见 tag**:`before_submit` / `after_submit` / `captcha` / `login_fail` / `error`。
|
- **常见 tag**:`before_submit` / `after_submit` / `captcha` / `login_fail` / `error`。
|
||||||
@@ -263,13 +303,16 @@ skill 退出/抛错统一用 `ERROR:` 前缀 + 稳定码,方便宿主与上层
|
|||||||
|
|
||||||
### 5.3 录屏成片标准
|
### 5.3 录屏成片标准
|
||||||
|
|
||||||
- RPA skill 默认 `OPENCLAW_RECORD_VIDEO=1`。
|
- **skill-template 默认 `OPENCLAW_RECORD_VIDEO=0`**(开发调试更快,不启 ffmpeg)。
|
||||||
|
- **`OPENCLAW_RECORD_VIDEO=1` 时启用录屏**:字幕、旁白、背景音、MP4 成片由 platform-kit 统一处理。
|
||||||
- 使用 platform-kit 的 **`RpaVideoSession`**;**skill 不要自行合成视频**(不要自己调 ffmpeg 拼 MP4)。
|
- 使用 platform-kit 的 **`RpaVideoSession`**;**skill 不要自行合成视频**(不要自己调 ffmpeg 拼 MP4)。
|
||||||
- `OPENCLAW_RECORD_VIDEO=0` 时 session 无副作用(不启 ffmpeg、不写字幕文件)。
|
- **默认关闭 ≠ 可以删除录屏接入**:RPA / 长任务 **service 层**(`scripts/service/*.py`)**必须保留** `RpaVideoSession`、`video.add_step`、video artifact merge 到 `result_summary`(见 `POLICY-RPA-003`)。
|
||||||
|
- `OPENCLAW_RECORD_VIDEO=0` 时 session **无副作用**(不启 ffmpeg、不写字幕文件、不生成最终 MP4),但 **`RpaVideoSession.add_step` 仍可同步 Activity 进度**。
|
||||||
|
- 生产留证 / 合规 / 客户现场复现时,由用户在 `.env` 或进程环境变量中开启 `OPENCLAW_RECORD_VIDEO=1`。
|
||||||
- **ffmpeg 是唯一录屏器**(Windows:`gdigrab` + `desktop`)。
|
- **ffmpeg 是唯一录屏器**(Windows:`gdigrab` + `desktop`)。
|
||||||
- **最终视频**:`{skill_data_dir}/videos/{skill_slug}_{yyyyMMdd_HHmmss}_{batch_id}.mp4`
|
- **最终视频**(`OPENCLAW_RECORD_VIDEO=1` 时):`{skill_data_dir}/videos/{skill_slug}_{yyyyMMdd_HHmmss}_{batch_id}.mp4`
|
||||||
- **中间产物**:`rpa-artifacts/{batch_id}/capture.mp4`、`subtitles/`、`logs/` 等。
|
- **中间产物**:`rpa-artifacts/{batch_id}/capture.mp4`、`subtitles/`、`logs/` 等。
|
||||||
- 任务完成后 CLI / `result_summary` 应包含:`video_path`、`raw_video`、`video_log`、`video_warnings`、`music_path`、`voiceover_path`、`audio_warnings`(见 `scripts/service/task_run_support.py`)。
|
- 任务完成后 CLI / `result_summary` 应包含 video 字段(开启录屏时有路径;关闭时仍保留 `video` 结构与诊断占位):`video_path`、`raw_video`、`video_log`、`video_warnings`、`music_path`、`voiceover_path`、`audio_warnings`(见 `scripts/service/task_run_support.py`)。
|
||||||
|
|
||||||
模板最小示范见 `scripts/service/task_service.py` 的 `_run_template_demo()`。
|
模板最小示范见 `scripts/service/task_service.py` 的 `_run_template_demo()`。
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
## 共享 Python Runtime
|
## 共享 Python Runtime
|
||||||
|
|
||||||
**skill-template** 及复制出的新技能,公共能力均来自宿主匠厂安装的共享 Python Runtime(`jiangchang-platform-kit>=1.0.14` 及其传递依赖,含 `playwright`)。`jiangchang_skill_core` **不得**在技能仓库内 vendored,应由共享 venv 的 site-packages 提供。
|
**skill-template** 及复制出的新技能,公共能力均来自宿主匠厂安装的共享 Python Runtime(`jiangchang-platform-kit>=1.2.0` 及其传递依赖,含 `playwright`)。`jiangchang_skill_core` **不得**在技能仓库内 vendored,应由共享 venv 的 site-packages 提供。
|
||||||
|
|
||||||
技能根目录 `requirements.txt` **只声明技能特有依赖**;**不要**重复声明 `jiangchang-platform-kit` 或 `playwright`。`SKILL.md` 的 `platform_kit_min_version` 是运行契约,**不是** pip 依赖声明。
|
技能根目录 `requirements.txt` **只声明技能特有依赖**;**不要**重复声明 `jiangchang-platform-kit` 或 `playwright`。`SKILL.md` 的 `platform_kit_min_version` 是运行契约,**不是** pip 依赖声明。
|
||||||
|
|
||||||
@@ -22,15 +22,15 @@ Windows:
|
|||||||
<shared-python> {baseDir}/scripts/main.py health
|
<shared-python> {baseDir}/scripts/main.py health
|
||||||
```
|
```
|
||||||
|
|
||||||
`<shared-python>` 通常位于 `{JIANGCHANG_DATA_ROOT}/python-runtime/.venv`。数据根由宿主注入;开发模式下也可能通过 `CLAW_DATA_ROOT` 解析(见 `jiangchang_skill_core.runtime_env`)。
|
`<shared-python>` 通常位于 `{JIANGCHANG_DATA_ROOT}/python-runtime/.venv`。数据根由宿主注入;开发模式下也可能通过 `JIANGCHANG_DATA_ROOT` 解析(见 `jiangchang_skill_core.runtime_env`)。
|
||||||
|
|
||||||
## Runtime 诊断(platform-kit 1.0.14+)
|
## Runtime 诊断(platform-kit 1.2.0+)
|
||||||
|
|
||||||
`health` 命令通过 **`jiangchang_skill_core.collect_runtime_diagnostics`** 输出共享 runtime 诊断,**不在技能内重复实现**。典型字段:
|
`health` 命令通过 **`jiangchang_skill_core.collect_runtime_diagnostics`** 输出共享 runtime 诊断,**不在技能内重复实现**。典型字段:
|
||||||
|
|
||||||
- `skill_slug`、`python_executable`、`platform_kit_version`、`platform_kit_min_version`
|
- `skill_slug`、`python_executable`、`platform_kit_version`、`platform_kit_min_version`
|
||||||
- `jiangchang_skill_core_file` — 若从技能目录加载会输出 `runtime_issue[warning]`
|
- `jiangchang_skill_core_file` — 若从技能目录加载会输出 `runtime_issue[warning]`
|
||||||
- `CLAW_DATA_ROOT` / `JIANGCHANG_DATA_ROOT` / `resolved_data_root`
|
- `JIANGCHANG_DATA_ROOT` / `resolved_data_root`
|
||||||
- `media_assets_root`、`ffmpeg_path`、`background_music_*`
|
- `media_assets_root`、`ffmpeg_path`、`background_music_*`
|
||||||
- `record_video_enabled`、`runtime_issue[warning|error]`
|
- `record_video_enabled`、`runtime_issue[warning|error]`
|
||||||
|
|
||||||
@@ -39,10 +39,10 @@ Windows:
|
|||||||
## 配置 bootstrap
|
## 配置 bootstrap
|
||||||
|
|
||||||
- 仓库内 `.env.example` 是配置模板(单一事实来源)。
|
- 仓库内 `.env.example` 是配置模板(单一事实来源)。
|
||||||
- 用户实际 `.env`:`{CLAW_DATA_ROOT}/{CLAW_USER_ID}/{skill_slug}/.env`。
|
- 用户实际 `.env`:`{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/{skill_slug}/.env`。
|
||||||
- `scripts/main.py` 与 `cli.app.main()` 启动时调用 `util.config_bootstrap.bootstrap_skill_config()`。
|
- `scripts/main.py` 与 `cli.app.main()` 启动时调用 `util.config_bootstrap.bootstrap_skill_config()`。
|
||||||
- 配置优先级:**进程环境变量** > **用户 `.env`** > **`.env.example` 默认值**。
|
- 配置优先级:**进程环境变量** > **用户 `.env`** > **`.env.example` 默认值**。
|
||||||
- 公共 `config` / `merge_missing_env_keys` 来自共享 runtime 的 `jiangchang-platform-kit>=1.0.14`,**不得** vendored `scripts/jiangchang_skill_core/`。
|
- 公共 `config` / `merge_missing_env_keys` 来自共享 runtime 的 `jiangchang-platform-kit>=1.2.0`,**不得** vendored `scripts/jiangchang_skill_core/`。
|
||||||
|
|
||||||
## media-assets / ffmpeg / 背景音乐
|
## media-assets / ffmpeg / 背景音乐
|
||||||
|
|
||||||
@@ -52,7 +52,7 @@ Windows:
|
|||||||
{JIANGCHANG_DATA_ROOT}/shared/media-assets
|
{JIANGCHANG_DATA_ROOT}/shared/media-assets
|
||||||
```
|
```
|
||||||
|
|
||||||
(与 `CLAW_DATA_ROOT` 解析规则一致,由宿主注入。)
|
(由宿主注入 `JIANGCHANG_DATA_ROOT`。)
|
||||||
|
|
||||||
RPA 录屏成片(`RpaVideoSession`)、ffmpeg 路径、背景音乐探测均由 platform-kit 提供;技能只 import,不重复实现。
|
RPA 录屏成片(`RpaVideoSession`)、ffmpeg 路径、背景音乐探测均由 platform-kit 提供;技能只 import,不重复实现。
|
||||||
|
|
||||||
@@ -71,7 +71,7 @@ RPA 录屏成片(`RpaVideoSession`)、ffmpeg 路径、背景音乐探测均
|
|||||||
|
|
||||||
- `scripts/main.py`:唯一 CLI 入口
|
- `scripts/main.py`:唯一 CLI 入口
|
||||||
- `scripts/cli/`:参数解析与命令分发
|
- `scripts/cli/`:参数解析与命令分发
|
||||||
- `scripts/db/`:SQLite 或本地持久化层
|
- `scripts/db/`:SQLite 或本地持久化层(标准时间字段见 `references/SCHEMA.md`)
|
||||||
- `scripts/service/`:业务用例与外部交互
|
- `scripts/service/`:业务用例与外部交互
|
||||||
- `scripts/util/`:通用工具、常量、日志、路径薄封装
|
- `scripts/util/`:通用工具、常量、日志、路径薄封装
|
||||||
|
|
||||||
@@ -80,7 +80,7 @@ RPA 录屏成片(`RpaVideoSession`)、ffmpeg 路径、背景音乐探测均
|
|||||||
推荐:
|
推荐:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
{CLAW_DATA_ROOT}/{CLAW_USER_ID}/{skill_slug}/
|
{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/{skill_slug}/
|
||||||
```
|
```
|
||||||
|
|
||||||
数据库文件建议:
|
数据库文件建议:
|
||||||
@@ -89,6 +89,11 @@ RPA 录屏成片(`RpaVideoSession`)、ffmpeg 路径、背景音乐探测均
|
|||||||
{...}/{skill_slug}.db
|
{...}/{skill_slug}.db
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**业务文件(下载、导入、导出、缓存等)** 须落在上述数据目录的标准子目录下,**不得**相对 workspace/CWD 写入。完整子目录树、env 覆盖规则、`resolve_data_path()` 用法见 **[`DATA_PATHS.md`](DATA_PATHS.md)**。
|
||||||
|
|
||||||
|
- 业务表使用英文 snake_case;中文表名/字段名写入 `_jiangchang_tables` / `_jiangchang_columns`(见 `references/SCHEMA.md`)。
|
||||||
|
- 界面字段顺序由 `CREATE TABLE` 列定义顺序决定,**不要**维护 `display_order` 来调整顺序。
|
||||||
|
|
||||||
## 明确禁止
|
## 明确禁止
|
||||||
|
|
||||||
- **不得** vendored `scripts/jiangchang_skill_core/`
|
- **不得** vendored `scripts/jiangchang_skill_core/`
|
||||||
@@ -97,12 +102,12 @@ RPA 录屏成片(`RpaVideoSession`)、ffmpeg 路径、背景音乐探测均
|
|||||||
|
|
||||||
## 测试时的运行时隔离
|
## 测试时的运行时隔离
|
||||||
|
|
||||||
本模板的 `tests/_support.IsolatedDataRoot` 会在测试期间同时设置:
|
本模板的 `tests/_support.IsolatedDataRoot` 会在测试期间设置:
|
||||||
|
|
||||||
- `CLAW_DATA_ROOT` / `JIANGCHANG_DATA_ROOT` → 临时 tempfile 目录
|
- `JIANGCHANG_DATA_ROOT` → 临时 tempfile 目录
|
||||||
- `CLAW_USER_ID` / `JIANGCHANG_USER_ID` → `_test`
|
- `JIANGCHANG_USER_ID` → `_test`
|
||||||
|
|
||||||
退出时四个变量恢复,临时目录删除。所有 DB / 文件写入都被限制在临时目录内,不污染本机。
|
退出时两个变量恢复,临时目录删除。所有 DB / 文件写入都被限制在临时目录内,不污染本机。
|
||||||
|
|
||||||
详见 `TESTING.md` 第 3 节。
|
详见 `TESTING.md` 第 3 节。
|
||||||
|
|
||||||
|
|||||||
198
development/SKILL_ACTION_RUNTIME.md
Normal file
198
development/SKILL_ACTION_RUNTIME.md
Normal file
@@ -0,0 +1,198 @@
|
|||||||
|
# Skill Action Runtime(宿主任务中心契约)
|
||||||
|
|
||||||
|
本文是匠厂宿主 **Skill Action / 任务中心** 的技能侧金标准。涉及浏览器 RPA、长耗时任务、数据管理按钮、定时任务或 Agent 直接调用时**必读**。
|
||||||
|
|
||||||
|
**边界:**
|
||||||
|
|
||||||
|
| 文档 | 职责 |
|
||||||
|
|------|------|
|
||||||
|
| 本文 | sync/async、任务中心、Agent 禁令、单内核编排、队列 pick、同步 vs 导出 |
|
||||||
|
| [`../references/ACTIONS.md`](../references/ACTIONS.md) | `actions.json` 字段、placements、`bind.tables`、inputSchema |
|
||||||
|
| [`LOGGING.md`](LOGGING.md) | `job_context` / `emit` / `finish` / Run Journal |
|
||||||
|
| [`DATA_PATHS.md`](DATA_PATHS.md) | 下载/导入等落盘路径 |
|
||||||
|
|
||||||
|
宿主实现细节以匠厂 Host API 为准;技能侧只需保证 manifest 与 CLI 契约稳定。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 核心原则
|
||||||
|
|
||||||
|
1. **宿主管调度,技能管业务** — 不自行实现任务中心 / Job 轮询 / 后台守护进程。
|
||||||
|
2. **单业务内核、多入口** — 数据管理、定时任务、Agent、技能详情与直接 CLI 复用同一 domain service;禁止按入口复制业务逻辑。
|
||||||
|
3. **五职责正交** — `placements` / `bind.tables` / `executionProfile` / `entrypoint` / domain service 各管一事(见 ACTIONS.md)。
|
||||||
|
4. **长耗时建议 async** — 开浏览器、RPA、HTTP 大文件下载等建议 `executionProfile: "async"`,进**任务中心**;这是选择建议,**不**限制可以出现在哪些 placement。
|
||||||
|
5. **Agent 禁止 `exec` 直跑长任务 CLI** — 必须 `run_skill_action`;禁止 `exec python main.py run` + `process poll` 干等。
|
||||||
|
6. **进度走 Journal** — `emit` / `video.add_step` → Run Journal;UI / Skill Run Card / 任务中心展示;**不靠 stdout 流**。
|
||||||
|
7. **显式声明 `executionProfile`** — 每个 action **必须**写明 `sync` 或 `async`;禁止依赖宿主缺省;禁止第三种模糊模式(`auto` / `background` / `deferred` 等)。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. `executionProfile`:sync vs async
|
||||||
|
|
||||||
|
| 值 | 宿主行为 | 超时 | 任务中心 |
|
||||||
|
|----|----------|------|----------|
|
||||||
|
| **`sync`** | 调用方等待 CLI 结束,直接返回结构化结果或结构化错误;**不**创建后台 Job | 默认约 **30s**(`SKILL_ACTION_SYNC_TIMEOUT_MS`) | ❌ 不进 |
|
||||||
|
| **`async`** | 后台 spawn Job,立即返回 `jobId`;`emit` / `checkpoint` / `finish`;长任务应支持暂停/停止/取消检查 | Job 本身无默认墙钟上限 | ✅ 进入 |
|
||||||
|
|
||||||
|
直接执行 CLI:终端等待进程结束。宿主经 Action 调用同一 CLI:再按 `executionProfile` 分流。技能不得自建任务中心。
|
||||||
|
|
||||||
|
### 选择建议(不是 placement 硬限制)
|
||||||
|
|
||||||
|
| 场景 | 建议 |
|
||||||
|
|------|------|
|
||||||
|
| 浏览器 / Playwright / RPA 主路径 | `async` + 建议 `confirmation` |
|
||||||
|
| 单次可能超过 ~20s 的网络/下载/同步 | `async` |
|
||||||
|
| `health` / `version` / `config-path` / 纯统计 / 秒级查询 | `sync` |
|
||||||
|
| 任意 placement(含 toolbar) | 允许 sync 或 async;以 manifest 为准 |
|
||||||
|
|
||||||
|
合法:`sync|async` × `toolbar|cron|agent|skill-detail`。
|
||||||
|
|
||||||
|
历史说明:旧文档曾错误地把数据管理按钮入口与异步执行方式绑死。该约束**已废止**;模板测试与 Schema **不得**再建立「入口位置决定 sync/async」一类硬耦合。宿主省略 `executionProfile` 时的兼容行为以宿主实现为准,**新技能不得依赖**。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 多入口如何感知 sync / async
|
||||||
|
|
||||||
|
多个入口统一走 `POST /api/skill-actions/run`,可能带 `source.kind`:
|
||||||
|
|
||||||
|
| 入口 | 常见 `source.kind` | 说明 |
|
||||||
|
|------|-------------------|------|
|
||||||
|
| **Agent** | `agent` | `run_skill_action`;按 manifest 的 executionProfile 执行 |
|
||||||
|
| **数据管理** | `data-management` | toolbar 按钮;须 `bind.tables` |
|
||||||
|
| **定时任务** | `cron` | Cron 配置参数后调用同一 Action |
|
||||||
|
| **技能详情** | (依宿主) | 与上同一 CLI / 同一业务内核 |
|
||||||
|
|
||||||
|
技能 **不要** 在 Python 里按 `source` / placement 写业务分叉;宿主读 manifest 分流展示与等待策略。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Action 分类与 placements(示例,不是限制)
|
||||||
|
|
||||||
|
下表只表示常见组合示例。**placements 以 manifest 为准;sync/async 不影响展示入口。**
|
||||||
|
|
||||||
|
| Action 类型 | 常见 `executionProfile` | 常见 placements | `confirmation` |
|
||||||
|
|-------------|-------------------------|-----------------|----------------|
|
||||||
|
| 运行检查 / 版本 / 配置路径 | `sync` | `skill-detail`, `agent` | 无 |
|
||||||
|
| 库 / 队列统计 | `sync` | `skill-detail`, `agent` | 无 |
|
||||||
|
| 外源 → 本地库同步 | `sync` 或 `async` | 可含 `toolbar`(须 `bind.tables`)、`cron`、`agent` | 可选 |
|
||||||
|
| 数据导入 / 失败重置 | `sync` 或 `async` | `skill-detail`, `agent` | 可选 |
|
||||||
|
| **单条**副作用 RPA | `async`(建议) | `agent`, `skill-detail` | **建议** |
|
||||||
|
| **批量顺序** RPA(pick) | `async`(建议) | `toolbar`, `cron`, `agent` | **建议** |
|
||||||
|
|
||||||
|
禁忌:
|
||||||
|
|
||||||
|
- 高副作用 action 不要默认只挂 `toolbar`(应有 confirmation)。
|
||||||
|
- 含 `sensitive` 参数的 action 不要挂 `toolbar` / `cron`(除非有明确安全设计)。
|
||||||
|
- 不要为了「按钮多」暴露所有 CLI 子命令。
|
||||||
|
- 不要按入口复制多套采集 / 同步 / 处理实现。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 技能内编排范式(单内核 + 多入口)
|
||||||
|
|
||||||
|
推荐分层:
|
||||||
|
|
||||||
|
```text
|
||||||
|
scripts/cli/app.py # 参数解析 → 调用 task / service
|
||||||
|
scripts/service/task_service.py # job_context / emit / checkpoint / finish / 错误转换
|
||||||
|
scripts/service/<domain>_service.py # 唯一业务内核
|
||||||
|
scripts/db/*_repository.py # 只负责读写与事务
|
||||||
|
assets/actions.json # 声明入口、参数、placement、executionProfile、bind
|
||||||
|
```
|
||||||
|
|
||||||
|
长任务 / RPA 常见拆分(勿把 `job_context` 塞进纯业务内核):
|
||||||
|
|
||||||
|
```text
|
||||||
|
execute_single_<biz>(...) # 纯业务:鉴权 + 核心逻辑 + task_log;不含 job_context
|
||||||
|
cmd_run(...) # 单条:job_context + execute_single + finish
|
||||||
|
cmd_run_pick(N, ...) # 批量:job_context + for-loop execute_single + emit(progress) + finish
|
||||||
|
cmd_stats() # 只读 sync:JSON stdout,无 job_context
|
||||||
|
```
|
||||||
|
|
||||||
|
要点:
|
||||||
|
|
||||||
|
1. **`job_context` 只包编排层**(`cmd_run` / `cmd_run_pick`),不包 `execute_single_*` / domain service。
|
||||||
|
2. 批量 **顺序、不并发**;数量由参数 `pickCount` / `--pick N` 传入。
|
||||||
|
3. pick 循环内:`checkpoint()` + `emit("正在处理 {i}/{total}", progress={...})`。
|
||||||
|
4. 结束:全成功 `finish(success)`;部分失败 `finish(partial)`;全失败 `finish(failed)`。
|
||||||
|
5. 同一浏览器 Profile / account lease:**禁止并发**。
|
||||||
|
6. 兼容旧命令(例如旧 export 需先刷新)必须调用同一 sync / domain 内核,禁止重写采集逻辑。
|
||||||
|
|
||||||
|
详见 [`LOGGING.md`](LOGGING.md) §2.5 与 `scripts/service/task_service.py` 示范。可复用契约样例见 `tests/samples/test_action_core_contract.py.sample`、`tests/samples/test_sync_contract.py.sample`。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 队列 + pick(可选,Type B 批量)
|
||||||
|
|
||||||
|
有「待处理列表」的技能建议:
|
||||||
|
|
||||||
|
| 能力 | 约定 |
|
||||||
|
|------|------|
|
||||||
|
| 队列表 | `status`: `pending` → `processing` → `success` / `failed` |
|
||||||
|
| 入库 | 数据管理 CRUD,或 `import-*`(相对 `{skill_data}/imports/`,见 [`DATA_PATHS.md`](DATA_PATHS.md)) |
|
||||||
|
| 消费 | `run --pick N`,默认仅 `pending` |
|
||||||
|
| 重试 | `reset` 或数据管理改 `pending`;**failed 不要自动重试** |
|
||||||
|
| 批次 | 可选 `batch_id`,便于筛选与任务中心对照 |
|
||||||
|
| Manifest | `*-run-pick`:建议 `async`,`placements` 按需含 `toolbar` / `cron` / `agent`;有 toolbar 则 `bind.tables` 必填 |
|
||||||
|
|
||||||
|
批量有两种合理形态(都是**顺序**):
|
||||||
|
|
||||||
|
| 形态 | 任务中心条数 | 适用 |
|
||||||
|
|------|-------------|------|
|
||||||
|
| 一次 `run-pick` 处理 N 条 | **1** 条 Job | 同类 RPA、同 Profile、定时消费队列 |
|
||||||
|
| Agent/UI 触发 N 次单条 `run` | **N** 条 Job | 每条独立追踪 / 独立重试 |
|
||||||
|
|
||||||
|
默认优先 **一次 pick、一条 Job**。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. 业务同步与系统导出
|
||||||
|
|
||||||
|
| 能力 | 方向 | 负责方 |
|
||||||
|
|------|------|--------|
|
||||||
|
| 同步 / refresh / collect | 外部来源 → 技能本地 SQLite | 技能 domain service |
|
||||||
|
| 导出当前数据表 | 本地库 → CSV/Excel | **宿主**数据管理统一导出 |
|
||||||
|
| 特殊业务报告 | 多表合并 / 特殊格式 / 附加计算 | 仅系统导出不足时提供 `export-*` |
|
||||||
|
|
||||||
|
同步 Action 默认写库、不写导出文件。通用幂等 / 事务 / 空结果保护见 [`../references/SCHEMA.md`](../references/SCHEMA.md)。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. Agent / SKILL.md 契约(复制后必改)
|
||||||
|
|
||||||
|
业务技能 `SKILL.md` 应明确:
|
||||||
|
|
||||||
|
1. 副作用任务必须通过宿主 **Skill Action**(`run_skill_action`)调用。
|
||||||
|
2. **禁止**对长任务使用 `exec` + `process poll`。
|
||||||
|
3. 单条 vs 批量 action id 与参数(如 `url` / `pickCount`)。
|
||||||
|
4. 长任务进度看**任务中心** / Skill Run Card,不等 CLI stdout。
|
||||||
|
5. 多入口复用同一业务内核;异步 Action 进入任务中心。
|
||||||
|
|
||||||
|
模板源仓库的 `SKILL.md` 含占位段落;scaffold 后按业务改写。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. Policy
|
||||||
|
|
||||||
|
自动检测索引见 [`POLICY_MATRIX.md`](POLICY_MATRIX.md):
|
||||||
|
|
||||||
|
- **POLICY-SKILL-ACTION-001**:Runtime 文档存在;schema 含 `executionProfile`;有 RPA 的业务技能须声明 async agent action。
|
||||||
|
- **POLICY-SKILL-ACTION-002**:每个 Action 显式声明 `executionProfile`(sync/async)。
|
||||||
|
- **POLICY-SKILL-ACTION-003**:toolbar Action 必须声明合法 `bind.tables`。
|
||||||
|
- **POLICY-SKILL-ACTION-004**:placements 与 executionProfile 正交(文档/测试不得写死耦合)。
|
||||||
|
- **POLICY-ARCH-CORE-001** / **POLICY-DATA-SYNC-001**:见矩阵;完整语义多用 sample / code review。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 10. 与宿主 API(参考)
|
||||||
|
|
||||||
|
| API | 用途 |
|
||||||
|
|-----|------|
|
||||||
|
| `GET /api/skill-actions/{skillSlug}` | 读 manifest |
|
||||||
|
| `POST /api/skill-actions/run` | 执行 action(sync inline / async job) |
|
||||||
|
| `GET /api/skill-actions/jobs` | 任务中心列表 |
|
||||||
|
| `GET /api/skill-actions/jobs/{jobId}` | 单 Job 详情 / 事件 |
|
||||||
|
|
||||||
|
Agent 工具(插件):`list_skill_actions` → `get_skill_action` → `run_skill_action`;正常对话**不要**轮询 `get_skill_action_job`(交给 UI / 任务中心)。
|
||||||
|
|
||||||
|
表级 `bind.tables` 过滤依赖宿主支持;旧宿主忽略绑定时,toolbar Action 可能在技能全部数据表显示——新技能仍须显式绑定,待宿主升级后完整按表过滤生效。
|
||||||
@@ -23,13 +23,18 @@
|
|||||||
必跑套件要像一个紧张的守门员:**快、确定、离线**。典型覆盖:
|
必跑套件要像一个紧张的守门员:**快、确定、离线**。典型覆盖:
|
||||||
|
|
||||||
- CLI:导入 [`cli.app`](../scripts/cli/app.py) 走解析链路、`health`(runtime diagnostics)/ `version` / `logs` / `log-get` 冒烟;
|
- CLI:导入 [`cli.app`](../scripts/cli/app.py) 走解析链路、`health`(runtime diagnostics)/ `version` / `logs` / `log-get` 冒烟;
|
||||||
- 架构守护:无 `scripts/jiangchang_skill_core/`、`platform-kit>=1.0.14` 导入来源、文档/runtime 标准(见 `test_platform_import.py` 等);
|
- 架构守护:无 `scripts/jiangchang_skill_core/`、`platform-kit>=1.2.0` 导入来源、文档/runtime 标准(见 `test_platform_import.py` 等);
|
||||||
- **真实 subprocess**:[`tests/test_entrypoint_subprocess.py`](../tests/test_entrypoint_subprocess.py) 再调用一遍 `python scripts/main.py`,防路径漂移;
|
- **真实 subprocess**:[`tests/test_entrypoint_subprocess.py`](../tests/test_entrypoint_subprocess.py) 再调用一遍 `python scripts/main.py`,防路径漂移;
|
||||||
- 运行时:`runtime_paths` 与 **`CLAW_*` / `JIANGCHANG_*` 并发兜底;
|
- 运行时:`runtime_paths` 与 **`JIANGCHANG_*` 隔离**;
|
||||||
- `SKILL.md` YAML slug vs [`constants.SKILL_SLUG`](../scripts/util/constants.py);
|
- `SKILL.md` YAML slug vs [`constants.SKILL_SLUG`](../scripts/util/constants.py);
|
||||||
- SQLite 骨架:`task_logs` 创建幂等与仓储读写;
|
- SQLite 骨架:`task_logs` 创建幂等与仓储读写;
|
||||||
|
- 数据管理元数据:`_jiangchang_*` 幂等初始化、中文展示名、`PRAGMA table_info` 字段顺序、editable 权限(见 `test_display_metadata.py`、`test_data_management_contract.py`);
|
||||||
|
- Skill Action manifest:`assets/actions.json` 结构、CLI 映射、placements 与 inputSchema 守护(见 `test_actions_manifest.py`);
|
||||||
|
- 标准时间字段:`created_at` / `updated_at` 默认值、trigger 维护与 `datetime_unix_seconds` 元数据(见 `test_timestamp_columns.py`);
|
||||||
- **adapter profile**:[`tests/test_adapter_profile_policy.py`](../tests/test_adapter_profile_policy.py) + [`adapter_test_utils`](../tests/adapter_test_utils.py) ——验证在未授权情况下绝不误判开启真实网络/RPA。
|
- **adapter profile**:[`tests/test_adapter_profile_policy.py`](../tests/test_adapter_profile_policy.py) + [`adapter_test_utils`](../tests/adapter_test_utils.py) ——验证在未授权情况下绝不误判开启真实网络/RPA。
|
||||||
- **发布打包守护**:[`tests/test_release_packaging_constraints.py`](../tests/test_release_packaging_constraints.py) ——`scripts/**/*.py` 单文件 < 1000 行、文本文件 UTF-8 without BOM。
|
- **发布打包守护**:[`tests/test_release_packaging_constraints.py`](../tests/test_release_packaging_constraints.py) ——`scripts/**/*.py` 单文件 < 1000 行、文本文件 UTF-8 without BOM。
|
||||||
|
- **开发规范守护(hard policy)**:[`tests/test_development_policy_guard.py`](../tests/test_development_policy_guard.py) ——规则索引见 [`development/POLICY_MATRIX.md`](POLICY_MATRIX.md),只执行可机器检测的 hard 规则。
|
||||||
|
- **slug 语义**:[`tests/test_slug_naming.py`](../tests/test_slug_naming.py) ——verb-noun-platform 命名规范校验。
|
||||||
|
|
||||||
**原则:`tests/test_*.py` 不允许隐形访问外网、不允许拉起真实浏览器、不允许读写开发者机器的真实数据根**。如果需要仿真服务器,也应仅在 integration(并由档位变量放行)。
|
**原则:`tests/test_*.py` 不允许隐形访问外网、不允许拉起真实浏览器、不允许读写开发者机器的真实数据根**。如果需要仿真服务器,也应仅在 integration(并由档位变量放行)。
|
||||||
|
|
||||||
@@ -39,7 +44,7 @@
|
|||||||
|
|
||||||
## 3. 数据隔离:IsolatedDataRoot
|
## 3. 数据隔离:IsolatedDataRoot
|
||||||
|
|
||||||
[`tests/_support.py`](../tests/_support.py) 提供的上下文管理器 `IsolatedDataRoot()`:进入一个专用临时目录,**镜像写入四套变量**:`CLAW_DATA_ROOT`、`JIANGCHANG_DATA_ROOT`(同一 tempfile)、以及用户镜像 ID:`CLAW_USER_ID`、`JIANGCHANG_USER_ID` → `_test`。
|
[`tests/_support.py`](../tests/_support.py) 提供的上下文管理器 `IsolatedDataRoot()`:进入一个专用临时目录,写入 `JIANGCHANG_DATA_ROOT`(tempfile)与 `JIANGCHANG_USER_ID` → `_test`。
|
||||||
|
|
||||||
结束时:**恢复原 environ**,删除目录。
|
结束时:**恢复原 environ**,删除目录。
|
||||||
|
|
||||||
@@ -127,6 +132,20 @@ Golden fixture 流程同理([`tests/samples/test_golden_cases.py.sample`](../t
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 7.1 simulator_rpa 联调检查表
|
||||||
|
|
||||||
|
浏览器 RPA 走 `simulator_rpa` 档位联调前,逐项确认:
|
||||||
|
|
||||||
|
- [ ] 数据目录 `.env` 中 `OPENCLAW_TEST_TARGET=simulator_rpa`(非 `mock` / `unit`)
|
||||||
|
- [ ] account-manager:`platform ensure` + 账号 `active` + 有 `profile_dir`
|
||||||
|
- [ ] 目标 sandbox UI 已部署(跨团队;本地可用 `sandbox/demo_app.html`)
|
||||||
|
- [ ] 失败先查 `rpa-artifacts/` 截图,再查 Chrome profile 缓存(`--user-data-dir` 手工打开清站点数据)
|
||||||
|
- [ ] 默认 `python tests/run_tests.py -v` 仍全部通过(mock 离线);example 内 `pytest` 不启真实浏览器
|
||||||
|
|
||||||
|
参考实现:`examples/simulator_browser_rpa/README.md`。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 8. 新 skill 的最小测试清单
|
## 8. 新 skill 的最小测试清单
|
||||||
|
|
||||||
以下清单 **原文摘自 [`tests/README.md`](../tests/README.md) 「新技能最小测试清单」**(复制新仓库后逐项勾选):
|
以下清单 **原文摘自 [`tests/README.md`](../tests/README.md) 「新技能最小测试清单」**(复制新仓库后逐项勾选):
|
||||||
@@ -140,6 +159,8 @@ Golden fixture 流程同理([`tests/samples/test_golden_cases.py.sample`](../t
|
|||||||
- [ ] 至少有 1 个缺必填字段 / 非法输入测试。
|
- [ ] 至少有 1 个缺必填字段 / 非法输入测试。
|
||||||
- [ ] 如果有 adapter,至少覆盖 timeout / unauthorized / invalid response(可用 fake 模拟)。
|
- [ ] 如果有 adapter,至少覆盖 timeout / unauthorized / invalid response(可用 fake 模拟)。
|
||||||
- [ ] 如果有解析 / 计算 / 校验类业务,至少保留 1 组 golden fixture(脱敏)。
|
- [ ] 如果有解析 / 计算 / 校验类业务,至少保留 1 组 golden fixture(脱敏)。
|
||||||
|
- [ ] 若有 `assets/actions.json`,`tests/test_actions_manifest.py` 通过;不需要 Action 时可删除 manifest。
|
||||||
|
- [ ] 若有本地 SQLite 业务表,`_jiangchang_*` 元数据与 `tests/test_data_management_contract.py` 规则一致。
|
||||||
- [ ] 真实 API / 真实 RPA 测试只放 `tests/integration/`,并且默认 `.sample`,不默认运行。
|
- [ ] 真实 API / 真实 RPA 测试只放 `tests/integration/`,并且默认 `.sample`,不默认运行。
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -160,9 +181,36 @@ Golden fixture 流程同理([`tests/samples/test_golden_cases.py.sample`](../t
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 9.1 开发规范守护测试
|
||||||
|
|
||||||
|
[`tests/test_development_policy_guard.py`](../tests/test_development_policy_guard.py) 将 [`development/POLICY_MATRIX.md`](POLICY_MATRIX.md) 中的 **hard policy** 落地为默认必跑 unittest:
|
||||||
|
|
||||||
|
- 每条失败信息包含 `policy_id` 与来源文档路径,便于定位规范出处。
|
||||||
|
- 只覆盖目录结构、runtime 依赖边界、配置读取、默认测试安全档位、RPA 禁令等**可静态扫描**规则;软规则列在矩阵「暂不自动检测」小节,**不**做成测试。
|
||||||
|
- `POLICY-TESTING-001`:根目录 `tests/test_*.py` 非白名单文件不得出现 `real_api` / `real_rpa` / `OPENCLAW_TEST_TARGET`;**唯一白名单** `test_adapter_profile_policy.py`(档位 helper 自测)。`adapter_test_utils.py` 与 `tests/integration/*.sample` 不在默认套件内,不受此条扫描。
|
||||||
|
- `POLICY-RPA-002`:只禁止 `subprocess` / `os.system` / `os.popen` **直接执行** ffmpeg,不误伤 `ffmpeg_path` 等诊断字段。
|
||||||
|
- 与已有测试分工:`test_release_packaging_constraints.py` 继续守护 PyArmor 行数与 UTF-8 BOM;`test_no_rpa_helpers_import.py` 与 policy guard 的 `POLICY-RPA-001` 语义一致,二者并存防回归。
|
||||||
|
|
||||||
|
### 日志规范测试
|
||||||
|
|
||||||
|
[`tests/test_development_policy_guard.py`](../tests/test_development_policy_guard.py) 中的 `POLICY-LOGGING-*` 规则会检查 logging **hard policy**(见 [`POLICY_MATRIX.md`](POLICY_MATRIX.md)):
|
||||||
|
|
||||||
|
- CLI 是否调用 `setup_skill_logging`(`POLICY-LOGGING-001`)
|
||||||
|
- `task_service.py` 是否使用 `get_skill_logger`、含 `log.info` / `log.exception`、写入 `save_task_log`(`POLICY-LOGGING-002` / `003`)
|
||||||
|
- 长任务模板是否使用 Activity 或 RPA video step(`POLICY-LOGGING-004`)
|
||||||
|
- 交付代码是否在 logging 调用中拼接明显敏感字段(`POLICY-LOGGING-005`)
|
||||||
|
|
||||||
|
**局限**:自动检测只覆盖可静态判断的**底线**,**不**判断业务日志是否足够完整。复制新 skill 后,仍须人工对照 [`LOGGING.md`](LOGGING.md) §必打日志节点清单做 code review。
|
||||||
|
|
||||||
|
新增或调整开发规范时:**先更新 `POLICY_MATRIX.md`,再补/改 `test_development_policy_guard.py`(或注明已有测试覆盖)**。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 10. 测试和发布的关系
|
## 10. 测试和发布的关系
|
||||||
|
|
||||||
**在运行 [`release.ps1`](../release.ps1) 之前,`python tests/run_tests.py -v` 必须绿色**。失败的默认套件意味着:
|
[`release.ps1`](../release.ps1) **默认**在 **auto commit 之前**、创建 tag 之前,对**当前工作区**执行 `python tests/run_tests.py -v`;测试失败会终止 release,不会自动提交、不会打 tag。仅紧急排障时可传 `-SkipTests`(会输出黄色警告,不应作为常规发布路径)。`-DryRun` 仍会实际运行默认测试。
|
||||||
|
|
||||||
|
即便手工发布,也应在运行 `release.ps1` 之前确认 `python tests/run_tests.py -v` 绿色。失败的默认套件意味着:
|
||||||
|
|
||||||
- 打包路径可能根本不可运行;
|
- 打包路径可能根本不可运行;
|
||||||
- CI 加密前的静态假设可能在宿主崩溃;
|
- CI 加密前的静态假设可能在宿主崩溃;
|
||||||
@@ -188,10 +236,11 @@ Golden fixture 流程同理([`tests/samples/test_golden_cases.py.sample`](../t
|
|||||||
|
|
||||||
## 12. RPA / video 测试标准
|
## 12. RPA / video 测试标准
|
||||||
|
|
||||||
- `RpaVideoSession` 调用**不跑真实 ffmpeg**:单测中使用 `unittest.mock` patch session 或设 `OPENCLAW_RECORD_VIDEO=0`。
|
- 模板 `.env.example` 默认 **`OPENCLAW_RECORD_VIDEO=0`**;默认必跑测试**不应启动真实 ffmpeg**(patch session 或显式设 `OPENCLAW_RECORD_VIDEO=0`)。
|
||||||
|
- **但测试必须守护录屏接入能力**(`POLICY-RPA-003` 扫描 `scripts/service/*.py`):`RpaVideoSession` 被构造、`video.add_step` 被调用、video artifact 结构 merge 进 `result_summary`(`video` / `video_path` 等字段),与默认是否录屏无关。
|
||||||
- 断言 `title` / `closing_title` 是**中文**业务文案。
|
- 断言 `title` / `closing_title` 是**中文**业务文案。
|
||||||
- 断言 video artifact 会进入 `result_summary`(`video_path`、`raw_video`、`video_log` 等)。
|
|
||||||
- 断言 step 文案贴近用户动作,不是技术日志(如「准备执行示例任务」而非「enter cmd_run」)。
|
- 断言 step 文案贴近用户动作,不是技术日志(如「准备执行示例任务」而非「enter cmd_run」)。
|
||||||
|
- 若需测试**真实录屏**(ffmpeg 成片),必须显式设 `OPENCLAW_RECORD_VIDEO=1`,并放在 `tests/integration/` 或手动触发场景,**不得**进入默认 unittest 套件。
|
||||||
|
|
||||||
参考 `tests/test_video_service.py`。
|
参考 `tests/test_video_service.py`。
|
||||||
|
|
||||||
@@ -211,7 +260,7 @@ Golden fixture 流程同理([`tests/samples/test_golden_cases.py.sample`](../t
|
|||||||
|
|
||||||
- [ ] `requirements.txt` **不含** `jiangchang-platform-kit` / `playwright`
|
- [ ] `requirements.txt` **不含** `jiangchang-platform-kit` / `playwright`
|
||||||
- [ ] 无 `scripts/jiangchang_skill_core/` vendored 副本
|
- [ ] 无 `scripts/jiangchang_skill_core/` vendored 副本
|
||||||
- [ ] `platform_kit_min_version` **>= 1.0.14**(`SKILL.md` + `constants.py`)
|
- [ ] `platform_kit_min_version` **>= 1.2.0**(`SKILL.md` + `constants.py`)
|
||||||
- [ ] `health` 能输出 `platform_kit_version_ok`(或等价诊断行)
|
- [ ] `health` 能输出 `platform_kit_version_ok`(或等价诊断行)
|
||||||
- [ ] `config-path` 可输出用户 `.env` 路径 JSON
|
- [ ] `config-path` 可输出用户 `.env` 路径 JSON
|
||||||
- [ ] `pytest.ini` 存在且 `python_files` 只收集 `test_*.py` / `*_test.py`
|
- [ ] `pytest.ini` 存在且 `python_files` 只收集 `test_*.py` / `*_test.py`
|
||||||
|
|||||||
@@ -19,13 +19,23 @@
|
|||||||
|
|
||||||
## 两类浏览器 RPA 的区别
|
## 两类浏览器 RPA 的区别
|
||||||
|
|
||||||
| | real_browser_rpa | simulator_browser_rpa |
|
| | real_browser_rpa | simulator_browser_rpa(修正后) |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| 目标 | 真实第三方网页 | 自有仿真页面 / sandbox |
|
| 目标 | 真实第三方网页 | 自有仿真页面 / sandbox / jc2009 类 |
|
||||||
| 风控 | 高(验证码、登录态、反爬) | 低(DOM 可控) |
|
| 风控 | 高(验证码、登录态、反爬) | 低(DOM 可控) |
|
||||||
| 账号 | 通常需 account-manager + profile | 示例可用 env / demo 账号 |
|
| 账号 | account-manager + profile | account-manager + profile(`simulator_rpa` 档) |
|
||||||
| 用途 | 生产级真实采集/操作参考 | adapter 分层 + 表单 RPA 教学 |
|
| 用途 | 生产级真实采集/操作参考 | adapter 分层 + 表单 RPA 教学 |
|
||||||
|
|
||||||
|
### 工程范式对比
|
||||||
|
|
||||||
|
| 工程范式 | real_browser_rpa | simulator_browser_rpa(修正后) |
|
||||||
|
|---|---|---|
|
||||||
|
| async Playwright | ✅ | ✅ |
|
||||||
|
| 薄 adapter + `*_playwright.py` | `task_rpa.py` | `simulator_playwright.py` |
|
||||||
|
| account-manager subprocess | ✅ | ✅(`simulator_rpa` 档位) |
|
||||||
|
|
||||||
|
两者工程范式一致,差异在目标系统(真实站 vs 仿真站/本地 demo)。
|
||||||
|
|
||||||
## 如何选择示例
|
## 如何选择示例
|
||||||
|
|
||||||
| 你的场景 | 参考目录 |
|
| 你的场景 | 参考目录 |
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ real_browser_rpa/
|
|||||||
|
|
||||||
`account_client.py` 末尾的 `D:\OpenClaw\client-commons\account-manager\scripts\main.py` 是**开发环境兜底路径**,仅用于模板/本机调试。复制到真实 skill 后:
|
`account_client.py` 末尾的 `D:\OpenClaw\client-commons\account-manager\scripts\main.py` 是**开发环境兜底路径**,仅用于模板/本机调试。复制到真实 skill 后:
|
||||||
|
|
||||||
- **优先**通过 `ACCOUNT_MANAGER_ROOT`、`CLAW_SKILLS_ROOT`、`JIANGCHANG_SKILLS_ROOT` 或宿主运行环境解析 account-manager
|
- **优先**通过 `ACCOUNT_MANAGER_ROOT`、Platform Kit `get_sibling_skills_root` 或宿主运行环境解析 account-manager
|
||||||
- **不要**把个人机器路径作为生产依赖
|
- **不要**把个人机器路径作为生产依赖
|
||||||
|
|
||||||
## 必须保留的安全原则
|
## 必须保留的安全原则
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
from typing import Any, Dict, List, Optional
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
|
from jiangchang_skill_core.runtime_env import get_sibling_skills_root
|
||||||
|
|
||||||
from util.constants import LEASE_HOLDER, LEASE_TTL_SEC, TARGET_PLATFORM
|
from util.constants import LEASE_HOLDER, LEASE_TTL_SEC, TARGET_PLATFORM
|
||||||
from util.logging import mask_text
|
from util.logging import mask_text
|
||||||
|
|
||||||
@@ -39,18 +41,18 @@ def mask_login_id(login_id: str) -> str:
|
|||||||
def _resolve_account_manager_main() -> str:
|
def _resolve_account_manager_main() -> str:
|
||||||
"""解析 account-manager CLI 入口路径。
|
"""解析 account-manager CLI 入口路径。
|
||||||
|
|
||||||
优先级:ACCOUNT_MANAGER_ROOT → CLAW_SKILLS_ROOT / JIANGCHANG_SKILLS_ROOT → 开发机兜底。
|
优先级:ACCOUNT_MANAGER_ROOT → get_sibling_skills_root(路径推断 / JIANGCHANG_SKILLS_ROOT)→ 开发机兜底。
|
||||||
末尾 dev 路径仅用于模板/本机调试,复制到真实 skill 后不要依赖个人机器绝对路径。
|
末尾 dev 路径仅用于模板/本机调试,复制到真实 skill 后不要依赖个人机器绝对路径。
|
||||||
"""
|
"""
|
||||||
env_root = (os.getenv("ACCOUNT_MANAGER_ROOT") or "").strip()
|
env_root = (os.getenv("ACCOUNT_MANAGER_ROOT") or "").strip()
|
||||||
if env_root and os.path.isfile(os.path.join(env_root, "scripts", "main.py")):
|
if env_root and os.path.isfile(os.path.join(env_root, "scripts", "main.py")):
|
||||||
return os.path.join(os.path.abspath(env_root), "scripts", "main.py")
|
return os.path.join(os.path.abspath(env_root), "scripts", "main.py")
|
||||||
|
|
||||||
skills_root = (os.getenv("CLAW_SKILLS_ROOT") or os.getenv("JIANGCHANG_SKILLS_ROOT") or "").strip()
|
scripts_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
if skills_root:
|
skills_root = get_sibling_skills_root(scripts_dir)
|
||||||
candidate = os.path.join(os.path.abspath(skills_root), "account-manager", "scripts", "main.py")
|
candidate = os.path.join(skills_root, "account-manager", "scripts", "main.py")
|
||||||
if os.path.isfile(candidate):
|
if os.path.isfile(candidate):
|
||||||
return candidate
|
return candidate
|
||||||
|
|
||||||
# 开发环境兜底:仅模板/本机调试;生产依赖宿主注入的路径变量,勿硬编码个人目录
|
# 开发环境兜底:仅模板/本机调试;生产依赖宿主注入的路径变量,勿硬编码个人目录
|
||||||
dev = r"D:\OpenClaw\client-commons\account-manager\scripts\main.py"
|
dev = r"D:\OpenClaw\client-commons\account-manager\scripts\main.py"
|
||||||
|
|||||||
@@ -1,20 +1,20 @@
|
|||||||
# Simulator Browser RPA Example
|
# Simulator Browser RPA Example
|
||||||
|
|
||||||
这是一个**仿真浏览器 RPA** 的可复制参考实现:在可控 sandbox 页面上,通过 Playwright 完成登录、表单填写、弹窗确认、结果解析。
|
这是一个**仿真浏览器 RPA** 的可复制参考实现:在可控 sandbox 页面上,通过 **async Playwright** 完成门户门闩、两步登录、表单填写、PIN 弹窗、结果解析。
|
||||||
|
|
||||||
本示例抽象自已跑通的「批量提交类」浏览器自动化 skill,但已去业务化,不包含真实银行/真实资金语义。
|
本示例抽象自已跑通的「工行批量提交类」浏览器自动化 skill 的工程范式,但已**去业务化**——不包含真实银行/真实资金语义,也**不是** Amazon 或任何生产技能的复制。
|
||||||
|
|
||||||
## 适合什么场景
|
## 适合什么场景
|
||||||
|
|
||||||
- 自有 **仿真系统 / sandbox / training 页面**
|
- 自有 **行业仿真系统** / `sandbox.jc2009.com` / 本地 `sandbox/demo_app.html`
|
||||||
- 需要 **浏览器 RPA** 做端到端演示或回归
|
- 需要 **浏览器 RPA** 做端到端演示或回归
|
||||||
- 表单较复杂:多步登录、Tab 切换、动态增行、PIN 弹窗、成功页解析
|
- 表单较复杂:门户 HITL、多步登录、Tab 切换、动态增行、PIN 弹窗、成功页解析
|
||||||
- 需要 **adapter 分层**:mock(CI)与 simulator_rpa(半集成)可切换
|
- 需要 **adapter 分层**:`mock`(CI)与 `simulator_rpa`(半集成)可切换
|
||||||
|
|
||||||
## 不适合什么场景
|
## 不适合什么场景
|
||||||
|
|
||||||
- **真实第三方网站 + 高风控 + 人工验证码** → 优先看 [`../real_browser_rpa/README.md`](../real_browser_rpa/README.md)
|
- **真实第三方网站 + 高风控 + 人工验证码** → 优先看 [`../real_browser_rpa/README.md`](../real_browser_rpa/README.md)
|
||||||
- 目标系统有稳定 **官方 API** → 不要硬写浏览器 RPA,后续参考 `real_api`
|
- 目标系统有稳定 **官方 API** → 不要硬写浏览器 RPA
|
||||||
- **不要把本示例的业务字段、selector、sandbox URL 原样复制**到你的 skill
|
- **不要把本示例的业务字段、selector、sandbox URL 原样复制**到你的 skill
|
||||||
|
|
||||||
## 目录结构
|
## 目录结构
|
||||||
@@ -23,22 +23,24 @@
|
|||||||
simulator_browser_rpa/
|
simulator_browser_rpa/
|
||||||
├── README.md
|
├── README.md
|
||||||
├── sandbox/
|
├── sandbox/
|
||||||
│ └── demo_app.html # 本地仿真页面(稳定 data-testid / name)
|
│ └── demo_app.html # 本地仿真页面(门户门闩 + 批量提交教学 DOM)
|
||||||
├── scripts/
|
├── scripts/
|
||||||
│ ├── service/
|
│ ├── service/
|
||||||
│ │ ├── browser_session.py # 浏览器启动(URL 仅 page.goto)
|
│ │ ├── browser_session.py # async 启动 persistent context(不含 goto)
|
||||||
│ │ ├── account_client.py # 账号来源集中封装
|
│ │ ├── account_client.py # account-manager subprocess(对齐 real_browser_rpa)
|
||||||
│ │ ├── task_service.py # 编排层
|
│ │ ├── simulator_playwright.py # RPA 主流程(厚)
|
||||||
|
│ │ ├── task_service.py # async 编排层
|
||||||
│ │ └── adapter/
|
│ │ └── adapter/
|
||||||
│ │ ├── base.py # BatchItem / BatchSubmitResult 契约
|
│ │ ├── base.py # BatchItem / BatchSubmitResult 契约
|
||||||
│ │ ├── mock.py # mock/unit 档
|
│ │ ├── mock.py # mock/unit 档
|
||||||
│ │ ├── simulator_rpa.py
|
│ │ ├── simulator_rpa.py # 薄 adapter:pick / lease / 委托 RPA
|
||||||
│ │ └── __init__.py # select_adapter
|
│ │ └── __init__.py # select_adapter
|
||||||
│ └── util/
|
│ └── util/
|
||||||
│ ├── constants.py
|
│ ├── constants.py
|
||||||
│ └── logging.py
|
│ └── logging.py
|
||||||
└── tests/
|
└── tests/
|
||||||
├── test_adapter_dispatch.py
|
├── test_adapter_dispatch.py
|
||||||
|
├── test_no_rpa_helpers_import.py
|
||||||
├── test_simulator_rpa_unit.py
|
├── test_simulator_rpa_unit.py
|
||||||
└── test_stop_reason.py
|
└── test_stop_reason.py
|
||||||
```
|
```
|
||||||
@@ -47,91 +49,95 @@ simulator_browser_rpa/
|
|||||||
|
|
||||||
| 文件 | 职责 |
|
| 文件 | 职责 |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `browser_session.py` | 系统 Chrome/Edge + launch args 规范;支持 profile / 无 profile |
|
| `browser_session.py` | async 系统 Chrome/Edge + launch args;**不在此 goto** |
|
||||||
| `account_client.py` | 示例从环境变量读账号;真实 skill 可在此集中对接 account-manager |
|
| `account_client.py` | **唯一** account-manager subprocess 封装(`pick_web_account` / `release_lease`) |
|
||||||
| `adapter/base.py` | 数据契约与 `BatchAdapterBase` |
|
| `simulator_playwright.py` | 门户轮询、登录、批量表单、PIN、解析 `batch_id`、截图 |
|
||||||
|
| `adapter/simulator_rpa.py` | **薄** adapter:pick 账号、lease、委托 RPA、`finally release_lease` |
|
||||||
| `adapter/mock.py` | 不启浏览器,供 unit/mock/CI |
|
| `adapter/mock.py` | 不启浏览器,供 unit/mock/CI |
|
||||||
| `adapter/simulator_rpa.py` | 仿真 RPA 主流程 |
|
| `task_service.py` | async 校验输入 → 选 adapter → `await submit_batch` |
|
||||||
| `task_service.py` | 校验输入 → 选 adapter → 提交 → 返回 summary |
|
| `sandbox/demo_app.html` | 可控 DOM;含可选门户门闩 + 原批量提交流程 |
|
||||||
| `sandbox/demo_app.html` | 可控 DOM,配合 selector 稳定 |
|
|
||||||
| `tests/` | dispatch、URL 不进 launch args、失败转结果 |
|
|
||||||
|
|
||||||
## 核心流程
|
## 核心流程
|
||||||
|
|
||||||
1. `task_service.run_batch_submit(target, items)` 校验参数
|
1. `await run_batch_submit(target, items)` 校验参数
|
||||||
2. `select_adapter()` 按 `OPENCLAW_TEST_TARGET` 选择 mock 或 simulator RPA
|
2. `select_adapter()` 按 `OPENCLAW_TEST_TARGET` 选择 mock 或 simulator RPA
|
||||||
3. simulator 档:`pick_simulator_account()` → `set_credentials()` → `submit_batch()`
|
3. `simulator_rpa` 档:`SimulatorBrowserRpaAdapter.submit_batch` 内 `pick_web_account(sim_batch)` → `submit_batch_rpa` → `release_lease`
|
||||||
4. RPA:登录两步 → 批量页 → 填表 → 提交 → PIN → 解析 `batch_id`
|
4. RPA:门户门闩(若可见则 HITL 轮询)→ 登录两步 → 批量页 → 填表 → 提交 → PIN → 解析 `batch_id`
|
||||||
5. 失败截图(有 `artifacts_dir` 时)→ 返回 `BatchSubmitResult`
|
5. 失败截图(有 `artifacts_dir` 时)→ 返回 `BatchSubmitResult`
|
||||||
|
|
||||||
## 复制到新 skill 时怎么做
|
## 两档仿真目标
|
||||||
|
|
||||||
按 copy map **选择性复制**到 `scripts/`;**不要**整包照搬本目录,**不要**把本 README 当作新技能根 README。
|
| 档位 | 目标 | 说明 |
|
||||||
|
|---|---|---|
|
||||||
|
| 本地教学 | `sandbox/demo_app.html`(`file://`) | 结构教学 + mock 单测默认 |
|
||||||
|
| 线上联调 | `https://sandbox.jc2009.com/...` | 设 `SIMULATOR_BASE_URL` + account-manager `sim_batch` 账号 |
|
||||||
|
|
||||||
|
联调时账号 `url` 用行业根路径,**不要**写 `/login` 子路径;`auth_strategy=per_session_manual`。
|
||||||
|
|
||||||
|
## account-manager 注册示例(泛化)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python .../account-manager/scripts/main.py account add-web \
|
||||||
|
--platform sim_batch \
|
||||||
|
--login-id demo001 \
|
||||||
|
--url file:///.../demo_app.html \
|
||||||
|
--environment simulator \
|
||||||
|
--auth-strategy per_session_manual
|
||||||
|
```
|
||||||
|
|
||||||
|
线上 sandbox 时将 `--url` 换为 `https://sandbox.jc2009.com/...` 占位路径(按团队部署填写)。
|
||||||
|
|
||||||
|
**PIN/密码演示值**:RPA 从 account 的 `login_id` 取账号;`password` / `token_pin` 允许从 account 字段或环境变量 `SIMULATOR_PASSWORD` / `SIMULATOR_TOKEN_PIN` 回退;验证码固定演示值 `0000`(仅 sandbox 用)。
|
||||||
|
|
||||||
## Copy map(复制到新技能 `scripts/`)
|
## Copy map(复制到新技能 `scripts/`)
|
||||||
|
|
||||||
| 来源(examples) | 目标(新技能) | 说明 |
|
| 来源(examples) | 目标(新技能) | 说明 |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| `examples/simulator_browser_rpa/scripts/service/browser_session.py` | `scripts/service/browser_session.py` | URL 仅 `page.goto`,不进 launch args |
|
| `browser_session.py` | `scripts/service/browser_session.py` | async;URL 仅 `page.goto`,不进 launch args |
|
||||||
| `examples/simulator_browser_rpa/scripts/service/account_client.py` | `scripts/service/account_client.py` | 账号来源集中封装 |
|
| `account_client.py` | `scripts/service/account_client.py` | subprocess,对齐 `real_browser_rpa` |
|
||||||
| `examples/simulator_browser_rpa/scripts/service/task_service.py` | `scripts/service/task_service.py` | 编排层,合并业务逻辑 |
|
| `simulator_playwright.py` | `scripts/service/<platform>_playwright.py` | RPA 主流程(厚) |
|
||||||
| `examples/simulator_browser_rpa/scripts/service/adapter/` | `scripts/service/<domain>_adapter/` | **adapter 分层权威参考** |
|
| `adapter/` | `scripts/service/<domain>_adapter/` | 薄 `simulator_rpa` + mock |
|
||||||
| `examples/simulator_browser_rpa/scripts/util/constants.py` | `scripts/util/constants.py` | 须替换业务常量 |
|
| `task_service.py` | `scripts/service/task_service.py` | async 编排 |
|
||||||
| `examples/simulator_browser_rpa/scripts/util/logging.py` | `scripts/util/logging.py` | 可选 |
|
| `util/constants.py` | `scripts/util/constants.py` | 须替换 `TARGET_PLATFORM` 等业务常量 |
|
||||||
| `examples/simulator_browser_rpa/tests/` | `tests/` | 可按需复制 dispatch / unit 测试 |
|
| `tests/` | `tests/` | 可按需复制 dispatch / unit / 禁止 import 守护 |
|
||||||
| `examples/simulator_browser_rpa/sandbox/demo_app.html` | — | **仅仿真测试用**,不进入生产 skill |
|
| `sandbox/demo_app.html` | — | **仅仿真测试**,不进入生产 skill |
|
||||||
| `examples/simulator_browser_rpa/README.md` | — | **只读参考**,不复制为新技能根 README |
|
|
||||||
|
|
||||||
**边界说明:**
|
|
||||||
|
|
||||||
- `sandbox/` 只用于仿真测试与本地回归,**不进入**真实生产 skill
|
|
||||||
- `adapter/` 分层(base / mock / simulator_rpa)是仿真浏览器 RPA 的权威参考
|
|
||||||
- `mock` / `simulator_rpa` 只用于测试与仿真,**不要**混入 `real_browser_rpa` 的真实站点逻辑
|
|
||||||
- `demo_app.html` 是可运行沙箱页面,**不是**真实业务系统
|
|
||||||
|
|
||||||
**保留:**
|
|
||||||
|
|
||||||
- adapter 分层(base / mock / simulator_rpa / `select_adapter`)
|
|
||||||
- `browser_session.py` 启动规范(**URL 不进 launch args**)
|
|
||||||
- `account_client.py` 集中封装模式
|
|
||||||
- 关键节点结构化日志 + 失败截图
|
|
||||||
- 测试:dispatch、launch args、错误转 `BatchSubmitResult`
|
|
||||||
|
|
||||||
**替换:**
|
|
||||||
|
|
||||||
- `BatchItem` 字段与校验规则
|
|
||||||
- `sandbox/demo_app.html` 或 `SIMULATOR_BASE_URL` 指向的页面
|
|
||||||
- 全部 DOM selector(必须 F12 实测)
|
|
||||||
- `task_service.py` 输入输出与 DB/任务日志
|
|
||||||
- mock 返回字段、成功页 `batch_id` 解析逻辑
|
|
||||||
|
|
||||||
## 明确禁止
|
## 明确禁止
|
||||||
|
|
||||||
- 不要复制 `__pycache__`、`.pytest_cache`、`artifacts/`、`recordings/` 等生成物
|
- **不要** `import account-manager` 内部模块(`rpa_helpers`、`inject_account_manager_scripts_path`、`get_account_credential`)
|
||||||
- **不要在技能侧**执行 `playwright install` / `pip install playwright`(Python 包由宿主共享 runtime 提供)
|
- **不要** sync Playwright 用于完整 RPA 主路径
|
||||||
- **不要把 URL 放进** `launch_persistent_context(args=[...])`
|
|
||||||
- **不要在** `task_service.py` / RPA 主流程里散落 account-manager subprocess
|
- **不要在** `task_service.py` / RPA 主流程里散落 account-manager subprocess
|
||||||
- **不要把真实生产系统**配置到 `simulator_rpa` 档位
|
- **不要在技能侧**执行 `playwright install` / `pip install playwright`
|
||||||
- 不要照抄 slug、logger 名、演示账号到生产 skill
|
- **不要把 URL 放进** `launch_persistent_context(args=[...])`
|
||||||
|
- **不要** vendor `scripts/jiangchang_skill_core/`
|
||||||
|
- **不要**照抄 slug、logger 名、演示账号到生产 skill
|
||||||
|
|
||||||
|
> 旧版 `pick_simulator_account()` / `SimulatorAccount` / `set_credentials()` 已废弃;账号统一由 account-manager 下发。
|
||||||
|
|
||||||
|
## 联调检查表
|
||||||
|
|
||||||
|
- [ ] 数据目录 `.env` 中 `OPENCLAW_TEST_TARGET=simulator_rpa`(非 mock)
|
||||||
|
- [ ] account-manager:`platform ensure` + 账号 `active` + 有 `profile_dir`
|
||||||
|
- [ ] 目标 sandbox UI 已部署(跨团队)
|
||||||
|
- [ ] 失败先查 `rpa-artifacts/` 截图,再查 Chrome profile 缓存(可用 `--user-data-dir` 手工打开清站点数据)
|
||||||
|
- [ ] 默认 `tests/run_tests.py` / 本 example `pytest` 仍全部通过(mock 离线)
|
||||||
|
|
||||||
## 依赖说明
|
## 依赖说明
|
||||||
|
|
||||||
- Python 3.10+
|
- Python 3.10+
|
||||||
- Python 包 `playwright`:由**宿主共享 runtime** 提供;技能侧不要写入 `requirements.txt`,不要 `pip install playwright`
|
- Python 包 `playwright`:由**宿主共享 runtime** 提供;技能侧不要 `pip install playwright`
|
||||||
- 默认使用**系统 Chrome/Edge**,不使用 Playwright 内置 Chromium
|
- 默认使用**系统 Chrome/Edge**;技能侧不要 `playwright install`
|
||||||
- 技能侧不要执行 `playwright install` / `playwright install chromium`
|
- `jiangchang_skill_core.runtime_env.find_chrome_executable`(可选)
|
||||||
- 本地独立开发若缺 Playwright Python 包,仅作开发机临时补装;生产由宿主解决
|
|
||||||
- `jiangchang_skill_core.runtime_env.find_chrome_executable`(可选,用于查找系统浏览器)
|
|
||||||
|
|
||||||
## 环境变量(示例)
|
## 环境变量(示例)
|
||||||
|
|
||||||
| 变量 | 说明 |
|
| 变量 | 说明 |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `OPENCLAW_TEST_TARGET` | `mock`/`unit` → Mock;默认 → Simulator RPA |
|
| `OPENCLAW_TEST_TARGET` | `mock`/`unit` → Mock;`simulator_rpa` → 仿真 RPA |
|
||||||
| `SIMULATOR_BASE_URL` | 仿真页 URL;默认本地 `sandbox/demo_app.html` 的 file URI |
|
| `SIMULATOR_BASE_URL` | 仿真页 URL;默认本地 `demo_app.html` 的 file URI |
|
||||||
| `SIMULATOR_LOGIN_ID` / `PASSWORD` / `TOKEN_PIN` | 演示账号 |
|
| `SIMULATOR_PASSWORD` / `SIMULATOR_TOKEN_PIN` | 演示密码/PIN 回退(账号字段优先) |
|
||||||
| `SIMULATOR_PROFILE_DIR` | 可选 persistent profile |
|
| `PORTAL_LOGIN_WAIT_SEC` | 门户 HITL 超时(默认 120) |
|
||||||
| `OPENCLAW_BROWSER_HEADLESS` | `0` 默认有头;`1` 无头模式(CI 可用) |
|
| `OPENCLAW_BROWSER_HEADLESS` | `0` 默认有头;`1` 无头(CI 可用) |
|
||||||
|
|
||||||
## 运行测试
|
## 运行测试
|
||||||
|
|
||||||
@@ -140,9 +146,9 @@ cd examples/simulator_browser_rpa
|
|||||||
python -m pytest tests/ -v
|
python -m pytest tests/ -v
|
||||||
```
|
```
|
||||||
|
|
||||||
测试为 mock/纯函数,**不需要启动真实浏览器**。
|
测试为 mock/纯函数,**不启动真实浏览器**。
|
||||||
|
|
||||||
## 当前状态
|
## 当前状态
|
||||||
|
|
||||||
- 示例代码与 sandbox 页面已就绪,可作为仿真浏览器 RPA 复制起点。
|
- async Playwright + 薄 adapter + `simulator_playwright.py` 工程范式已对齐 `real_browser_rpa`。
|
||||||
- 未接入完整 CLI、数据库与 entitlement。
|
- 未接入完整 CLI、数据库与 entitlement。
|
||||||
|
|||||||
@@ -15,7 +15,16 @@
|
|||||||
<body>
|
<body>
|
||||||
<h1>仿真业务系统 · 批量提交(示例)</h1>
|
<h1>仿真业务系统 · 批量提交(示例)</h1>
|
||||||
|
|
||||||
<section id="login-step1-section">
|
<section id="portal-section">
|
||||||
|
<h2>平台门户登录(示例)</h2>
|
||||||
|
<form name="portalGate">
|
||||||
|
<label>门户账号 <input id="portal-user" name="portalUser" /></label>
|
||||||
|
<label>门户密码 <input id="portal-pass" name="portalPass" type="password" /></label>
|
||||||
|
<button type="button" id="portal-enter">进入业务系统</button>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="login-step1-section" class="hidden">
|
||||||
<h2>登录 · 第一步</h2>
|
<h2>登录 · 第一步</h2>
|
||||||
<form name="simLoginStep1" data-testid="login-step1">
|
<form name="simLoginStep1" data-testid="login-step1">
|
||||||
<label>账号 <input name="loginId" data-testid="login-id" /></label>
|
<label>账号 <input name="loginId" data-testid="login-id" /></label>
|
||||||
@@ -69,6 +78,11 @@
|
|||||||
const DEMO_CAPTCHA = "0000";
|
const DEMO_CAPTCHA = "0000";
|
||||||
let rowCount = 0;
|
let rowCount = 0;
|
||||||
|
|
||||||
|
document.getElementById('portal-enter').addEventListener('click', function () {
|
||||||
|
document.getElementById('portal-section').classList.add('hidden');
|
||||||
|
document.getElementById('login-step1-section').classList.remove('hidden');
|
||||||
|
});
|
||||||
|
|
||||||
document.querySelector('form[name="simLoginStep1"]').addEventListener('submit', function (e) {
|
document.querySelector('form[name="simLoginStep1"]').addEventListener('submit', function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
document.getElementById('login-step1-section').classList.add('hidden');
|
document.getElementById('login-step1-section').classList.add('hidden');
|
||||||
|
|||||||
@@ -1,40 +1,199 @@
|
|||||||
"""仿真账号来源封装(示例级;真实 skill 可在此集中对接 account-manager)。"""
|
"""account-manager CLI 集成(仅 subprocess,不 import 兄弟 skill 内部模块)。"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
from dataclasses import dataclass
|
import subprocess
|
||||||
from typing import Optional
|
import sys
|
||||||
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
from util.constants import (
|
from jiangchang_skill_core.runtime_env import get_sibling_skills_root
|
||||||
DEFAULT_DEMO_LOGIN_ID,
|
|
||||||
DEFAULT_DEMO_PASSWORD,
|
from util.constants import LEASE_HOLDER, LEASE_TTL_SEC, TARGET_PLATFORM
|
||||||
DEFAULT_DEMO_TOKEN_PIN,
|
from util.logging import mask_text
|
||||||
ENV_SIMULATOR_LOGIN_ID,
|
|
||||||
ENV_SIMULATOR_PASSWORD,
|
logger = logging.getLogger(__name__)
|
||||||
ENV_SIMULATOR_PROFILE_DIR,
|
|
||||||
ENV_SIMULATOR_TOKEN_PIN,
|
PLACEHOLDER_PLATFORM = TARGET_PLATFORM
|
||||||
|
|
||||||
|
ACCOUNT_SETUP_MESSAGE = (
|
||||||
|
f"未找到可用的 {PLACEHOLDER_PLATFORM} 账号,所以还没有打开浏览器。"
|
||||||
|
f"请先在 account-manager 中添加 platform={PLACEHOLDER_PLATFORM}、"
|
||||||
|
"status=active、带 profile_dir 的账号后重新运行。"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
LEASE_BUSY_MESSAGE = "目标平台账号当前被其他任务占用,请等待释放租约后重试。"
|
||||||
@dataclass
|
|
||||||
class SimulatorAccount:
|
|
||||||
login_id: str
|
|
||||||
password: str
|
|
||||||
token_pin: str
|
|
||||||
profile_dir: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
def pick_simulator_account() -> SimulatorAccount:
|
class AccountManagerError(Exception):
|
||||||
|
def __init__(self, code: str, message: str) -> None:
|
||||||
|
super().__init__(message)
|
||||||
|
self.code = code
|
||||||
|
self.message = message
|
||||||
|
|
||||||
|
|
||||||
|
def mask_login_id(login_id: str) -> str:
|
||||||
|
return mask_text(login_id)
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_account_manager_main() -> str:
|
||||||
|
"""解析 account-manager CLI 入口路径。
|
||||||
|
|
||||||
|
优先级:ACCOUNT_MANAGER_ROOT → get_sibling_skills_root → 开发机兜底。
|
||||||
"""
|
"""
|
||||||
示例账号来源:优先读环境变量,否则返回内置 demo 账号。
|
env_root = (os.getenv("ACCOUNT_MANAGER_ROOT") or "").strip()
|
||||||
|
if env_root and os.path.isfile(os.path.join(env_root, "scripts", "main.py")):
|
||||||
|
return os.path.join(os.path.abspath(env_root), "scripts", "main.py")
|
||||||
|
|
||||||
真实 skill 若依赖 account-manager,应把 subprocess / sibling_bridge 调用
|
scripts_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
集中在本模块,不要散落到 task_service 或 RPA 主流程中。
|
skills_root = get_sibling_skills_root(scripts_dir)
|
||||||
"""
|
candidate = os.path.join(skills_root, "account-manager", "scripts", "main.py")
|
||||||
return SimulatorAccount(
|
if os.path.isfile(candidate):
|
||||||
login_id=(os.getenv(ENV_SIMULATOR_LOGIN_ID) or DEFAULT_DEMO_LOGIN_ID).strip(),
|
return candidate
|
||||||
password=(os.getenv(ENV_SIMULATOR_PASSWORD) or DEFAULT_DEMO_PASSWORD).strip(),
|
|
||||||
token_pin=(os.getenv(ENV_SIMULATOR_TOKEN_PIN) or DEFAULT_DEMO_TOKEN_PIN).strip(),
|
dev = r"D:\OpenClaw\client-commons\account-manager\scripts\main.py"
|
||||||
profile_dir=(os.getenv(ENV_SIMULATOR_PROFILE_DIR) or "").strip(),
|
if os.path.isfile(dev):
|
||||||
|
return dev
|
||||||
|
|
||||||
|
raise AccountManagerError(
|
||||||
|
"ACCOUNT_NOT_FOUND",
|
||||||
|
"未找到 account-manager,请配置 ACCOUNT_MANAGER_ROOT 或安装 account-manager 技能。",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_last_json(stdout: str) -> Any:
|
||||||
|
lines = [ln.strip() for ln in (stdout or "").splitlines() if ln.strip()]
|
||||||
|
for raw in reversed(lines):
|
||||||
|
if raw.startswith("ERROR:"):
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
return json.loads(raw)
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
continue
|
||||||
|
raise AccountManagerError("UNKNOWN_ERROR", "stdout 中没有可解析的 JSON。")
|
||||||
|
|
||||||
|
|
||||||
|
def _run_argv(argv_suffix: List[str]) -> subprocess.CompletedProcess[str]:
|
||||||
|
main_py = _resolve_account_manager_main()
|
||||||
|
env = os.environ.copy()
|
||||||
|
return subprocess.run(
|
||||||
|
[sys.executable, main_py, *argv_suffix],
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
encoding="utf-8",
|
||||||
|
errors="replace",
|
||||||
|
env=env,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_error_code(raw: str) -> str:
|
||||||
|
code = (raw or "").strip()
|
||||||
|
if code.startswith("ERROR:"):
|
||||||
|
code = code[6:]
|
||||||
|
return code
|
||||||
|
|
||||||
|
|
||||||
|
def _validate_pick_payload(payload: dict[str, Any]) -> dict[str, Any]:
|
||||||
|
if payload.get("success") is False:
|
||||||
|
err = payload.get("error") if isinstance(payload.get("error"), dict) else {}
|
||||||
|
code = _normalize_error_code(str(err.get("code") or ""))
|
||||||
|
message = str(err.get("message") or "")
|
||||||
|
if code == "LEASE_CONFLICT" or "LEASE_CONFLICT" in code:
|
||||||
|
raise AccountManagerError("LEASE_CONFLICT", LEASE_BUSY_MESSAGE)
|
||||||
|
if code in ("NO_ACCOUNT", "ACCOUNT_NOT_FOUND") or "NO_ACCOUNT" in code:
|
||||||
|
raise AccountManagerError("NO_ACCOUNT", message or "没有可用账号。")
|
||||||
|
raise AccountManagerError(code or "PICK_WEB_FAILED", message or "pick-web 失败。")
|
||||||
|
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise AccountManagerError("ACCOUNT_NOT_FOUND", "pick-web 返回格式异常。")
|
||||||
|
if not payload.get("profile_dir"):
|
||||||
|
raise AccountManagerError("ACCOUNT_NOT_FOUND", "pick-web 返回的账号缺少 profile_dir。")
|
||||||
|
return payload
|
||||||
|
|
||||||
|
|
||||||
|
def _pick_web_with_lease(platform: str) -> Dict[str, Any]:
|
||||||
|
proc = _run_argv(
|
||||||
|
[
|
||||||
|
"account",
|
||||||
|
"pick-web",
|
||||||
|
"--platform",
|
||||||
|
platform,
|
||||||
|
"--lease",
|
||||||
|
"--holder",
|
||||||
|
LEASE_HOLDER,
|
||||||
|
"--ttl-sec",
|
||||||
|
LEASE_TTL_SEC,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
out = proc.stdout or ""
|
||||||
|
if proc.returncode != 0 and not out.strip():
|
||||||
|
raise AccountManagerError(
|
||||||
|
"PICK_WEB_FAILED",
|
||||||
|
(proc.stderr or "").strip() or "pick-web 子进程失败",
|
||||||
|
)
|
||||||
|
payload = _parse_last_json(out)
|
||||||
|
if isinstance(payload, dict) and payload.get("success") is False:
|
||||||
|
return _validate_pick_payload(payload)
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise AccountManagerError("ACCOUNT_NOT_FOUND", "pick-web 返回格式异常。")
|
||||||
|
return payload
|
||||||
|
|
||||||
|
|
||||||
|
def _pick_by_id(platform: str, account_id: int) -> Dict[str, Any]:
|
||||||
|
proc = _run_argv(["account", "get", str(account_id)])
|
||||||
|
out = proc.stdout or ""
|
||||||
|
if proc.returncode != 0 or out.startswith("ERROR:"):
|
||||||
|
raise AccountManagerError("ACCOUNT_NOT_FOUND", f"指定账号 {account_id} 不存在或获取失败。")
|
||||||
|
raw = _parse_last_json(out)
|
||||||
|
if isinstance(raw, dict) and "data" in raw and isinstance(raw["data"], dict):
|
||||||
|
data = raw["data"]
|
||||||
|
elif isinstance(raw, dict):
|
||||||
|
data = raw
|
||||||
|
else:
|
||||||
|
raise AccountManagerError("ACCOUNT_NOT_FOUND", "account get 返回非对象 JSON。")
|
||||||
|
|
||||||
|
platform_key = str(data.get("platform_key") or "").lower()
|
||||||
|
if platform_key != platform.lower():
|
||||||
|
raise AccountManagerError(
|
||||||
|
"ACCOUNT_NOT_FOUND",
|
||||||
|
f"账号 {account_id} 不是 {platform} 平台账号。",
|
||||||
|
)
|
||||||
|
profile_dir = str(data.get("profile_dir") or "").strip()
|
||||||
|
if not profile_dir:
|
||||||
|
raise AccountManagerError("ACCOUNT_NOT_FOUND", f"账号 {account_id} 缺少 profile_dir。")
|
||||||
|
data["profile_dir"] = profile_dir
|
||||||
|
data["lease_token"] = ""
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
def pick_web_account(platform: str, account_id: Optional[str] = None) -> dict:
|
||||||
|
"""获取网页账号(profile_dir + lease_token)。"""
|
||||||
|
platform_key = (platform or PLACEHOLDER_PLATFORM).strip() or PLACEHOLDER_PLATFORM
|
||||||
|
|
||||||
|
if account_id:
|
||||||
|
try:
|
||||||
|
aid = int(account_id)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
raise AccountManagerError("ACCOUNT_NOT_FOUND", f"账号 ID 无效:{account_id}")
|
||||||
|
return _pick_by_id(platform_key, aid)
|
||||||
|
|
||||||
|
try:
|
||||||
|
return _pick_web_with_lease(platform_key)
|
||||||
|
except AccountManagerError as exc:
|
||||||
|
if exc.code in ("NO_ACCOUNT", "ACCOUNT_NOT_FOUND") or "NO_ACCOUNT" in exc.code:
|
||||||
|
raise AccountManagerError("ACCOUNT_SETUP_REQUIRED", ACCOUNT_SETUP_MESSAGE) from exc
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
def release_lease(lease_token: Optional[str]) -> None:
|
||||||
|
token = (lease_token or "").strip()
|
||||||
|
if not token:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
proc = _run_argv(["lease", "release", token])
|
||||||
|
if proc.returncode != 0:
|
||||||
|
logger.warning("lease_release_failed stdout=%s", (proc.stdout or "").strip())
|
||||||
|
except Exception:
|
||||||
|
logger.warning("lease_release_exception", exc_info=True)
|
||||||
|
|||||||
@@ -28,5 +28,5 @@ class BatchSubmitResult:
|
|||||||
class BatchAdapterBase:
|
class BatchAdapterBase:
|
||||||
name: str = "base"
|
name: str = "base"
|
||||||
|
|
||||||
def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
|
async def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from service.adapter.base import BatchAdapterBase, BatchItem, BatchSubmitResult
|
|||||||
class MockBatchAdapter(BatchAdapterBase):
|
class MockBatchAdapter(BatchAdapterBase):
|
||||||
name = "mock"
|
name = "mock"
|
||||||
|
|
||||||
def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
|
async def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
|
||||||
del target
|
del target
|
||||||
if not items:
|
if not items:
|
||||||
return BatchSubmitResult(
|
return BatchSubmitResult(
|
||||||
|
|||||||
@@ -1,78 +1,45 @@
|
|||||||
"""仿真浏览器 RPA:操作 sandbox/demo_app.html 完成批量提交。"""
|
"""仿真浏览器 RPA 薄 adapter:pick 账号、lease、委托 RPA、release lease。"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
|
||||||
import random
|
|
||||||
import re
|
|
||||||
import time
|
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
|
|
||||||
from jiangchang_skill_core import config
|
from jiangchang_skill_core import config
|
||||||
|
|
||||||
|
from service.account_client import AccountManagerError, pick_web_account, release_lease
|
||||||
from service.adapter.base import BatchAdapterBase, BatchItem, BatchSubmitResult
|
from service.adapter.base import BatchAdapterBase, BatchItem, BatchSubmitResult
|
||||||
from service.browser_session import browser_session, find_chrome_executable
|
from service.browser_session import find_chrome_executable
|
||||||
from util.constants import (
|
from service.simulator_playwright import submit_batch_rpa
|
||||||
DEFAULT_DEMO_CAPTCHA,
|
from util.constants import TARGET_PLATFORM, resolve_simulator_base_url
|
||||||
DEFAULT_DEMO_LOGIN_ID,
|
|
||||||
DEFAULT_DEMO_PASSWORD,
|
|
||||||
DEFAULT_DEMO_TOKEN_PIN,
|
|
||||||
DEFAULT_TIMEOUT_MS,
|
|
||||||
LOGIN_NAVIGATE_TIMEOUT_MS,
|
|
||||||
SUBMIT_NAVIGATE_TIMEOUT_MS,
|
|
||||||
resolve_simulator_base_url,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
_PAUSE_MIN_MS = 500
|
|
||||||
_PAUSE_MAX_MS = 2000
|
|
||||||
|
|
||||||
|
def _resolve_entry_url(account: dict) -> str:
|
||||||
class RpaError(Exception):
|
url = str(account.get("url") or "").strip()
|
||||||
def __init__(self, message: str, screenshot_path: Optional[str] = None):
|
if url:
|
||||||
super().__init__(message)
|
return url.rstrip("/")
|
||||||
self.screenshot_path = screenshot_path
|
return resolve_simulator_base_url()
|
||||||
|
|
||||||
|
|
||||||
class SimulatorBrowserRpaAdapter(BatchAdapterBase):
|
class SimulatorBrowserRpaAdapter(BatchAdapterBase):
|
||||||
name = "simulator_browser_rpa"
|
name = "simulator_rpa"
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
base_url: Optional[str] = None,
|
|
||||||
headless: Optional[bool] = None,
|
|
||||||
artifacts_dir: Optional[str] = None,
|
artifacts_dir: Optional[str] = None,
|
||||||
|
headless: Optional[bool] = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
self.base_url = (base_url or resolve_simulator_base_url()).rstrip("/")
|
self.artifacts_dir = artifacts_dir
|
||||||
if headless is None:
|
if headless is None:
|
||||||
self.headless = config.get_bool("OPENCLAW_BROWSER_HEADLESS", default=False)
|
self.headless = config.get_bool("OPENCLAW_BROWSER_HEADLESS", default=False)
|
||||||
else:
|
else:
|
||||||
self.headless = headless
|
self.headless = headless
|
||||||
self.artifacts_dir = artifacts_dir
|
|
||||||
|
|
||||||
self._login_id: str = DEFAULT_DEMO_LOGIN_ID
|
async def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
|
||||||
self._password: str = DEFAULT_DEMO_PASSWORD
|
|
||||||
self._token_pin: str = DEFAULT_DEMO_TOKEN_PIN
|
|
||||||
self._profile_dir: Optional[str] = None
|
|
||||||
|
|
||||||
def set_credentials(
|
|
||||||
self,
|
|
||||||
login_id: str,
|
|
||||||
password: str,
|
|
||||||
token_pin: str,
|
|
||||||
profile_dir: str,
|
|
||||||
) -> None:
|
|
||||||
self._login_id = login_id
|
|
||||||
self._password = password
|
|
||||||
self._token_pin = token_pin
|
|
||||||
stripped = (profile_dir or "").strip()
|
|
||||||
self._profile_dir = stripped or None
|
|
||||||
|
|
||||||
def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
|
|
||||||
try:
|
try:
|
||||||
from playwright.sync_api import sync_playwright # noqa: F401
|
from playwright.async_api import async_playwright # noqa: F401
|
||||||
except ImportError:
|
except ImportError:
|
||||||
return BatchSubmitResult(
|
return BatchSubmitResult(
|
||||||
ok=False,
|
ok=False,
|
||||||
@@ -106,236 +73,37 @@ class SimulatorBrowserRpaAdapter(BatchAdapterBase):
|
|||||||
artifacts={"adapter": self.name},
|
artifacts={"adapter": self.name},
|
||||||
)
|
)
|
||||||
|
|
||||||
start_url = self.base_url
|
lease_token: Optional[str] = None
|
||||||
try:
|
try:
|
||||||
with browser_session(
|
account = pick_web_account(TARGET_PLATFORM)
|
||||||
start_url,
|
lease_token = account.get("lease_token")
|
||||||
profile_dir=self._profile_dir,
|
base_url = _resolve_entry_url(account)
|
||||||
|
return await submit_batch_rpa(
|
||||||
|
account,
|
||||||
|
target=target,
|
||||||
|
items=items,
|
||||||
|
base_url=base_url,
|
||||||
|
artifacts_dir=self.artifacts_dir,
|
||||||
headless=self.headless,
|
headless=self.headless,
|
||||||
) as page:
|
)
|
||||||
try:
|
except AccountManagerError as exc:
|
||||||
logger.info("rpa_login_start url=%s", start_url)
|
|
||||||
self._login(page)
|
|
||||||
logger.info("rpa_login_done")
|
|
||||||
|
|
||||||
self._goto_batch_page(page)
|
|
||||||
logger.info("rpa_batch_page_ready")
|
|
||||||
|
|
||||||
self._fill_batch_form(page, target, items)
|
|
||||||
logger.info("rpa_batch_form_filled rows=%s", len(items))
|
|
||||||
|
|
||||||
batch_id = self._submit_and_get_batch_id(page)
|
|
||||||
logger.info("rpa_submit_success batch_id=%s", batch_id)
|
|
||||||
|
|
||||||
total = sum(it.amount for it in items)
|
|
||||||
return BatchSubmitResult(
|
|
||||||
ok=True,
|
|
||||||
batch_id=batch_id,
|
|
||||||
submitted_count=len(items),
|
|
||||||
submitted_amount=total,
|
|
||||||
error_msg=None,
|
|
||||||
artifacts={"adapter": self.name},
|
|
||||||
)
|
|
||||||
except RpaError as exc:
|
|
||||||
logger.error("rpa_failed: %s", exc)
|
|
||||||
arts = {"adapter": self.name}
|
|
||||||
if exc.screenshot_path:
|
|
||||||
arts["screenshot"] = exc.screenshot_path
|
|
||||||
return BatchSubmitResult(
|
|
||||||
ok=False,
|
|
||||||
batch_id=None,
|
|
||||||
submitted_count=0,
|
|
||||||
submitted_amount=0.0,
|
|
||||||
error_msg=str(exc),
|
|
||||||
artifacts=arts,
|
|
||||||
)
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "unexpected_error")
|
|
||||||
logger.exception("rpa_unexpected: %s", exc)
|
|
||||||
arts = {"adapter": self.name}
|
|
||||||
if sp:
|
|
||||||
arts["screenshot"] = sp
|
|
||||||
return BatchSubmitResult(
|
|
||||||
ok=False,
|
|
||||||
batch_id=None,
|
|
||||||
submitted_count=0,
|
|
||||||
submitted_amount=0.0,
|
|
||||||
error_msg=f"未预期异常:{type(exc).__name__}: {exc}",
|
|
||||||
artifacts=arts,
|
|
||||||
)
|
|
||||||
except Exception as outer:
|
|
||||||
return BatchSubmitResult(
|
return BatchSubmitResult(
|
||||||
ok=False,
|
ok=False,
|
||||||
batch_id=None,
|
batch_id=None,
|
||||||
submitted_count=0,
|
submitted_count=0,
|
||||||
submitted_amount=0.0,
|
submitted_amount=0.0,
|
||||||
error_msg=f"启动浏览器失败:{outer}",
|
error_msg=f"ERROR:{exc.code} {exc.message}",
|
||||||
artifacts={"adapter": self.name},
|
artifacts={"adapter": self.name},
|
||||||
)
|
)
|
||||||
|
|
||||||
def _pause(self, min_ms: int = _PAUSE_MIN_MS, max_ms: int = _PAUSE_MAX_MS) -> None:
|
|
||||||
time.sleep(random.uniform(min_ms, max_ms) / 1000.0)
|
|
||||||
|
|
||||||
def _login(self, page) -> None:
|
|
||||||
try:
|
|
||||||
page.wait_for_selector('form[name="simLoginStep1"]', timeout=LOGIN_NAVIGATE_TIMEOUT_MS)
|
|
||||||
self._pause()
|
|
||||||
page.fill('form[name="simLoginStep1"] input[name="loginId"]', self._login_id)
|
|
||||||
self._pause()
|
|
||||||
page.click('form[name="simLoginStep1"] button[type="submit"]')
|
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
sp = self._safe_screenshot(page, "login_step1_failed")
|
logger.exception("adapter_unexpected: %s", exc)
|
||||||
raise RpaError(f"登录第一步失败:{exc}", screenshot_path=sp) from exc
|
return BatchSubmitResult(
|
||||||
|
ok=False,
|
||||||
try:
|
batch_id=None,
|
||||||
page.wait_for_selector('form[name="simLoginStep2"]', timeout=DEFAULT_TIMEOUT_MS)
|
submitted_count=0,
|
||||||
self._pause()
|
submitted_amount=0.0,
|
||||||
page.fill('form[name="simLoginStep2"] input[name="password"]', self._password)
|
error_msg=f"未预期异常:{type(exc).__name__}: {exc}",
|
||||||
page.fill('form[name="simLoginStep2"] input[name="captcha"]', DEFAULT_DEMO_CAPTCHA)
|
artifacts={"adapter": self.name},
|
||||||
self._pause()
|
)
|
||||||
page.click('form[name="simLoginStep2"] button[type="submit"]')
|
finally:
|
||||||
except Exception as exc:
|
release_lease(lease_token)
|
||||||
sp = self._safe_screenshot(page, "login_step2_failed")
|
|
||||||
raise RpaError(f"登录第二步失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
try:
|
|
||||||
page.wait_for_selector('form[name="simBatchForm"]', timeout=LOGIN_NAVIGATE_TIMEOUT_MS)
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "login_navigate_failed")
|
|
||||||
raise RpaError(f"登录后未进入批量提交页:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
def _goto_batch_page(self, page) -> None:
|
|
||||||
try:
|
|
||||||
page.wait_for_selector('form[name="simBatchForm"]', timeout=DEFAULT_TIMEOUT_MS)
|
|
||||||
self._pause()
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "goto_batch_failed")
|
|
||||||
raise RpaError(f"进入批量提交页失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
def _select_target_account(self, page, target: str) -> None:
|
|
||||||
sel = page.locator('select[name="fromAccountNo"]')
|
|
||||||
sel.wait_for(timeout=DEFAULT_TIMEOUT_MS)
|
|
||||||
n = sel.locator("option").count()
|
|
||||||
matched_value: Optional[str] = None
|
|
||||||
first_value: Optional[str] = None
|
|
||||||
for i in range(n):
|
|
||||||
opt = sel.locator("option").nth(i)
|
|
||||||
val = opt.get_attribute("value") or ""
|
|
||||||
if not val.strip():
|
|
||||||
continue
|
|
||||||
label_txt = opt.inner_text()
|
|
||||||
if first_value is None:
|
|
||||||
first_value = val
|
|
||||||
if target.strip() and target.strip() in label_txt:
|
|
||||||
matched_value = val
|
|
||||||
break
|
|
||||||
pick = matched_value or first_value
|
|
||||||
if not pick:
|
|
||||||
raise RpaError("来源账户下拉无可选项")
|
|
||||||
if not matched_value and target.strip():
|
|
||||||
logger.warning("target '%s' 未匹配选项,回退 value=%s", target, pick)
|
|
||||||
sel.select_option(value=pick)
|
|
||||||
self._pause()
|
|
||||||
|
|
||||||
def _fill_batch_form(self, page, target: str, items: List[BatchItem]) -> None:
|
|
||||||
try:
|
|
||||||
page.get_by_role("button", name=re.compile(r"页面填写")).click()
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "tab_switch_failed")
|
|
||||||
raise RpaError(f"切换到页面填写失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
try:
|
|
||||||
self._select_target_account(page, target)
|
|
||||||
except RpaError:
|
|
||||||
raise
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "select_account_failed")
|
|
||||||
raise RpaError(f"选择来源账户失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
try:
|
|
||||||
existing = page.locator("tr[data-row-index]").count()
|
|
||||||
need_more = max(0, len(items) - existing)
|
|
||||||
add_btn = page.get_by_role("button", name=re.compile(r"新增一行"))
|
|
||||||
for _ in range(need_more):
|
|
||||||
self._pause(400, 900)
|
|
||||||
add_btn.click()
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "add_rows_failed")
|
|
||||||
raise RpaError(f"新增明细行失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
for it in items:
|
|
||||||
try:
|
|
||||||
row = page.locator(f'tr[data-row-index="{it.row_index}"]')
|
|
||||||
row.wait_for(timeout=DEFAULT_TIMEOUT_MS)
|
|
||||||
self._pause(300, 800)
|
|
||||||
row.locator('input[name="name"]').fill(it.name)
|
|
||||||
row.locator('input[name="account"]').fill(it.account)
|
|
||||||
row.locator('input[name="note"]').fill(it.note or "")
|
|
||||||
row.locator('input[name="amount"]').fill(f"{it.amount}")
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, f"fill_row_{it.row_index}_failed")
|
|
||||||
raise RpaError(f"填第 {it.row_index} 行失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
try:
|
|
||||||
page.fill('input[name="purpose"]', "仿真批量提交示例")
|
|
||||||
except Exception as exc:
|
|
||||||
logger.warning("填写用途失败(非致命):%s", exc)
|
|
||||||
|
|
||||||
def _submit_and_get_batch_id(self, page) -> str:
|
|
||||||
try:
|
|
||||||
self._pause(800, 1500)
|
|
||||||
page.locator('form[name="simBatchForm"] button[type="submit"]').click()
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "click_submit_failed")
|
|
||||||
raise RpaError(f"点击提交失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
dlg_sel = 'div[role="dialog"][aria-modal="true"]'
|
|
||||||
try:
|
|
||||||
page.wait_for_selector(dlg_sel, timeout=DEFAULT_TIMEOUT_MS)
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "pin_dialog_not_open")
|
|
||||||
raise RpaError(f"PIN 弹窗未出现:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
try:
|
|
||||||
pin_input = page.locator(f'{dlg_sel} input[type="password"][inputmode="numeric"]')
|
|
||||||
self._pause(500, 1200)
|
|
||||||
pin_input.fill(self._token_pin)
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "fill_pin_failed")
|
|
||||||
raise RpaError(f"填写 PIN 失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
try:
|
|
||||||
page.locator(dlg_sel).get_by_role("button", name=re.compile(r"确认提交")).click()
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "click_confirm_failed")
|
|
||||||
raise RpaError(f"确认提交失败:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
try:
|
|
||||||
page.wait_for_selector('[data-testid="batch-id"]', timeout=SUBMIT_NAVIGATE_TIMEOUT_MS)
|
|
||||||
except Exception as exc:
|
|
||||||
sp = self._safe_screenshot(page, "success_area_not_visible")
|
|
||||||
raise RpaError(f"提交后未出现成功区域:{exc}", screenshot_path=sp) from exc
|
|
||||||
|
|
||||||
batch_id = page.locator('[data-testid="batch-id"]').get_attribute("data-batch-id") or ""
|
|
||||||
if not batch_id:
|
|
||||||
batch_id = page.locator('[data-testid="batch-id"]').inner_text().strip()
|
|
||||||
url = page.url
|
|
||||||
if not batch_id and "#/batch/" in url:
|
|
||||||
batch_id = url.split("#/batch/", 1)[1].split("?")[0].split("#")[0].strip("/")
|
|
||||||
if not batch_id:
|
|
||||||
sp = self._safe_screenshot(page, "batch_id_empty")
|
|
||||||
raise RpaError(f"无法解析 batch_id,url={url}", screenshot_path=sp)
|
|
||||||
return batch_id
|
|
||||||
|
|
||||||
def _safe_screenshot(self, page, tag: str) -> Optional[str]:
|
|
||||||
if not self.artifacts_dir:
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
os.makedirs(self.artifacts_dir, exist_ok=True)
|
|
||||||
path = os.path.join(self.artifacts_dir, f"{tag}_{int(time.time())}.png")
|
|
||||||
page.screenshot(path=path, full_page=True)
|
|
||||||
logger.info("screenshot_saved path=%s", path)
|
|
||||||
return path
|
|
||||||
except Exception as exc:
|
|
||||||
logger.warning("screenshot_failed tag=%s err=%s", tag, exc)
|
|
||||||
return None
|
|
||||||
|
|||||||
@@ -1,16 +1,14 @@
|
|||||||
"""浏览器会话启动(系统 Chrome/Edge;URL 仅通过 page.goto 打开)。"""
|
"""浏览器会话启动(系统 Chrome/Edge + async Playwright persistent context)。"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
from contextlib import contextmanager
|
from typing import Any, List, Optional, Tuple
|
||||||
from typing import Any, Generator, Iterator, List, Optional, Tuple
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
DEFAULT_PAGE_TIMEOUT_MS = 15_000
|
DEFAULT_PAGE_TIMEOUT_MS = 15_000
|
||||||
GOTO_TIMEOUT_MS = 60_000
|
|
||||||
|
|
||||||
CHROME_LAUNCH_ARGS: List[str] = [
|
CHROME_LAUNCH_ARGS: List[str] = [
|
||||||
"--start-maximized",
|
"--start-maximized",
|
||||||
@@ -33,11 +31,11 @@ def _headless_from_env() -> bool:
|
|||||||
return v in ("1", "true", "yes", "on")
|
return v in ("1", "true", "yes", "on")
|
||||||
|
|
||||||
|
|
||||||
def _find_chrome_executable() -> str | None:
|
def find_chrome_executable() -> str | None:
|
||||||
try:
|
try:
|
||||||
from jiangchang_skill_core.runtime_env import find_chrome_executable
|
from jiangchang_skill_core.runtime_env import find_chrome_executable as _find
|
||||||
|
|
||||||
chrome = find_chrome_executable()
|
chrome = _find()
|
||||||
if chrome and os.path.isfile(chrome):
|
if chrome and os.path.isfile(chrome):
|
||||||
return chrome
|
return chrome
|
||||||
except ImportError:
|
except ImportError:
|
||||||
@@ -59,80 +57,70 @@ def _clear_node_options() -> None:
|
|||||||
os.environ.pop("NODE_OPTIONS", None)
|
os.environ.pop("NODE_OPTIONS", None)
|
||||||
|
|
||||||
|
|
||||||
@contextmanager
|
async def start_browser_session(
|
||||||
def browser_session(
|
profile_dir: str,
|
||||||
start_url: str,
|
|
||||||
*,
|
*,
|
||||||
profile_dir: Optional[str] = None,
|
|
||||||
headless: Optional[bool] = None,
|
headless: Optional[bool] = None,
|
||||||
) -> Generator[Any, None, None]:
|
) -> Tuple[Any, Any, Any]:
|
||||||
"""
|
"""
|
||||||
同步 Playwright 浏览器会话。
|
启动持久化 Chrome profile,返回 (playwright, context, page)。
|
||||||
|
|
||||||
- Playwright Python 包由宿主共享 runtime 提供;技能侧不要 playwright install。
|
URL 不在此文件打开;由 simulator_playwright.py 负责 page.goto。
|
||||||
- launch args 仅放 Chrome 参数,不含 URL。
|
|
||||||
- 流程:launch → new_page → goto(start_url)
|
|
||||||
"""
|
"""
|
||||||
from playwright.sync_api import sync_playwright
|
from playwright.async_api import async_playwright
|
||||||
|
|
||||||
_clear_node_options()
|
_clear_node_options()
|
||||||
hl = headless if headless is not None else _headless_from_env()
|
hl = headless if headless is not None else _headless_from_env()
|
||||||
chrome = _find_chrome_executable()
|
chrome = find_chrome_executable()
|
||||||
if not chrome:
|
if not chrome:
|
||||||
raise RuntimeError(
|
raise RuntimeError(
|
||||||
"未检测到 Chrome 或 Edge 浏览器,请安装系统浏览器后重试。"
|
"ERROR:MISSING_BROWSER 未检测到 Chrome 或 Edge 浏览器,请先安装系统浏览器后重试。"
|
||||||
)
|
)
|
||||||
|
|
||||||
args = chrome_launch_args()
|
args = chrome_launch_args()
|
||||||
logger.info(
|
logger.info(
|
||||||
"browser_launch chrome=%s profile_dir=%s start_url=%s args=%s headless=%s",
|
"browser_launch chrome=%s profile_dir=%s args=%s headless=%s",
|
||||||
chrome,
|
chrome,
|
||||||
profile_dir or "",
|
profile_dir,
|
||||||
start_url,
|
|
||||||
args,
|
args,
|
||||||
hl,
|
hl,
|
||||||
)
|
)
|
||||||
|
|
||||||
browser_holder = None
|
pw = await async_playwright().start()
|
||||||
context = None
|
context = None
|
||||||
with sync_playwright() as pw:
|
try:
|
||||||
try:
|
context = await pw.chromium.launch_persistent_context(
|
||||||
if profile_dir:
|
user_data_dir=profile_dir,
|
||||||
context = pw.chromium.launch_persistent_context(
|
headless=hl,
|
||||||
user_data_dir=profile_dir,
|
executable_path=chrome,
|
||||||
headless=hl,
|
locale="zh-CN",
|
||||||
executable_path=chrome,
|
no_viewport=True,
|
||||||
locale="zh-CN",
|
args=args,
|
||||||
no_viewport=True,
|
ignore_default_args=["--enable-automation"],
|
||||||
args=args,
|
)
|
||||||
ignore_default_args=["--enable-automation"],
|
await context.add_init_script(STEALTH_INIT_SCRIPT)
|
||||||
)
|
|
||||||
else:
|
|
||||||
browser_holder = pw.chromium.launch(
|
|
||||||
headless=hl,
|
|
||||||
executable_path=chrome,
|
|
||||||
args=args,
|
|
||||||
ignore_default_args=["--enable-automation"],
|
|
||||||
)
|
|
||||||
context = browser_holder.new_context(no_viewport=True, locale="zh-CN")
|
|
||||||
|
|
||||||
context.add_init_script(STEALTH_INIT_SCRIPT)
|
page = context.pages[0] if context.pages else await context.new_page()
|
||||||
page = context.new_page()
|
page.set_default_timeout(DEFAULT_PAGE_TIMEOUT_MS)
|
||||||
page.set_default_timeout(DEFAULT_PAGE_TIMEOUT_MS)
|
return pw, context, page
|
||||||
page.goto(start_url, wait_until="domcontentloaded", timeout=GOTO_TIMEOUT_MS)
|
except Exception:
|
||||||
yield page
|
if context is not None:
|
||||||
finally:
|
|
||||||
try:
|
try:
|
||||||
if context is not None:
|
await context.close()
|
||||||
context.close()
|
except Exception:
|
||||||
except Exception as exc:
|
pass
|
||||||
logger.warning("browser_context_close_failed: %s", exc)
|
await pw.stop()
|
||||||
if browser_holder is not None:
|
raise
|
||||||
try:
|
|
||||||
browser_holder.close()
|
|
||||||
except Exception as exc:
|
|
||||||
logger.warning("browser_close_failed: %s", exc)
|
|
||||||
|
|
||||||
|
|
||||||
def find_chrome_executable() -> str | None:
|
async def close_browser_session(playwright: Any, context: Any) -> None:
|
||||||
return _find_chrome_executable()
|
try:
|
||||||
|
if context is not None:
|
||||||
|
await context.close()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
if playwright is not None:
|
||||||
|
await playwright.stop()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|||||||
@@ -0,0 +1,400 @@
|
|||||||
|
"""仿真批量提交 RPA 主流程(async Playwright)。"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import random
|
||||||
|
import re
|
||||||
|
import time
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from typing import Any, List, Optional
|
||||||
|
|
||||||
|
from jiangchang_skill_core import config
|
||||||
|
|
||||||
|
from service.adapter.base import BatchItem, BatchSubmitResult
|
||||||
|
from service.browser_session import (
|
||||||
|
close_browser_session,
|
||||||
|
find_chrome_executable,
|
||||||
|
start_browser_session,
|
||||||
|
)
|
||||||
|
from util.constants import (
|
||||||
|
DEFAULT_DEMO_CAPTCHA,
|
||||||
|
DEFAULT_DEMO_LOGIN_ID,
|
||||||
|
DEFAULT_DEMO_PASSWORD,
|
||||||
|
DEFAULT_DEMO_TOKEN_PIN,
|
||||||
|
DEFAULT_TIMEOUT_MS,
|
||||||
|
ENV_SIMULATOR_PASSWORD,
|
||||||
|
ENV_SIMULATOR_TOKEN_PIN,
|
||||||
|
LOGIN_NAVIGATE_TIMEOUT_MS,
|
||||||
|
SUBMIT_NAVIGATE_TIMEOUT_MS,
|
||||||
|
portal_login_wait_sec,
|
||||||
|
)
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
GOTO_TIMEOUT_MS = 60_000
|
||||||
|
|
||||||
|
_PAUSE_MIN_MS = 500
|
||||||
|
_PAUSE_MAX_MS = 2000
|
||||||
|
|
||||||
|
|
||||||
|
class RpaError(Exception):
|
||||||
|
def __init__(self, message: str, screenshot_path: Optional[str] = None):
|
||||||
|
super().__init__(message)
|
||||||
|
self.screenshot_path = screenshot_path
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class _Credentials:
|
||||||
|
login_id: str
|
||||||
|
password: str
|
||||||
|
token_pin: str
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_credentials(account: dict[str, Any]) -> _Credentials:
|
||||||
|
login_id = str(
|
||||||
|
account.get("login_id") or account.get("username") or DEFAULT_DEMO_LOGIN_ID
|
||||||
|
).strip()
|
||||||
|
password = str(
|
||||||
|
account.get("password")
|
||||||
|
or os.getenv(ENV_SIMULATOR_PASSWORD)
|
||||||
|
or config.get(ENV_SIMULATOR_PASSWORD)
|
||||||
|
or DEFAULT_DEMO_PASSWORD
|
||||||
|
).strip()
|
||||||
|
token_pin = str(
|
||||||
|
account.get("token_pin")
|
||||||
|
or account.get("pin")
|
||||||
|
or os.getenv(ENV_SIMULATOR_TOKEN_PIN)
|
||||||
|
or config.get(ENV_SIMULATOR_TOKEN_PIN)
|
||||||
|
or DEFAULT_DEMO_TOKEN_PIN
|
||||||
|
).strip()
|
||||||
|
return _Credentials(login_id=login_id, password=password, token_pin=token_pin)
|
||||||
|
|
||||||
|
|
||||||
|
def _headless() -> bool:
|
||||||
|
return config.get_bool("OPENCLAW_BROWSER_HEADLESS", default=False)
|
||||||
|
|
||||||
|
|
||||||
|
async def _pause(min_ms: int = _PAUSE_MIN_MS, max_ms: int = _PAUSE_MAX_MS) -> None:
|
||||||
|
await asyncio.sleep(random.uniform(min_ms, max_ms) / 1000.0)
|
||||||
|
|
||||||
|
|
||||||
|
async def _visible(locator) -> bool:
|
||||||
|
try:
|
||||||
|
return await locator.count() > 0 and await locator.is_visible(timeout=500)
|
||||||
|
except Exception:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
async def _wait_portal_gate(page, wait_sec: int) -> None:
|
||||||
|
portal_user = page.locator("#portal-user")
|
||||||
|
try:
|
||||||
|
if not await _visible(portal_user):
|
||||||
|
return
|
||||||
|
except Exception:
|
||||||
|
return
|
||||||
|
|
||||||
|
print(f"[门户] 检测到平台门户登录门闩,请手工完成门户登录,最多等待 {wait_sec} 秒...")
|
||||||
|
deadline = time.monotonic() + wait_sec
|
||||||
|
while time.monotonic() < deadline:
|
||||||
|
try:
|
||||||
|
portal_section = page.locator("#portal-section")
|
||||||
|
login_step1 = page.locator('form[name="simLoginStep1"]')
|
||||||
|
if not await _visible(portal_section) or await _visible(login_step1):
|
||||||
|
print("[门户] 门户门闩已通过,进入业务系统登录")
|
||||||
|
return
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
await asyncio.sleep(2.0)
|
||||||
|
|
||||||
|
raise RpaError("ERROR:LOGIN_TIMEOUT 门户登录超时,请重新运行并及时完成门户登录。")
|
||||||
|
|
||||||
|
|
||||||
|
async def _login(page, creds: _Credentials, artifacts_dir: str | None) -> None:
|
||||||
|
try:
|
||||||
|
await page.wait_for_selector(
|
||||||
|
'form[name="simLoginStep1"]', timeout=LOGIN_NAVIGATE_TIMEOUT_MS
|
||||||
|
)
|
||||||
|
await _pause()
|
||||||
|
await page.fill('form[name="simLoginStep1"] input[name="loginId"]', creds.login_id)
|
||||||
|
await _pause()
|
||||||
|
await page.click('form[name="simLoginStep1"] button[type="submit"]')
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "login_step1_failed")
|
||||||
|
raise RpaError(f"登录第一步失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
try:
|
||||||
|
await page.wait_for_selector('form[name="simLoginStep2"]', timeout=DEFAULT_TIMEOUT_MS)
|
||||||
|
await _pause()
|
||||||
|
await page.fill('form[name="simLoginStep2"] input[name="password"]', creds.password)
|
||||||
|
await page.fill('form[name="simLoginStep2"] input[name="captcha"]', DEFAULT_DEMO_CAPTCHA)
|
||||||
|
await _pause()
|
||||||
|
await page.click('form[name="simLoginStep2"] button[type="submit"]')
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "login_step2_failed")
|
||||||
|
raise RpaError(f"登录第二步失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
try:
|
||||||
|
await page.wait_for_selector('form[name="simBatchForm"]', timeout=LOGIN_NAVIGATE_TIMEOUT_MS)
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "login_navigate_failed")
|
||||||
|
raise RpaError(f"登录后未进入批量提交页:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
|
||||||
|
async def _goto_batch_page(page, artifacts_dir: str | None) -> None:
|
||||||
|
try:
|
||||||
|
await page.wait_for_selector('form[name="simBatchForm"]', timeout=DEFAULT_TIMEOUT_MS)
|
||||||
|
await _pause()
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "goto_batch_failed")
|
||||||
|
raise RpaError(f"进入批量提交页失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
|
||||||
|
async def _select_target_account(page, target: str) -> None:
|
||||||
|
sel = page.locator('select[name="fromAccountNo"]')
|
||||||
|
await sel.wait_for(timeout=DEFAULT_TIMEOUT_MS)
|
||||||
|
n = await sel.locator("option").count()
|
||||||
|
matched_value: Optional[str] = None
|
||||||
|
first_value: Optional[str] = None
|
||||||
|
for i in range(n):
|
||||||
|
opt = sel.locator("option").nth(i)
|
||||||
|
val = (await opt.get_attribute("value")) or ""
|
||||||
|
if not val.strip():
|
||||||
|
continue
|
||||||
|
label_txt = await opt.inner_text()
|
||||||
|
if first_value is None:
|
||||||
|
first_value = val
|
||||||
|
if target.strip() and target.strip() in label_txt:
|
||||||
|
matched_value = val
|
||||||
|
break
|
||||||
|
pick = matched_value or first_value
|
||||||
|
if not pick:
|
||||||
|
raise RpaError("来源账户下拉无可选项")
|
||||||
|
if not matched_value and target.strip():
|
||||||
|
logger.warning("target '%s' 未匹配选项,回退 value=%s", target, pick)
|
||||||
|
await sel.select_option(value=pick)
|
||||||
|
await _pause()
|
||||||
|
|
||||||
|
|
||||||
|
async def _fill_batch_form(
|
||||||
|
page, target: str, items: List[BatchItem], artifacts_dir: str | None
|
||||||
|
) -> None:
|
||||||
|
try:
|
||||||
|
await page.get_by_role("button", name=re.compile(r"页面填写")).click()
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "tab_switch_failed")
|
||||||
|
raise RpaError(f"切换到页面填写失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
try:
|
||||||
|
await _select_target_account(page, target)
|
||||||
|
except RpaError:
|
||||||
|
raise
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "select_account_failed")
|
||||||
|
raise RpaError(f"选择来源账户失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
try:
|
||||||
|
existing = await page.locator("tr[data-row-index]").count()
|
||||||
|
need_more = max(0, len(items) - existing)
|
||||||
|
add_btn = page.get_by_role("button", name=re.compile(r"新增一行"))
|
||||||
|
for _ in range(need_more):
|
||||||
|
await _pause(400, 900)
|
||||||
|
await add_btn.click()
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "add_rows_failed")
|
||||||
|
raise RpaError(f"新增明细行失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
for it in items:
|
||||||
|
try:
|
||||||
|
row = page.locator(f'tr[data-row-index="{it.row_index}"]')
|
||||||
|
await row.wait_for(timeout=DEFAULT_TIMEOUT_MS)
|
||||||
|
await _pause(300, 800)
|
||||||
|
await row.locator('input[name="name"]').fill(it.name)
|
||||||
|
await row.locator('input[name="account"]').fill(it.account)
|
||||||
|
await row.locator('input[name="note"]').fill(it.note or "")
|
||||||
|
await row.locator('input[name="amount"]').fill(f"{it.amount}")
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, f"fill_row_{it.row_index}_failed")
|
||||||
|
raise RpaError(f"填第 {it.row_index} 行失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
try:
|
||||||
|
await page.fill('input[name="purpose"]', "仿真批量提交示例")
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning("填写用途失败(非致命):%s", exc)
|
||||||
|
|
||||||
|
|
||||||
|
async def _submit_and_get_batch_id(page, token_pin: str, artifacts_dir: str | None) -> str:
|
||||||
|
try:
|
||||||
|
await _pause(800, 1500)
|
||||||
|
await page.locator('form[name="simBatchForm"] button[type="submit"]').click()
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "click_submit_failed")
|
||||||
|
raise RpaError(f"点击提交失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
dlg_sel = 'div[role="dialog"][aria-modal="true"]'
|
||||||
|
try:
|
||||||
|
await page.wait_for_selector(dlg_sel, timeout=DEFAULT_TIMEOUT_MS)
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "pin_dialog_not_open")
|
||||||
|
raise RpaError(f"PIN 弹窗未出现:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
try:
|
||||||
|
pin_input = page.locator(f'{dlg_sel} input[type="password"][inputmode="numeric"]')
|
||||||
|
await _pause(500, 1200)
|
||||||
|
await pin_input.fill(token_pin)
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "fill_pin_failed")
|
||||||
|
raise RpaError(f"填写 PIN 失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
try:
|
||||||
|
await page.locator(dlg_sel).get_by_role("button", name=re.compile(r"确认提交")).click()
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "click_confirm_failed")
|
||||||
|
raise RpaError(f"确认提交失败:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
try:
|
||||||
|
await page.wait_for_selector('[data-testid="batch-id"]', timeout=SUBMIT_NAVIGATE_TIMEOUT_MS)
|
||||||
|
except Exception as exc:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "success_area_not_visible")
|
||||||
|
raise RpaError(f"提交后未出现成功区域:{exc}", screenshot_path=sp) from exc
|
||||||
|
|
||||||
|
batch_id = await page.locator('[data-testid="batch-id"]').get_attribute("data-batch-id") or ""
|
||||||
|
if not batch_id:
|
||||||
|
batch_id = (await page.locator('[data-testid="batch-id"]').inner_text()).strip()
|
||||||
|
url = page.url
|
||||||
|
if not batch_id and "#/batch/" in url:
|
||||||
|
batch_id = url.split("#/batch/", 1)[1].split("?")[0].split("#")[0].strip("/")
|
||||||
|
if not batch_id:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "batch_id_empty")
|
||||||
|
raise RpaError(f"无法解析 batch_id,url={url}", screenshot_path=sp)
|
||||||
|
return batch_id
|
||||||
|
|
||||||
|
|
||||||
|
async def _safe_screenshot(page, artifacts_dir: str | None, tag: str) -> Optional[str]:
|
||||||
|
if not artifacts_dir:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
os.makedirs(artifacts_dir, exist_ok=True)
|
||||||
|
path = os.path.join(artifacts_dir, f"{tag}_{int(time.time())}.png")
|
||||||
|
await page.screenshot(path=path, full_page=True)
|
||||||
|
logger.info("screenshot_saved path=%s", path)
|
||||||
|
return path
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning("screenshot_failed tag=%s err=%s", tag, exc)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
async def submit_batch_rpa(
|
||||||
|
account: dict[str, Any],
|
||||||
|
*,
|
||||||
|
target: str,
|
||||||
|
items: list[BatchItem],
|
||||||
|
base_url: str,
|
||||||
|
artifacts_dir: str | None,
|
||||||
|
video_session: Any = None,
|
||||||
|
headless: bool | None = None,
|
||||||
|
) -> BatchSubmitResult:
|
||||||
|
del video_session # 示例占位;真实 skill 可接入 RpaVideoSession
|
||||||
|
|
||||||
|
profile_dir = str(account.get("profile_dir") or "").strip()
|
||||||
|
if not profile_dir:
|
||||||
|
return BatchSubmitResult(
|
||||||
|
ok=False,
|
||||||
|
batch_id=None,
|
||||||
|
submitted_count=0,
|
||||||
|
submitted_amount=0.0,
|
||||||
|
error_msg="账号缺少 profile_dir",
|
||||||
|
artifacts={"adapter": "simulator_rpa"},
|
||||||
|
)
|
||||||
|
|
||||||
|
if not items:
|
||||||
|
return BatchSubmitResult(
|
||||||
|
ok=False,
|
||||||
|
batch_id=None,
|
||||||
|
submitted_count=0,
|
||||||
|
submitted_amount=0.0,
|
||||||
|
error_msg="items 为空",
|
||||||
|
artifacts={"adapter": "simulator_rpa"},
|
||||||
|
)
|
||||||
|
|
||||||
|
if not find_chrome_executable():
|
||||||
|
return BatchSubmitResult(
|
||||||
|
ok=False,
|
||||||
|
batch_id=None,
|
||||||
|
submitted_count=0,
|
||||||
|
submitted_amount=0.0,
|
||||||
|
error_msg="未检测到 Chrome 或 Edge 浏览器,请安装系统浏览器后重试。",
|
||||||
|
artifacts={"adapter": "simulator_rpa"},
|
||||||
|
)
|
||||||
|
|
||||||
|
creds = _resolve_credentials(account)
|
||||||
|
portal_wait = portal_login_wait_sec()
|
||||||
|
hl = headless if headless is not None else _headless()
|
||||||
|
|
||||||
|
pw = None
|
||||||
|
context = None
|
||||||
|
page = None
|
||||||
|
try:
|
||||||
|
pw, context, page = await start_browser_session(profile_dir, headless=hl)
|
||||||
|
logger.info("rpa_goto url=%s", base_url)
|
||||||
|
await page.goto(base_url, wait_until="domcontentloaded", timeout=GOTO_TIMEOUT_MS)
|
||||||
|
|
||||||
|
await _wait_portal_gate(page, portal_wait)
|
||||||
|
logger.info("rpa_login_start")
|
||||||
|
await _login(page, creds, artifacts_dir)
|
||||||
|
logger.info("rpa_login_done")
|
||||||
|
|
||||||
|
await _goto_batch_page(page, artifacts_dir)
|
||||||
|
logger.info("rpa_batch_page_ready")
|
||||||
|
|
||||||
|
await _fill_batch_form(page, target, items, artifacts_dir)
|
||||||
|
logger.info("rpa_batch_form_filled rows=%s", len(items))
|
||||||
|
|
||||||
|
batch_id = await _submit_and_get_batch_id(page, creds.token_pin, artifacts_dir)
|
||||||
|
logger.info("rpa_submit_success batch_id=%s", batch_id)
|
||||||
|
|
||||||
|
total = sum(it.amount for it in items)
|
||||||
|
return BatchSubmitResult(
|
||||||
|
ok=True,
|
||||||
|
batch_id=batch_id,
|
||||||
|
submitted_count=len(items),
|
||||||
|
submitted_amount=total,
|
||||||
|
error_msg=None,
|
||||||
|
artifacts={"adapter": "simulator_rpa"},
|
||||||
|
)
|
||||||
|
except RpaError as exc:
|
||||||
|
logger.error("rpa_failed: %s", exc)
|
||||||
|
arts = {"adapter": "simulator_rpa"}
|
||||||
|
if exc.screenshot_path:
|
||||||
|
arts["screenshot"] = exc.screenshot_path
|
||||||
|
elif page is not None:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "rpa_error")
|
||||||
|
if sp:
|
||||||
|
arts["screenshot"] = sp
|
||||||
|
return BatchSubmitResult(
|
||||||
|
ok=False,
|
||||||
|
batch_id=None,
|
||||||
|
submitted_count=0,
|
||||||
|
submitted_amount=0.0,
|
||||||
|
error_msg=str(exc),
|
||||||
|
artifacts=arts,
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.exception("rpa_unexpected: %s", exc)
|
||||||
|
arts = {"adapter": "simulator_rpa"}
|
||||||
|
if page is not None:
|
||||||
|
sp = await _safe_screenshot(page, artifacts_dir, "unexpected_error")
|
||||||
|
if sp:
|
||||||
|
arts["screenshot"] = sp
|
||||||
|
return BatchSubmitResult(
|
||||||
|
ok=False,
|
||||||
|
batch_id=None,
|
||||||
|
submitted_count=0,
|
||||||
|
submitted_amount=0.0,
|
||||||
|
error_msg=f"未预期异常:{type(exc).__name__}: {exc}",
|
||||||
|
artifacts=arts,
|
||||||
|
)
|
||||||
|
finally:
|
||||||
|
await close_browser_session(pw, context)
|
||||||
@@ -7,8 +7,7 @@ import tempfile
|
|||||||
import uuid
|
import uuid
|
||||||
from typing import Any, Dict, List, Optional
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
from service.account_client import pick_simulator_account
|
from service.adapter import BatchItem, select_adapter
|
||||||
from service.adapter import BatchItem, SimulatorBrowserRpaAdapter, select_adapter
|
|
||||||
from util.logging import get_logger
|
from util.logging import get_logger
|
||||||
|
|
||||||
logger = get_logger(__name__)
|
logger = get_logger(__name__)
|
||||||
@@ -42,7 +41,7 @@ def _validate_items(items: List[Dict[str, Any]]) -> tuple[List[BatchItem], Optio
|
|||||||
return parsed, None
|
return parsed, None
|
||||||
|
|
||||||
|
|
||||||
def run_batch_submit(
|
async def run_batch_submit(
|
||||||
target: str,
|
target: str,
|
||||||
items: List[Dict[str, Any]],
|
items: List[Dict[str, Any]],
|
||||||
*,
|
*,
|
||||||
@@ -53,6 +52,7 @@ def run_batch_submit(
|
|||||||
最小编排示例。
|
最小编排示例。
|
||||||
|
|
||||||
真实 skill 中还应:写 task_logs、entitlement、RpaVideoSession 等。
|
真实 skill 中还应:写 task_logs、entitlement、RpaVideoSession 等。
|
||||||
|
账号 pick / lease 在 adapter 内完成,编排层不直接碰 account-manager。
|
||||||
"""
|
"""
|
||||||
del force # 示例占位;真实 skill 可用于跳过确认
|
del force # 示例占位;真实 skill 可用于跳过确认
|
||||||
|
|
||||||
@@ -70,19 +70,15 @@ def run_batch_submit(
|
|||||||
uuid.uuid4().hex[:8],
|
uuid.uuid4().hex[:8],
|
||||||
)
|
)
|
||||||
os.makedirs(art_dir, exist_ok=True)
|
os.makedirs(art_dir, exist_ok=True)
|
||||||
logger.info("batch_submit_start target=%s item_count=%s artifacts_dir=%s", target_key, len(batch_items), art_dir)
|
logger.info(
|
||||||
|
"batch_submit_start target=%s item_count=%s artifacts_dir=%s",
|
||||||
|
target_key,
|
||||||
|
len(batch_items),
|
||||||
|
art_dir,
|
||||||
|
)
|
||||||
|
|
||||||
adapter = select_adapter(artifacts_dir=art_dir)
|
adapter = select_adapter(artifacts_dir=art_dir)
|
||||||
if isinstance(adapter, SimulatorBrowserRpaAdapter):
|
result = await adapter.submit_batch(target_key, batch_items)
|
||||||
account = pick_simulator_account()
|
|
||||||
adapter.set_credentials(
|
|
||||||
account.login_id,
|
|
||||||
account.password,
|
|
||||||
account.token_pin,
|
|
||||||
account.profile_dir,
|
|
||||||
)
|
|
||||||
|
|
||||||
result = adapter.submit_batch(target_key, batch_items)
|
|
||||||
summary: Dict[str, Any] = {
|
summary: Dict[str, Any] = {
|
||||||
"success": result.ok,
|
"success": result.ok,
|
||||||
"target": target_key,
|
"target": target_key,
|
||||||
|
|||||||
@@ -5,12 +5,19 @@ from __future__ import annotations
|
|||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
from jiangchang_skill_core import config
|
||||||
|
|
||||||
SKILL_SLUG = "example-simulator-browser-rpa"
|
SKILL_SLUG = "example-simulator-browser-rpa"
|
||||||
LOG_LOGGER_NAME = "openclaw.skill.example_simulator_browser_rpa"
|
LOG_LOGGER_NAME = "openclaw.skill.example_simulator_browser_rpa"
|
||||||
|
|
||||||
|
TARGET_PLATFORM = "sim_batch"
|
||||||
|
LEASE_HOLDER = "example-simulator-browser-rpa"
|
||||||
|
LEASE_TTL_SEC = "1800"
|
||||||
|
|
||||||
DEFAULT_TIMEOUT_MS = 15_000
|
DEFAULT_TIMEOUT_MS = 15_000
|
||||||
LOGIN_NAVIGATE_TIMEOUT_MS = 30_000
|
LOGIN_NAVIGATE_TIMEOUT_MS = 30_000
|
||||||
SUBMIT_NAVIGATE_TIMEOUT_MS = 60_000
|
SUBMIT_NAVIGATE_TIMEOUT_MS = 60_000
|
||||||
|
DEFAULT_PORTAL_LOGIN_WAIT_SEC = 120
|
||||||
|
|
||||||
DEFAULT_DEMO_LOGIN_ID = "demo001"
|
DEFAULT_DEMO_LOGIN_ID = "demo001"
|
||||||
DEFAULT_DEMO_PASSWORD = "demo-password"
|
DEFAULT_DEMO_PASSWORD = "demo-password"
|
||||||
@@ -18,15 +25,26 @@ DEFAULT_DEMO_CAPTCHA = "0000"
|
|||||||
DEFAULT_DEMO_TOKEN_PIN = "123456"
|
DEFAULT_DEMO_TOKEN_PIN = "123456"
|
||||||
|
|
||||||
ENV_SIMULATOR_BASE_URL = "SIMULATOR_BASE_URL"
|
ENV_SIMULATOR_BASE_URL = "SIMULATOR_BASE_URL"
|
||||||
ENV_SIMULATOR_LOGIN_ID = "SIMULATOR_LOGIN_ID"
|
|
||||||
ENV_SIMULATOR_PASSWORD = "SIMULATOR_PASSWORD"
|
ENV_SIMULATOR_PASSWORD = "SIMULATOR_PASSWORD"
|
||||||
ENV_SIMULATOR_TOKEN_PIN = "SIMULATOR_TOKEN_PIN"
|
ENV_SIMULATOR_TOKEN_PIN = "SIMULATOR_TOKEN_PIN"
|
||||||
ENV_SIMULATOR_PROFILE_DIR = "SIMULATOR_PROFILE_DIR"
|
ENV_PORTAL_LOGIN_WAIT_SEC = "PORTAL_LOGIN_WAIT_SEC"
|
||||||
|
|
||||||
_EXAMPLE_ROOT = Path(__file__).resolve().parents[2]
|
_EXAMPLE_ROOT = Path(__file__).resolve().parents[2]
|
||||||
DEFAULT_DEMO_APP_PATH = _EXAMPLE_ROOT / "sandbox" / "demo_app.html"
|
DEFAULT_DEMO_APP_PATH = _EXAMPLE_ROOT / "sandbox" / "demo_app.html"
|
||||||
|
|
||||||
|
|
||||||
|
def portal_login_wait_sec() -> int:
|
||||||
|
raw = (
|
||||||
|
os.getenv(ENV_PORTAL_LOGIN_WAIT_SEC)
|
||||||
|
or config.get(ENV_PORTAL_LOGIN_WAIT_SEC)
|
||||||
|
or str(DEFAULT_PORTAL_LOGIN_WAIT_SEC)
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
return max(1, int(str(raw).strip()))
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return DEFAULT_PORTAL_LOGIN_WAIT_SEC
|
||||||
|
|
||||||
|
|
||||||
def resolve_simulator_base_url() -> str:
|
def resolve_simulator_base_url() -> str:
|
||||||
env = (os.getenv(ENV_SIMULATOR_BASE_URL) or "").strip()
|
env = (os.getenv(ENV_SIMULATOR_BASE_URL) or "").strip()
|
||||||
if env:
|
if env:
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
import re
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
from util.constants import LOG_LOGGER_NAME
|
from util.constants import LOG_LOGGER_NAME
|
||||||
|
|
||||||
@@ -13,3 +15,24 @@ def get_logger(name: str | None = None) -> logging.Logger:
|
|||||||
|
|
||||||
def configure_logging(level: int = logging.INFO) -> None:
|
def configure_logging(level: int = logging.INFO) -> None:
|
||||||
logging.basicConfig(level=level, format="%(levelname)s %(name)s %(message)s")
|
logging.basicConfig(level=level, format="%(levelname)s %(name)s %(message)s")
|
||||||
|
|
||||||
|
|
||||||
|
def mask_text(value: str, *, keep_start: int = 2, keep_end: int = 2) -> str:
|
||||||
|
s = (value or "").strip()
|
||||||
|
if len(s) >= 11 and s.isdigit():
|
||||||
|
return s[:3] + "****" + s[-4:]
|
||||||
|
if len(s) > keep_start + keep_end:
|
||||||
|
return s[:keep_start] + "****" + s[-keep_end:]
|
||||||
|
return "****"
|
||||||
|
|
||||||
|
|
||||||
|
def safe_log_value(value: Any) -> str:
|
||||||
|
if value is None:
|
||||||
|
return ""
|
||||||
|
text = str(value)
|
||||||
|
if re.fullmatch(r"\d{7,}", text):
|
||||||
|
return mask_text(text)
|
||||||
|
if "@" in text and len(text) > 6:
|
||||||
|
local, _, domain = text.partition("@")
|
||||||
|
return f"{mask_text(local, keep_start=1, keep_end=1)}@{domain}"
|
||||||
|
return text
|
||||||
|
|||||||
@@ -42,20 +42,20 @@ class TestAdapterDispatch(unittest.TestCase):
|
|||||||
self.assertIsInstance(select_adapter(), SimulatorBrowserRpaAdapter)
|
self.assertIsInstance(select_adapter(), SimulatorBrowserRpaAdapter)
|
||||||
|
|
||||||
|
|
||||||
class TestMockAdapter(unittest.TestCase):
|
class TestMockAdapter(unittest.IsolatedAsyncioTestCase):
|
||||||
def test_mock_success(self) -> None:
|
async def test_mock_success(self) -> None:
|
||||||
items = [
|
items = [
|
||||||
BatchItem(row_index=1, name="Alice", account="1001", amount=10.5),
|
BatchItem(row_index=1, name="Alice", account="1001", amount=10.5),
|
||||||
BatchItem(row_index=2, name="Bob", account="1002", amount=20.0),
|
BatchItem(row_index=2, name="Bob", account="1002", amount=20.0),
|
||||||
]
|
]
|
||||||
result = MockBatchAdapter().submit_batch("acct-demo-001", items)
|
result = await MockBatchAdapter().submit_batch("acct-demo-001", items)
|
||||||
self.assertTrue(result.ok)
|
self.assertTrue(result.ok)
|
||||||
self.assertEqual(result.submitted_count, 2)
|
self.assertEqual(result.submitted_count, 2)
|
||||||
self.assertEqual(result.submitted_amount, 30.5)
|
self.assertEqual(result.submitted_amount, 30.5)
|
||||||
self.assertTrue((result.batch_id or "").startswith("MOCK-"))
|
self.assertTrue((result.batch_id or "").startswith("MOCK-"))
|
||||||
|
|
||||||
def test_mock_empty_items(self) -> None:
|
async def test_mock_empty_items(self) -> None:
|
||||||
result = MockBatchAdapter().submit_batch("acct-demo-001", [])
|
result = await MockBatchAdapter().submit_batch("acct-demo-001", [])
|
||||||
self.assertFalse(result.ok)
|
self.assertFalse(result.ok)
|
||||||
self.assertEqual(result.error_msg, "items 为空")
|
self.assertEqual(result.error_msg, "items 为空")
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""禁止 import account-manager 内部 RPA 辅助模块。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
FORBIDDEN_PATTERNS = (
|
||||||
|
re.compile(r"\brpa_helpers\b"),
|
||||||
|
re.compile(r"\binject_account_manager_scripts_path\b"),
|
||||||
|
re.compile(r"\bget_account_credential\b"),
|
||||||
|
)
|
||||||
|
|
||||||
|
SCRIPTS_ROOT = Path(__file__).resolve().parents[1] / "scripts"
|
||||||
|
|
||||||
|
|
||||||
|
class TestNoRpaHelpersImport(unittest.TestCase):
|
||||||
|
def test_scripts_tree_has_no_forbidden_account_manager_imports(self) -> None:
|
||||||
|
violations: list[str] = []
|
||||||
|
for root, _dirs, files in os.walk(SCRIPTS_ROOT):
|
||||||
|
for name in files:
|
||||||
|
if not name.endswith(".py"):
|
||||||
|
continue
|
||||||
|
path = Path(root) / name
|
||||||
|
text = path.read_text(encoding="utf-8")
|
||||||
|
for pattern in FORBIDDEN_PATTERNS:
|
||||||
|
if pattern.search(text):
|
||||||
|
violations.append(f"{path.relative_to(SCRIPTS_ROOT)}: {pattern.pattern}")
|
||||||
|
self.assertEqual(
|
||||||
|
violations,
|
||||||
|
[],
|
||||||
|
msg="Forbidden account-manager internal imports found:\n" + "\n".join(violations),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -2,31 +2,27 @@
|
|||||||
"""SimulatorBrowserRpaAdapter 单元测试(不启动真实浏览器)。"""
|
"""SimulatorBrowserRpaAdapter 单元测试(不启动真实浏览器)。"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import asyncio
|
||||||
import unittest
|
import unittest
|
||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import AsyncMock, MagicMock, patch
|
||||||
|
|
||||||
from service.adapter import BatchItem, SimulatorBrowserRpaAdapter
|
from service.adapter import BatchItem, SimulatorBrowserRpaAdapter
|
||||||
from service.browser_session import CHROME_LAUNCH_ARGS
|
from service.browser_session import CHROME_LAUNCH_ARGS
|
||||||
|
from service.simulator_playwright import RpaError
|
||||||
|
|
||||||
|
|
||||||
class TestSimulatorRpaUnit(unittest.TestCase):
|
class TestSimulatorRpaUnit(unittest.IsolatedAsyncioTestCase):
|
||||||
def test_set_credentials_and_empty_profile_dir(self) -> None:
|
async def test_submit_batch_empty_items(self) -> None:
|
||||||
adapter = SimulatorBrowserRpaAdapter()
|
adapter = SimulatorBrowserRpaAdapter()
|
||||||
adapter.set_credentials("demo001", "pwd", "pin", " ")
|
result = await adapter.submit_batch("acct-demo-001", [])
|
||||||
self.assertEqual(adapter._login_id, "demo001")
|
|
||||||
self.assertIsNone(adapter._profile_dir)
|
|
||||||
|
|
||||||
def test_submit_batch_empty_items(self) -> None:
|
|
||||||
adapter = SimulatorBrowserRpaAdapter()
|
|
||||||
result = adapter.submit_batch("acct-demo-001", [])
|
|
||||||
self.assertFalse(result.ok)
|
self.assertFalse(result.ok)
|
||||||
self.assertIn("items", result.error_msg or "")
|
self.assertIn("items", result.error_msg or "")
|
||||||
|
|
||||||
@patch("service.adapter.simulator_rpa.find_chrome_executable", return_value=None)
|
@patch("service.adapter.simulator_rpa.find_chrome_executable", return_value=None)
|
||||||
def test_no_chrome_returns_error_without_launch(self, _chrome: MagicMock) -> None:
|
async def test_no_chrome_returns_error_without_launch(self, _chrome: MagicMock) -> None:
|
||||||
adapter = SimulatorBrowserRpaAdapter()
|
adapter = SimulatorBrowserRpaAdapter()
|
||||||
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
||||||
result = adapter.submit_batch("acct-demo-001", items)
|
result = await adapter.submit_batch("acct-demo-001", items)
|
||||||
self.assertFalse(result.ok)
|
self.assertFalse(result.ok)
|
||||||
msg = result.error_msg or ""
|
msg = result.error_msg or ""
|
||||||
self.assertTrue("Chrome" in msg or "Edge" in msg or "浏览器" in msg)
|
self.assertTrue("Chrome" in msg or "Edge" in msg or "浏览器" in msg)
|
||||||
@@ -38,38 +34,100 @@ class TestSimulatorRpaUnit(unittest.TestCase):
|
|||||||
self.assertFalse(lowered.startswith("https://"))
|
self.assertFalse(lowered.startswith("https://"))
|
||||||
self.assertFalse(lowered.startswith("file://"))
|
self.assertFalse(lowered.startswith("file://"))
|
||||||
|
|
||||||
@patch("service.adapter.simulator_rpa.browser_session")
|
@patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
|
||||||
|
@patch("service.adapter.simulator_rpa.pick_web_account")
|
||||||
@patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
|
@patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
|
||||||
def test_start_url_opened_via_goto_not_launch_args(
|
async def test_adapter_delegates_to_playwright_with_account_url(
|
||||||
self,
|
self,
|
||||||
_chrome: MagicMock,
|
_chrome: MagicMock,
|
||||||
mock_session: MagicMock,
|
mock_pick: MagicMock,
|
||||||
|
mock_rpa: AsyncMock,
|
||||||
) -> None:
|
) -> None:
|
||||||
from service.adapter.simulator_rpa import RpaError
|
from service.adapter.base import BatchSubmitResult
|
||||||
|
|
||||||
adapter = SimulatorBrowserRpaAdapter(base_url="file:///demo/demo_app.html")
|
mock_pick.return_value = {
|
||||||
|
"login_id": "demo001",
|
||||||
|
"profile_dir": "/tmp/profile",
|
||||||
|
"url": "file:///demo/demo_app.html",
|
||||||
|
"lease_token": "tok-1",
|
||||||
|
}
|
||||||
|
mock_rpa.return_value = BatchSubmitResult(
|
||||||
|
ok=False,
|
||||||
|
batch_id=None,
|
||||||
|
submitted_count=0,
|
||||||
|
submitted_amount=0.0,
|
||||||
|
error_msg="login fail",
|
||||||
|
artifacts={"adapter": "simulator_rpa"},
|
||||||
|
)
|
||||||
|
|
||||||
|
adapter = SimulatorBrowserRpaAdapter(artifacts_dir="/tmp/art")
|
||||||
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
||||||
|
result = await adapter.submit_batch("acct-demo-001", items)
|
||||||
page = MagicMock()
|
|
||||||
mock_cm = MagicMock()
|
|
||||||
mock_cm.__enter__.return_value = page
|
|
||||||
mock_cm.__exit__.return_value = False
|
|
||||||
mock_session.return_value = mock_cm
|
|
||||||
|
|
||||||
with patch.object(adapter, "_login", side_effect=RpaError("login fail")):
|
|
||||||
result = adapter.submit_batch("acct-demo-001", items)
|
|
||||||
|
|
||||||
self.assertFalse(result.ok)
|
self.assertFalse(result.ok)
|
||||||
mock_session.assert_called_once()
|
mock_rpa.assert_awaited_once()
|
||||||
called_start_url = mock_session.call_args[0][0]
|
call_kwargs = mock_rpa.call_args.kwargs
|
||||||
self.assertEqual(called_start_url, "file:///demo/demo_app.html")
|
self.assertEqual(call_kwargs["base_url"], "file:///demo/demo_app.html")
|
||||||
for arg in CHROME_LAUNCH_ARGS:
|
for arg in CHROME_LAUNCH_ARGS:
|
||||||
self.assertNotIn(arg, called_start_url)
|
self.assertNotIn(arg, call_kwargs["base_url"])
|
||||||
|
|
||||||
def test_safe_screenshot_without_artifacts_dir(self) -> None:
|
@patch("service.simulator_playwright.start_browser_session", new_callable=AsyncMock)
|
||||||
adapter = SimulatorBrowserRpaAdapter(artifacts_dir=None)
|
async def test_playwright_opens_url_via_goto_not_launch_args(self, mock_start: AsyncMock) -> None:
|
||||||
page = MagicMock()
|
from service.simulator_playwright import submit_batch_rpa
|
||||||
self.assertIsNone(adapter._safe_screenshot(page, "tag"))
|
|
||||||
|
page = AsyncMock()
|
||||||
|
page.goto = AsyncMock()
|
||||||
|
mock_start.return_value = (MagicMock(), MagicMock(), page)
|
||||||
|
|
||||||
|
account = {"profile_dir": "/tmp/p", "login_id": "demo001"}
|
||||||
|
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"service.simulator_playwright._wait_portal_gate",
|
||||||
|
new_callable=AsyncMock,
|
||||||
|
return_value=None,
|
||||||
|
):
|
||||||
|
with patch(
|
||||||
|
"service.simulator_playwright._login",
|
||||||
|
new_callable=AsyncMock,
|
||||||
|
side_effect=RpaError("login fail"),
|
||||||
|
):
|
||||||
|
with patch(
|
||||||
|
"service.simulator_playwright.find_chrome_executable",
|
||||||
|
return_value="C:/Chrome/chrome.exe",
|
||||||
|
):
|
||||||
|
with patch(
|
||||||
|
"service.simulator_playwright.close_browser_session",
|
||||||
|
new_callable=AsyncMock,
|
||||||
|
):
|
||||||
|
result = await submit_batch_rpa(
|
||||||
|
account,
|
||||||
|
target="acct-demo-001",
|
||||||
|
items=items,
|
||||||
|
base_url="file:///demo/demo_app.html",
|
||||||
|
artifacts_dir=None,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertFalse(result.ok)
|
||||||
|
page.goto.assert_awaited_once()
|
||||||
|
goto_url = page.goto.call_args[0][0]
|
||||||
|
self.assertEqual(goto_url, "file:///demo/demo_app.html")
|
||||||
|
for arg in CHROME_LAUNCH_ARGS:
|
||||||
|
self.assertNotIn(arg, goto_url)
|
||||||
|
|
||||||
|
async def test_safe_screenshot_without_artifacts_dir(self) -> None:
|
||||||
|
from service.simulator_playwright import _safe_screenshot
|
||||||
|
|
||||||
|
page = AsyncMock()
|
||||||
|
self.assertIsNone(await _safe_screenshot(page, None, "tag"))
|
||||||
|
|
||||||
|
|
||||||
|
class TestSyncHelpers(unittest.TestCase):
|
||||||
|
def test_asyncio_run_smoke(self) -> None:
|
||||||
|
async def _noop() -> bool:
|
||||||
|
return True
|
||||||
|
|
||||||
|
self.assertTrue(asyncio.run(_noop()))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@@ -3,51 +3,70 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import AsyncMock, MagicMock, patch
|
||||||
|
|
||||||
from service.adapter import BatchItem, SimulatorBrowserRpaAdapter
|
from service.adapter import BatchItem, SimulatorBrowserRpaAdapter
|
||||||
from service.adapter.simulator_rpa import RpaError
|
from service.adapter.base import BatchSubmitResult
|
||||||
|
|
||||||
|
|
||||||
class TestBatchSubmitFailureResult(unittest.TestCase):
|
class TestBatchSubmitFailureResult(unittest.IsolatedAsyncioTestCase):
|
||||||
|
@patch("service.adapter.simulator_rpa.release_lease")
|
||||||
|
@patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
|
||||||
|
@patch("service.adapter.simulator_rpa.pick_web_account")
|
||||||
@patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
|
@patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
|
||||||
@patch("service.adapter.simulator_rpa.browser_session")
|
async def test_rpa_error_converts_to_failed_result(
|
||||||
def test_rpa_error_converts_to_failed_result(self, mock_session: MagicMock, _chrome: MagicMock) -> None:
|
self,
|
||||||
page = MagicMock()
|
_chrome: MagicMock,
|
||||||
mock_cm = MagicMock()
|
mock_pick: MagicMock,
|
||||||
mock_cm.__enter__.return_value = page
|
mock_rpa: AsyncMock,
|
||||||
mock_cm.__exit__.return_value = False
|
_release: MagicMock,
|
||||||
mock_session.return_value = mock_cm
|
) -> None:
|
||||||
|
mock_pick.return_value = {
|
||||||
|
"profile_dir": "/tmp/profile",
|
||||||
|
"lease_token": "tok",
|
||||||
|
}
|
||||||
|
mock_rpa.return_value = BatchSubmitResult(
|
||||||
|
ok=False,
|
||||||
|
batch_id=None,
|
||||||
|
submitted_count=0,
|
||||||
|
submitted_amount=0.0,
|
||||||
|
error_msg="登录第一步失败:timeout",
|
||||||
|
artifacts={"adapter": "simulator_rpa", "screenshot": "/tmp/art/x.png"},
|
||||||
|
)
|
||||||
|
|
||||||
adapter = SimulatorBrowserRpaAdapter(artifacts_dir="/tmp/art")
|
adapter = SimulatorBrowserRpaAdapter(artifacts_dir="/tmp/art")
|
||||||
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
||||||
|
result = await adapter.submit_batch("acct-demo-001", items)
|
||||||
with patch.object(adapter, "_login", side_effect=RpaError("登录第一步失败:timeout", screenshot_path="/tmp/art/x.png")):
|
|
||||||
result = adapter.submit_batch("acct-demo-001", items)
|
|
||||||
|
|
||||||
self.assertFalse(result.ok)
|
self.assertFalse(result.ok)
|
||||||
self.assertIn("登录第一步失败", result.error_msg or "")
|
self.assertIn("登录第一步失败", result.error_msg or "")
|
||||||
self.assertEqual(result.artifacts.get("adapter"), "simulator_browser_rpa")
|
self.assertEqual(result.artifacts.get("adapter"), "simulator_rpa")
|
||||||
self.assertEqual(result.artifacts.get("screenshot"), "/tmp/art/x.png")
|
self.assertEqual(result.artifacts.get("screenshot"), "/tmp/art/x.png")
|
||||||
|
|
||||||
|
@patch("service.adapter.simulator_rpa.release_lease")
|
||||||
|
@patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
|
||||||
|
@patch("service.adapter.simulator_rpa.pick_web_account")
|
||||||
@patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
|
@patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
|
||||||
@patch("service.adapter.simulator_rpa.browser_session")
|
async def test_unexpected_error_includes_adapter_name(
|
||||||
def test_unexpected_error_includes_adapter_name(self, mock_session: MagicMock, _chrome: MagicMock) -> None:
|
self,
|
||||||
page = MagicMock()
|
_chrome: MagicMock,
|
||||||
mock_cm = MagicMock()
|
mock_pick: MagicMock,
|
||||||
mock_cm.__enter__.return_value = page
|
mock_rpa: AsyncMock,
|
||||||
mock_cm.__exit__.return_value = False
|
_release: MagicMock,
|
||||||
mock_session.return_value = mock_cm
|
) -> None:
|
||||||
|
mock_pick.return_value = {
|
||||||
|
"profile_dir": "/tmp/profile",
|
||||||
|
"lease_token": "tok",
|
||||||
|
}
|
||||||
|
mock_rpa.side_effect = RuntimeError("boom")
|
||||||
|
|
||||||
adapter = SimulatorBrowserRpaAdapter(artifacts_dir=None)
|
adapter = SimulatorBrowserRpaAdapter(artifacts_dir=None)
|
||||||
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
|
||||||
|
result = await adapter.submit_batch("acct-demo-001", items)
|
||||||
with patch.object(adapter, "_login", side_effect=RuntimeError("boom")):
|
|
||||||
result = adapter.submit_batch("acct-demo-001", items)
|
|
||||||
|
|
||||||
self.assertFalse(result.ok)
|
self.assertFalse(result.ok)
|
||||||
self.assertIn("未预期异常", result.error_msg or "")
|
self.assertIn("未预期异常", result.error_msg or "")
|
||||||
self.assertEqual(result.artifacts.get("adapter"), "simulator_browser_rpa")
|
self.assertEqual(result.artifacts.get("adapter"), "simulator_rpa")
|
||||||
self.assertNotIn("screenshot", result.artifacts)
|
self.assertNotIn("screenshot", result.artifacts)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
300
references/ACTIONS.md
Normal file
300
references/ACTIONS.md
Normal file
@@ -0,0 +1,300 @@
|
|||||||
|
# Skill Action Manifest(匠厂宿主)
|
||||||
|
|
||||||
|
本文件说明 `assets/actions.json` 与 `scripts/main.py` CLI 的对应关系,供 Agent 编排与宿主 **Skill Action Runtime** 使用。
|
||||||
|
|
||||||
|
**权威运行时契约(sync/async、任务中心、单内核编排)见 [`../development/SKILL_ACTION_RUNTIME.md`](../development/SKILL_ACTION_RUNTIME.md)。**
|
||||||
|
|
||||||
|
**边界:** 用户市场说明见根目录 [`README.md`](../README.md);CLI 参数与错误码细节见 [`CLI.md`](CLI.md)。
|
||||||
|
|
||||||
|
## 模板严格规范 vs 宿主向后兼容
|
||||||
|
|
||||||
|
| 角色 | 定位 |
|
||||||
|
|------|------|
|
||||||
|
| **skill-template** | 新技能推荐的**严格规范**:必填字段、明确类型、`additionalProperties: false` |
|
||||||
|
| **宿主运行时** | **向后兼容**的历史 manifest 解析器:可能接受部分缺省字段(如 `description`、`placements`、`entrypoint.args`、缺失的 `bind.tables`) |
|
||||||
|
|
||||||
|
**新技能不应依赖宿主缺省行为。** 复制模板后按 [`assets/schemas/skill-actions.schema.json`](../assets/schemas/skill-actions.schema.json) 与本文完整填写 manifest。
|
||||||
|
|
||||||
|
JSON Schema 使用 `additionalProperties: false` 表达模板严格边界;这与宿主共享类型中的可选字段并不矛盾——宿主为兼容旧技能可能更宽松,模板为防漂移要求更严。
|
||||||
|
|
||||||
|
## Action 是否必需
|
||||||
|
|
||||||
|
Action 是**可选能力**:
|
||||||
|
|
||||||
|
- 没有宿主直接操作需求的技能,**可以不提供** `actions.json`。
|
||||||
|
- 需要出现在**数据管理按钮**、**技能详情**、**定时任务**或 **Agent 直接调用**中的技能,**必须**提供 `assets/actions.json`。
|
||||||
|
- **含浏览器 RPA / 长耗时任务**的技能:**必须**提供至少一条 `executionProfile: "async"` 且 `placements` 含 `agent` 的 action(见 `POLICY-SKILL-ACTION-001`)。
|
||||||
|
|
||||||
|
## 文件位置
|
||||||
|
|
||||||
|
```text
|
||||||
|
{skill_root}/assets/actions.json
|
||||||
|
```
|
||||||
|
|
||||||
|
宿主扫描路径示例:
|
||||||
|
|
||||||
|
```text
|
||||||
|
~/.openclaw/skills/your-skill-slug/assets/actions.json
|
||||||
|
```
|
||||||
|
|
||||||
|
## 顶层结构
|
||||||
|
|
||||||
|
| 字段 | 必填 | 说明 |
|
||||||
|
|------|------|------|
|
||||||
|
| `schemaVersion` | 是 | 当前固定为 `1` |
|
||||||
|
| `skill` | 是 | 必须与 `SKILL.md` 的 `metadata.openclaw.slug` 一致 |
|
||||||
|
| `actions` | 是 | Action 数组,每项 `id` 唯一 |
|
||||||
|
|
||||||
|
模板最小示例见 [`assets/actions.json`](../assets/actions.json);JSON Schema 见 [`assets/schemas/skill-actions.schema.json`](../assets/schemas/skill-actions.schema.json)。
|
||||||
|
|
||||||
|
## 五职责正交(必读)
|
||||||
|
|
||||||
|
| 字段 / 层 | 只决定什么 | 不决定什么 |
|
||||||
|
|-----------|------------|------------|
|
||||||
|
| **`placements`** | Action **出现在哪里**(toolbar / cron / agent / skill-detail …) | 不决定 sync/async |
|
||||||
|
| **`bind.tables`** | 数据管理里出现在**哪些业务表** | 不决定业务实现 |
|
||||||
|
| **`executionProfile`** | 宿主是**同步等待**还是**异步 Job** | 不限制可展示入口 |
|
||||||
|
| **`entrypoint`** | 实际执行哪个 CLI 命令与参数 | 不写业务逻辑 |
|
||||||
|
| **domain service** | **真正完成什么业务** | 不感知 toolbar / cron / agent 来源 |
|
||||||
|
|
||||||
|
一个业务能力通常只定义**一个** Action,用 `placements` 同时挂到多个入口。不要拆成 `sync-records-toolbar` / `sync-records-cron` 等副本,除非语义确实不同;即便拆分,也必须调用同一个领域业务内核。
|
||||||
|
|
||||||
|
## Phase 1 当前稳定支持(新技能应只使用这些)
|
||||||
|
|
||||||
|
| 层级 | 稳定字段 / 能力 |
|
||||||
|
|------|----------------|
|
||||||
|
| 顶层 | `schemaVersion`、`skill`、`actions` |
|
||||||
|
| action | `id`、`label`、`description`、`placements`、`entrypoint`、**`executionProfile`(必填)**;可选 `inputSchema`、`confirmation`、**`bind`** |
|
||||||
|
| entrypoint | `type = cli`、`command`、`args`(**必填** JSON 数组,项为 `string` / `number` / `boolean`) |
|
||||||
|
| placements | `toolbar`、`skill-detail`、`agent`、`cron` |
|
||||||
|
| **bind** | `{ "tables": ["business_table"] }`(见下节) |
|
||||||
|
| inputSchema | 根 `type: object`;properties 使用 `string` / `number` / `boolean`;支持 `enum`、`default`、`required`、`sensitive` |
|
||||||
|
| confirmation | `{ "message": "..." }` |
|
||||||
|
| **executionProfile** | `"sync"` \| `"async"`(**必须显式写出**,禁止依赖缺省) |
|
||||||
|
|
||||||
|
## `bind.tables`(表级绑定)
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"bind": {
|
||||||
|
"tables": ["business_table"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
规则:
|
||||||
|
|
||||||
|
- `bind` 为 object,`additionalProperties: false`;当前只允许 `tables`。
|
||||||
|
- `tables` 非空数组、元素唯一、英文 **snake_case**、不得为空字符串。
|
||||||
|
- **`placements` 含 `toolbar` 时必须显式声明非空 `bind.tables`**(模板 Schema `if/then` + 自动测试强制)。
|
||||||
|
- 表名须真实存在于技能 SQLite 与 `_jiangchang_tables`。
|
||||||
|
- 希望出现在多张表时,显式列出所有表;**不要**依赖「无 bind 则全表展示」——那是宿主对**旧技能**的兼容,不是新技能标准。
|
||||||
|
- 本阶段**不**扩展 `selection` / `inputMapping` / `columns` / row binding / concurrency / locks。
|
||||||
|
|
||||||
|
默认模板 `actions.json` 仅含 `health` / `version` / `config-path`,不放在 toolbar,故无需 `bind` 示例污染默认 manifest。业务示例:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "sync-records",
|
||||||
|
"label": "同步记录",
|
||||||
|
"description": "从外部来源同步到技能本地数据库,不生成导出文件。",
|
||||||
|
"placements": ["toolbar", "cron", "agent", "skill-detail"],
|
||||||
|
"executionProfile": "async",
|
||||||
|
"bind": { "tables": ["business_records"] },
|
||||||
|
"entrypoint": { "type": "cli", "command": "sync-records", "args": [] }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 预留能力(当前不可当作已实现能力)
|
||||||
|
|
||||||
|
| 类别 | 预留项 | 说明 |
|
||||||
|
|------|--------|------|
|
||||||
|
| placements | `row`、`batch` | 行内 / 批量入口,未来扩展;新技能示例不得使用 |
|
||||||
|
| action 字段 | `concurrency`、`locks` | 并发与锁控制,未稳定开放 |
|
||||||
|
| inputSchema | `array`、nested `object`、`oneOf` 等 | 复杂表单,不属于当前推荐范围 |
|
||||||
|
|
||||||
|
`bind` **不是**保留字段;已作为 Phase 1 表级绑定正式能力。
|
||||||
|
|
||||||
|
## 执行模型
|
||||||
|
|
||||||
|
宿主将 action 转为 argv,再执行:
|
||||||
|
|
||||||
|
```text
|
||||||
|
python {skill_root}/scripts/main.py <command> <args...>
|
||||||
|
```
|
||||||
|
|
||||||
|
- `entrypoint.type` 当前只支持 `cli`
|
||||||
|
- `entrypoint.command` → CLI 子命令(须真实存在)
|
||||||
|
- `entrypoint.args` → 子命令参数(**必须为 JSON 数组**)
|
||||||
|
- `{{fieldName}}` → 来自 `inputSchema` 用户输入的简单模板替换
|
||||||
|
|
||||||
|
完整子命令定义见 [`scripts/cli/app.py`](../scripts/cli/app.py)。
|
||||||
|
|
||||||
|
### `executionProfile`(仅 sync / async)
|
||||||
|
|
||||||
|
模板与新技能**只允许**这两种值;禁止发明 `auto` / `background` / `deferred` 等第三种模式。
|
||||||
|
|
||||||
|
| 值 | 宿主行为 | 任务中心 |
|
||||||
|
|----|----------|----------|
|
||||||
|
| `sync` | 调用方等待结束,直接返回结构化结果或结构化错误;**不**创建后台 Job | 不进 |
|
||||||
|
| `async` | 宿主创建后台 Job,立即返回 `jobId`;用 `emit` / `checkpoint` / `finish` 报告进度与终态 | **进入** |
|
||||||
|
|
||||||
|
合法组合(全部允许):`sync|async` × `toolbar|cron|agent|skill-detail`。
|
||||||
|
|
||||||
|
经验建议(**不是** placement 硬限制):耗时不可预测、需要暂停/停止/进度展示的任务,建议用 `async`。
|
||||||
|
|
||||||
|
直接执行 CLI 时,终端自然等待进程结束;宿主通过 Action 调用同一 CLI 时,再按 `executionProfile` 决定同步等待还是建 Job。技能**不得**自行实现第二套任务中心或后台队列。
|
||||||
|
|
||||||
|
### CLI 输出契约
|
||||||
|
|
||||||
|
技能 CLI 必须:
|
||||||
|
|
||||||
|
- 使用稳定的退出码
|
||||||
|
- 成功时输出可解析的结构化结果
|
||||||
|
- 失败时输出稳定错误信息
|
||||||
|
- 对可预期错误提供稳定错误码
|
||||||
|
- 对用户可处理的问题提供 `HINT`
|
||||||
|
- 不依赖 Agent 连续对话才能完成
|
||||||
|
- 不自行实现宿主任务中心
|
||||||
|
- 不在 CLI 中硬编码宿主安装目录
|
||||||
|
- 不直接依赖某个具体 UI 页面
|
||||||
|
|
||||||
|
建议错误输出格式:
|
||||||
|
|
||||||
|
```text
|
||||||
|
ERROR:<CODE>: <message>
|
||||||
|
HINT: <next step>
|
||||||
|
```
|
||||||
|
|
||||||
|
## placements(入口位置)
|
||||||
|
|
||||||
|
| 值 | 含义 |
|
||||||
|
|----|------|
|
||||||
|
| `toolbar` | 数据管理第一排技能按钮(须配合 `bind.tables`) |
|
||||||
|
| `skill-detail` | 技能详情或技能市场详情页 |
|
||||||
|
| `agent` | Agent 可直接调用(`run_skill_action`) |
|
||||||
|
| `cron` | 定时任务可直接调用 |
|
||||||
|
|
||||||
|
**预留(模板示例请勿使用):** `row`、`batch`。
|
||||||
|
|
||||||
|
### Action 类型 × placements(常见示例,不是限制)
|
||||||
|
|
||||||
|
下表只表示**常见用法示例**。实际 `placements` 以 manifest 配置为准;**`sync` / `async` 不影响展示入口**。
|
||||||
|
|
||||||
|
| Action 类型 | 常见 executionProfile | 常见 placements | confirmation |
|
||||||
|
|-------------|----------------------|-----------------|--------------|
|
||||||
|
| health / version / config-path | sync | skill-detail, agent | 无 |
|
||||||
|
| 统计 / 只读查询 | sync | skill-detail, agent | 无 |
|
||||||
|
| 数据同步(外源 → 本地库) | sync 或 async | toolbar + cron + agent + skill-detail(按需) | 可选 |
|
||||||
|
| 导入 / 重置 | sync 或 async | skill-detail, agent | 可选 |
|
||||||
|
| 单条副作用 RPA | async(建议) | agent, skill-detail | **建议** |
|
||||||
|
| 批量顺序 pick RPA | async(建议) | toolbar, cron, agent | **建议** |
|
||||||
|
|
||||||
|
## 同步数据 vs 导出当前表 vs 特殊业务报告
|
||||||
|
|
||||||
|
不要混用「导出」一词:
|
||||||
|
|
||||||
|
| 能力 | 语义 | 谁负责 |
|
||||||
|
|------|------|--------|
|
||||||
|
| **同步数据**(sync / refresh / collect) | 外部来源 → 技能本地数据库 | 技能 Action / domain service |
|
||||||
|
| **导出当前数据表** | 技能本地数据库 → CSV/Excel 等 | 数据管理页**宿主统一导出** |
|
||||||
|
| **生成特殊业务报告** | 多表合并、特殊排版或附加计算 | 仅当系统导出无法满足时,才提供独立 `export-*` Action |
|
||||||
|
|
||||||
|
同步型 Action 默认:读外部数据、写技能自己的库、**不**生成 CSV/Excel/JSON 文件、不重复实现宿主表导出。兼容旧 export 命令若需要刷新数据,必须调用同一个 sync 业务内核。通用同步语义见 [`SCHEMA.md`](SCHEMA.md) 与 [`../development/SKILL_ACTION_RUNTIME.md`](../development/SKILL_ACTION_RUNTIME.md)。
|
||||||
|
|
||||||
|
## inputSchema 与参数表单
|
||||||
|
|
||||||
|
当前宿主稳定支持:
|
||||||
|
|
||||||
|
- `object` / `string` / `number` / `boolean`
|
||||||
|
- `enum` / `default` / `required` / `sensitive`
|
||||||
|
- 简单模板替换(`{{fieldName}}`)
|
||||||
|
|
||||||
|
示例:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"inputSchema": {
|
||||||
|
"type": "object",
|
||||||
|
"required": ["query"],
|
||||||
|
"properties": {
|
||||||
|
"query": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "查询条件"
|
||||||
|
},
|
||||||
|
"limit": {
|
||||||
|
"type": "number",
|
||||||
|
"title": "返回数量",
|
||||||
|
"default": 50
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
批量 pick 参数约定(有队列表时):
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"pickCount": {
|
||||||
|
"type": "number",
|
||||||
|
"title": "处理数量",
|
||||||
|
"description": "从队列选取 pending 记录条数",
|
||||||
|
"default": 1,
|
||||||
|
"minimum": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
约定:
|
||||||
|
|
||||||
|
- `boolean` 在宿主中渲染为开关
|
||||||
|
- `enum` 在宿主中渲染为选择框
|
||||||
|
- `required` 字段在提交前校验
|
||||||
|
- `sensitive` 字段不得出现在低信任入口
|
||||||
|
- 需要确认的副作用操作使用 `confirmation.message`
|
||||||
|
- 模板参数使用 `{{fieldName}}`,且必须在 `inputSchema.properties` 中声明
|
||||||
|
- `entrypoint.args` 项当前只允许 `string`、`number`、`boolean`;不允许对象或 `null`
|
||||||
|
- **不要**在当前模板中宣传 `nested object`、`oneOf`、复杂数组等尚未稳定支持的能力
|
||||||
|
|
||||||
|
## 风险与入口配置
|
||||||
|
|
||||||
|
- 查询、诊断、版本检查可以放到 `skill-detail` 或 `agent`
|
||||||
|
- 低风险、常用动作才考虑放 `toolbar`(须 `bind.tables`;executionProfile 按耗时自选)
|
||||||
|
- 会修改本地数据、访问外部系统、执行长时间任务的动作必须谨慎配置
|
||||||
|
- 有副作用的动作应添加 `confirmation.message`
|
||||||
|
- 高风险动作不应默认出现在 `toolbar`
|
||||||
|
- 含 `sensitive` 参数的 action 不应放入 `toolbar` 或 `cron`,除非有明确安全设计
|
||||||
|
- 不要为了「按钮多」而暴露所有 CLI 子命令
|
||||||
|
- 一个 CLI 命令可以拆成多个语义清晰的 action,但每个 action 必须有明确语义,并复用同一业务内核
|
||||||
|
- **Agent 必须用 `run_skill_action`,禁止 `exec` 直跑长任务 CLI**(见 `SKILL_ACTION_RUNTIME.md`)
|
||||||
|
- **禁止**按 `source=toolbar/cron/agent/skill-detail` 在业务代码中分叉业务行为
|
||||||
|
|
||||||
|
## 模板示例 action 一览
|
||||||
|
|
||||||
|
| id | CLI | executionProfile | placements | 说明 |
|
||||||
|
|----|-----|------------------|------------|------|
|
||||||
|
| `health` | `health` | sync | skill-detail, agent | 运行环境检查 |
|
||||||
|
| `version` | `version` | sync | skill-detail | 版本 JSON |
|
||||||
|
| `config-path` | `config-path` | sync | skill-detail | 配置路径 JSON |
|
||||||
|
|
||||||
|
业务技能复制后,按需增加例如:
|
||||||
|
|
||||||
|
| 模式 | id 示例 | executionProfile | placements | bind |
|
||||||
|
|------|---------|------------------|------------|------|
|
||||||
|
| 数据同步 | `sync-records` | async 或 sync | toolbar, cron, agent, skill-detail | 必填 tables |
|
||||||
|
| 单条 RPA | `your-run` | async(建议) | agent, skill-detail | 按需 |
|
||||||
|
| 队列 pick | `your-run-pick` | async(建议) | toolbar, cron, agent | 有 toolbar 则必填 |
|
||||||
|
| 统计 | `your-stats` | sync | skill-detail, agent | 无 |
|
||||||
|
|
||||||
|
不需要宿主入口时可删除整个 `actions.json`(无 RPA 长任务时)。
|
||||||
|
|
||||||
|
## 与宿主 API(参考)
|
||||||
|
|
||||||
|
| 宿主 API | 用途 |
|
||||||
|
|----------|------|
|
||||||
|
| `GET /api/skill-actions/{skillSlug}` | 读取 manifest |
|
||||||
|
| `POST /api/skill-actions/run` | `{ skillSlug, actionId, input?, source? }` |
|
||||||
|
| `GET /api/skill-actions/jobs` | 任务中心 |
|
||||||
|
|
||||||
|
具体路径与字段以宿主实现为准;技能侧只需保证 manifest 与 CLI 契约稳定。
|
||||||
@@ -16,8 +16,15 @@ python {baseDir}/scripts/main.py version
|
|||||||
- **`health`**:只读 runtime 诊断,**不下载、不修复 media-assets,不执行业务动作**;不输出敏感值。
|
- **`health`**:只读 runtime 诊断,**不下载、不修复 media-assets,不执行业务动作**;不输出敏感值。
|
||||||
- **`config-path`**:输出 JSON,包含 `skill`、`env_path`、`example_path`。
|
- **`config-path`**:输出 JSON,包含 `skill`、`env_path`、`example_path`。
|
||||||
- **`version`**:输出 JSON(`version`、`skill`)。
|
- **`version`**:输出 JSON(`version`、`skill`)。
|
||||||
- **`run`**:长时间无 stdout **不代表卡死**;应通过 `logs` / `log-get` 排查。
|
- **`run`**:长时间无 stdout **不代表卡死**;RPA / 外部调用期间应通过 Activity 或 Run Journal 看进度。
|
||||||
- **任务完成后**若有 video artifact,CLI 应打印录屏路径、录屏日志、视频/音频诊断(见 `task_run_support._print_video_summary`)。
|
- **排查顺序**(由快到慢):
|
||||||
|
1. `python {baseDir}/scripts/main.py logs`
|
||||||
|
2. `python {baseDir}/scripts/main.py log-get <log_id>`
|
||||||
|
3. 统一日志文件 `{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/logs/jiangchang.log`(含 `trace_id`、`task_failed` 等)
|
||||||
|
4. Run Journal `{JIANGCHANG_DATA_ROOT}/.jiangchang/runs/{job_id}.jsonl`
|
||||||
|
5. RPA artifacts / `video_log` / 失败截图(见 `development/RPA.md`);未开启录屏时可能只有截图或日志
|
||||||
|
- **录屏默认关闭**:模板 `.env.example` 为 `OPENCLAW_RECORD_VIDEO=0`;若未开启录屏,任务**可能不会**打印录屏路径。
|
||||||
|
- 需要录屏时在用户 `.env` 或进程环境变量中设置 **`OPENCLAW_RECORD_VIDEO=1`**;开启后任务完成时 CLI 应打印录屏路径、录屏日志、视频/音频诊断(见 `task_run_support._print_video_summary`),且 `result_summary` 含 video 字段。
|
||||||
|
|
||||||
## config-path(配置路径)
|
## config-path(配置路径)
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,9 @@
|
|||||||
| 根目录 [`README.md`](../README.md) | 用户市场详情页说明 |
|
| 根目录 [`README.md`](../README.md) | 用户市场详情页说明 |
|
||||||
| [`SKILL.md`](../SKILL.md) | LLM / OpenClaw 平台技能入口 |
|
| [`SKILL.md`](../SKILL.md) | LLM / OpenClaw 平台技能入口 |
|
||||||
| [`CLI.md`](CLI.md) | 命令行入口、参数与调用契约 |
|
| [`CLI.md`](CLI.md) | 命令行入口、参数与调用契约 |
|
||||||
| [`SCHEMA.md`](SCHEMA.md) | 输入输出、数据库与字段说明 |
|
| [`SCHEMA.md`](SCHEMA.md) | 本地 SQLite 与数据管理展示契约 |
|
||||||
|
| [`ACTIONS.md`](ACTIONS.md) | Skill Action manifest(**可选**能力)与宿主入口契约 |
|
||||||
|
| [`../development/SKILL_ACTION_RUNTIME.md`](../development/SKILL_ACTION_RUNTIME.md) | sync/async、任务中心、Agent 禁令、编排与队列 pick(长任务必读) |
|
||||||
| [`../development/`](../development/) | 开发、测试、技术规范(给开发者 / AI 编程代理) |
|
| [`../development/`](../development/) | 开发、测试、技术规范(给开发者 / AI 编程代理) |
|
||||||
|
|
||||||
按需阅读:编排任务时优先 `CLI.md`;解析结构化字段时读 `SCHEMA.md`;运行时环境细节见 `../development/RUNTIME.md`。
|
按需阅读:编排任务时优先 `CLI.md`;解析结构化字段时读 `SCHEMA.md`;配置宿主按钮/定时任务/Agent 入口时读 `ACTIONS.md` + `SKILL_ACTION_RUNTIME.md`;运行时环境细节见 `../development/RUNTIME.md`。
|
||||||
|
|||||||
@@ -1,38 +1,447 @@
|
|||||||
# 数据存储模板
|
# 数据存储与数据管理展示规范
|
||||||
|
|
||||||
## 数据库路径
|
本文是 skill 本地 SQLite 与匠厂宿主「数据管理」页面展示契约的**权威说明**。
|
||||||
|
实现上的 DDL 与默认中文元数据种子见 `scripts/db/display_metadata.py`;`scripts/db/connection.py` 的 `init_db()` 会一并初始化。
|
||||||
|
|
||||||
`{DATA_ROOT}/{USER_ID}/your-skill-slug/your-skill-slug.db`
|
## 职责边界
|
||||||
|
|
||||||
## 通用任务日志表(task_logs)
|
### 技能负责
|
||||||
|
|
||||||
模板默认建表:
|
- 定义真实 SQLite 表结构
|
||||||
|
- 使用英文 `snake_case` 表名和字段名
|
||||||
|
- 使用 `_jiangchang_tables` 提供表级展示元数据
|
||||||
|
- 使用 `_jiangchang_columns` 提供字段级展示元数据
|
||||||
|
- 定义哪些字段可见、可搜索、可创建、可编辑
|
||||||
|
- 定义字段展示类型和枚举选项
|
||||||
|
- 保证元数据与真实数据库结构一致
|
||||||
|
- 保证元数据初始化幂等
|
||||||
|
|
||||||
| 字段 | 类型 | 说明 |
|
### 宿主负责
|
||||||
|
|
||||||
|
- 读取 `_jiangchang_*` 元数据
|
||||||
|
- 读取 SQLite `PRAGMA table_info`
|
||||||
|
- 根据 schema 渲染数据管理页面
|
||||||
|
- 根据 `editable` 推导字段是否可创建或编辑
|
||||||
|
- 执行通用查询、新增、编辑、删除、导入、导出
|
||||||
|
- 对字段名、表名、类型和权限进行最终校验
|
||||||
|
- 不猜测技能业务含义
|
||||||
|
- 不根据具体技能名称写特殊逻辑
|
||||||
|
|
||||||
|
SQLite **没有**可靠的 `COMMENT ON TABLE/COLUMN`;SQL 文件里的 `-- 注释` 也不会成为可查询结构。
|
||||||
|
因此中文展示名称必须写入元数据表;字段顺序必须写在 `CREATE TABLE` 的列定义顺序中(`PRAGMA table_info` 的 `cid`)。
|
||||||
|
|
||||||
|
> **禁止**新技能使用宿主的旧版 `_schema_meta` 表。仅 `_jiangchang_tables` / `_jiangchang_columns` 为正式契约。
|
||||||
|
|
||||||
|
## 技能名称(SKILL.md)
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
---
|
||||||
|
name: 中文业务名称
|
||||||
|
description: 中文技能说明
|
||||||
|
metadata:
|
||||||
|
openclaw:
|
||||||
|
slug: english-kebab-slug
|
||||||
|
---
|
||||||
|
```
|
||||||
|
|
||||||
|
- `name`:用户可见的中文业务名称。
|
||||||
|
- `description`:能力说明,不是技能名称。
|
||||||
|
- `metadata.openclaw.slug`:机器标识,kebab-case 英文;目录名与默认数据库文件名使用 slug。slug 语义规范见 [`../development/NAMING.md`](../development/NAMING.md)。
|
||||||
|
- 复制模板后不得将 `your-skill-slug`、`My Skill` 等占位内容作为正式技能发布名称。
|
||||||
|
|
||||||
|
## 数据库路径与命名
|
||||||
|
|
||||||
|
```text
|
||||||
|
{JIANGCHANG_DATA_ROOT}/{JIANGCHANG_USER_ID}/{skill-slug}/{skill-slug}.db
|
||||||
|
```
|
||||||
|
|
||||||
|
- 数据库文件:英文 slug,例如 `your-skill-slug.db`(默认 `{skill-slug}.db`)。
|
||||||
|
- 业务表、字段:**英文 snake_case** 物理名,例如 `demo_items`、`task_logs`、`created_at`。
|
||||||
|
- **禁止**用中文作为 SQLite 真实表名或字段名。
|
||||||
|
|
||||||
|
## 外部来源只读与本地数据可写
|
||||||
|
|
||||||
|
某些技能会从外部系统读取数据并写入技能自己的本地数据库。需要区分:
|
||||||
|
|
||||||
|
```text
|
||||||
|
外部来源数据库:
|
||||||
|
可能只读,不应被修改
|
||||||
|
|
||||||
|
技能本地数据库:
|
||||||
|
可以根据业务语义允许新增、编辑或删除
|
||||||
|
```
|
||||||
|
|
||||||
|
不要把「外部来源只读」错误理解成「技能本地数据库一定只读」。技能通过 `_jiangchang_tables.readonly` 与 `_jiangchang_columns.editable` 声明本地表的实际写权限。
|
||||||
|
|
||||||
|
## 标准数据同步语义(外源 → 本地库)
|
||||||
|
|
||||||
|
适用于「同步 / refresh / collect」类能力。使用通用名称表述,勿把具体平台表名写进模板实现。
|
||||||
|
|
||||||
|
| 要求 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| 外部来源默认只读 | 技能不得修改外源 |
|
||||||
|
| 本地 SQLite 可事务写入 | 写入走 repository + 事务 |
|
||||||
|
| 幂等 | 同一业务键重复同步结果稳定 |
|
||||||
|
| 稳定唯一业务键 | 明确 upsert / 匹配字段 |
|
||||||
|
| 全量或增量 | 在实现与文档中显式声明 |
|
||||||
|
| 完整快照才提交 | 完整性校验通过后再 commit;调用方**必须显式提供**完整性状态(如 keyword-only 必填的 `snapshot_complete`),**禁止**默认视为完整,**禁止**靠数据条数猜测 |
|
||||||
|
| 空结果 / 读取失败保护 | 读取失败、分页不完整或不可信空结果(`snapshot_complete=False`)**不得**清库或误删;仅当完整快照**显式确认**为空(`snapshot_complete=True` 且结果为空)时,才可按全量失效策略处理旧数据 |
|
||||||
|
| 全量失效策略 | 物理删除、`removed`/`is_active` 标记、或保留历史——必须三选一并写清 |
|
||||||
|
| 部分失败 | 不得伪装成整体成功 |
|
||||||
|
| 半成品 | 事务失败不得留下可见不一致状态 |
|
||||||
|
|
||||||
|
建议统一返回统计:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"total": 100,
|
||||||
|
"inserted": 10,
|
||||||
|
"updated": 20,
|
||||||
|
"unchanged": 65,
|
||||||
|
"removed": 5
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 同步数据 vs 导出当前数据表 vs 特殊业务报告
|
||||||
|
|
||||||
|
| 能力 | 语义 | 负责方 |
|
||||||
|
|------|------|--------|
|
||||||
|
| **同步数据** | 外部来源 → 技能本地数据库 | 技能 Action / domain service |
|
||||||
|
| **导出当前数据表** | 本地库 → CSV/Excel 等 | 数据管理页**宿主统一导出** |
|
||||||
|
| **生成特殊业务报告** | 多表合并、特殊排版或附加计算 | 仅当系统导出无法满足时,才提供独立 `export-*` |
|
||||||
|
|
||||||
|
同步型 Action 默认只写库、不生成导出文件。兼容旧 export 命令需要刷新时,必须调用同一 sync 内核。可复用测试范式见 `tests/samples/test_sync_contract.py.sample`。
|
||||||
|
|
||||||
|
## 元数据表(宿主兼容)
|
||||||
|
|
||||||
|
宿主读取字段(与匠厂 `metadata-resolver` 一致):
|
||||||
|
|
||||||
|
### `_jiangchang_tables` 表级标准
|
||||||
|
|
||||||
|
| 字段 | 必填 | 说明 |
|
||||||
|------|------|------|
|
|------|------|------|
|
||||||
| `id` | INTEGER PK | 自增主键 |
|
| `table_name` | 是 | 真实英文表名 |
|
||||||
| `task_type` | TEXT NOT NULL | 任务类型(disburse / reconcile / verify ...) |
|
| `display_name` | 是 | 用户可见的中文业务名称 |
|
||||||
| `target_id` | TEXT | 任务目标(账号、平台、客户等的 ID) |
|
| `description` | 否 | 表说明 |
|
||||||
| `input_id` | TEXT | 输入对象 ID |
|
| `sort_order` | 否 | 兼容保留字段,不用于替代物理字段顺序 |
|
||||||
| `input_title` | TEXT | 输入对象标题快照 |
|
| `visible` | 是 | `1` 在宿主数据管理中展示 / `0` 隐藏 |
|
||||||
| `status` | TEXT NOT NULL | success / failed / partial / require_login 等 |
|
| `readonly` | 是 | `1` 整张表只读;`0` 允许宿主根据字段权限执行写操作 |
|
||||||
| `error_msg` | TEXT | 错误说明 |
|
|
||||||
| `result_summary` | TEXT | 结果摘要(建议存 JSON 字符串) |
|
|
||||||
| `created_at` | INTEGER | Unix 时间戳 |
|
|
||||||
| `updated_at` | INTEGER | Unix 时间戳 |
|
|
||||||
|
|
||||||
## 不同业务的字段映射建议
|
禁止:
|
||||||
|
|
||||||
| 业务场景 | task_type | target_id 含义 | input_id 含义 |
|
- 使用中文真实表名
|
||||||
|---|---|---|---|
|
- 使用 `_schema_meta` 作为新的正式契约
|
||||||
| 发布类 | publish | 账号 ID | 文章 ID |
|
- 只写英文物理名而不写中文 `display_name`
|
||||||
| 工资代发 | disburse | 付款账户 | 工资表批次 ID |
|
- 让元数据引用不存在的表
|
||||||
| 对账 | reconcile | 银行 / 平台 | 对账批次 ID |
|
|
||||||
|
### `_jiangchang_columns` 字段级标准
|
||||||
|
|
||||||
|
| 字段 | 必填 | 说明 |
|
||||||
|
|------|------|------|
|
||||||
|
| `table_name` | 是 | 所属物理表 |
|
||||||
|
| `column_name` | 是 | 真实英文字段名 |
|
||||||
|
| `display_name` | 是 | 用户可见的中文字段名 |
|
||||||
|
| `description` | 否 | 字段说明 |
|
||||||
|
| `display_order` | 否 | 兼容字段,默认保持 `NULL` |
|
||||||
|
| `visible` | 是 | 是否在数据管理表格中展示 |
|
||||||
|
| `searchable` | 是 | 是否参与搜索 |
|
||||||
|
| `editable` | 是 | `1` 业务字段允许宿主用于新增和编辑;`0` 系统/只读字段 |
|
||||||
|
| `display_type` | 否 | 字段渲染类型(如 `text`、`textarea`、`datetime_unix_seconds`) |
|
||||||
|
| `options_json` | 否 | 枚举选项 JSON |
|
||||||
|
|
||||||
|
这两张表是**数据字典**,不是业务数据;宿主不会把它们当作普通业务表展示。
|
||||||
|
|
||||||
|
## editable 与 createable 的关系
|
||||||
|
|
||||||
|
技能模板只维护 `editable` 这一份字段权限声明:
|
||||||
|
|
||||||
|
```text
|
||||||
|
skill metadata:
|
||||||
|
editable
|
||||||
|
|
||||||
|
host runtime:
|
||||||
|
createable / editable
|
||||||
|
```
|
||||||
|
|
||||||
|
宿主根据以下因素计算字段是否能够出现在新增或编辑表单中:
|
||||||
|
|
||||||
|
- 表级 `readonly`
|
||||||
|
- 字段 `editable`
|
||||||
|
- 主键
|
||||||
|
- generated 字段
|
||||||
|
- sensitive 字段
|
||||||
|
- BLOB 类型
|
||||||
|
- not-null 约束
|
||||||
|
- default value
|
||||||
|
|
||||||
|
通用规则:
|
||||||
|
|
||||||
|
```text
|
||||||
|
新增表单:
|
||||||
|
editable = 1
|
||||||
|
且不是主键
|
||||||
|
且不是 generated
|
||||||
|
且不是敏感字段
|
||||||
|
且不是 BLOB
|
||||||
|
|
||||||
|
编辑表单:
|
||||||
|
editable = 1
|
||||||
|
且不是主键
|
||||||
|
且不是 generated
|
||||||
|
且不是敏感字段
|
||||||
|
且不是 BLOB
|
||||||
|
```
|
||||||
|
|
||||||
|
若一张表:
|
||||||
|
|
||||||
|
```text
|
||||||
|
readonly = 0
|
||||||
|
但所有字段 editable = 0
|
||||||
|
```
|
||||||
|
|
||||||
|
则:
|
||||||
|
|
||||||
|
- 这张表技术上可写,但不适合手工新增或编辑
|
||||||
|
- 宿主不应打开空白新增表单
|
||||||
|
- 技能应通过自身业务流程产生数据
|
||||||
|
- 这不是宿主猜测业务,而是技能通过元数据声明的结果
|
||||||
|
|
||||||
|
## 系统字段标准
|
||||||
|
|
||||||
|
通常保持 `editable = 0` 的字段类型包括:
|
||||||
|
|
||||||
|
- 自增主键
|
||||||
|
- generated 字段
|
||||||
|
- `created_at` / `updated_at`
|
||||||
|
- 同步时间戳
|
||||||
|
- 内容哈希
|
||||||
|
- 计算结果
|
||||||
|
- 内部状态
|
||||||
|
- 删除标记
|
||||||
|
- 审计字段
|
||||||
|
- 敏感凭据或密钥字段
|
||||||
|
|
||||||
|
不要把具体业务字段名写死;按字段类型和职责设置 `editable`。
|
||||||
|
|
||||||
|
## 表结构标准
|
||||||
|
|
||||||
|
- 业务表和字段使用英文 `snake_case`
|
||||||
|
- 可写表优先使用单字段主键
|
||||||
|
- 自增主键优先放在 `CREATE TABLE` 第一列
|
||||||
|
- `created_at` 和 `updated_at` 放在业务字段末尾
|
||||||
|
- 字段展示顺序以 `CREATE TABLE` 和 `PRAGMA table_info(cid)` 为准
|
||||||
|
- 不依赖 `display_order` 重新排列字段
|
||||||
|
- 不要让宿主通过英文字段名推断展示顺序
|
||||||
|
- 复杂字段需要通过 `display_type` 或 `visible` 明确处理
|
||||||
|
|
||||||
|
推荐顺序(可按业务裁剪,但已有字段应遵守相对位置):
|
||||||
|
|
||||||
|
```text
|
||||||
|
1. 主键 id
|
||||||
|
2. 关联标识与核心业务字段
|
||||||
|
3. 普通业务字段
|
||||||
|
4. 状态、结果、错误等辅助字段
|
||||||
|
5. created_at(如有)
|
||||||
|
6. updated_at(如有)
|
||||||
|
```
|
||||||
|
|
||||||
|
## 标准时间字段(新技能统一规范)
|
||||||
|
|
||||||
|
新技能业务表若需要时间审计字段,**统一**采用 Unix **秒级**时间戳,不要使用毫秒时间戳、ISO 字符串或 SQLite 文本 datetime。
|
||||||
|
|
||||||
|
| 项目 | 规范 |
|
||||||
|
|------|------|
|
||||||
|
| 物理字段 | `created_at INTEGER`、`updated_at INTEGER` |
|
||||||
|
| 存储格式 | Unix 秒级整数 |
|
||||||
|
| 展示元数据 `display_type` | `datetime_unix_seconds` |
|
||||||
|
| 中文名 | `created_at` → **创建时间**;`updated_at` → **更新时间** |
|
||||||
|
| 用户编辑 | `editable = 0`(系统字段,宿主只展示格式化结果) |
|
||||||
|
| 字段顺序 | 位于业务字段末尾:`… → created_at → updated_at` |
|
||||||
|
| 排序 | **不使用** `display_order`;顺序仅来自 `PRAGMA table_info` |
|
||||||
|
|
||||||
|
### 自动生成与维护
|
||||||
|
|
||||||
|
- **created_at**:`INTEGER NOT NULL DEFAULT (unixepoch())`;插入时可省略,由数据库生成。
|
||||||
|
- **updated_at**:`INTEGER NOT NULL DEFAULT (unixepoch())`;插入时同样可省略。
|
||||||
|
- **updated_at 更新**:模板默认表 `task_logs` 通过 SQLite trigger `{table}_set_updated_at` 在业务字段更新后自动刷新。
|
||||||
|
|
||||||
|
实现参考:
|
||||||
|
|
||||||
|
- DDL 与 trigger:`scripts/db/connection.py`、`scripts/db/timestamp_columns.py`
|
||||||
|
- 中文元数据种子:`scripts/db/display_metadata.py`
|
||||||
|
- 自检:`scripts/db/display_metadata_validator.py`
|
||||||
|
|
||||||
|
宿主只负责把 `display_type = datetime_unix_seconds` 格式化为 `YYYY-MM-DD HH:mm:ss` 展示,**不修改**数据库原始值。
|
||||||
|
|
||||||
|
### 模板默认:`task_logs`
|
||||||
|
|
||||||
|
`task_logs` 是技能内部**系统自动写入**的任务审计日志(由 `task_logs_repository` INSERT/UPDATE),不是供用户在宿主数据管理中手工维护的业务表。
|
||||||
|
|
||||||
|
权限设计:
|
||||||
|
|
||||||
|
| 层级 | 值 | 说明 |
|
||||||
|
|------|-----|------|
|
||||||
|
| 表级 `readonly` | `1` | 宿主数据管理只读展示,不提供新增/编辑/删除表单 |
|
||||||
|
| 所有业务字段 `editable` | `0` | 含 `task_type`、`status`、`error_msg`、`result_summary` 等 |
|
||||||
|
| 技能内部 repository | 正常 INSERT/UPDATE | 元数据权限只约束宿主 UI,不限制技能代码写库 |
|
||||||
|
|
||||||
|
物理定义(权威顺序):
|
||||||
|
|
||||||
|
```sql
|
||||||
|
CREATE TABLE IF NOT EXISTS task_logs (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
task_type TEXT NOT NULL,
|
||||||
|
target_id TEXT,
|
||||||
|
input_id TEXT,
|
||||||
|
input_title TEXT,
|
||||||
|
status TEXT NOT NULL,
|
||||||
|
error_msg TEXT,
|
||||||
|
result_summary TEXT,
|
||||||
|
created_at INTEGER NOT NULL DEFAULT (unixepoch()),
|
||||||
|
updated_at INTEGER NOT NULL DEFAULT (unixepoch())
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
对应中文展示(由 `init_db()` 写入元数据表):
|
||||||
|
|
||||||
|
| 物理字段 | 中文名 | editable |
|
||||||
|
|----------|--------|----------|
|
||||||
|
| id | 编号 | 0 |
|
||||||
|
| task_type | 任务类型 | 0 |
|
||||||
|
| target_id | 目标编号 | 0 |
|
||||||
|
| input_id | 输入编号 | 0 |
|
||||||
|
| input_title | 输入标题 | 0 |
|
||||||
|
| status | 状态 | 0 |
|
||||||
|
| error_msg | 错误信息 | 0 |
|
||||||
|
| result_summary | 结果摘要 | 0 |
|
||||||
|
| created_at | 创建时间 | 0 |
|
||||||
|
| updated_at | 更新时间 | 0 |
|
||||||
|
|
||||||
|
表中文名:**任务日志**;表级 `readonly = 1`(宿主只读;技能 repository 仍可写入)。
|
||||||
|
|
||||||
|
### 通用示例:`demo_items`(测试 fixture 参考)
|
||||||
|
|
||||||
|
以下表结构用于模板测试演示数据管理契约,**不是**模板默认业务表:
|
||||||
|
|
||||||
|
```sql
|
||||||
|
CREATE TABLE demo_items (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
title TEXT NOT NULL,
|
||||||
|
description TEXT,
|
||||||
|
status TEXT NOT NULL DEFAULT 'draft',
|
||||||
|
generated_value TEXT,
|
||||||
|
created_at INTEGER NOT NULL DEFAULT (unixepoch()),
|
||||||
|
updated_at INTEGER NOT NULL DEFAULT (unixepoch())
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
对应元数据要点:
|
||||||
|
|
||||||
|
| 物理字段 | editable | 说明 |
|
||||||
|
|----------|----------|------|
|
||||||
|
| id | 0 | 自增主键 |
|
||||||
|
| title | 1 | 业务字段 |
|
||||||
|
| description | 1 | 业务字段 |
|
||||||
|
| status | 1 | 枚举,`options_json` 演示 |
|
||||||
|
| generated_value | 0 | 系统/计算字段 |
|
||||||
|
| created_at | 0 | 系统时间 |
|
||||||
|
| updated_at | 0 | 系统时间 |
|
||||||
|
|
||||||
|
## 枚举字段 options_json
|
||||||
|
|
||||||
|
`options_json` 为 JSON 数组,每项包含 `value` 与 `label`:
|
||||||
|
|
||||||
|
```json
|
||||||
|
[
|
||||||
|
{"value": "draft", "label": "草稿"},
|
||||||
|
{"value": "published", "label": "已发布"},
|
||||||
|
{"value": "archived", "label": "已归档"}
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
宿主据此渲染选择框;技能侧负责保证 JSON 合法且与物理字段取值一致。
|
||||||
|
|
||||||
|
## 幂等初始化标准
|
||||||
|
|
||||||
|
- `_jiangchang_tables` 和 `_jiangchang_columns` 必须通过 upsert 初始化
|
||||||
|
- 多次执行初始化不能重复记录
|
||||||
|
- 重新初始化可以更新展示名、描述、`visible`、`searchable`、`editable`、`display_type`、`options_json`
|
||||||
|
- 元数据不能残留旧字段(删除或重命名字段时必须同步清理)
|
||||||
|
- 元数据不能引用不存在的表或字段
|
||||||
|
- 新增字段或表时必须同步增加元数据
|
||||||
|
- 不要直接修改用户真实数据库作为迁移方式
|
||||||
|
|
||||||
|
实现 helper:
|
||||||
|
|
||||||
|
- `upsert_table_metadata` / `upsert_column_metadata` — 幂等写入
|
||||||
|
- `seed_column_metadata_batch` — 批量 upsert;**可选**传入 `valid_column_names` 时在 upsert 后自动 prune
|
||||||
|
- `prune_stale_column_metadata` — 清理已删除物理字段的元数据
|
||||||
|
|
||||||
|
### 新增业务表时如何初始化
|
||||||
|
|
||||||
|
1. 在 `connection.py`(或迁移脚本)中 `CREATE TABLE` 真实物理表。
|
||||||
|
2. 用 `PRAGMA table_info` 或 `list_physical_column_names` 取得**真实物理字段列表**(顺序以 `cid` 为准)。
|
||||||
|
3. 调用 `upsert_table_metadata` 写入表级元数据。
|
||||||
|
4. 调用 `seed_column_metadata_batch`,并传入 `valid_column_names=physical_column_names`:
|
||||||
|
|
||||||
|
```python
|
||||||
|
from db.display_metadata import list_physical_column_names, seed_column_metadata_batch, upsert_table_metadata
|
||||||
|
|
||||||
|
physical = list_physical_column_names(cursor, "demo_items")
|
||||||
|
upsert_table_metadata(cursor, table_name="demo_items", display_name="示例记录", readonly=0)
|
||||||
|
seed_column_metadata_batch(
|
||||||
|
cursor,
|
||||||
|
table_name="demo_items",
|
||||||
|
columns=DEMO_ITEMS_COLUMN_METADATA,
|
||||||
|
valid_column_names=physical,
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
传入 `valid_column_names` 时:先 upsert,再删除不在物理表中的陈旧 `_jiangchang_columns` 行。
|
||||||
|
|
||||||
|
### 字段删除或重命名时如何清理
|
||||||
|
|
||||||
|
1. 在 DDL / 迁移中完成物理字段删除或重命名。
|
||||||
|
2. 重新执行 `seed_column_metadata_batch(..., valid_column_names=当前物理字段列表)`,自动 prune 旧字段元数据。
|
||||||
|
3. 或单独调用 `prune_stale_column_metadata(cursor, table_name, valid_column_names)`。
|
||||||
|
|
||||||
|
**不传入 `valid_column_names` 时不会自动 prune**——模板不会猜测真实物理字段,避免误删;文档与实现均以此为准。
|
||||||
|
|
||||||
|
不要直接修改用户真实数据库作为迁移方式;元数据初始化必须使用真实物理字段列表。
|
||||||
|
|
||||||
|
## 中文命名质量
|
||||||
|
|
||||||
|
- 使用普通用户能理解的业务用语:`task_logs` → **任务日志**,`error_msg` → **错误信息**。
|
||||||
|
- 禁止:`Task Logs`、`input编号`、`errormsg`、直接把物理名当 `display_name`。
|
||||||
|
- 不宜向用户暴露的实现细节(如 `payload_json`、`selector`)应设 `visible = 0` 或给出可理解中文名。
|
||||||
|
|
||||||
|
## 元数据同步规则
|
||||||
|
|
||||||
|
1. 新增用户可见业务表 → 同步 `_jiangchang_tables`。
|
||||||
|
2. 新增用户可见字段 → 同步 `_jiangchang_columns`。
|
||||||
|
3. 删除/重命名表或字段 → 同步清理或迁移元数据。
|
||||||
|
4. 初始化脚本必须幂等。
|
||||||
|
5. 元数据中的表、字段必须在库中真实存在;可见项不得缺少中文 `display_name`。
|
||||||
|
|
||||||
|
## 不同业务的 `task_logs` 映射
|
||||||
|
|
||||||
|
| 业务场景 | task_type | target_id | input_id |
|
||||||
|
|----------|-----------|-----------|----------|
|
||||||
|
| 发布类 | publish | 账号 ID | 内容 ID |
|
||||||
|
| 工资代发 | disburse | 付款账户 | 批次 ID |
|
||||||
|
| 对账 | reconcile | 平台标识 | 对账批次 ID |
|
||||||
| 发票验真 | verify | 税务地区 | 发票批次 ID |
|
| 发票验真 | verify | 税务地区 | 发票批次 ID |
|
||||||
| 报关 | declare | 港口 / 海关 | 报关批次 ID |
|
|
||||||
|
业务特有字段优先放入 `result_summary`(JSON 字符串),避免随意加列;若确需新列,必须同步元数据并保持合理物理顺序。
|
||||||
|
|
||||||
|
## 开发自检
|
||||||
|
|
||||||
|
- `init_db()` 后运行 `tests/test_display_metadata.py` 与 `tests/test_data_management_contract.py`。
|
||||||
|
- 若提供宿主 Action 入口,运行 `tests/test_actions_manifest.py`。
|
||||||
|
- 复制为真实技能后,使用 `scripts/db/display_metadata_validator.py` 中的校验函数检查 SKILL 名称、slug 与元数据完整性。
|
||||||
|
|
||||||
## 模板原则
|
## 模板原则
|
||||||
|
|
||||||
- 模板不做历史迁移兼容设计
|
- 模板不做复杂历史迁移框架;新 skill 从当前 schema 起步。
|
||||||
- 新 skill 直接从当前 schema 起步
|
- 元数据 DDL 与 `task_logs` 中文种子以 `scripts/db/display_metadata.py` 为单一权威来源。
|
||||||
- 业务有特殊字段时,建议放 `result_summary`(JSON 字符串),不要乱加列
|
- 模板定义「如何声明能力」;具体技能定义「声明什么业务能力」;宿主负责「如何通用渲染和执行」。
|
||||||
|
|||||||
36
release.ps1
36
release.ps1
@@ -8,6 +8,10 @@
|
|||||||
(.github/workflows/release_skill.yaml → reusable-release-skill.yaml@main).
|
(.github/workflows/release_skill.yaml → reusable-release-skill.yaml@main).
|
||||||
|
|
||||||
Requires: git, PowerShell 5+
|
Requires: git, PowerShell 5+
|
||||||
|
|
||||||
|
After fetch, runs default tests against the current working tree (before auto-commit):
|
||||||
|
python tests/run_tests.py -v
|
||||||
|
Use -SkipTests only for emergency diagnostics. -DryRun still runs tests.
|
||||||
#>
|
#>
|
||||||
|
|
||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
@@ -17,7 +21,8 @@ param(
|
|||||||
[switch]$AutoCommit,
|
[switch]$AutoCommit,
|
||||||
[switch]$RequireClean,
|
[switch]$RequireClean,
|
||||||
[string]$CommitMessage,
|
[string]$CommitMessage,
|
||||||
[switch]$DryRun
|
[switch]$DryRun,
|
||||||
|
[switch]$SkipTests
|
||||||
)
|
)
|
||||||
|
|
||||||
Set-StrictMode -Version Latest
|
Set-StrictMode -Version Latest
|
||||||
@@ -140,6 +145,29 @@ function Assert-SkillReleasePackagingSources {
|
|||||||
Write-Host "Packaging check: $($pyFiles.Count) Python file(s) under scripts/ (CI will obfuscate all recursively)." -ForegroundColor DarkGray
|
Write-Host "Packaging check: $($pyFiles.Count) Python file(s) under scripts/ (CI will obfuscate all recursively)." -ForegroundColor DarkGray
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function Invoke-DefaultTests {
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory = $true)][string]$SkillRoot,
|
||||||
|
[switch]$Skip
|
||||||
|
)
|
||||||
|
|
||||||
|
if ($Skip) {
|
||||||
|
Write-Host "WARNING: Skipping tests before release. This should only be used for emergency diagnostics." -ForegroundColor Yellow
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
$runTests = Join-Path $SkillRoot "tests\run_tests.py"
|
||||||
|
if (-not (Test-Path -LiteralPath $runTests)) {
|
||||||
|
throw "Release check failed: tests/run_tests.py not found."
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Host ">> python tests/run_tests.py -v" -ForegroundColor DarkGray
|
||||||
|
& python $runTests -v
|
||||||
|
if ($LASTEXITCODE -ne 0) {
|
||||||
|
throw "Release aborted: default tests failed (python tests/run_tests.py -v)."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function Ensure-CleanOrAutoCommit {
|
function Ensure-CleanOrAutoCommit {
|
||||||
param(
|
param(
|
||||||
[switch]$DoAutoCommit,
|
[switch]$DoAutoCommit,
|
||||||
@@ -198,13 +226,15 @@ try {
|
|||||||
Invoke-Git "fetch --tags --prune origin"
|
Invoke-Git "fetch --tags --prune origin"
|
||||||
}
|
}
|
||||||
|
|
||||||
Ensure-CleanOrAutoCommit -DoAutoCommit:$AutoCommit -NeedClean:$RequireClean -IsDryRun:$DryRun -Msg $CommitMessage
|
|
||||||
|
|
||||||
$skillRoot = (Get-GitOutput "rev-parse --show-toplevel" | Select-Object -First 1).Trim()
|
$skillRoot = (Get-GitOutput "rev-parse --show-toplevel" | Select-Object -First 1).Trim()
|
||||||
if (Test-Path -LiteralPath (Join-Path $skillRoot "SKILL.md")) {
|
if (Test-Path -LiteralPath (Join-Path $skillRoot "SKILL.md")) {
|
||||||
Assert-SkillReleasePackagingSources -SkillRoot $skillRoot
|
Assert-SkillReleasePackagingSources -SkillRoot $skillRoot
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Invoke-DefaultTests -SkillRoot $skillRoot -Skip:$SkipTests
|
||||||
|
|
||||||
|
Ensure-CleanOrAutoCommit -DoAutoCommit:$AutoCommit -NeedClean:$RequireClean -IsDryRun:$DryRun -Msg $CommitMessage
|
||||||
|
|
||||||
$null = Remove-GitNoise -Lines @(& cmd /c 'git rev-parse --abbrev-ref --symbolic-full-name "@{u}" 2>&1')
|
$null = Remove-GitNoise -Lines @(& cmd /c 'git rev-parse --abbrev-ref --symbolic-full-name "@{u}" 2>&1')
|
||||||
$hasUpstream = ($LASTEXITCODE -eq 0)
|
$hasUpstream = ($LASTEXITCODE -eq 0)
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
"""CLI:argparse 与分发模板。"""
|
"""CLI:argparse 与分发模板。
|
||||||
|
|
||||||
|
只负责参数解析并转交 service;业务内核在 domain / task_service,勿在此按入口复制逻辑。
|
||||||
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
|
||||||
|
from db.display_metadata import init_display_metadata
|
||||||
|
from db.timestamp_columns import init_task_logs_timestamp_maintenance
|
||||||
from util.runtime_paths import get_db_path
|
from util.runtime_paths import get_db_path
|
||||||
|
|
||||||
|
|
||||||
@@ -26,11 +28,13 @@ def init_db() -> None:
|
|||||||
status TEXT NOT NULL,
|
status TEXT NOT NULL,
|
||||||
error_msg TEXT,
|
error_msg TEXT,
|
||||||
result_summary TEXT,
|
result_summary TEXT,
|
||||||
created_at INTEGER NOT NULL,
|
created_at INTEGER NOT NULL DEFAULT (unixepoch()),
|
||||||
updated_at INTEGER NOT NULL
|
updated_at INTEGER NOT NULL DEFAULT (unixepoch())
|
||||||
)
|
)
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
init_task_logs_timestamp_maintenance(cur)
|
||||||
|
init_display_metadata(cur)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
finally:
|
finally:
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|||||||
283
scripts/db/display_metadata.py
Normal file
283
scripts/db/display_metadata.py
Normal file
@@ -0,0 +1,283 @@
|
|||||||
|
"""匠厂数据管理展示元数据(_jiangchang_tables / _jiangchang_columns)。
|
||||||
|
|
||||||
|
SQLite 无原生表/字段 COMMENT;中文展示名称通过这两张元数据表提供给宿主「数据管理」页面。
|
||||||
|
字段在界面上的顺序由 CREATE TABLE / PRAGMA table_info(cid) 决定,**不**使用 display_order 排序。
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Iterable
|
||||||
|
|
||||||
|
# 宿主会隐藏这些表,不作为业务表展示(见 jiangchang electron/data-management/types.ts)
|
||||||
|
INTERNAL_METADATA_TABLES = frozenset({"_jiangchang_tables", "_jiangchang_columns"})
|
||||||
|
LEGACY_METADATA_TABLES = frozenset({"_schema_meta"})
|
||||||
|
METADATA_TABLES = INTERNAL_METADATA_TABLES | LEGACY_METADATA_TABLES
|
||||||
|
|
||||||
|
TASK_LOGS_TABLE = "task_logs"
|
||||||
|
DATETIME_UNIX_SECONDS = "datetime_unix_seconds"
|
||||||
|
STANDARD_TIMESTAMP_COLUMNS = frozenset({"created_at", "updated_at"})
|
||||||
|
|
||||||
|
_JIANGCHANG_TABLES_DDL = """
|
||||||
|
CREATE TABLE IF NOT EXISTS _jiangchang_tables (
|
||||||
|
table_name TEXT PRIMARY KEY,
|
||||||
|
display_name TEXT NOT NULL,
|
||||||
|
description TEXT,
|
||||||
|
sort_order INTEGER,
|
||||||
|
visible INTEGER NOT NULL DEFAULT 1,
|
||||||
|
readonly INTEGER NOT NULL DEFAULT 0
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
|
||||||
|
_JIANGCHANG_COLUMNS_DDL = """
|
||||||
|
CREATE TABLE IF NOT EXISTS _jiangchang_columns (
|
||||||
|
table_name TEXT NOT NULL,
|
||||||
|
column_name TEXT NOT NULL,
|
||||||
|
display_name TEXT NOT NULL,
|
||||||
|
description TEXT,
|
||||||
|
display_order INTEGER,
|
||||||
|
visible INTEGER NOT NULL DEFAULT 1,
|
||||||
|
searchable INTEGER NOT NULL DEFAULT 1,
|
||||||
|
editable INTEGER NOT NULL DEFAULT 1,
|
||||||
|
display_type TEXT,
|
||||||
|
options_json TEXT,
|
||||||
|
PRIMARY KEY (table_name, column_name)
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
|
||||||
|
TASK_LOGS_TABLE_METADATA = {
|
||||||
|
"table_name": TASK_LOGS_TABLE,
|
||||||
|
"display_name": "任务日志",
|
||||||
|
"description": "记录技能任务的执行状态和结果(系统自动写入,宿主数据管理只读展示)",
|
||||||
|
"visible": 1,
|
||||||
|
"readonly": 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
TASK_LOGS_COLUMN_METADATA: tuple[dict[str, object], ...] = (
|
||||||
|
{"column_name": "id", "display_name": "编号", "description": "任务日志唯一编号", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{"column_name": "task_type", "display_name": "任务类型", "description": "任务的业务类型", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{"column_name": "target_id", "display_name": "目标编号", "description": "任务目标对象编号", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{"column_name": "input_id", "display_name": "输入编号", "description": "输入对象编号", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{"column_name": "input_title", "display_name": "输入标题", "description": "输入对象标题", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{"column_name": "status", "display_name": "状态", "description": "任务当前状态", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{"column_name": "error_msg", "display_name": "错误信息", "description": "任务失败时的错误说明", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{"column_name": "result_summary", "display_name": "结果摘要", "description": "任务执行结果摘要", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{
|
||||||
|
"column_name": "created_at",
|
||||||
|
"display_name": "创建时间",
|
||||||
|
"description": "记录创建时间(Unix 秒级时间戳,数据库自动生成)",
|
||||||
|
"visible": 1,
|
||||||
|
"searchable": 0,
|
||||||
|
"editable": 0,
|
||||||
|
"display_type": DATETIME_UNIX_SECONDS,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"column_name": "updated_at",
|
||||||
|
"display_name": "更新时间",
|
||||||
|
"description": "记录最后更新时间(Unix 秒级时间戳,自动维护)",
|
||||||
|
"visible": 1,
|
||||||
|
"searchable": 0,
|
||||||
|
"editable": 0,
|
||||||
|
"display_type": DATETIME_UNIX_SECONDS,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def init_display_metadata_tables(cursor) -> None:
|
||||||
|
cursor.execute(_JIANGCHANG_TABLES_DDL)
|
||||||
|
cursor.execute(_JIANGCHANG_COLUMNS_DDL)
|
||||||
|
|
||||||
|
|
||||||
|
def upsert_table_metadata(cursor, *, table_name: str, display_name: str, description: str | None = None, visible: int = 1, readonly: int = 0) -> None:
|
||||||
|
cursor.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_tables (table_name, display_name, description, visible, readonly)
|
||||||
|
VALUES (?, ?, ?, ?, ?)
|
||||||
|
ON CONFLICT(table_name) DO UPDATE SET
|
||||||
|
display_name = excluded.display_name,
|
||||||
|
description = excluded.description,
|
||||||
|
visible = excluded.visible,
|
||||||
|
readonly = excluded.readonly
|
||||||
|
""",
|
||||||
|
(table_name, display_name, description, visible, readonly),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def upsert_column_metadata(
|
||||||
|
cursor,
|
||||||
|
*,
|
||||||
|
table_name: str,
|
||||||
|
column_name: str,
|
||||||
|
display_name: str,
|
||||||
|
description: str | None = None,
|
||||||
|
visible: int = 1,
|
||||||
|
searchable: int = 1,
|
||||||
|
editable: int = 1,
|
||||||
|
display_type: str | None = None,
|
||||||
|
options_json: str | None = None,
|
||||||
|
) -> None:
|
||||||
|
# display_order 保留为 NULL:宿主按 PRAGMA table_info cid 展示字段,不读 display_order。
|
||||||
|
cursor.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_columns (
|
||||||
|
table_name, column_name, display_name, description,
|
||||||
|
display_order, visible, searchable, editable, display_type, options_json
|
||||||
|
)
|
||||||
|
VALUES (?, ?, ?, ?, NULL, ?, ?, ?, ?, ?)
|
||||||
|
ON CONFLICT(table_name, column_name) DO UPDATE SET
|
||||||
|
display_name = excluded.display_name,
|
||||||
|
description = excluded.description,
|
||||||
|
display_order = NULL,
|
||||||
|
visible = excluded.visible,
|
||||||
|
searchable = excluded.searchable,
|
||||||
|
editable = excluded.editable,
|
||||||
|
display_type = excluded.display_type,
|
||||||
|
options_json = excluded.options_json
|
||||||
|
""",
|
||||||
|
(
|
||||||
|
table_name,
|
||||||
|
column_name,
|
||||||
|
display_name,
|
||||||
|
description,
|
||||||
|
visible,
|
||||||
|
searchable,
|
||||||
|
editable,
|
||||||
|
display_type,
|
||||||
|
options_json,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def seed_task_logs_display_metadata(cursor) -> None:
|
||||||
|
meta = TASK_LOGS_TABLE_METADATA
|
||||||
|
upsert_table_metadata(
|
||||||
|
cursor,
|
||||||
|
table_name=str(meta["table_name"]),
|
||||||
|
display_name=str(meta["display_name"]),
|
||||||
|
description=str(meta["description"]) if meta.get("description") else None,
|
||||||
|
visible=int(meta["visible"]),
|
||||||
|
readonly=int(meta["readonly"]),
|
||||||
|
)
|
||||||
|
seed_column_metadata_batch(
|
||||||
|
cursor,
|
||||||
|
table_name=TASK_LOGS_TABLE,
|
||||||
|
columns=TASK_LOGS_COLUMN_METADATA,
|
||||||
|
valid_column_names=[str(column["column_name"]) for column in TASK_LOGS_COLUMN_METADATA],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def seed_column_metadata_batch(
|
||||||
|
cursor,
|
||||||
|
*,
|
||||||
|
table_name: str,
|
||||||
|
columns: Iterable[dict[str, object]],
|
||||||
|
valid_column_names: Iterable[str] | None = None,
|
||||||
|
) -> None:
|
||||||
|
"""批量 upsert 字段元数据;传入 valid_column_names 时会在 upsert 后清理陈旧字段元数据。"""
|
||||||
|
for column in columns:
|
||||||
|
upsert_column_metadata(
|
||||||
|
cursor,
|
||||||
|
table_name=table_name,
|
||||||
|
column_name=str(column["column_name"]),
|
||||||
|
display_name=str(column["display_name"]),
|
||||||
|
description=str(column["description"]) if column.get("description") else None,
|
||||||
|
visible=int(column.get("visible", 1)),
|
||||||
|
searchable=int(column.get("searchable", 1)),
|
||||||
|
editable=int(column.get("editable", 1)),
|
||||||
|
display_type=str(column["display_type"]) if column.get("display_type") else None,
|
||||||
|
options_json=str(column["options_json"]) if column.get("options_json") else None,
|
||||||
|
)
|
||||||
|
if valid_column_names is not None:
|
||||||
|
prune_stale_column_metadata(cursor, table_name, valid_column_names)
|
||||||
|
|
||||||
|
|
||||||
|
def prune_stale_column_metadata(cursor, table_name: str, valid_column_names: Iterable[str]) -> None:
|
||||||
|
"""删除表中已不存在物理字段的元数据行(幂等初始化后不得残留旧字段)。"""
|
||||||
|
valid = set(valid_column_names)
|
||||||
|
cursor.execute(
|
||||||
|
"SELECT column_name FROM _jiangchang_columns WHERE table_name = ?",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
for (column_name,) in cursor.fetchall():
|
||||||
|
if str(column_name) not in valid:
|
||||||
|
cursor.execute(
|
||||||
|
"DELETE FROM _jiangchang_columns WHERE table_name = ? AND column_name = ?",
|
||||||
|
(table_name, column_name),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_table_readonly(cursor, table_name: str) -> int | None:
|
||||||
|
cursor.execute(
|
||||||
|
"SELECT readonly FROM _jiangchang_tables WHERE table_name = ?",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
if not row:
|
||||||
|
return None
|
||||||
|
return int(row[0] or 0)
|
||||||
|
|
||||||
|
|
||||||
|
def get_column_editable(cursor, table_name: str, column_name: str) -> int | None:
|
||||||
|
cursor.execute(
|
||||||
|
"""
|
||||||
|
SELECT editable FROM _jiangchang_columns
|
||||||
|
WHERE table_name = ? AND column_name = ?
|
||||||
|
""",
|
||||||
|
(table_name, column_name),
|
||||||
|
)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
if not row:
|
||||||
|
return None
|
||||||
|
return int(row[0] or 0)
|
||||||
|
|
||||||
|
|
||||||
|
def list_editable_business_columns(cursor, table_name: str) -> list[str]:
|
||||||
|
"""返回 editable=1 的业务字段名(不含宿主侧主键/generated 等二次过滤)。"""
|
||||||
|
physical = list_physical_column_names(cursor, table_name)
|
||||||
|
cursor.execute(
|
||||||
|
"""
|
||||||
|
SELECT column_name, editable
|
||||||
|
FROM _jiangchang_columns
|
||||||
|
WHERE table_name = ?
|
||||||
|
""",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
editable_set = {
|
||||||
|
str(column_name)
|
||||||
|
for column_name, editable in cursor.fetchall()
|
||||||
|
if editable is not None and int(editable) == 1
|
||||||
|
}
|
||||||
|
return [name for name in physical if name in editable_set]
|
||||||
|
|
||||||
|
|
||||||
|
def table_allows_manual_create(cursor, table_name: str) -> bool:
|
||||||
|
"""表级 readonly=0 且至少有一个 editable=1 字段时,宿主才应提供空白新增表单。"""
|
||||||
|
readonly = get_table_readonly(cursor, table_name)
|
||||||
|
if readonly is None or int(readonly) != 0:
|
||||||
|
return False
|
||||||
|
return bool(list_editable_business_columns(cursor, table_name))
|
||||||
|
|
||||||
|
|
||||||
|
def init_display_metadata(cursor) -> None:
|
||||||
|
init_display_metadata_tables(cursor)
|
||||||
|
seed_task_logs_display_metadata(cursor)
|
||||||
|
|
||||||
|
|
||||||
|
def iter_user_tables(cursor) -> Iterable[str]:
|
||||||
|
cursor.execute(
|
||||||
|
"SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name"
|
||||||
|
)
|
||||||
|
for (name,) in cursor.fetchall():
|
||||||
|
if name in METADATA_TABLES:
|
||||||
|
continue
|
||||||
|
yield str(name)
|
||||||
|
|
||||||
|
|
||||||
|
def _quote_identifier(name: str) -> str:
|
||||||
|
return '"' + name.replace('"', '""') + '"'
|
||||||
|
|
||||||
|
|
||||||
|
def list_physical_column_names(cursor, table_name: str) -> list[str]:
|
||||||
|
cursor.execute(f"PRAGMA table_info({_quote_identifier(table_name)})")
|
||||||
|
rows = cursor.fetchall()
|
||||||
|
rows.sort(key=lambda row: int(row[0]))
|
||||||
|
return [str(row[1]) for row in rows]
|
||||||
510
scripts/db/display_metadata_validator.py
Normal file
510
scripts/db/display_metadata_validator.py
Normal file
@@ -0,0 +1,510 @@
|
|||||||
|
"""数据管理展示元数据校验(模板开发自检,不依赖宿主)。"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import sqlite3
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
|
||||||
|
from db.display_metadata import (
|
||||||
|
DATETIME_UNIX_SECONDS,
|
||||||
|
METADATA_TABLES,
|
||||||
|
STANDARD_TIMESTAMP_COLUMNS,
|
||||||
|
TASK_LOGS_COLUMN_METADATA,
|
||||||
|
TASK_LOGS_TABLE,
|
||||||
|
iter_user_tables,
|
||||||
|
list_editable_business_columns,
|
||||||
|
list_physical_column_names,
|
||||||
|
table_allows_manual_create,
|
||||||
|
)
|
||||||
|
from db.timestamp_columns import has_updated_at_trigger
|
||||||
|
from util.constants import SKILL_SLUG
|
||||||
|
from util.slug_naming import LEGACY_EXEMPT_SLUGS, validate_slug_semantics
|
||||||
|
|
||||||
|
_TEMPLATE_PLACEHOLDER_SLUGS = frozenset({"your-skill-slug", "your_skill_slug"})
|
||||||
|
_ENGLISH_PLACEHOLDER_NAME_PATTERNS = (
|
||||||
|
re.compile(r"^my\s+skill$", re.I),
|
||||||
|
re.compile(r"^your[-_\s]?skill", re.I),
|
||||||
|
re.compile(r"^skill[-_\s]?template$", re.I),
|
||||||
|
re.compile(r"^[a-z0-9_-]+$"),
|
||||||
|
)
|
||||||
|
_KEBAB_SLUG = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*$")
|
||||||
|
_CJK_RE = re.compile(r"[\u4e00-\u9fff]")
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class ValidationReport:
|
||||||
|
errors: list[str] = field(default_factory=list)
|
||||||
|
warnings: list[str] = field(default_factory=list)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def ok(self) -> bool:
|
||||||
|
return not self.errors
|
||||||
|
|
||||||
|
|
||||||
|
def _has_cjk(text: str) -> bool:
|
||||||
|
return bool(_CJK_RE.search(text))
|
||||||
|
|
||||||
|
|
||||||
|
def _looks_like_raw_physical_name(display_name: str, physical_name: str) -> bool:
|
||||||
|
if not display_name.strip():
|
||||||
|
return True
|
||||||
|
if display_name.strip().lower() == physical_name.strip().lower():
|
||||||
|
return True
|
||||||
|
compact = display_name.replace(" ", "").replace("_", "").lower()
|
||||||
|
if compact == physical_name.replace("_", "").lower():
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_frontmatter_field(text: str, field_name: str) -> str:
|
||||||
|
parts = text.split("---", 2)
|
||||||
|
if len(parts) < 2:
|
||||||
|
return ""
|
||||||
|
for line in parts[1].splitlines():
|
||||||
|
match = re.match(rf"^{re.escape(field_name)}:\s*(.+)\s*$", line.strip())
|
||||||
|
if match:
|
||||||
|
return match.group(1).strip().strip("\"'")
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_openclaw_slug(text: str) -> str:
|
||||||
|
parts = text.split("---", 2)
|
||||||
|
if len(parts) < 2:
|
||||||
|
return ""
|
||||||
|
lines = parts[1].splitlines()
|
||||||
|
for index, line in enumerate(lines):
|
||||||
|
if re.match(r"^\s+openclaw:\s*$", line):
|
||||||
|
for inner in lines[index + 1 :]:
|
||||||
|
if inner.strip() and inner[0] not in (" ", "\t"):
|
||||||
|
break
|
||||||
|
match = re.match(r"^(\s+)slug:\s*(.+)\s*$", inner)
|
||||||
|
if match:
|
||||||
|
return match.group(2).strip().strip("\"'")
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
def parse_skill_frontmatter(skill_root: str) -> dict[str, str]:
|
||||||
|
path = os.path.join(skill_root, "SKILL.md")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
text = f.read()
|
||||||
|
return {
|
||||||
|
"name": _parse_frontmatter_field(text, "name"),
|
||||||
|
"slug": _parse_openclaw_slug(text),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def validate_skill_frontmatter(skill_root: str, *, allow_template_placeholders: bool = True) -> ValidationReport:
|
||||||
|
report = ValidationReport()
|
||||||
|
data = parse_skill_frontmatter(skill_root)
|
||||||
|
name = str(data.get("name") or "").strip()
|
||||||
|
slug = str(data.get("slug") or "").strip()
|
||||||
|
|
||||||
|
if not name:
|
||||||
|
report.errors.append("SKILL.md frontmatter.name 缺失")
|
||||||
|
elif not _has_cjk(name):
|
||||||
|
if allow_template_placeholders and slug in _TEMPLATE_PLACEHOLDER_SLUGS:
|
||||||
|
report.warnings.append("SKILL.md frontmatter.name 建议使用清晰的中文业务名称(模板占位可暂保留)")
|
||||||
|
else:
|
||||||
|
report.errors.append("SKILL.md frontmatter.name 应使用用户可见的中文业务名称")
|
||||||
|
else:
|
||||||
|
for pattern in _ENGLISH_PLACEHOLDER_NAME_PATTERNS:
|
||||||
|
if pattern.fullmatch(name):
|
||||||
|
if allow_template_placeholders and slug in _TEMPLATE_PLACEHOLDER_SLUGS:
|
||||||
|
report.warnings.append(f"SKILL.md frontmatter.name 仍为占位风格:{name!r}")
|
||||||
|
else:
|
||||||
|
report.errors.append(f"SKILL.md frontmatter.name 不应为英文占位名:{name!r}")
|
||||||
|
break
|
||||||
|
|
||||||
|
if not slug:
|
||||||
|
report.errors.append("SKILL.md metadata.openclaw.slug 缺失")
|
||||||
|
elif not _KEBAB_SLUG.fullmatch(slug):
|
||||||
|
report.errors.append(f"metadata.openclaw.slug 必须为 kebab-case:{slug!r}")
|
||||||
|
elif slug in _TEMPLATE_PLACEHOLDER_SLUGS and not allow_template_placeholders:
|
||||||
|
report.errors.append(f"metadata.openclaw.slug 仍为模板占位:{slug!r}")
|
||||||
|
|
||||||
|
constants_slug = SKILL_SLUG.strip()
|
||||||
|
if slug and constants_slug and slug != constants_slug:
|
||||||
|
report.warnings.append(
|
||||||
|
f"SKILL.md slug ({slug!r}) 与 util.constants.SKILL_SLUG ({constants_slug!r}) 不一致"
|
||||||
|
)
|
||||||
|
|
||||||
|
if slug and slug not in LEGACY_EXEMPT_SLUGS and _KEBAB_SLUG.fullmatch(slug):
|
||||||
|
naming_errors, naming_warnings = validate_slug_semantics(
|
||||||
|
slug,
|
||||||
|
strict=not allow_template_placeholders,
|
||||||
|
)
|
||||||
|
report.errors.extend(naming_errors)
|
||||||
|
report.warnings.extend(naming_warnings)
|
||||||
|
|
||||||
|
return report
|
||||||
|
|
||||||
|
|
||||||
|
def _quote_identifier(name: str) -> str:
|
||||||
|
return '"' + name.replace('"', '""') + '"'
|
||||||
|
|
||||||
|
|
||||||
|
def _table_column_info(cursor, table_name: str) -> dict[str, dict[str, object]]:
|
||||||
|
cursor.execute(f"PRAGMA table_info({_quote_identifier(table_name)})")
|
||||||
|
info: dict[str, dict[str, object]] = {}
|
||||||
|
for row in cursor.fetchall():
|
||||||
|
info[str(row[1])] = {
|
||||||
|
"cid": int(row[0]),
|
||||||
|
"name": str(row[1]),
|
||||||
|
"type": str(row[2] or ""),
|
||||||
|
"notnull": int(row[3] or 0),
|
||||||
|
"dflt_value": row[4],
|
||||||
|
"pk": int(row[5] or 0),
|
||||||
|
}
|
||||||
|
return info
|
||||||
|
|
||||||
|
|
||||||
|
def _table_column_xinfo(cursor, table_name: str) -> dict[str, dict[str, object]]:
|
||||||
|
"""PRAGMA table_xinfo 可识别 generated/hidden 字段(SQLite 3.31+)。"""
|
||||||
|
cursor.execute(f"PRAGMA table_xinfo({_quote_identifier(table_name)})")
|
||||||
|
info: dict[str, dict[str, object]] = {}
|
||||||
|
for row in cursor.fetchall():
|
||||||
|
hidden = int(row[6] or 0) if len(row) > 6 else 0
|
||||||
|
info[str(row[1])] = {
|
||||||
|
"cid": int(row[0]),
|
||||||
|
"name": str(row[1]),
|
||||||
|
"type": str(row[2] or ""),
|
||||||
|
"notnull": int(row[3] or 0),
|
||||||
|
"dflt_value": row[4],
|
||||||
|
"pk": int(row[5] or 0),
|
||||||
|
"hidden": hidden,
|
||||||
|
}
|
||||||
|
return info
|
||||||
|
|
||||||
|
|
||||||
|
def _is_generated_column(xinfo: dict[str, object]) -> bool:
|
||||||
|
hidden = int(xinfo.get("hidden") or 0)
|
||||||
|
return hidden in (2, 3)
|
||||||
|
|
||||||
|
|
||||||
|
def _is_blob_column(column_info: dict[str, object]) -> bool:
|
||||||
|
return "BLOB" in str(column_info.get("type") or "").upper()
|
||||||
|
|
||||||
|
|
||||||
|
def _default_uses_unixepoch(default_value: object) -> bool:
|
||||||
|
if default_value is None:
|
||||||
|
return False
|
||||||
|
text = str(default_value).strip().lower()
|
||||||
|
return "unixepoch" in text
|
||||||
|
|
||||||
|
|
||||||
|
def validate_options_json(options_json: str | None) -> tuple[list[str], list[str]]:
|
||||||
|
"""校验枚举 options_json 可被解析为 [{value, label}, ...] 结构。"""
|
||||||
|
errors: list[str] = []
|
||||||
|
warnings: list[str] = []
|
||||||
|
if options_json is None or str(options_json).strip() == "":
|
||||||
|
return errors, warnings
|
||||||
|
try:
|
||||||
|
parsed = json.loads(str(options_json))
|
||||||
|
except json.JSONDecodeError as exc:
|
||||||
|
errors.append(f"options_json 不是合法 JSON:{exc}")
|
||||||
|
return errors, warnings
|
||||||
|
if not isinstance(parsed, list):
|
||||||
|
errors.append("options_json 必须是 JSON 数组")
|
||||||
|
return errors, warnings
|
||||||
|
for index, item in enumerate(parsed):
|
||||||
|
if not isinstance(item, dict):
|
||||||
|
errors.append(f"options_json[{index}] 必须是对象")
|
||||||
|
continue
|
||||||
|
if "value" not in item or "label" not in item:
|
||||||
|
errors.append(f"options_json[{index}] 必须包含 value 与 label")
|
||||||
|
return errors, warnings
|
||||||
|
|
||||||
|
|
||||||
|
def validate_column_permissions(
|
||||||
|
cursor,
|
||||||
|
table_name: str,
|
||||||
|
*,
|
||||||
|
physical_columns: list[str] | None = None,
|
||||||
|
) -> tuple[list[str], list[str]]:
|
||||||
|
"""校验常见系统字段 editable=0,并识别技术上可写但不适合手工新增的表。"""
|
||||||
|
errors: list[str] = []
|
||||||
|
warnings: list[str] = []
|
||||||
|
ordered = physical_columns or list_physical_column_names(cursor, table_name)
|
||||||
|
column_info = _table_column_info(cursor, table_name)
|
||||||
|
column_xinfo = _table_column_xinfo(cursor, table_name)
|
||||||
|
|
||||||
|
cursor.execute(
|
||||||
|
"""
|
||||||
|
SELECT column_name, editable, options_json
|
||||||
|
FROM _jiangchang_columns
|
||||||
|
WHERE table_name = ?
|
||||||
|
""",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
meta_by_column = {
|
||||||
|
str(row[0]): {"editable": row[1], "options_json": row[2]}
|
||||||
|
for row in cursor.fetchall()
|
||||||
|
}
|
||||||
|
|
||||||
|
for column_name, meta in meta_by_column.items():
|
||||||
|
physical = column_info.get(column_name) or {}
|
||||||
|
xinfo = column_xinfo.get(column_name) or physical
|
||||||
|
if not physical and column_name not in column_xinfo:
|
||||||
|
continue
|
||||||
|
|
||||||
|
pk = int(physical.get("pk") or xinfo.get("pk") or 0)
|
||||||
|
editable = meta["editable"]
|
||||||
|
if pk and editable is not None and int(editable) != 0:
|
||||||
|
errors.append(f"{table_name}.{column_name} 是主键,editable 应为 0")
|
||||||
|
|
||||||
|
if column_name == "id" and editable is not None and int(editable) != 0:
|
||||||
|
errors.append(f"{table_name}.id 的 editable 应为 0(自增主键)")
|
||||||
|
|
||||||
|
if _is_generated_column(xinfo) and editable is not None and int(editable) != 0:
|
||||||
|
errors.append(f"{table_name}.{column_name} 是 generated 字段,editable 应为 0")
|
||||||
|
|
||||||
|
if _is_blob_column(physical or xinfo) and editable is not None and int(editable) != 0:
|
||||||
|
errors.append(f"{table_name}.{column_name} 是 BLOB 字段,editable 应为 0")
|
||||||
|
|
||||||
|
opt_errors, _ = validate_options_json(meta.get("options_json"))
|
||||||
|
for item in opt_errors:
|
||||||
|
errors.append(f"{table_name}.{column_name}: {item}")
|
||||||
|
|
||||||
|
cursor.execute(
|
||||||
|
"SELECT readonly FROM _jiangchang_tables WHERE table_name = ?",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
readonly_row = cursor.fetchone()
|
||||||
|
readonly = int(readonly_row[0]) if readonly_row else None
|
||||||
|
editable_columns = list_editable_business_columns(cursor, table_name)
|
||||||
|
if readonly == 0 and not editable_columns:
|
||||||
|
warnings.append(
|
||||||
|
f"{table_name}: 表级 readonly=0 但所有字段 editable=0,"
|
||||||
|
"宿主不应打开空白新增表单;数据应由技能业务流程产生"
|
||||||
|
)
|
||||||
|
if readonly == 1 and editable_columns:
|
||||||
|
warnings.append(
|
||||||
|
f"{table_name}: 表级 readonly=1 但存在 editable=1 字段,"
|
||||||
|
"宿主应以表级只读为准"
|
||||||
|
)
|
||||||
|
|
||||||
|
return errors, warnings
|
||||||
|
|
||||||
|
|
||||||
|
def _expected_timestamp_display_name(column_name: str) -> str:
|
||||||
|
if column_name == "created_at":
|
||||||
|
return "创建时间"
|
||||||
|
if column_name == "updated_at":
|
||||||
|
return "更新时间"
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
def validate_standard_timestamp_columns(
|
||||||
|
cursor,
|
||||||
|
table_name: str,
|
||||||
|
*,
|
||||||
|
physical_columns: list[str] | None = None,
|
||||||
|
) -> tuple[list[str], list[str]]:
|
||||||
|
errors: list[str] = []
|
||||||
|
warnings: list[str] = []
|
||||||
|
ordered = physical_columns or list_physical_column_names(cursor, table_name)
|
||||||
|
column_info = _table_column_info(cursor, table_name)
|
||||||
|
|
||||||
|
for column_name in STANDARD_TIMESTAMP_COLUMNS:
|
||||||
|
if column_name not in ordered:
|
||||||
|
continue
|
||||||
|
|
||||||
|
physical = column_info.get(column_name)
|
||||||
|
if not physical:
|
||||||
|
errors.append(f"{table_name}.{column_name} 缺少物理字段定义")
|
||||||
|
continue
|
||||||
|
|
||||||
|
if "INT" not in str(physical["type"]).upper():
|
||||||
|
errors.append(
|
||||||
|
f"{table_name}.{column_name} 字段类型应为 INTEGER(Unix 秒级时间戳),当前为 {physical['type']!r}"
|
||||||
|
)
|
||||||
|
|
||||||
|
if column_name == "created_at" and not _default_uses_unixepoch(physical["dflt_value"]):
|
||||||
|
errors.append(
|
||||||
|
f"{table_name}.created_at 应设置数据库默认值 DEFAULT (unixepoch()),当前默认值为 {physical['dflt_value']!r}"
|
||||||
|
)
|
||||||
|
if column_name == "updated_at" and not _default_uses_unixepoch(physical["dflt_value"]):
|
||||||
|
errors.append(
|
||||||
|
f"{table_name}.updated_at 应设置数据库初始默认值 DEFAULT (unixepoch()),当前默认值为 {physical['dflt_value']!r}"
|
||||||
|
)
|
||||||
|
|
||||||
|
cursor.execute(
|
||||||
|
"""
|
||||||
|
SELECT display_name, display_type, editable, searchable, display_order
|
||||||
|
FROM _jiangchang_columns
|
||||||
|
WHERE table_name = ? AND column_name = ?
|
||||||
|
""",
|
||||||
|
(table_name, column_name),
|
||||||
|
)
|
||||||
|
meta_row = cursor.fetchone()
|
||||||
|
if not meta_row:
|
||||||
|
errors.append(f"{table_name}.{column_name} 缺少 _jiangchang_columns 元数据")
|
||||||
|
continue
|
||||||
|
|
||||||
|
display_name, display_type, editable, searchable, display_order = meta_row
|
||||||
|
expected_name = _expected_timestamp_display_name(column_name)
|
||||||
|
if str(display_name or "").strip() != expected_name:
|
||||||
|
errors.append(
|
||||||
|
f"{table_name}.{column_name} 的 display_name 应为 {expected_name!r},当前为 {display_name!r}"
|
||||||
|
)
|
||||||
|
if str(display_type or "").strip() != DATETIME_UNIX_SECONDS:
|
||||||
|
errors.append(
|
||||||
|
f"{table_name}.{column_name} 的 display_type 应为 {DATETIME_UNIX_SECONDS!r},当前为 {display_type!r}"
|
||||||
|
)
|
||||||
|
if editable is None or int(editable) != 0:
|
||||||
|
errors.append(f"{table_name}.{column_name} 的 editable 应为 0(系统时间字段不可编辑)")
|
||||||
|
if display_order is not None:
|
||||||
|
errors.append(f"{table_name}.{column_name} 的 display_order 应为 NULL")
|
||||||
|
if searchable is not None and int(searchable) != 0:
|
||||||
|
warnings.append(f"{table_name}.{column_name} 的时间字段通常不必开启 searchable")
|
||||||
|
|
||||||
|
if "created_at" in ordered and "updated_at" in ordered:
|
||||||
|
if ordered.index("updated_at") < ordered.index("created_at"):
|
||||||
|
warnings.append(f"{table_name}: updated_at 不应出现在 created_at 之前")
|
||||||
|
|
||||||
|
if "updated_at" in ordered and not has_updated_at_trigger(cursor, table_name):
|
||||||
|
errors.append(
|
||||||
|
f"{table_name}.updated_at 缺少自动维护 trigger(期望 {table_name}_set_updated_at)"
|
||||||
|
)
|
||||||
|
|
||||||
|
return errors, warnings
|
||||||
|
|
||||||
|
|
||||||
|
def column_order_warnings(table_name: str, ordered_names: list[str]) -> list[str]:
|
||||||
|
warnings: list[str] = []
|
||||||
|
if "id" in ordered_names and ordered_names.index("id") != 0:
|
||||||
|
warnings.append(f"{table_name}: 字段 id 通常应定义在 CREATE TABLE 的第一列")
|
||||||
|
if "created_at" in ordered_names:
|
||||||
|
idx = ordered_names.index("created_at")
|
||||||
|
trailing = ordered_names[idx + 1 :]
|
||||||
|
if trailing and trailing != ["updated_at"]:
|
||||||
|
warnings.append(
|
||||||
|
f"{table_name}: created_at 之后通常只应跟 updated_at,不应再放置其他业务字段"
|
||||||
|
)
|
||||||
|
if "updated_at" in ordered_names and "created_at" in ordered_names:
|
||||||
|
if ordered_names.index("updated_at") < ordered_names.index("created_at"):
|
||||||
|
warnings.append(f"{table_name}: updated_at 不应出现在 created_at 之前")
|
||||||
|
return warnings
|
||||||
|
|
||||||
|
|
||||||
|
def _table_exists(cursor, table_name: str) -> bool:
|
||||||
|
cursor.execute(
|
||||||
|
"SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ? LIMIT 1",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
return cursor.fetchone() is not None
|
||||||
|
|
||||||
|
|
||||||
|
def validate_display_metadata(conn: sqlite3.Connection, *, check_column_order: bool = True) -> ValidationReport:
|
||||||
|
report = ValidationReport()
|
||||||
|
cur = conn.cursor()
|
||||||
|
|
||||||
|
has_tables_meta = _table_exists(cur, "_jiangchang_tables")
|
||||||
|
has_columns_meta = _table_exists(cur, "_jiangchang_columns")
|
||||||
|
if not has_tables_meta:
|
||||||
|
report.errors.append("缺少数据管理元数据表 _jiangchang_tables")
|
||||||
|
if not has_columns_meta:
|
||||||
|
report.errors.append("缺少数据管理元数据表 _jiangchang_columns")
|
||||||
|
if not has_tables_meta or not has_columns_meta:
|
||||||
|
return report
|
||||||
|
|
||||||
|
for table_name in iter_user_tables(cur):
|
||||||
|
cur.execute(
|
||||||
|
"SELECT display_name FROM _jiangchang_tables WHERE table_name = ?",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
row = cur.fetchone()
|
||||||
|
if not row or not str(row[0] or "").strip():
|
||||||
|
report.errors.append(f"业务表 {table_name!r} 缺少 _jiangchang_tables.display_name")
|
||||||
|
elif not _has_cjk(str(row[0])):
|
||||||
|
report.errors.append(f"业务表 {table_name!r} 的 display_name 应使用中文业务名称")
|
||||||
|
|
||||||
|
physical_columns = list_physical_column_names(cur, table_name)
|
||||||
|
if check_column_order:
|
||||||
|
report.warnings.extend(column_order_warnings(table_name, physical_columns))
|
||||||
|
|
||||||
|
for column_name in physical_columns:
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT display_name, visible
|
||||||
|
FROM _jiangchang_columns
|
||||||
|
WHERE table_name = ? AND column_name = ?
|
||||||
|
""",
|
||||||
|
(table_name, column_name),
|
||||||
|
)
|
||||||
|
col_row = cur.fetchone()
|
||||||
|
if not col_row:
|
||||||
|
report.errors.append(
|
||||||
|
f"字段 {table_name}.{column_name} 缺少 _jiangchang_columns 元数据"
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
display_name = str(col_row[0] or "").strip()
|
||||||
|
visible = col_row[1] is None or int(col_row[1]) != 0
|
||||||
|
if visible and not display_name:
|
||||||
|
report.errors.append(f"字段 {table_name}.{column_name} 的 display_name 为空")
|
||||||
|
elif visible and _looks_like_raw_physical_name(display_name, column_name):
|
||||||
|
report.errors.append(
|
||||||
|
f"字段 {table_name}.{column_name} 的 display_name 不应直接等于英文物理名:{display_name!r}"
|
||||||
|
)
|
||||||
|
elif visible and not _has_cjk(display_name):
|
||||||
|
report.errors.append(
|
||||||
|
f"字段 {table_name}.{column_name} 的 display_name 应使用中文:{display_name!r}"
|
||||||
|
)
|
||||||
|
|
||||||
|
ts_errors, ts_warnings = validate_standard_timestamp_columns(
|
||||||
|
cur,
|
||||||
|
table_name,
|
||||||
|
physical_columns=physical_columns,
|
||||||
|
)
|
||||||
|
report.errors.extend(ts_errors)
|
||||||
|
report.warnings.extend(ts_warnings)
|
||||||
|
|
||||||
|
perm_errors, perm_warnings = validate_column_permissions(
|
||||||
|
cur,
|
||||||
|
table_name,
|
||||||
|
physical_columns=physical_columns,
|
||||||
|
)
|
||||||
|
report.errors.extend(perm_errors)
|
||||||
|
report.warnings.extend(perm_warnings)
|
||||||
|
|
||||||
|
cur.execute("SELECT table_name, column_name FROM _jiangchang_columns")
|
||||||
|
for table_name, column_name in cur.fetchall():
|
||||||
|
if table_name in METADATA_TABLES:
|
||||||
|
continue
|
||||||
|
cur.execute(
|
||||||
|
"SELECT 1 FROM sqlite_master WHERE type='table' AND name = ?",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
if not cur.fetchone():
|
||||||
|
report.errors.append(f"元数据引用了不存在的表:{table_name!r}")
|
||||||
|
continue
|
||||||
|
physical = list_physical_column_names(cur, str(table_name))
|
||||||
|
if str(column_name) not in physical:
|
||||||
|
report.errors.append(f"元数据引用了不存在的字段:{table_name}.{column_name}")
|
||||||
|
|
||||||
|
cur.execute("SELECT table_name FROM _jiangchang_tables")
|
||||||
|
for (table_name,) in cur.fetchall():
|
||||||
|
if table_name in METADATA_TABLES:
|
||||||
|
continue
|
||||||
|
cur.execute(
|
||||||
|
"SELECT 1 FROM sqlite_master WHERE type='table' AND name = ?",
|
||||||
|
(table_name,),
|
||||||
|
)
|
||||||
|
if not cur.fetchone():
|
||||||
|
report.errors.append(f"元数据引用了不存在的表:{table_name!r}")
|
||||||
|
|
||||||
|
return report
|
||||||
|
|
||||||
|
|
||||||
|
def validate_template_database(conn: sqlite3.Connection) -> ValidationReport:
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
physical = list_physical_column_names(conn.cursor(), TASK_LOGS_TABLE)
|
||||||
|
expected = [str(item["column_name"]) for item in TASK_LOGS_COLUMN_METADATA]
|
||||||
|
if physical != expected:
|
||||||
|
report.errors.append(
|
||||||
|
f"task_logs 物理字段顺序应为 {expected},当前为 {physical}"
|
||||||
|
)
|
||||||
|
return report
|
||||||
@@ -9,7 +9,6 @@ from __future__ import annotations
|
|||||||
from typing import Any, List, Optional, Tuple
|
from typing import Any, List, Optional, Tuple
|
||||||
|
|
||||||
from db.connection import get_conn, init_db
|
from db.connection import get_conn, init_db
|
||||||
from util.timeutil import now_unix
|
|
||||||
|
|
||||||
|
|
||||||
def save_task_log(
|
def save_task_log(
|
||||||
@@ -22,17 +21,16 @@ def save_task_log(
|
|||||||
result_summary: Optional[str] = None,
|
result_summary: Optional[str] = None,
|
||||||
) -> int:
|
) -> int:
|
||||||
init_db()
|
init_db()
|
||||||
now = now_unix()
|
|
||||||
conn = get_conn()
|
conn = get_conn()
|
||||||
try:
|
try:
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
cur.execute(
|
cur.execute(
|
||||||
"""
|
"""
|
||||||
INSERT INTO task_logs
|
INSERT INTO task_logs
|
||||||
(task_type, target_id, input_id, input_title, status, error_msg, result_summary, created_at, updated_at)
|
(task_type, target_id, input_id, input_title, status, error_msg, result_summary)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||||
""",
|
""",
|
||||||
(task_type, target_id, input_id, input_title or "", status, error_msg, result_summary, now, now),
|
(task_type, target_id, input_id, input_title or "", status, error_msg, result_summary),
|
||||||
)
|
)
|
||||||
new_id = int(cur.lastrowid)
|
new_id = int(cur.lastrowid)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
|
|||||||
36
scripts/db/timestamp_columns.py
Normal file
36
scripts/db/timestamp_columns.py
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
"""标准时间字段:Unix 秒级时间戳、默认值与 updated_at 自动维护。"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
STANDARD_TIMESTAMP_COLUMNS = frozenset({"created_at", "updated_at"})
|
||||||
|
DATETIME_UNIX_SECONDS = "datetime_unix_seconds"
|
||||||
|
TASK_LOGS_UPDATED_AT_TRIGGER = "task_logs_set_updated_at"
|
||||||
|
|
||||||
|
_TASK_LOGS_UPDATED_AT_TRIGGER_DDL = f"""
|
||||||
|
CREATE TRIGGER IF NOT EXISTS {TASK_LOGS_UPDATED_AT_TRIGGER}
|
||||||
|
AFTER UPDATE ON task_logs
|
||||||
|
FOR EACH ROW
|
||||||
|
BEGIN
|
||||||
|
UPDATE task_logs
|
||||||
|
SET updated_at = unixepoch()
|
||||||
|
WHERE id = NEW.id AND updated_at = OLD.updated_at;
|
||||||
|
END
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
def init_task_logs_timestamp_maintenance(cursor) -> None:
|
||||||
|
"""幂等创建 task_logs.updated_at 自动维护 trigger。"""
|
||||||
|
cursor.execute(_TASK_LOGS_UPDATED_AT_TRIGGER_DDL)
|
||||||
|
|
||||||
|
|
||||||
|
def has_updated_at_trigger(cursor, table_name: str) -> bool:
|
||||||
|
trigger_name = f"{table_name}_set_updated_at"
|
||||||
|
cursor.execute(
|
||||||
|
"""
|
||||||
|
SELECT 1 FROM sqlite_master
|
||||||
|
WHERE type = 'trigger' AND name = ? AND tbl_name = ?
|
||||||
|
LIMIT 1
|
||||||
|
""",
|
||||||
|
(trigger_name, table_name),
|
||||||
|
)
|
||||||
|
return cursor.fetchone() is not None
|
||||||
@@ -2,29 +2,29 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
|
||||||
from typing import Tuple
|
from typing import Tuple
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
from jiangchang_skill_core import config
|
||||||
|
|
||||||
|
|
||||||
def check_entitlement(skill_slug: str) -> Tuple[bool, str]:
|
def check_entitlement(skill_slug: str) -> Tuple[bool, str]:
|
||||||
auth_base = (os.getenv("JIANGCHANG_AUTH_BASE_URL") or "").strip().rstrip("/")
|
auth_base = (config.get("JIANGCHANG_AUTH_BASE_URL") or "").strip().rstrip("/")
|
||||||
if not auth_base:
|
if not auth_base:
|
||||||
return True, ""
|
return True, ""
|
||||||
user_id = (os.getenv("CLAW_USER_ID") or os.getenv("JIANGCHANG_USER_ID") or "").strip()
|
user_id = (config.get("JIANGCHANG_USER_ID") or "").strip()
|
||||||
if not user_id:
|
if not user_id:
|
||||||
return False, "鉴权失败:缺少用户身份(CLAW_USER_ID / JIANGCHANG_USER_ID)"
|
return False, "鉴权失败:缺少用户身份(JIANGCHANG_USER_ID)"
|
||||||
|
|
||||||
auth_api_key = (os.getenv("JIANGCHANG_AUTH_API_KEY") or "").strip()
|
auth_api_key = (config.get("JIANGCHANG_AUTH_API_KEY") or "").strip()
|
||||||
timeout = int((os.getenv("JIANGCHANG_AUTH_TIMEOUT_SECONDS") or "5").strip())
|
timeout = int((config.get("JIANGCHANG_AUTH_TIMEOUT_SECONDS") or "5").strip())
|
||||||
headers = {"Content-Type": "application/json"}
|
headers = {"Content-Type": "application/json"}
|
||||||
if auth_api_key:
|
if auth_api_key:
|
||||||
headers["Authorization"] = f"Bearer {auth_api_key}"
|
headers["Authorization"] = f"Bearer {auth_api_key}"
|
||||||
payload = {
|
payload = {
|
||||||
"user_id": user_id,
|
"user_id": user_id,
|
||||||
"skill_slug": skill_slug,
|
"skill_slug": skill_slug,
|
||||||
"trace_id": (os.getenv("JIANGCHANG_TRACE_ID") or "").strip(),
|
"trace_id": (config.get("JIANGCHANG_TRACE_ID") or "").strip(),
|
||||||
"context": {"entry": "main.py"},
|
"context": {"entry": "main.py"},
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
"""任务编排、日志查询模板。
|
"""任务编排、日志查询模板。
|
||||||
|
|
||||||
通用业务编排层:负责参数校验、鉴权、调用具体业务实现、写入任务日志。
|
编排层:job_context / emit / checkpoint / finish、鉴权、任务日志与错误转换。
|
||||||
复制后在 cmd_run 中实现真正的业务逻辑。
|
领域业务请放在 ``service/<domain>_service.py``,由本模块调用;多入口(CLI/Action/cron)复用同一内核。
|
||||||
|
复制后在 cmd_run(或 cmd_sync_*)中接线到真实 domain service,勿按 toolbar/cron/agent 分叉业务。
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
@@ -13,20 +14,30 @@ import uuid
|
|||||||
from typing import Any, Dict, Optional
|
from typing import Any, Dict, Optional
|
||||||
|
|
||||||
from jiangchang_skill_core import collect_runtime_diagnostics, config, format_runtime_health_lines
|
from jiangchang_skill_core import collect_runtime_diagnostics, config, format_runtime_health_lines
|
||||||
from jiangchang_skill_core.rpa.video_session import RpaVideoSession
|
from jiangchang_skill_core.activity import JobStopped, emit, finish, job_context
|
||||||
|
|
||||||
from db import task_logs_repository as tlr
|
from db import task_logs_repository as tlr
|
||||||
|
from jiangchang_skill_core.rpa.video_session import RpaVideoSession
|
||||||
from service.entitlement_service import check_entitlement
|
from service.entitlement_service import check_entitlement
|
||||||
from service.task_run_support import (
|
from service.task_run_support import (
|
||||||
_print_video_summary,
|
_print_video_summary,
|
||||||
build_video_info,
|
build_video_info,
|
||||||
merge_video_into_result_summary,
|
merge_video_into_result_summary,
|
||||||
)
|
)
|
||||||
from util.constants import PLATFORM_KIT_MIN_VERSION, SKILL_SLUG, SKILL_VERSION
|
from util.constants import LOG_LOGGER_NAME, PLATFORM_KIT_MIN_VERSION, SKILL_SLUG, SKILL_VERSION
|
||||||
|
from util.logging_config import get_skill_logger, setup_skill_logging
|
||||||
from util.runtime_paths import get_skill_data_dir, get_skill_root
|
from util.runtime_paths import get_skill_data_dir, get_skill_root
|
||||||
from util.timeutil import unix_to_iso
|
from util.timeutil import unix_to_iso
|
||||||
|
|
||||||
|
|
||||||
|
def _get_task_logger():
|
||||||
|
try:
|
||||||
|
return get_skill_logger()
|
||||||
|
except RuntimeError:
|
||||||
|
setup_skill_logging(SKILL_SLUG, LOG_LOGGER_NAME)
|
||||||
|
return get_skill_logger()
|
||||||
|
|
||||||
|
|
||||||
async def _run_template_demo(target: Optional[str], input_id: Optional[str]) -> tuple[int, dict[str, Any]]:
|
async def _run_template_demo(target: Optional[str], input_id: Optional[str]) -> tuple[int, dict[str, Any]]:
|
||||||
"""最小 RpaVideoSession 示范:不启动浏览器、不执行业务,仅演示录屏包裹范式。"""
|
"""最小 RpaVideoSession 示范:不启动浏览器、不执行业务,仅演示录屏包裹范式。"""
|
||||||
batch_id = uuid.uuid4().hex[:12]
|
batch_id = uuid.uuid4().hex[:12]
|
||||||
@@ -53,34 +64,129 @@ async def _run_template_demo(target: Optional[str], input_id: Optional[str]) ->
|
|||||||
|
|
||||||
def cmd_run(target: Optional[str] = None, input_id: Optional[str] = None) -> int:
|
def cmd_run(target: Optional[str] = None, input_id: Optional[str] = None) -> int:
|
||||||
"""通用任务执行入口模板。复制后请实现真实业务逻辑。"""
|
"""通用任务执行入口模板。复制后请实现真实业务逻辑。"""
|
||||||
ok, reason = check_entitlement(SKILL_SLUG)
|
log = _get_task_logger()
|
||||||
if not ok:
|
task_type = "demo"
|
||||||
print(f"❌ {reason}")
|
|
||||||
return 1
|
|
||||||
|
|
||||||
rc, video_info = asyncio.run(_run_template_demo(target, input_id))
|
with job_context(skill=SKILL_SLUG):
|
||||||
_print_video_summary(video_info)
|
log.info(
|
||||||
|
"task_start task_type=%s target_id=%s input_id=%s",
|
||||||
|
task_type,
|
||||||
|
target,
|
||||||
|
input_id,
|
||||||
|
)
|
||||||
|
emit("开始处理任务", skill=SKILL_SLUG, stage="run")
|
||||||
|
try:
|
||||||
|
ok, reason = check_entitlement(SKILL_SLUG)
|
||||||
|
if not ok:
|
||||||
|
log.warning("entitlement_failed task_type=%s reason=%s", task_type, reason)
|
||||||
|
emit("鉴权失败,已记录诊断信息", type="warn", skill=SKILL_SLUG, stage="auth")
|
||||||
|
tlr.save_task_log(
|
||||||
|
task_type=task_type,
|
||||||
|
target_id=target,
|
||||||
|
input_id=input_id,
|
||||||
|
input_title="模板示例任务",
|
||||||
|
status="failed",
|
||||||
|
error_msg=reason,
|
||||||
|
result_summary=json.dumps({"stage": "auth", "error": reason}, ensure_ascii=False),
|
||||||
|
)
|
||||||
|
log.info(
|
||||||
|
"task_log_saved task_type=%s target_id=%s input_id=%s stage=auth status=failed",
|
||||||
|
task_type,
|
||||||
|
target,
|
||||||
|
input_id,
|
||||||
|
)
|
||||||
|
finish(
|
||||||
|
status="failed",
|
||||||
|
message=reason,
|
||||||
|
skill=SKILL_SLUG,
|
||||||
|
error_code="ENTITLEMENT_DENIED",
|
||||||
|
stage="auth",
|
||||||
|
)
|
||||||
|
print(f"❌ {reason}")
|
||||||
|
return 1
|
||||||
|
|
||||||
summary_payload = merge_video_into_result_summary(
|
log.info("task_run_demo_start target_id=%s input_id=%s", target, input_id)
|
||||||
{
|
rc, video_info = asyncio.run(_run_template_demo(target, input_id))
|
||||||
"template_demo": True,
|
log.info("task_run_demo_done target_id=%s input_id=%s status=failed", target, input_id)
|
||||||
"target": target,
|
_print_video_summary(video_info)
|
||||||
"input_id": input_id,
|
|
||||||
},
|
|
||||||
video_info,
|
|
||||||
)
|
|
||||||
tlr.save_task_log(
|
|
||||||
task_type="demo",
|
|
||||||
target_id=target,
|
|
||||||
input_id=input_id,
|
|
||||||
input_title="模板示例任务",
|
|
||||||
status="failed",
|
|
||||||
error_msg="模板仓库未实现真实业务",
|
|
||||||
result_summary=json.dumps(summary_payload, ensure_ascii=False),
|
|
||||||
)
|
|
||||||
|
|
||||||
print("❌ 这是模板仓库,请复制后在 scripts/service/task_service.py 中实现 cmd_run 的真实业务逻辑。")
|
summary_payload = merge_video_into_result_summary(
|
||||||
return rc
|
{
|
||||||
|
"template_demo": True,
|
||||||
|
"target": target,
|
||||||
|
"input_id": input_id,
|
||||||
|
},
|
||||||
|
video_info,
|
||||||
|
)
|
||||||
|
tlr.save_task_log(
|
||||||
|
task_type=task_type,
|
||||||
|
target_id=target,
|
||||||
|
input_id=input_id,
|
||||||
|
input_title="模板示例任务",
|
||||||
|
status="failed",
|
||||||
|
error_msg="模板仓库未实现真实业务",
|
||||||
|
result_summary=json.dumps(summary_payload, ensure_ascii=False),
|
||||||
|
)
|
||||||
|
log.info(
|
||||||
|
"task_log_saved task_type=%s target_id=%s input_id=%s status=failed",
|
||||||
|
task_type,
|
||||||
|
target,
|
||||||
|
input_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
finish(
|
||||||
|
status="failed",
|
||||||
|
message="模板仓库未实现真实业务",
|
||||||
|
skill=SKILL_SLUG,
|
||||||
|
template_demo=True,
|
||||||
|
target=target,
|
||||||
|
input_id=input_id,
|
||||||
|
)
|
||||||
|
print("❌ 这是模板仓库,请复制后在 scripts/service/task_service.py 中实现 cmd_run 的真实业务逻辑。")
|
||||||
|
return rc
|
||||||
|
except JobStopped:
|
||||||
|
raise
|
||||||
|
except Exception:
|
||||||
|
log.exception(
|
||||||
|
"task_failed task_type=%s target_id=%s input_id=%s",
|
||||||
|
task_type,
|
||||||
|
target,
|
||||||
|
input_id,
|
||||||
|
)
|
||||||
|
emit("任务失败,已记录诊断信息", type="warn", skill=SKILL_SLUG, stage="run")
|
||||||
|
try:
|
||||||
|
tlr.save_task_log(
|
||||||
|
task_type=task_type,
|
||||||
|
target_id=target,
|
||||||
|
input_id=input_id,
|
||||||
|
input_title="模板示例任务",
|
||||||
|
status="failed",
|
||||||
|
error_msg="任务执行异常,详见统一日志",
|
||||||
|
result_summary=json.dumps(
|
||||||
|
{"stage": "run", "error": "unexpected_exception"},
|
||||||
|
ensure_ascii=False,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
log.info(
|
||||||
|
"task_log_saved task_type=%s target_id=%s input_id=%s stage=run status=failed",
|
||||||
|
task_type,
|
||||||
|
target,
|
||||||
|
input_id,
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
log.exception(
|
||||||
|
"task_log_save_failed task_type=%s target_id=%s input_id=%s",
|
||||||
|
task_type,
|
||||||
|
target,
|
||||||
|
input_id,
|
||||||
|
)
|
||||||
|
finish(
|
||||||
|
status="failed",
|
||||||
|
message="任务执行异常,详见统一日志",
|
||||||
|
skill=SKILL_SLUG,
|
||||||
|
stage="run",
|
||||||
|
)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
|
||||||
def cmd_logs(
|
def cmd_logs(
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"""技能标识、版本与平台公共库约束(复制后请修改 slug/version/logger)。"""
|
"""技能标识、版本与平台公共库约束(复制后请修改 slug/version/logger)。"""
|
||||||
|
|
||||||
SKILL_SLUG = "your-skill-slug"
|
SKILL_SLUG = "your-skill-slug"
|
||||||
SKILL_VERSION = "1.0.14"
|
SKILL_VERSION = "1.0.40"
|
||||||
LOG_LOGGER_NAME = "openclaw.skill.your_skill_slug"
|
LOG_LOGGER_NAME = "openclaw.skill.your_skill_slug"
|
||||||
PLATFORM_KIT_MIN_VERSION = "1.0.14"
|
PLATFORM_KIT_MIN_VERSION = "1.2.0"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
"""数据根、技能目录、兄弟技能根路径。"""
|
"""数据根、技能目录、兄弟技能根路径与用户数据子目录解析。"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
@@ -10,6 +10,22 @@ from util.constants import SKILL_SLUG
|
|||||||
|
|
||||||
_SCRIPTS_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
_SCRIPTS_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
|
STANDARD_SUBDIR_DOWNLOADS = "downloads"
|
||||||
|
STANDARD_SUBDIR_IMPORTS = "imports"
|
||||||
|
STANDARD_SUBDIR_EXPORTS = "exports"
|
||||||
|
STANDARD_SUBDIR_UPLOADS = "uploads"
|
||||||
|
STANDARD_SUBDIR_CACHE = "cache"
|
||||||
|
STANDARD_SUBDIR_TEMP = "temp"
|
||||||
|
STANDARD_SUBDIR_RPA_ARTIFACTS = "rpa-artifacts"
|
||||||
|
STANDARD_SUBDIR_VIDEOS = "videos"
|
||||||
|
|
||||||
|
CONFIG_KEY_DOWNLOAD_DIR = "SKILL_DOWNLOAD_DIR"
|
||||||
|
CONFIG_KEY_IMPORT_DIR = "SKILL_IMPORT_DIR"
|
||||||
|
CONFIG_KEY_EXPORT_DIR = "SKILL_EXPORT_DIR"
|
||||||
|
CONFIG_KEY_UPLOAD_DIR = "SKILL_UPLOAD_DIR"
|
||||||
|
CONFIG_KEY_CACHE_DIR = "SKILL_CACHE_DIR"
|
||||||
|
CONFIG_KEY_TEMP_DIR = "SKILL_TEMP_DIR"
|
||||||
|
|
||||||
|
|
||||||
def get_skill_root() -> str:
|
def get_skill_root() -> str:
|
||||||
return os.path.dirname(_SCRIPTS_DIR)
|
return os.path.dirname(_SCRIPTS_DIR)
|
||||||
@@ -32,3 +48,98 @@ def get_skill_data_dir() -> str:
|
|||||||
def get_db_path(filename: str | None = None) -> str:
|
def get_db_path(filename: str | None = None) -> str:
|
||||||
name = filename or f"{SKILL_SLUG}.db"
|
name = filename or f"{SKILL_SLUG}.db"
|
||||||
return os.path.join(get_skill_data_dir(), name)
|
return os.path.join(get_skill_data_dir(), name)
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_subdir(value: str) -> str:
|
||||||
|
cleaned = value.strip().strip("/\\")
|
||||||
|
if not cleaned or cleaned.startswith(".."):
|
||||||
|
raise ValueError(f"invalid skill data subdir: {value!r}")
|
||||||
|
return cleaned.replace("/", os.sep).replace("\\", os.sep)
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_data_path(
|
||||||
|
config_key: str | None,
|
||||||
|
default_subdir: str,
|
||||||
|
*,
|
||||||
|
create: bool = True,
|
||||||
|
) -> str:
|
||||||
|
"""解析技能拥有路径:空配置 → 数据目录下 default_subdir;相对 → 相对数据目录;绝对 → 原样。"""
|
||||||
|
from jiangchang_skill_core import config
|
||||||
|
|
||||||
|
base = get_skill_data_dir()
|
||||||
|
raw = (config.get(config_key) or "").strip() if config_key else ""
|
||||||
|
if not raw:
|
||||||
|
path = os.path.join(base, _normalize_subdir(default_subdir))
|
||||||
|
elif os.path.isabs(raw):
|
||||||
|
path = os.path.abspath(os.path.expanduser(raw))
|
||||||
|
else:
|
||||||
|
path = os.path.join(base, _normalize_subdir(raw))
|
||||||
|
|
||||||
|
if create:
|
||||||
|
os.makedirs(path, exist_ok=True)
|
||||||
|
return path
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_input_path(raw_path: str, *, create_parent: bool = False) -> str:
|
||||||
|
"""解析 CLI 输入路径:绝对路径原样;相对路径相对 {skill_data_dir}/imports/。"""
|
||||||
|
text = (raw_path or "").strip()
|
||||||
|
if not text:
|
||||||
|
return text
|
||||||
|
expanded = os.path.expanduser(text)
|
||||||
|
if os.path.isabs(expanded):
|
||||||
|
return os.path.abspath(expanded)
|
||||||
|
imports_dir = get_imports_dir(create=create_parent)
|
||||||
|
return os.path.abspath(os.path.join(imports_dir, os.path.normpath(expanded)))
|
||||||
|
|
||||||
|
|
||||||
|
def get_downloads_dir(*, create: bool = True) -> str:
|
||||||
|
return resolve_data_path(CONFIG_KEY_DOWNLOAD_DIR, STANDARD_SUBDIR_DOWNLOADS, create=create)
|
||||||
|
|
||||||
|
|
||||||
|
def get_imports_dir(*, create: bool = True) -> str:
|
||||||
|
return resolve_data_path(CONFIG_KEY_IMPORT_DIR, STANDARD_SUBDIR_IMPORTS, create=create)
|
||||||
|
|
||||||
|
|
||||||
|
def get_exports_dir(*, create: bool = True) -> str:
|
||||||
|
return resolve_data_path(CONFIG_KEY_EXPORT_DIR, STANDARD_SUBDIR_EXPORTS, create=create)
|
||||||
|
|
||||||
|
|
||||||
|
def get_uploads_dir(*, create: bool = True) -> str:
|
||||||
|
return resolve_data_path(CONFIG_KEY_UPLOAD_DIR, STANDARD_SUBDIR_UPLOADS, create=create)
|
||||||
|
|
||||||
|
|
||||||
|
def get_cache_dir(*, create: bool = True) -> str:
|
||||||
|
return resolve_data_path(CONFIG_KEY_CACHE_DIR, STANDARD_SUBDIR_CACHE, create=create)
|
||||||
|
|
||||||
|
|
||||||
|
def get_temp_dir(*, create: bool = True) -> str:
|
||||||
|
return resolve_data_path(CONFIG_KEY_TEMP_DIR, STANDARD_SUBDIR_TEMP, create=create)
|
||||||
|
|
||||||
|
|
||||||
|
def get_rpa_artifacts_dir(batch_id: str, *, create: bool = True) -> str:
|
||||||
|
batch = (batch_id or "").strip() or "default"
|
||||||
|
path = os.path.join(get_skill_data_dir(), STANDARD_SUBDIR_RPA_ARTIFACTS, batch)
|
||||||
|
if create:
|
||||||
|
os.makedirs(path, exist_ok=True)
|
||||||
|
return path
|
||||||
|
|
||||||
|
|
||||||
|
def get_videos_dir(*, create: bool = True) -> str:
|
||||||
|
path = os.path.join(get_skill_data_dir(), STANDARD_SUBDIR_VIDEOS)
|
||||||
|
if create:
|
||||||
|
os.makedirs(path, exist_ok=True)
|
||||||
|
return path
|
||||||
|
|
||||||
|
|
||||||
|
def list_resolved_data_paths() -> dict[str, str]:
|
||||||
|
"""供 health / config-path 输出已解析的数据子目录(不创建目录)。"""
|
||||||
|
return {
|
||||||
|
"skill_data_dir": get_skill_data_dir(),
|
||||||
|
"downloads_dir": get_downloads_dir(create=False),
|
||||||
|
"imports_dir": get_imports_dir(create=False),
|
||||||
|
"exports_dir": get_exports_dir(create=False),
|
||||||
|
"uploads_dir": get_uploads_dir(create=False),
|
||||||
|
"cache_dir": get_cache_dir(create=False),
|
||||||
|
"temp_dir": get_temp_dir(create=False),
|
||||||
|
"videos_dir": get_videos_dir(create=False),
|
||||||
|
}
|
||||||
|
|||||||
227
scripts/util/slug_naming.py
Normal file
227
scripts/util/slug_naming.py
Normal file
@@ -0,0 +1,227 @@
|
|||||||
|
"""技能 slug 语义校验(verb-noun-platform 规范,见 development/NAMING.md)。"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
|
||||||
|
_KEBAB_SLUG = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*$")
|
||||||
|
_MAX_SLUG_LENGTH = 48
|
||||||
|
_MIN_SEGMENTS = 3
|
||||||
|
_MAX_SEGMENTS = 5
|
||||||
|
_MAX_NOUN_SEGMENTS = 3
|
||||||
|
|
||||||
|
_SKILL_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||||
|
_NAMING_DIR = os.path.join(_SKILL_ROOT, "assets", "naming")
|
||||||
|
|
||||||
|
_BUILTIN_VERBS = frozenset(
|
||||||
|
{
|
||||||
|
"scrape",
|
||||||
|
"receive",
|
||||||
|
"download",
|
||||||
|
"export",
|
||||||
|
"add",
|
||||||
|
"fill",
|
||||||
|
"enter",
|
||||||
|
"bind",
|
||||||
|
"withdraw",
|
||||||
|
"reconcile",
|
||||||
|
"verify",
|
||||||
|
"submit",
|
||||||
|
"query",
|
||||||
|
"process",
|
||||||
|
"reply",
|
||||||
|
"generate",
|
||||||
|
"draft",
|
||||||
|
"review",
|
||||||
|
"confirm",
|
||||||
|
"track",
|
||||||
|
"upload",
|
||||||
|
"match",
|
||||||
|
"triage",
|
||||||
|
"ship",
|
||||||
|
"reprice",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
_BUILTIN_PLATFORMS = frozenset(
|
||||||
|
{
|
||||||
|
"amazon",
|
||||||
|
"shopee",
|
||||||
|
"xinghang",
|
||||||
|
"alibaba",
|
||||||
|
"kingdee",
|
||||||
|
"icbc",
|
||||||
|
"pingpong",
|
||||||
|
"worldfirst",
|
||||||
|
"paypal",
|
||||||
|
"lianlian",
|
||||||
|
"single-window",
|
||||||
|
"export-rebate",
|
||||||
|
"etax",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
_BUILTIN_SCOPES = frozenset({"all", "batch", "multi", "default"})
|
||||||
|
|
||||||
|
LEGACY_EXEMPT_SLUGS: frozenset[str] = frozenset(
|
||||||
|
{
|
||||||
|
"account-manager",
|
||||||
|
"skill-template",
|
||||||
|
"your-skill-slug",
|
||||||
|
"your_skill_slug",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def load_wordlist(filename: str) -> frozenset[str]:
|
||||||
|
"""从 assets/naming/{filename} 加载词表;文件不存在时 fallback 内置集合。"""
|
||||||
|
fallbacks = {
|
||||||
|
"verbs.txt": _BUILTIN_VERBS,
|
||||||
|
"platforms.txt": _BUILTIN_PLATFORMS,
|
||||||
|
"scopes.txt": _BUILTIN_SCOPES,
|
||||||
|
}
|
||||||
|
fallback = fallbacks.get(filename, frozenset())
|
||||||
|
path = os.path.join(_NAMING_DIR, filename)
|
||||||
|
if not os.path.isfile(path):
|
||||||
|
return fallback
|
||||||
|
words: set[str] = set()
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
for line in f:
|
||||||
|
word = line.strip()
|
||||||
|
if word and not word.startswith("#"):
|
||||||
|
words.add(word)
|
||||||
|
return frozenset(words) if words else fallback
|
||||||
|
|
||||||
|
|
||||||
|
def parse_slug_segments(slug: str) -> list[str]:
|
||||||
|
"""按 '-' 分割;非法字符由上层 kebab 校验处理。"""
|
||||||
|
slug = slug.strip()
|
||||||
|
if not slug:
|
||||||
|
return []
|
||||||
|
return slug.split("-")
|
||||||
|
|
||||||
|
|
||||||
|
def _match_platform_suffix(
|
||||||
|
segments: list[str],
|
||||||
|
platforms: frozenset[str],
|
||||||
|
) -> tuple[str, int] | None:
|
||||||
|
"""返回 (platform_name, platform_part_count) 或 None。"""
|
||||||
|
for platform in sorted(platforms, key=lambda item: (-item.count("-"), item)):
|
||||||
|
parts = platform.split("-")
|
||||||
|
part_count = len(parts)
|
||||||
|
if len(segments) < part_count + 2:
|
||||||
|
continue
|
||||||
|
if segments[-part_count:] == parts:
|
||||||
|
return platform, part_count
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def classify_slug_form(segments: list[str], *, slug: str = "") -> str:
|
||||||
|
"""
|
||||||
|
返回: 'legacy_exempt' | 'standard' | 'scope' | 'invalid'
|
||||||
|
|
||||||
|
- legacy_exempt: slug in LEGACY_EXEMPT_SLUGS
|
||||||
|
- standard: 末段匹配 platforms, 首段 in verbs, 3<=len<=5
|
||||||
|
- scope: 末段 in scopes, 首段 in verbs, 3<=len<=5
|
||||||
|
- invalid: 其他
|
||||||
|
"""
|
||||||
|
if slug in LEGACY_EXEMPT_SLUGS:
|
||||||
|
return "legacy_exempt"
|
||||||
|
|
||||||
|
if not segments or not (_MIN_SEGMENTS <= len(segments) <= _MAX_SEGMENTS):
|
||||||
|
return "invalid"
|
||||||
|
|
||||||
|
verbs = load_wordlist("verbs.txt")
|
||||||
|
platforms = load_wordlist("platforms.txt")
|
||||||
|
scopes = load_wordlist("scopes.txt")
|
||||||
|
|
||||||
|
if segments[0] not in verbs:
|
||||||
|
return "invalid"
|
||||||
|
|
||||||
|
if segments[-1] in scopes:
|
||||||
|
return "scope"
|
||||||
|
|
||||||
|
if _match_platform_suffix(segments, platforms) is not None:
|
||||||
|
return "standard"
|
||||||
|
|
||||||
|
return "invalid"
|
||||||
|
|
||||||
|
|
||||||
|
def validate_slug_semantics(
|
||||||
|
slug: str,
|
||||||
|
*,
|
||||||
|
strict: bool = True,
|
||||||
|
) -> tuple[list[str], list[str]]:
|
||||||
|
"""返回 (errors, warnings)。"""
|
||||||
|
slug = slug.strip()
|
||||||
|
if slug in LEGACY_EXEMPT_SLUGS:
|
||||||
|
return [], []
|
||||||
|
|
||||||
|
errors: list[str] = []
|
||||||
|
warnings: list[str] = []
|
||||||
|
|
||||||
|
if not _KEBAB_SLUG.fullmatch(slug):
|
||||||
|
msg = f"slug 必须为 kebab-case(小写字母、数字、连字符):{slug!r}"
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
return errors, warnings
|
||||||
|
|
||||||
|
if len(slug) > _MAX_SLUG_LENGTH:
|
||||||
|
msg = f"slug 长度不得超过 {_MAX_SLUG_LENGTH} 字符(当前 {len(slug)}):{slug!r}"
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
|
||||||
|
segments = parse_slug_segments(slug)
|
||||||
|
segment_count = len(segments)
|
||||||
|
|
||||||
|
if segment_count < _MIN_SEGMENTS:
|
||||||
|
msg = (
|
||||||
|
f"slug 段数应为 {_MIN_SEGMENTS}~{_MAX_SEGMENTS}(verb-noun-platform),"
|
||||||
|
f"当前为 {segment_count} 段:{slug!r};新技能禁止 2 段无平台形态(如 reconcile-finance)"
|
||||||
|
)
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
return errors, warnings
|
||||||
|
|
||||||
|
if segment_count > _MAX_SEGMENTS:
|
||||||
|
msg = f"slug 段数不得超过 {_MAX_SEGMENTS}(当前 {segment_count}):{slug!r}"
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
|
||||||
|
verbs = load_wordlist("verbs.txt")
|
||||||
|
platforms = load_wordlist("platforms.txt")
|
||||||
|
scopes = load_wordlist("scopes.txt")
|
||||||
|
|
||||||
|
if segments[0] in platforms and segments[0] not in verbs:
|
||||||
|
msg = f"平台名不应放在 slug 最前:{slug!r}(应为 verb-noun-platform)"
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
|
||||||
|
if segments[0] not in verbs:
|
||||||
|
msg = f"slug 首段应为动词白名单中的词:{segments[0]!r}(slug={slug!r})"
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
|
||||||
|
form = classify_slug_form(segments, slug=slug)
|
||||||
|
if form == "scope":
|
||||||
|
if segments[-1] not in scopes:
|
||||||
|
msg = f"slug 末段应为 scope 白名单中的词:{segments[-1]!r}(slug={slug!r})"
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
noun_count = segment_count - 2
|
||||||
|
elif form == "standard":
|
||||||
|
platform_match = _match_platform_suffix(segments, platforms)
|
||||||
|
if platform_match is None:
|
||||||
|
msg = f"slug 末段应匹配平台白名单:{slug!r}"
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
noun_count = 0
|
||||||
|
else:
|
||||||
|
_platform_name, platform_part_count = platform_match
|
||||||
|
noun_count = segment_count - 1 - platform_part_count
|
||||||
|
else:
|
||||||
|
if segment_count >= _MIN_SEGMENTS:
|
||||||
|
if segments[-1] not in scopes:
|
||||||
|
platform_match = _match_platform_suffix(segments, platforms)
|
||||||
|
if platform_match is None:
|
||||||
|
msg = f"slug 末段应匹配平台或 scope 白名单:{slug!r}"
|
||||||
|
(errors if strict else warnings).append(msg)
|
||||||
|
noun_count = 0
|
||||||
|
|
||||||
|
if noun_count > _MAX_NOUN_SEGMENTS:
|
||||||
|
warnings.append(
|
||||||
|
f"slug 中间名词段建议不超过 {_MAX_NOUN_SEGMENTS} 个词(当前 {noun_count}):{slug!r}"
|
||||||
|
)
|
||||||
|
|
||||||
|
return errors, warnings
|
||||||
@@ -15,6 +15,8 @@
|
|||||||
| CLI / health / version / metadata / runtime 路径 | `tests/test_*.py` | 是 | 默认必跑,保持轻量、无外联 |
|
| CLI / health / version / metadata / runtime 路径 | `tests/test_*.py` | 是 | 默认必跑,保持轻量、无外联 |
|
||||||
| 纯函数 / 业务规则 | `tests/test_*.py` | 是 | 不依赖真实外部系统 |
|
| 纯函数 / 业务规则 | `tests/test_*.py` | 是 | 不依赖真实外部系统 |
|
||||||
| service 层契约 | 从 `tests/samples/test_service_contract.py.sample` 复制到 `tests/test_service_contract.py` | 是,复制后 | 用 `FakeAdapter` / stub 注入外部依赖 |
|
| service 层契约 | 从 `tests/samples/test_service_contract.py.sample` 复制到 `tests/test_service_contract.py` | 是,复制后 | 用 `FakeAdapter` / stub 注入外部依赖 |
|
||||||
|
| 外源同步契约 | 从 `tests/samples/test_sync_contract.py.sample` 复制 | 是,复制后 | 幂等 / 事务 / 空结果保护 / 不导出文件 |
|
||||||
|
| 单内核多入口 | 从 `tests/samples/test_action_core_contract.py.sample` 复制 | 是,复制后 | CLI/task/兼容命令复用同一 domain service |
|
||||||
| golden fixture 回归 | 从 `tests/samples/test_golden_cases.py.sample` 复制到 `tests/test_golden_cases.py` | 是,复制后 | 输入样例 + 期望输出,适合解析、计算、校验类技能 |
|
| golden fixture 回归 | 从 `tests/samples/test_golden_cases.py.sample` 复制到 `tests/test_golden_cases.py` | 是,复制后 | 输入样例 + 期望输出,适合解析、计算、校验类技能 |
|
||||||
| 仿真 API | `tests/integration/test_simulator_api_contract.py.sample` | 否 | 复制并设置 `OPENCLAW_TEST_TARGET=simulator_api` 后按需运行 |
|
| 仿真 API | `tests/integration/test_simulator_api_contract.py.sample` | 否 | 复制并设置 `OPENCLAW_TEST_TARGET=simulator_api` 后按需运行 |
|
||||||
| 仿真 RPA / 页面操作 | `tests/integration/test_simulator_rpa_contract.py.sample` | 否 | 用 localhost / 仿真页面,不碰真实系统 |
|
| 仿真 RPA / 页面操作 | `tests/integration/test_simulator_rpa_contract.py.sample` | 否 | 用 localhost / 仿真页面,不碰真实系统 |
|
||||||
@@ -70,9 +72,11 @@ python tests/run_tests.py test_cli_smoke
|
|||||||
|------|------|
|
|------|------|
|
||||||
| CLI 冒烟(import ``cli.app.main``) | ``test_cli_smoke.py`` |
|
| CLI 冒烟(import ``cli.app.main``) | ``test_cli_smoke.py`` |
|
||||||
| **subprocess 真实入口** ``python scripts/main.py`` | ``test_entrypoint_subprocess.py`` |
|
| **subprocess 真实入口** ``python scripts/main.py`` | ``test_entrypoint_subprocess.py`` |
|
||||||
| 运行路径与 **CLAW_*/JIANGCHANG_*** 隔离 | ``test_runtime_paths.py`` |
|
| 运行路径与 **JIANGCHANG_*** 隔离 | ``test_runtime_paths.py`` |
|
||||||
| ``SKILL.md`` slug 与 ``constants.SKILL_SLUG`` | ``test_skill_metadata.py`` |
|
| ``SKILL.md`` slug 与 ``constants.SKILL_SLUG`` | ``test_skill_metadata.py`` |
|
||||||
| DB / ``task_logs`` 骨架冒烟 | ``test_db_smoke.py`` |
|
| DB / ``task_logs`` 骨架冒烟 | ``test_db_smoke.py`` |
|
||||||
|
| 数据管理元数据 / 字段顺序 | ``test_display_metadata.py`` |
|
||||||
|
| 标准时间字段(Unix 秒 / trigger / 元数据) | ``test_timestamp_columns.py`` |
|
||||||
| **adapter profile / 外呼授权策略** | ``test_adapter_profile_policy.py`` + ``adapter_test_utils.py``(非 ``test_`` 前缀,不自动当用例收集) |
|
| **adapter profile / 外呼授权策略** | ``test_adapter_profile_policy.py`` + ``adapter_test_utils.py``(非 ``test_`` 前缀,不自动当用例收集) |
|
||||||
| **无 vendored ``jiangchang_skill_core``** | ``test_platform_import.py`` |
|
| **无 vendored ``jiangchang_skill_core``** | ``test_platform_import.py`` |
|
||||||
| **runtime diagnostics 架构守护** | ``test_runtime_diagnostics_integration.py`` |
|
| **runtime diagnostics 架构守护** | ``test_runtime_diagnostics_integration.py`` |
|
||||||
@@ -84,17 +88,14 @@ python tests/run_tests.py test_cli_smoke
|
|||||||
|
|
||||||
### 1.3 数据隔离(``_support.IsolatedDataRoot``)
|
### 1.3 数据隔离(``_support.IsolatedDataRoot``)
|
||||||
|
|
||||||
同时设置(进入同一临时目录 / 用户):
|
进入同一临时目录 / 用户:
|
||||||
|
|
||||||
| ``CLAW_DATA_ROOT`` | ``JIANGCHANG_DATA_ROOT`` |
|
| 变量 | 值 |
|
||||||
|--------------------|---------------------------|
|
|------|-----|
|
||||||
| 同一 ``tempfile.mkdtemp(prefix="skill-test-")`` | 同上 |
|
| ``JIANGCHANG_DATA_ROOT`` | ``tempfile.mkdtemp(prefix="skill-test-")`` |
|
||||||
|
| ``JIANGCHANG_USER_ID`` | ``_test`` |
|
||||||
|
|
||||||
| ``CLAW_USER_ID`` | ``JIANGCHANG_USER_ID`` |
|
退出时两个键均恢复(原不存在则 ``pop``),并删除临时目录。
|
||||||
|------------------|-------------------------|
|
|
||||||
| ``_test`` | ``_test`` |
|
|
||||||
|
|
||||||
退出时四个键均恢复(原不存在则 ``pop``),并删除临时目录。
|
|
||||||
|
|
||||||
### 1.4 产物与密钥
|
### 1.4 产物与密钥
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,8 @@
|
|||||||
测试公共支撑。
|
测试公共支撑。
|
||||||
|
|
||||||
1. 将 scripts/ 加入 sys.path,便于 `from cli…` / `from db…` / `from util…` 等导入。
|
1. 将 scripts/ 加入 sys.path,便于 `from cli…` / `from db…` / `from util…` 等导入。
|
||||||
2. `IsolatedDataRoot`:同时设置 CLAW_* 与 JIANGCHANG_* 数据根与用户 ID,
|
2. `IsolatedDataRoot`:设置 `JIANGCHANG_DATA_ROOT` 与 `JIANGCHANG_USER_ID`,
|
||||||
与 `jiangchang_skill_core.runtime_env` 的优先级一致(CLAW_* 优先),
|
退出时恢复原值并删除临时目录,避免污染真实用户数据目录。
|
||||||
避免只设 JIANGCHANG_* 时仍读到真实 CLAW_DATA_ROOT。
|
|
||||||
退出时四个变量均恢复;原不存在的键会删除;并 rmtree 临时目录。
|
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
@@ -24,9 +22,7 @@ if _SCRIPTS_DIR not in sys.path:
|
|||||||
sys.path.insert(0, _SCRIPTS_DIR)
|
sys.path.insert(0, _SCRIPTS_DIR)
|
||||||
|
|
||||||
_ISOLATION_KEYS = (
|
_ISOLATION_KEYS = (
|
||||||
"CLAW_DATA_ROOT",
|
|
||||||
"JIANGCHANG_DATA_ROOT",
|
"JIANGCHANG_DATA_ROOT",
|
||||||
"CLAW_USER_ID",
|
|
||||||
"JIANGCHANG_USER_ID",
|
"JIANGCHANG_USER_ID",
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -39,7 +35,7 @@ def get_skill_root() -> str:
|
|||||||
return _SKILL_ROOT
|
return _SKILL_ROOT
|
||||||
|
|
||||||
|
|
||||||
def platform_kit_version_patch(version: str = "1.0.14"):
|
def platform_kit_version_patch(version: str = "1.2.0"):
|
||||||
"""Mock installed jiangchang-platform-kit version for health/diagnostics tests."""
|
"""Mock installed jiangchang-platform-kit version for health/diagnostics tests."""
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
@@ -53,11 +49,11 @@ class IsolatedDataRoot:
|
|||||||
"""
|
"""
|
||||||
在独立临时目录下模拟数据根,避免污染本机默认数据目录。
|
在独立临时目录下模拟数据根,避免污染本机默认数据目录。
|
||||||
|
|
||||||
进入上下文时(同一套隔离值写入 CLAW_* 与 JIANGCHANG_*):
|
进入上下文时:
|
||||||
- CLAW_DATA_ROOT / JIANGCHANG_DATA_ROOT -> 同一 tempfile.mkdtemp(prefix='skill-test-')
|
- JIANGCHANG_DATA_ROOT -> tempfile.mkdtemp(prefix='skill-test-')
|
||||||
- CLAW_USER_ID / JIANGCHANG_USER_ID -> _test(与业务默认用户区分)
|
- JIANGCHANG_USER_ID -> _test(与业务默认用户区分)
|
||||||
|
|
||||||
退出时:四个变量均恢复为进入前状态(若原先未设置则 pop),并删除临时目录。
|
退出时:两个变量均恢复为进入前状态(若原先未设置则 pop),并删除临时目录。
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, user_id: str = "_test") -> None:
|
def __init__(self, user_id: str = "_test") -> None:
|
||||||
@@ -69,9 +65,7 @@ class IsolatedDataRoot:
|
|||||||
self._tmp = tempfile.mkdtemp(prefix="skill-test-")
|
self._tmp = tempfile.mkdtemp(prefix="skill-test-")
|
||||||
for k in _ISOLATION_KEYS:
|
for k in _ISOLATION_KEYS:
|
||||||
self._old[k] = os.environ.get(k)
|
self._old[k] = os.environ.get(k)
|
||||||
os.environ["CLAW_DATA_ROOT"] = self._tmp
|
|
||||||
os.environ["JIANGCHANG_DATA_ROOT"] = self._tmp
|
os.environ["JIANGCHANG_DATA_ROOT"] = self._tmp
|
||||||
os.environ["CLAW_USER_ID"] = self._user_id
|
|
||||||
os.environ["JIANGCHANG_USER_ID"] = self._user_id
|
os.environ["JIANGCHANG_USER_ID"] = self._user_id
|
||||||
return self._tmp
|
return self._tmp
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 两类样例文件
|
## 样例文件
|
||||||
|
|
||||||
### 1. `test_service_contract.py.sample`
|
### 1. `test_service_contract.py.sample`
|
||||||
|
|
||||||
@@ -22,7 +22,17 @@
|
|||||||
- 需要验证:**成功路径**、**参数/校验错误**、**adapter 异常被转换为业务可读错误**。
|
- 需要验证:**成功路径**、**参数/校验错误**、**adapter 异常被转换为业务可读错误**。
|
||||||
- 需要用 **`FakeAdapter`**(见 `tests/adapter_test_utils.py`)或自建 **stub** 替代 ERP、TMS、WMS、船司、报关、LLM、RPA 等,**不**发真实 HTTP、**不**开真实浏览器。
|
- 需要用 **`FakeAdapter`**(见 `tests/adapter_test_utils.py`)或自建 **stub** 替代 ERP、TMS、WMS、船司、报关、LLM、RPA 等,**不**发真实 HTTP、**不**开真实浏览器。
|
||||||
|
|
||||||
### 2. `test_golden_cases.py.sample`
|
### 2. `test_sync_contract.py.sample`
|
||||||
|
|
||||||
|
**适合:** 外源 → 本地库的同步 / refresh / collect 能力。
|
||||||
|
|
||||||
|
至少应覆盖:首次插入、第二次幂等、更新、失效数据处理、不可信空结果保护 vs 完整空快照失效、遗漏 `snapshot_complete` 立即失败、部分写入后故障注入与回滚(`fail_after_writes`)、统计字段 `inserted/updated/unchanged/removed`、同步路径不调用 CSV/Excel 导出器。`snapshot_complete` 为调用方**必须显式传入**的 keyword-only 参数(无默认值),禁止默认把结果当成完整快照,也禁止靠条数猜测完整性。使用通用表名(如 `business_key`),不要写具体平台业务名。
|
||||||
|
|
||||||
|
### 3. `test_action_core_contract.py.sample`
|
||||||
|
|
||||||
|
**适合:** 校验「单业务内核、多入口」——task/CLI/兼容命令调用同一 domain service;不按 toolbar/cron/agent 来源改变业务结果。
|
||||||
|
|
||||||
|
### 4. `test_golden_cases.py.sample`
|
||||||
|
|
||||||
**适合:**
|
**适合:**
|
||||||
|
|
||||||
@@ -103,6 +113,8 @@
|
|||||||
| 用途 | 示例文件名 |
|
| 用途 | 示例文件名 |
|
||||||
|------|------------|
|
|------|------------|
|
||||||
| Service 契约 | `tests/test_service_contract.py` |
|
| Service 契约 | `tests/test_service_contract.py` |
|
||||||
|
| 同步契约 | `tests/test_sync_contract.py` |
|
||||||
|
| 单内核多入口 | `tests/test_action_core_contract.py` |
|
||||||
| Golden / fixture 回归 | `tests/test_golden_cases.py` |
|
| Golden / fixture 回归 | `tests/test_golden_cases.py` |
|
||||||
| 领域规则 | `tests/test_<domain>_rules.py` |
|
| 领域规则 | `tests/test_<domain>_rules.py` |
|
||||||
| 校验逻辑 | `tests/test_<domain>_validation.py` |
|
| 校验逻辑 | `tests/test_<domain>_validation.py` |
|
||||||
|
|||||||
116
tests/samples/test_action_core_contract.py.sample
Normal file
116
tests/samples/test_action_core_contract.py.sample
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# 样例:复制到 ``tests/test_action_core_contract.py`` 后按实际模块改名运行。
|
||||||
|
# 默认不会被 ``python tests/run_tests.py`` 收集(扩展名为 .sample)。
|
||||||
|
"""
|
||||||
|
单业务内核、多入口契约范式(通用)。
|
||||||
|
|
||||||
|
覆盖:
|
||||||
|
- task / command adapter 调用唯一 domain service
|
||||||
|
- 兼容命令复用同一个核心函数
|
||||||
|
- CLI handler 不复制业务逻辑
|
||||||
|
- 不根据 toolbar / cron / agent 来源改变业务处理
|
||||||
|
|
||||||
|
复制后把示意函数换成真实 import;禁止按入口维护多套实现。
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from typing import Any, Callable
|
||||||
|
|
||||||
|
|
||||||
|
class DomainService:
|
||||||
|
"""唯一业务内核示意。"""
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
self.calls: list[dict[str, Any]] = []
|
||||||
|
|
||||||
|
def sync_records(self, *, limit: int = 100) -> dict[str, Any]:
|
||||||
|
self.calls.append({"op": "sync_records", "limit": limit})
|
||||||
|
return {"ok": True, "limit": limit, "inserted": 1}
|
||||||
|
|
||||||
|
|
||||||
|
def cmd_sync_records(domain: DomainService, *, limit: int = 100) -> dict[str, Any]:
|
||||||
|
"""task_service 编排层:可加 job_context,但不按 source 分叉业务。"""
|
||||||
|
return domain.sync_records(limit=limit)
|
||||||
|
|
||||||
|
|
||||||
|
def cmd_export_compat_refresh(domain: DomainService, *, limit: int = 100) -> dict[str, Any]:
|
||||||
|
"""兼容旧 export:刷新必须复用同一 sync 内核,禁止另写采集逻辑。"""
|
||||||
|
sync_result = domain.sync_records(limit=limit)
|
||||||
|
return {"export": "delegated-to-host-or-report", "sync": sync_result}
|
||||||
|
|
||||||
|
|
||||||
|
def cli_handle_sync(domain: DomainService, argv_limit: int) -> dict[str, Any]:
|
||||||
|
"""CLI handler:只解析参数后转发,不内嵌业务。"""
|
||||||
|
return cmd_sync_records(domain, limit=argv_limit)
|
||||||
|
|
||||||
|
|
||||||
|
def run_from_source(
|
||||||
|
domain: DomainService,
|
||||||
|
*,
|
||||||
|
source: str,
|
||||||
|
limit: int = 10,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""
|
||||||
|
宿主可能传入 source=toolbar|cron|agent|skill-detail。
|
||||||
|
正确实现:忽略 source,业务结果一致。
|
||||||
|
"""
|
||||||
|
_ = source # 不得用于分支业务语义
|
||||||
|
return cmd_sync_records(domain, limit=limit)
|
||||||
|
|
||||||
|
|
||||||
|
class TestActionCoreContractSample(unittest.TestCase):
|
||||||
|
def test_task_adapter_calls_single_domain_service(self) -> None:
|
||||||
|
domain = DomainService()
|
||||||
|
out = cmd_sync_records(domain, limit=5)
|
||||||
|
self.assertTrue(out["ok"])
|
||||||
|
self.assertEqual(domain.calls, [{"op": "sync_records", "limit": 5}])
|
||||||
|
|
||||||
|
def test_compat_command_reuses_same_core(self) -> None:
|
||||||
|
domain = DomainService()
|
||||||
|
cmd_export_compat_refresh(domain, limit=3)
|
||||||
|
self.assertEqual(len(domain.calls), 1)
|
||||||
|
self.assertEqual(domain.calls[0]["op"], "sync_records")
|
||||||
|
|
||||||
|
def test_cli_handler_does_not_duplicate_business_logic(self) -> None:
|
||||||
|
domain = DomainService()
|
||||||
|
# CLI 与 task 编排应落到同一函数对象(示意)
|
||||||
|
self.assertIs(cli_handle_sync.__wrapped__ if hasattr(cli_handle_sync, "__wrapped__") else None, None)
|
||||||
|
out = cli_handle_sync(domain, 7)
|
||||||
|
self.assertEqual(out["limit"], 7)
|
||||||
|
self.assertEqual(domain.calls[-1], {"op": "sync_records", "limit": 7})
|
||||||
|
|
||||||
|
# 强化:CLI 路径与 cmd 路径结果一致
|
||||||
|
domain2 = DomainService()
|
||||||
|
a = cli_handle_sync(domain2, 2)
|
||||||
|
domain3 = DomainService()
|
||||||
|
b = cmd_sync_records(domain3, limit=2)
|
||||||
|
self.assertEqual(a, b)
|
||||||
|
|
||||||
|
def test_business_result_independent_of_entry_source(self) -> None:
|
||||||
|
domain = DomainService()
|
||||||
|
results = [
|
||||||
|
run_from_source(domain, source=src, limit=4)
|
||||||
|
for src in ("toolbar", "cron", "agent", "skill-detail")
|
||||||
|
]
|
||||||
|
self.assertEqual(results[0], results[1])
|
||||||
|
self.assertEqual(results[1], results[2])
|
||||||
|
self.assertEqual(results[2], results[3])
|
||||||
|
self.assertEqual(len(domain.calls), 4)
|
||||||
|
self.assertTrue(all(c["op"] == "sync_records" and c["limit"] == 4 for c in domain.calls))
|
||||||
|
|
||||||
|
def test_entrypoint_wiring_points_to_same_callable(self) -> None:
|
||||||
|
"""示意:manifest 多 placements 应对应同一 Python 入口函数。"""
|
||||||
|
domain = DomainService()
|
||||||
|
handlers: dict[str, Callable[..., dict[str, Any]]] = {
|
||||||
|
"toolbar": lambda: cmd_sync_records(domain, limit=1),
|
||||||
|
"cron": lambda: cmd_sync_records(domain, limit=1),
|
||||||
|
"agent": lambda: cmd_sync_records(domain, limit=1),
|
||||||
|
}
|
||||||
|
outs = [handlers[k]() for k in handlers]
|
||||||
|
self.assertEqual(outs[0], outs[1])
|
||||||
|
self.assertEqual(outs[1], outs[2])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
274
tests/samples/test_sync_contract.py.sample
Normal file
274
tests/samples/test_sync_contract.py.sample
Normal file
@@ -0,0 +1,274 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# 样例:复制到 ``tests/test_sync_contract.py`` 后按实际 domain service 改名运行。
|
||||||
|
# 默认不会被 ``python tests/run_tests.py`` 收集(扩展名为 .sample)。
|
||||||
|
"""
|
||||||
|
外源 → 本地库同步契约范式(通用,无具体平台业务名)。
|
||||||
|
|
||||||
|
覆盖:
|
||||||
|
- 首次同步插入
|
||||||
|
- 第二次同步幂等
|
||||||
|
- 更新已有数据
|
||||||
|
- 处理失效数据
|
||||||
|
- 不可信空结果保护 vs 完整空快照失效(``snapshot_complete`` 必填,无默认值)
|
||||||
|
- 遗漏 ``snapshot_complete`` 立即失败(TypeError)
|
||||||
|
- 事务在部分写入后失败并回滚
|
||||||
|
- 返回 inserted/updated/unchanged/removed
|
||||||
|
- sync Action 不调用 CSV/Excel 文件导出器
|
||||||
|
|
||||||
|
复制后把内存仓库与 stub 外源换成真实 repository / reader;禁止访问真实网络或用户数据目录。
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class SyncStats:
|
||||||
|
total: int = 0
|
||||||
|
inserted: int = 0
|
||||||
|
updated: int = 0
|
||||||
|
unchanged: int = 0
|
||||||
|
removed: int = 0
|
||||||
|
|
||||||
|
def as_dict(self) -> dict[str, int]:
|
||||||
|
return {
|
||||||
|
"total": self.total,
|
||||||
|
"inserted": self.inserted,
|
||||||
|
"updated": self.updated,
|
||||||
|
"unchanged": self.unchanged,
|
||||||
|
"removed": self.removed,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class MemoryRecordStore:
|
||||||
|
"""内存库:演示幂等 upsert + 全量失效(is_active 标记)。"""
|
||||||
|
|
||||||
|
rows: dict[str, dict[str, Any]] = field(default_factory=dict)
|
||||||
|
in_transaction: bool = False
|
||||||
|
_tx_snapshot: dict[str, dict[str, Any]] | None = None
|
||||||
|
|
||||||
|
def begin(self) -> None:
|
||||||
|
self._tx_snapshot = {k: dict(v) for k, v in self.rows.items()}
|
||||||
|
self.in_transaction = True
|
||||||
|
|
||||||
|
def commit(self) -> None:
|
||||||
|
self._tx_snapshot = None
|
||||||
|
self.in_transaction = False
|
||||||
|
|
||||||
|
def rollback(self) -> None:
|
||||||
|
if self._tx_snapshot is not None:
|
||||||
|
self.rows = {k: dict(v) for k, v in self._tx_snapshot.items()}
|
||||||
|
self._tx_snapshot = None
|
||||||
|
self.in_transaction = False
|
||||||
|
|
||||||
|
def upsert_snapshot(
|
||||||
|
self,
|
||||||
|
records: list[dict[str, Any]],
|
||||||
|
*,
|
||||||
|
fail_after_writes: int | None = None,
|
||||||
|
) -> SyncStats:
|
||||||
|
"""全量快照:按 business_key 对齐;缺失标 is_active=0。
|
||||||
|
|
||||||
|
``fail_after_writes``:在成功完成该次数的 insert/update 之后抛错,用于验证回滚。
|
||||||
|
"""
|
||||||
|
self.begin()
|
||||||
|
try:
|
||||||
|
stats = SyncStats(total=len(records))
|
||||||
|
seen: set[str] = set()
|
||||||
|
write_count = 0
|
||||||
|
for rec in records:
|
||||||
|
key = str(rec["business_key"])
|
||||||
|
seen.add(key)
|
||||||
|
existing = self.rows.get(key)
|
||||||
|
payload = {
|
||||||
|
"business_key": key,
|
||||||
|
"title": rec["title"],
|
||||||
|
"is_active": 1,
|
||||||
|
}
|
||||||
|
if existing is None:
|
||||||
|
self.rows[key] = payload
|
||||||
|
stats.inserted += 1
|
||||||
|
write_count += 1
|
||||||
|
elif existing.get("title") == payload["title"] and existing.get("is_active") == 1:
|
||||||
|
stats.unchanged += 1
|
||||||
|
else:
|
||||||
|
self.rows[key] = payload
|
||||||
|
stats.updated += 1
|
||||||
|
write_count += 1
|
||||||
|
if fail_after_writes is not None and write_count >= fail_after_writes:
|
||||||
|
raise RuntimeError(
|
||||||
|
f"simulated write failure after {write_count} insert/update write(s)"
|
||||||
|
)
|
||||||
|
for key, existing in list(self.rows.items()):
|
||||||
|
if key not in seen and existing.get("is_active") == 1:
|
||||||
|
existing["is_active"] = 0
|
||||||
|
stats.removed += 1
|
||||||
|
self.commit()
|
||||||
|
return stats
|
||||||
|
except Exception:
|
||||||
|
self.rollback()
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
class ExportSpy:
|
||||||
|
"""若 sync 路径误调导出器,测试应失败。"""
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
self.calls: list[str] = []
|
||||||
|
|
||||||
|
def write_csv(self, *_a: Any, **_k: Any) -> None:
|
||||||
|
self.calls.append("csv")
|
||||||
|
|
||||||
|
def write_excel(self, *_a: Any, **_k: Any) -> None:
|
||||||
|
self.calls.append("excel")
|
||||||
|
|
||||||
|
|
||||||
|
def sync_records(
|
||||||
|
store: MemoryRecordStore,
|
||||||
|
external_rows: list[dict[str, Any]],
|
||||||
|
*,
|
||||||
|
snapshot_complete: bool,
|
||||||
|
exporter: ExportSpy | None = None,
|
||||||
|
fail_after_writes: int | None = None,
|
||||||
|
) -> dict[str, int]:
|
||||||
|
"""领域同步内核示意:只写库,不导出文件。
|
||||||
|
|
||||||
|
``snapshot_complete`` 为 keyword-only **必填**参数(无默认值):
|
||||||
|
- False:读取失败/分页不完整/不可信结果 → 不得清库或失效旧数据
|
||||||
|
- True:外源完整快照(可为空)→ 允许按全量策略 upsert / 标记失效
|
||||||
|
调用方必须显式传入,禁止默认当作完整快照,也禁止靠条数猜测完整性。
|
||||||
|
"""
|
||||||
|
if external_rows is None:
|
||||||
|
raise ValueError("external_rows required")
|
||||||
|
if not snapshot_complete:
|
||||||
|
active = sum(1 for r in store.rows.values() if r.get("is_active") == 1)
|
||||||
|
return SyncStats(total=0, unchanged=active).as_dict()
|
||||||
|
stats = store.upsert_snapshot(external_rows, fail_after_writes=fail_after_writes)
|
||||||
|
if exporter is not None:
|
||||||
|
# 正确实现不得调用;本示意刻意不调用,供测试断言
|
||||||
|
pass
|
||||||
|
return stats.as_dict()
|
||||||
|
|
||||||
|
|
||||||
|
class TestSyncContractSample(unittest.TestCase):
|
||||||
|
def test_first_sync_inserts(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
stats = sync_records(
|
||||||
|
store,
|
||||||
|
[{"business_key": "a", "title": "A"}, {"business_key": "b", "title": "B"}],
|
||||||
|
snapshot_complete=True,
|
||||||
|
)
|
||||||
|
self.assertEqual(stats["inserted"], 2)
|
||||||
|
self.assertEqual(stats["total"], 2)
|
||||||
|
self.assertEqual(len(store.rows), 2)
|
||||||
|
|
||||||
|
def test_second_sync_is_idempotent(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
rows = [{"business_key": "a", "title": "A"}]
|
||||||
|
sync_records(store, rows, snapshot_complete=True)
|
||||||
|
stats = sync_records(store, rows, snapshot_complete=True)
|
||||||
|
self.assertEqual(stats["unchanged"], 1)
|
||||||
|
self.assertEqual(stats["inserted"], 0)
|
||||||
|
self.assertEqual(stats["updated"], 0)
|
||||||
|
|
||||||
|
def test_updates_existing_row(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
sync_records(store, [{"business_key": "a", "title": "A"}], snapshot_complete=True)
|
||||||
|
stats = sync_records(
|
||||||
|
store, [{"business_key": "a", "title": "A2"}], snapshot_complete=True
|
||||||
|
)
|
||||||
|
self.assertEqual(stats["updated"], 1)
|
||||||
|
self.assertEqual(store.rows["a"]["title"], "A2")
|
||||||
|
|
||||||
|
def test_marks_removed_inactive_on_full_sync(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
sync_records(
|
||||||
|
store,
|
||||||
|
[{"business_key": "a", "title": "A"}, {"business_key": "b", "title": "B"}],
|
||||||
|
snapshot_complete=True,
|
||||||
|
)
|
||||||
|
stats = sync_records(
|
||||||
|
store, [{"business_key": "a", "title": "A"}], snapshot_complete=True
|
||||||
|
)
|
||||||
|
self.assertEqual(stats["removed"], 1)
|
||||||
|
self.assertEqual(store.rows["b"]["is_active"], 0)
|
||||||
|
self.assertEqual(store.rows["a"]["is_active"], 1)
|
||||||
|
|
||||||
|
def test_incomplete_empty_snapshot_does_not_wipe_existing(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
sync_records(store, [{"business_key": "a", "title": "A"}], snapshot_complete=True)
|
||||||
|
stats = sync_records(store, [], snapshot_complete=False)
|
||||||
|
self.assertEqual(store.rows["a"]["is_active"], 1)
|
||||||
|
self.assertEqual(stats["removed"], 0)
|
||||||
|
self.assertEqual(stats["unchanged"], 1)
|
||||||
|
|
||||||
|
def test_complete_empty_snapshot_marks_existing_inactive(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
sync_records(
|
||||||
|
store,
|
||||||
|
[{"business_key": "a", "title": "A"}, {"business_key": "b", "title": "B"}],
|
||||||
|
snapshot_complete=True,
|
||||||
|
)
|
||||||
|
stats = sync_records(store, [], snapshot_complete=True)
|
||||||
|
self.assertEqual(stats["removed"], 2)
|
||||||
|
self.assertEqual(store.rows["a"]["is_active"], 0)
|
||||||
|
self.assertEqual(store.rows["b"]["is_active"], 0)
|
||||||
|
|
||||||
|
def test_omitting_snapshot_complete_raises_type_error(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
with self.assertRaises(TypeError):
|
||||||
|
sync_records(store, [{"business_key": "a", "title": "A"}]) # type: ignore[call-arg]
|
||||||
|
|
||||||
|
def test_transaction_failure_after_partial_writes_rolls_back(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
sync_records(store, [{"business_key": "a", "title": "A"}], snapshot_complete=True)
|
||||||
|
with self.assertRaises(RuntimeError) as ctx:
|
||||||
|
sync_records(
|
||||||
|
store,
|
||||||
|
[
|
||||||
|
{"business_key": "a", "title": "A2"},
|
||||||
|
{"business_key": "b", "title": "B"},
|
||||||
|
],
|
||||||
|
snapshot_complete=True,
|
||||||
|
fail_after_writes=1,
|
||||||
|
)
|
||||||
|
self.assertIn("after 1", str(ctx.exception))
|
||||||
|
self.assertEqual(store.rows["a"]["title"], "A")
|
||||||
|
self.assertNotIn("b", store.rows)
|
||||||
|
self.assertFalse(store.in_transaction)
|
||||||
|
self.assertIsNone(store._tx_snapshot)
|
||||||
|
|
||||||
|
def test_stats_keys_cover_inserted_updated_unchanged_removed(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
sync_records(
|
||||||
|
store,
|
||||||
|
[{"business_key": "a", "title": "A"}, {"business_key": "b", "title": "B"}],
|
||||||
|
snapshot_complete=True,
|
||||||
|
)
|
||||||
|
stats = sync_records(
|
||||||
|
store,
|
||||||
|
[{"business_key": "a", "title": "A2"}],
|
||||||
|
snapshot_complete=True,
|
||||||
|
)
|
||||||
|
for key in ("total", "inserted", "updated", "unchanged", "removed"):
|
||||||
|
self.assertIn(key, stats)
|
||||||
|
self.assertEqual(stats["updated"], 1)
|
||||||
|
self.assertEqual(stats["removed"], 1)
|
||||||
|
|
||||||
|
def test_sync_does_not_call_file_exporters(self) -> None:
|
||||||
|
store = MemoryRecordStore()
|
||||||
|
spy = ExportSpy()
|
||||||
|
sync_records(
|
||||||
|
store,
|
||||||
|
[{"business_key": "a", "title": "A"}],
|
||||||
|
snapshot_complete=True,
|
||||||
|
exporter=spy,
|
||||||
|
)
|
||||||
|
self.assertEqual(spy.calls, [])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
495
tests/test_actions_manifest.py
Normal file
495
tests/test_actions_manifest.py
Normal file
@@ -0,0 +1,495 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""assets/actions.json 结构与 CLI 映射守护(通用模板,不含具体业务技能名称)。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import sqlite3
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from _support import IsolatedDataRoot, get_skill_root
|
||||||
|
|
||||||
|
from cli.app import build_parser
|
||||||
|
from util.constants import SKILL_SLUG
|
||||||
|
|
||||||
|
_TEMPLATE_PLACEHOLDER_SLUG = "your-skill-slug"
|
||||||
|
_ALLOWED_PLACEMENTS = frozenset({"toolbar", "row", "batch", "cron", "agent", "skill-detail"})
|
||||||
|
_RESERVED_PLACEMENTS = frozenset({"row", "batch"})
|
||||||
|
_RESERVED_ACTION_FIELDS = frozenset({"concurrency", "locks"})
|
||||||
|
_ALLOWED_EXECUTION_PROFILES = frozenset({"sync", "async"})
|
||||||
|
_REQUIRED_MANIFEST_KEYS = frozenset({"schemaVersion", "skill", "actions"})
|
||||||
|
_REQUIRED_ACTION_KEYS = frozenset(
|
||||||
|
{"id", "label", "description", "placements", "entrypoint", "executionProfile"}
|
||||||
|
)
|
||||||
|
_TABLE_NAME_PATTERN = re.compile(r"^[a-z][a-z0-9_]*$")
|
||||||
|
_FORBIDDEN_BUSINESS_TERMS = (
|
||||||
|
"wechat",
|
||||||
|
"微信",
|
||||||
|
"contacts",
|
||||||
|
"wxid",
|
||||||
|
"account_wxid",
|
||||||
|
"contact.db",
|
||||||
|
"scrape-contacts",
|
||||||
|
"douyin",
|
||||||
|
"抖音",
|
||||||
|
"xiaohongshu",
|
||||||
|
"小红书",
|
||||||
|
"公众号",
|
||||||
|
"logistics",
|
||||||
|
"物流",
|
||||||
|
)
|
||||||
|
|
||||||
|
_TEMPLATE_ARG_PATTERN = re.compile(r"\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}")
|
||||||
|
|
||||||
|
|
||||||
|
def _load_actions_manifest() -> dict:
|
||||||
|
path = os.path.join(get_skill_root(), "assets", "actions.json")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
return json.load(f)
|
||||||
|
|
||||||
|
|
||||||
|
def _cli_subcommands() -> set[str]:
|
||||||
|
parser = build_parser()
|
||||||
|
subs = parser._subparsers._group_actions[0].choices # type: ignore[attr-defined]
|
||||||
|
return set(subs.keys())
|
||||||
|
|
||||||
|
|
||||||
|
def _collect_template_vars(args: list) -> set[str]:
|
||||||
|
found: set[str] = set()
|
||||||
|
for item in args:
|
||||||
|
if not isinstance(item, str):
|
||||||
|
continue
|
||||||
|
for match in _TEMPLATE_ARG_PATTERN.finditer(item):
|
||||||
|
found.add(match.group(1))
|
||||||
|
return found
|
||||||
|
|
||||||
|
|
||||||
|
def _load_actions_schema() -> dict:
|
||||||
|
path = os.path.join(get_skill_root(), "assets", "schemas", "skill-actions.schema.json")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
return json.load(f)
|
||||||
|
|
||||||
|
|
||||||
|
def _validate_bind_tables(action_id: str, bind: object) -> list[str]:
|
||||||
|
errors: list[str] = []
|
||||||
|
if not isinstance(bind, dict):
|
||||||
|
return [f"{action_id}: bind must be object"]
|
||||||
|
if set(bind.keys()) - {"tables"}:
|
||||||
|
errors.append(f"{action_id}: bind only allows tables, got {sorted(bind.keys())}")
|
||||||
|
tables = bind.get("tables")
|
||||||
|
if not isinstance(tables, list) or len(tables) < 1:
|
||||||
|
errors.append(f"{action_id}: bind.tables must be non-empty array")
|
||||||
|
return errors
|
||||||
|
seen: set[str] = set()
|
||||||
|
for table in tables:
|
||||||
|
if not isinstance(table, str) or not table.strip():
|
||||||
|
errors.append(f"{action_id}: bind.tables entries must be non-empty strings")
|
||||||
|
continue
|
||||||
|
if table != table.strip() or not _TABLE_NAME_PATTERN.fullmatch(table):
|
||||||
|
errors.append(f"{action_id}: bind.tables entry {table!r} must be snake_case")
|
||||||
|
if table in seen:
|
||||||
|
errors.append(f"{action_id}: bind.tables duplicate {table!r}")
|
||||||
|
seen.add(table)
|
||||||
|
return errors
|
||||||
|
|
||||||
|
|
||||||
|
def _load_bindable_business_tables() -> set[str]:
|
||||||
|
"""在隔离临时数据根下 init_db,返回可绑定到 toolbar 的业务表集合。
|
||||||
|
|
||||||
|
表必须同时满足:
|
||||||
|
- SQLite 物理表存在(排除 sqlite_* 与 _jiangchang_* 元数据表)
|
||||||
|
- ``_jiangchang_tables`` 中有对应行且 ``visible=1``
|
||||||
|
|
||||||
|
失败时抛出 RuntimeError(带诊断),不得静默返回空集供测试 skip。
|
||||||
|
"""
|
||||||
|
from db.connection import init_db
|
||||||
|
from db.display_metadata import METADATA_TABLES
|
||||||
|
from util.runtime_paths import get_db_path
|
||||||
|
|
||||||
|
physical: set[str] = set()
|
||||||
|
visible_meta: set[str] = set()
|
||||||
|
try:
|
||||||
|
with IsolatedDataRoot() as data_root:
|
||||||
|
init_db()
|
||||||
|
db_path = get_db_path()
|
||||||
|
if not os.path.isfile(db_path):
|
||||||
|
raise RuntimeError(
|
||||||
|
f"init_db did not create database file under isolated root "
|
||||||
|
f"{data_root!r}: expected {db_path}"
|
||||||
|
)
|
||||||
|
conn = sqlite3.connect(db_path)
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT name FROM sqlite_master "
|
||||||
|
"WHERE type='table' AND name NOT LIKE 'sqlite_%'"
|
||||||
|
)
|
||||||
|
physical = {
|
||||||
|
str(row[0])
|
||||||
|
for row in cur.fetchall()
|
||||||
|
if str(row[0]) not in METADATA_TABLES
|
||||||
|
}
|
||||||
|
cur.execute(
|
||||||
|
"SELECT table_name FROM _jiangchang_tables WHERE visible = 1"
|
||||||
|
)
|
||||||
|
visible_meta = {str(row[0]) for row in cur.fetchall()}
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
bindable = physical & visible_meta
|
||||||
|
if not bindable:
|
||||||
|
raise RuntimeError(
|
||||||
|
"isolated init_db produced no bindable tables "
|
||||||
|
f"(physical={sorted(physical)}, visible_meta={sorted(visible_meta)}, "
|
||||||
|
f"db_path={db_path!r})"
|
||||||
|
)
|
||||||
|
return bindable
|
||||||
|
except RuntimeError:
|
||||||
|
raise
|
||||||
|
except Exception as exc:
|
||||||
|
raise RuntimeError(
|
||||||
|
"failed to load bindable business tables via isolated init_db: "
|
||||||
|
f"{type(exc).__name__}: {exc}"
|
||||||
|
) from exc
|
||||||
|
|
||||||
|
|
||||||
|
class TestActionsManifest(unittest.TestCase):
|
||||||
|
def test_manifest_exists_and_schema(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
self.assertEqual(manifest.get("schemaVersion"), 1)
|
||||||
|
skill = manifest.get("skill")
|
||||||
|
self.assertIn(skill, (SKILL_SLUG, _TEMPLATE_PLACEHOLDER_SLUG))
|
||||||
|
self.assertIsInstance(manifest.get("actions"), list)
|
||||||
|
self.assertGreater(len(manifest["actions"]), 0)
|
||||||
|
|
||||||
|
def test_action_ids_unique_and_cli_valid(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
subs = _cli_subcommands()
|
||||||
|
seen: set[str] = set()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
action_id = action["id"]
|
||||||
|
self.assertNotIn(action_id, seen, msg=f"duplicate action id: {action_id}")
|
||||||
|
seen.add(action_id)
|
||||||
|
|
||||||
|
self.assertTrue(str(action.get("label", "")).strip(), msg=f"{action_id} label empty")
|
||||||
|
self.assertTrue(str(action.get("description", "")).strip(), msg=f"{action_id} description empty")
|
||||||
|
|
||||||
|
entry = action["entrypoint"]
|
||||||
|
self.assertEqual(entry["type"], "cli")
|
||||||
|
self.assertIn(entry["command"], subs, msg=f"{action_id} command not in CLI")
|
||||||
|
|
||||||
|
args = entry.get("args")
|
||||||
|
self.assertIsInstance(args, list, msg=f"{action_id} args must be array")
|
||||||
|
for item in args:
|
||||||
|
self.assertIsInstance(
|
||||||
|
item,
|
||||||
|
(str, int, float, bool),
|
||||||
|
msg=f"{action_id} arg item must be scalar",
|
||||||
|
)
|
||||||
|
self.assertNotIsInstance(item, dict, msg=f"{action_id} arg must not be object")
|
||||||
|
self.assertIsNotNone(item, msg=f"{action_id} arg must not be null")
|
||||||
|
|
||||||
|
placements = action.get("placements")
|
||||||
|
self.assertIsInstance(placements, list, msg=f"{action_id} placements must be array")
|
||||||
|
self.assertGreater(len(placements), 0, msg=f"{action_id} placements empty")
|
||||||
|
for placement in placements:
|
||||||
|
self.assertIn(placement, _ALLOWED_PLACEMENTS, msg=f"{action_id} invalid placement {placement!r}")
|
||||||
|
|
||||||
|
def test_every_action_declares_execution_profile(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
profile = action.get("executionProfile")
|
||||||
|
self.assertIn(
|
||||||
|
profile,
|
||||||
|
_ALLOWED_EXECUTION_PROFILES,
|
||||||
|
msg=f"{action['id']} executionProfile must be sync|async, got {profile!r}",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_schema_requires_execution_profile_and_defines_bind(self) -> None:
|
||||||
|
schema = _load_actions_schema()
|
||||||
|
action_def = schema["$defs"]["action"]
|
||||||
|
self.assertIn("executionProfile", action_def.get("required") or [])
|
||||||
|
profile = action_def["properties"]["executionProfile"]
|
||||||
|
self.assertEqual(set(profile.get("enum") or []), {"sync", "async"})
|
||||||
|
self.assertIn("bind", schema["$defs"])
|
||||||
|
self.assertIn("bind", action_def["properties"])
|
||||||
|
bind_def = schema["$defs"]["bind"]
|
||||||
|
self.assertEqual(bind_def.get("required"), ["tables"])
|
||||||
|
self.assertIs(bind_def.get("additionalProperties"), False)
|
||||||
|
|
||||||
|
def test_manifest_validates_against_json_schema(self) -> None:
|
||||||
|
try:
|
||||||
|
import jsonschema
|
||||||
|
except ImportError:
|
||||||
|
self.skipTest("jsonschema not installed")
|
||||||
|
schema = _load_actions_schema()
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
jsonschema.validate(instance=manifest, schema=schema)
|
||||||
|
|
||||||
|
def test_bind_structure_when_present(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
errors: list[str] = []
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
if "bind" not in action:
|
||||||
|
continue
|
||||||
|
errors.extend(_validate_bind_tables(action["id"], action["bind"]))
|
||||||
|
self.assertEqual(errors, [], msg="\n".join(errors))
|
||||||
|
|
||||||
|
def test_toolbar_actions_require_bind_tables(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
errors: list[str] = []
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
placements = action.get("placements") or []
|
||||||
|
if "toolbar" not in placements:
|
||||||
|
continue
|
||||||
|
bind = action.get("bind")
|
||||||
|
if bind is None:
|
||||||
|
errors.append(f"{action['id']}: toolbar placement requires bind.tables")
|
||||||
|
continue
|
||||||
|
errors.extend(_validate_bind_tables(action["id"], bind))
|
||||||
|
self.assertEqual(errors, [], msg="\n".join(errors))
|
||||||
|
|
||||||
|
def test_bindable_business_tables_helper_loads_template_db(self) -> None:
|
||||||
|
"""helper 本身必须可用:即便默认 manifest 无 toolbar bind,也要验证隔离库可读。"""
|
||||||
|
bindable = _load_bindable_business_tables()
|
||||||
|
self.assertIn("task_logs", bindable)
|
||||||
|
self.assertNotIn("_jiangchang_tables", bindable)
|
||||||
|
self.assertNotIn("_jiangchang_columns", bindable)
|
||||||
|
|
||||||
|
def test_bind_tables_exist_in_physical_and_visible_metadata(self) -> None:
|
||||||
|
bindable = _load_bindable_business_tables()
|
||||||
|
self.assertTrue(bindable, msg="bindable table set must be non-empty after init_db")
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
missing: list[str] = []
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
bind = action.get("bind")
|
||||||
|
if not isinstance(bind, dict):
|
||||||
|
continue
|
||||||
|
for table in bind.get("tables") or []:
|
||||||
|
if table not in bindable:
|
||||||
|
missing.append(
|
||||||
|
f"{action['id']}: bind.tables entry {table!r} must exist as "
|
||||||
|
f"physical table AND _jiangchang_tables.visible=1 "
|
||||||
|
f"(bindable={sorted(bindable)})"
|
||||||
|
)
|
||||||
|
self.assertEqual(missing, [], msg="\n".join(missing))
|
||||||
|
|
||||||
|
def test_schema_allows_all_placement_execution_profile_combinations(self) -> None:
|
||||||
|
"""POLICY-SKILL-ACTION-004:4 placements × 2 profiles 必须全部通过 Schema。"""
|
||||||
|
try:
|
||||||
|
import jsonschema
|
||||||
|
except ImportError:
|
||||||
|
self.fail("jsonschema is required to validate placement×executionProfile orthogonality")
|
||||||
|
schema = _load_actions_schema()
|
||||||
|
placements = ("toolbar", "cron", "agent", "skill-detail")
|
||||||
|
profiles = ("sync", "async")
|
||||||
|
for placement in placements:
|
||||||
|
for profile in profiles:
|
||||||
|
action: dict = {
|
||||||
|
"id": "probe-action",
|
||||||
|
"label": "正交探测",
|
||||||
|
"description": "验证 placements 与 executionProfile 无条件耦合",
|
||||||
|
"placements": [placement],
|
||||||
|
"executionProfile": profile,
|
||||||
|
"entrypoint": {"type": "cli", "command": "health", "args": []},
|
||||||
|
}
|
||||||
|
if placement == "toolbar":
|
||||||
|
action["bind"] = {"tables": ["task_logs"]}
|
||||||
|
manifest = {
|
||||||
|
"schemaVersion": 1,
|
||||||
|
"skill": "your-skill-slug",
|
||||||
|
"actions": [action],
|
||||||
|
}
|
||||||
|
with self.subTest(placement=placement, executionProfile=profile):
|
||||||
|
jsonschema.validate(instance=manifest, schema=schema)
|
||||||
|
if placement != "toolbar":
|
||||||
|
self.assertNotIn("bind", action)
|
||||||
|
|
||||||
|
def test_schema_rejects_toolbar_without_bind(self) -> None:
|
||||||
|
try:
|
||||||
|
import jsonschema
|
||||||
|
from jsonschema import ValidationError
|
||||||
|
except ImportError:
|
||||||
|
self.fail("jsonschema is required")
|
||||||
|
schema = _load_actions_schema()
|
||||||
|
manifest = {
|
||||||
|
"schemaVersion": 1,
|
||||||
|
"skill": "your-skill-slug",
|
||||||
|
"actions": [
|
||||||
|
{
|
||||||
|
"id": "probe-toolbar",
|
||||||
|
"label": "缺 bind 探测",
|
||||||
|
"description": "toolbar 无 bind 应被 Schema 拒绝",
|
||||||
|
"placements": ["toolbar"],
|
||||||
|
"executionProfile": "sync",
|
||||||
|
"entrypoint": {"type": "cli", "command": "health", "args": []},
|
||||||
|
}
|
||||||
|
],
|
||||||
|
}
|
||||||
|
with self.assertRaises(ValidationError):
|
||||||
|
jsonschema.validate(instance=manifest, schema=schema)
|
||||||
|
|
||||||
|
def test_no_execution_profile_placement_coupling_in_tests(self) -> None:
|
||||||
|
"""守护:本文件不得引入入口位置与 sync/async 的错误硬耦合断言。"""
|
||||||
|
path = os.path.join(get_skill_root(), "tests", "test_actions_manifest.py")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
text = f.read()
|
||||||
|
# 拆开拼接,避免本测试源码自身触发字符串扫描。
|
||||||
|
forbidden_snippets = (
|
||||||
|
"toolbar " + "只能 async",
|
||||||
|
"toolbar only " + "async",
|
||||||
|
'toolbar"' + " and profile != " + '"async"',
|
||||||
|
'toolbar")' + " and profile != " + '"async"',
|
||||||
|
"toolbar must be " + "async",
|
||||||
|
"executionProfile" + " == " + '"async"' + " and " + '"toolbar"',
|
||||||
|
)
|
||||||
|
for snippet in forbidden_snippets:
|
||||||
|
self.assertNotIn(snippet, text)
|
||||||
|
|
||||||
|
def test_template_example_does_not_use_reserved_placements(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
placements = set(action.get("placements") or [])
|
||||||
|
overlap = placements & _RESERVED_PLACEMENTS
|
||||||
|
self.assertFalse(
|
||||||
|
overlap,
|
||||||
|
msg=f"{action['id']} uses reserved placements not yet supported in template: {overlap}",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_template_variables_have_input_schema(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
args = action.get("entrypoint", {}).get("args") or []
|
||||||
|
template_vars = _collect_template_vars(args)
|
||||||
|
if not template_vars:
|
||||||
|
continue
|
||||||
|
schema = action.get("inputSchema") or {}
|
||||||
|
properties = schema.get("properties") or {}
|
||||||
|
for var in template_vars:
|
||||||
|
self.assertIn(
|
||||||
|
var,
|
||||||
|
properties,
|
||||||
|
msg=f"{action['id']} uses {{{{{var}}}}} but inputSchema.properties missing it",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_required_fields_exist_in_properties(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
schema = action.get("inputSchema") or {}
|
||||||
|
required = schema.get("required") or []
|
||||||
|
properties = schema.get("properties") or {}
|
||||||
|
for field in required:
|
||||||
|
self.assertIn(
|
||||||
|
field,
|
||||||
|
properties,
|
||||||
|
msg=f"{action['id']} required field {field!r} missing from properties",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_sensitive_params_not_on_toolbar(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
props = (action.get("inputSchema") or {}).get("properties") or {}
|
||||||
|
has_sensitive = any(p.get("sensitive") for p in props.values())
|
||||||
|
if has_sensitive and "toolbar" in (action.get("placements") or []):
|
||||||
|
self.fail(f"{action['id']} has sensitive input but is on toolbar")
|
||||||
|
|
||||||
|
def test_confirmation_message_structure(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
confirmation = action.get("confirmation")
|
||||||
|
if confirmation is None:
|
||||||
|
continue
|
||||||
|
self.assertIsInstance(confirmation, dict)
|
||||||
|
message = confirmation.get("message")
|
||||||
|
self.assertTrue(str(message or "").strip(), msg=f"{action['id']} confirmation.message empty")
|
||||||
|
|
||||||
|
def test_manifest_has_no_specific_business_skill_names(self) -> None:
|
||||||
|
path = os.path.join(get_skill_root(), "assets", "actions.json")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
raw = f.read().lower()
|
||||||
|
for term in _FORBIDDEN_BUSINESS_TERMS:
|
||||||
|
self.assertNotIn(term.lower(), raw, msg=f"actions.json must not contain {term!r}")
|
||||||
|
|
||||||
|
def test_actions_md_exists_and_links_manifest(self) -> None:
|
||||||
|
path = os.path.join(get_skill_root(), "references", "ACTIONS.md")
|
||||||
|
self.assertTrue(os.path.isfile(path))
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
text = f.read()
|
||||||
|
self.assertIn("actions.json", text)
|
||||||
|
self.assertIn("schemaVersion", text)
|
||||||
|
for term in _FORBIDDEN_BUSINESS_TERMS:
|
||||||
|
self.assertNotIn(term.lower(), text.lower(), msg=f"ACTIONS.md must not contain {term!r}")
|
||||||
|
|
||||||
|
def test_skill_actions_schema_file_exists(self) -> None:
|
||||||
|
path = os.path.join(get_skill_root(), "assets", "schemas", "skill-actions.schema.json")
|
||||||
|
self.assertTrue(os.path.isfile(path))
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
schema = json.load(f)
|
||||||
|
self.assertEqual(schema.get("title"), "SkillActionManifest")
|
||||||
|
self.assertIn("actions", schema.get("properties", {}))
|
||||||
|
|
||||||
|
def test_skill_actions_schema_json_parses(self) -> None:
|
||||||
|
schema = _load_actions_schema()
|
||||||
|
self.assertEqual(schema["properties"]["schemaVersion"]["const"], 1)
|
||||||
|
self.assertTrue(schema.get("additionalProperties") is False)
|
||||||
|
self.assertIn("action", schema.get("$defs", {}))
|
||||||
|
|
||||||
|
def test_template_manifest_matches_schema_required_keys(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
schema = _load_actions_schema()
|
||||||
|
for key in _REQUIRED_MANIFEST_KEYS:
|
||||||
|
self.assertIn(key, manifest)
|
||||||
|
self.assertIn(key, schema.get("properties", {}))
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
for key in _REQUIRED_ACTION_KEYS:
|
||||||
|
self.assertIn(key, action)
|
||||||
|
|
||||||
|
def test_template_example_does_not_use_reserved_action_fields(self) -> None:
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
overlap = set(action.keys()) & _RESERVED_ACTION_FIELDS
|
||||||
|
self.assertFalse(
|
||||||
|
overlap,
|
||||||
|
msg=f"{action['id']} uses reserved action fields not supported in template Phase 1: {overlap}",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_default_manifest_does_not_place_health_on_toolbar(self) -> None:
|
||||||
|
"""脚手架默认健康类 Action 不应出现在数据管理 toolbar。"""
|
||||||
|
manifest = _load_actions_manifest()
|
||||||
|
for action in manifest["actions"]:
|
||||||
|
if action["id"] in {"health", "version", "config-path"}:
|
||||||
|
self.assertNotIn(
|
||||||
|
"toolbar",
|
||||||
|
action.get("placements") or [],
|
||||||
|
msg=f"{action['id']} must not be auto-placed on toolbar",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_actions_md_documents_strict_vs_host_boundary(self) -> None:
|
||||||
|
path = os.path.join(get_skill_root(), "references", "ACTIONS.md")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
text = f.read()
|
||||||
|
for marker in (
|
||||||
|
"严格规范",
|
||||||
|
"向后兼容",
|
||||||
|
"Phase 1",
|
||||||
|
"bind.tables",
|
||||||
|
"concurrency",
|
||||||
|
"locks",
|
||||||
|
"row",
|
||||||
|
"batch",
|
||||||
|
"additionalProperties",
|
||||||
|
"placements",
|
||||||
|
"executionProfile",
|
||||||
|
):
|
||||||
|
self.assertIn(marker, text, msg=f"ACTIONS.md missing {marker!r}")
|
||||||
|
for forbidden in (
|
||||||
|
"数据管理 toolbar " + "只挂",
|
||||||
|
"toolbar " + "只放 async",
|
||||||
|
"toolbar)→ " + "只挂",
|
||||||
|
"只挂 **" + "async**",
|
||||||
|
):
|
||||||
|
self.assertNotIn(forbidden, text, msg=f"ACTIONS.md must not contain deprecated coupling: {forbidden!r}")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -16,6 +16,12 @@ from cli.app import main
|
|||||||
from util.config_bootstrap import bootstrap_skill_config
|
from util.config_bootstrap import bootstrap_skill_config
|
||||||
from util.constants import SKILL_SLUG
|
from util.constants import SKILL_SLUG
|
||||||
|
|
||||||
|
_TEST_TARGET_KEY = "OPENCLAW_" + "TEST_TARGET"
|
||||||
|
|
||||||
|
|
||||||
|
def _env_line(key: str, value: str) -> str:
|
||||||
|
return f"{key}={value}\n"
|
||||||
|
|
||||||
|
|
||||||
class TestConfigBootstrap(unittest.TestCase):
|
class TestConfigBootstrap(unittest.TestCase):
|
||||||
def test_first_run_creates_user_env(self) -> None:
|
def test_first_run_creates_user_env(self) -> None:
|
||||||
@@ -30,16 +36,16 @@ class TestConfigBootstrap(unittest.TestCase):
|
|||||||
config.reset_cache()
|
config.reset_cache()
|
||||||
path = bootstrap_skill_config()
|
path = bootstrap_skill_config()
|
||||||
with open(path, "w", encoding="utf-8") as f:
|
with open(path, "w", encoding="utf-8") as f:
|
||||||
f.write("OPENCLAW_TEST_TARGET=simulator_rpa\n")
|
f.write(_env_line(_TEST_TARGET_KEY, "simulator_rpa"))
|
||||||
with tempfile.NamedTemporaryFile("w", encoding="utf-8", delete=False, suffix=".example") as tmp:
|
with tempfile.NamedTemporaryFile("w", encoding="utf-8", delete=False, suffix=".example") as tmp:
|
||||||
tmp.write("OPENCLAW_TEST_TARGET=mock\nHUMAN_WAIT_TIMEOUT=60\n")
|
tmp.write(_env_line(_TEST_TARGET_KEY, "mock") + "HUMAN_WAIT_TIMEOUT=60\n")
|
||||||
tmp_path = tmp.name
|
tmp_path = tmp.name
|
||||||
try:
|
try:
|
||||||
config.merge_missing_env_keys(tmp_path, path, comment_skill="test")
|
config.merge_missing_env_keys(tmp_path, path, comment_skill="test")
|
||||||
with open(path, encoding="utf-8") as f:
|
with open(path, encoding="utf-8") as f:
|
||||||
content = f.read()
|
content = f.read()
|
||||||
self.assertIn("OPENCLAW_TEST_TARGET=simulator_rpa", content)
|
self.assertIn(_env_line(_TEST_TARGET_KEY, "simulator_rpa").strip(), content)
|
||||||
self.assertNotIn("OPENCLAW_TEST_TARGET=mock", content)
|
self.assertNotIn(_env_line(_TEST_TARGET_KEY, "mock").strip(), content)
|
||||||
finally:
|
finally:
|
||||||
os.unlink(tmp_path)
|
os.unlink(tmp_path)
|
||||||
config.reset_cache()
|
config.reset_cache()
|
||||||
@@ -49,7 +55,7 @@ class TestConfigBootstrap(unittest.TestCase):
|
|||||||
config.reset_cache()
|
config.reset_cache()
|
||||||
path = bootstrap_skill_config()
|
path = bootstrap_skill_config()
|
||||||
with open(path, "w", encoding="utf-8") as f:
|
with open(path, "w", encoding="utf-8") as f:
|
||||||
f.write("OPENCLAW_TEST_TARGET=simulator_rpa\n")
|
f.write(_env_line(_TEST_TARGET_KEY, "simulator_rpa"))
|
||||||
example = os.path.join(get_skill_root(), ".env.example")
|
example = os.path.join(get_skill_root(), ".env.example")
|
||||||
added = config.merge_missing_env_keys(example, path, comment_skill="test")
|
added = config.merge_missing_env_keys(example, path, comment_skill="test")
|
||||||
self.assertIn("HUMAN_WAIT_TIMEOUT", added)
|
self.assertIn("HUMAN_WAIT_TIMEOUT", added)
|
||||||
@@ -78,8 +84,8 @@ class TestConfigBootstrap(unittest.TestCase):
|
|||||||
config.reset_cache()
|
config.reset_cache()
|
||||||
with open(example, encoding="utf-8") as f:
|
with open(example, encoding="utf-8") as f:
|
||||||
example_text = f.read()
|
example_text = f.read()
|
||||||
self.assertIn("OPENCLAW_TEST_TARGET=mock", example_text)
|
self.assertIn(_env_line(_TEST_TARGET_KEY, "mock").strip(), example_text)
|
||||||
self.assertEqual(config.get("OPENCLAW_TEST_TARGET"), "mock")
|
self.assertEqual(config.get(_TEST_TARGET_KEY), "mock")
|
||||||
|
|
||||||
def test_config_path_outputs_json(self) -> None:
|
def test_config_path_outputs_json(self) -> None:
|
||||||
with IsolatedDataRoot(user_id="_cfg_path"):
|
with IsolatedDataRoot(user_id="_cfg_path"):
|
||||||
|
|||||||
479
tests/test_data_management_contract.py
Normal file
479
tests/test_data_management_contract.py
Normal file
@@ -0,0 +1,479 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""通用数据管理契约测试(demo_items fixture,不含具体业务技能内容)。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import sqlite3
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from _support import IsolatedDataRoot
|
||||||
|
|
||||||
|
DEMO_ITEMS_DDL = """
|
||||||
|
CREATE TABLE IF NOT EXISTS demo_items (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
title TEXT NOT NULL,
|
||||||
|
description TEXT,
|
||||||
|
status TEXT NOT NULL DEFAULT 'draft',
|
||||||
|
generated_value TEXT,
|
||||||
|
created_at INTEGER NOT NULL DEFAULT (unixepoch()),
|
||||||
|
updated_at INTEGER NOT NULL DEFAULT (unixepoch())
|
||||||
|
);
|
||||||
|
CREATE TRIGGER IF NOT EXISTS demo_items_set_updated_at
|
||||||
|
AFTER UPDATE ON demo_items
|
||||||
|
FOR EACH ROW
|
||||||
|
BEGIN
|
||||||
|
UPDATE demo_items
|
||||||
|
SET updated_at = unixepoch()
|
||||||
|
WHERE id = NEW.id AND updated_at = OLD.updated_at;
|
||||||
|
END;
|
||||||
|
"""
|
||||||
|
|
||||||
|
DEMO_ITEMS_TABLE_METADATA = {
|
||||||
|
"table_name": "demo_items",
|
||||||
|
"display_name": "示例记录",
|
||||||
|
"description": "通用数据管理契约演示表",
|
||||||
|
"visible": 1,
|
||||||
|
"readonly": 0,
|
||||||
|
}
|
||||||
|
|
||||||
|
DEMO_ITEMS_COLUMN_METADATA: tuple[dict[str, object], ...] = (
|
||||||
|
{"column_name": "id", "display_name": "编号", "visible": 1, "searchable": 1, "editable": 0},
|
||||||
|
{"column_name": "title", "display_name": "标题", "visible": 1, "searchable": 1, "editable": 1},
|
||||||
|
{"column_name": "description", "display_name": "描述", "visible": 1, "searchable": 1, "editable": 1},
|
||||||
|
{
|
||||||
|
"column_name": "status",
|
||||||
|
"display_name": "状态",
|
||||||
|
"visible": 1,
|
||||||
|
"searchable": 1,
|
||||||
|
"editable": 1,
|
||||||
|
"options_json": json.dumps(
|
||||||
|
[
|
||||||
|
{"value": "draft", "label": "草稿"},
|
||||||
|
{"value": "published", "label": "已发布"},
|
||||||
|
{"value": "archived", "label": "已归档"},
|
||||||
|
],
|
||||||
|
ensure_ascii=False,
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{"column_name": "generated_value", "display_name": "生成值", "visible": 1, "searchable": 0, "editable": 0},
|
||||||
|
{
|
||||||
|
"column_name": "created_at",
|
||||||
|
"display_name": "创建时间",
|
||||||
|
"visible": 1,
|
||||||
|
"searchable": 0,
|
||||||
|
"editable": 0,
|
||||||
|
"display_type": "datetime_unix_seconds",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"column_name": "updated_at",
|
||||||
|
"display_name": "更新时间",
|
||||||
|
"visible": 1,
|
||||||
|
"searchable": 0,
|
||||||
|
"editable": 0,
|
||||||
|
"display_type": "datetime_unix_seconds",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _init_demo_items_fixture(conn: sqlite3.Connection, *, prune: bool = True) -> None:
|
||||||
|
from db.display_metadata import (
|
||||||
|
init_display_metadata_tables,
|
||||||
|
list_physical_column_names,
|
||||||
|
seed_column_metadata_batch,
|
||||||
|
upsert_table_metadata,
|
||||||
|
)
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
init_display_metadata_tables(cur)
|
||||||
|
cur.executescript(DEMO_ITEMS_DDL)
|
||||||
|
meta = DEMO_ITEMS_TABLE_METADATA
|
||||||
|
upsert_table_metadata(
|
||||||
|
cur,
|
||||||
|
table_name=str(meta["table_name"]),
|
||||||
|
display_name=str(meta["display_name"]),
|
||||||
|
description=str(meta["description"]),
|
||||||
|
visible=int(meta["visible"]),
|
||||||
|
readonly=int(meta["readonly"]),
|
||||||
|
)
|
||||||
|
physical = list_physical_column_names(cur, "demo_items")
|
||||||
|
seed_column_metadata_batch(
|
||||||
|
cur,
|
||||||
|
table_name="demo_items",
|
||||||
|
columns=DEMO_ITEMS_COLUMN_METADATA,
|
||||||
|
valid_column_names=physical if prune else None,
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
|
|
||||||
|
class TestDataManagementContract(unittest.TestCase):
|
||||||
|
def test_demo_items_metadata_permissions(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
from db.display_metadata import (
|
||||||
|
get_column_editable,
|
||||||
|
get_table_readonly,
|
||||||
|
list_editable_business_columns,
|
||||||
|
table_allows_manual_create,
|
||||||
|
)
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
self.assertEqual(get_table_readonly(cur, "demo_items"), 0)
|
||||||
|
self.assertEqual(get_column_editable(cur, "demo_items", "id"), 0)
|
||||||
|
self.assertEqual(get_column_editable(cur, "demo_items", "title"), 1)
|
||||||
|
self.assertEqual(get_column_editable(cur, "demo_items", "generated_value"), 0)
|
||||||
|
self.assertEqual(get_column_editable(cur, "demo_items", "created_at"), 0)
|
||||||
|
self.assertEqual(get_column_editable(cur, "demo_items", "updated_at"), 0)
|
||||||
|
|
||||||
|
editable_cols = list_editable_business_columns(cur, "demo_items")
|
||||||
|
self.assertEqual(editable_cols, ["title", "description", "status"])
|
||||||
|
self.assertTrue(table_allows_manual_create(cur, "demo_items"))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_demo_items_init_idempotent_no_duplicates(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute("SELECT COUNT(*) FROM _jiangchang_tables WHERE table_name = 'demo_items'")
|
||||||
|
self.assertEqual(int(cur.fetchone()[0]), 1)
|
||||||
|
cur.execute("SELECT COUNT(*) FROM _jiangchang_columns WHERE table_name = 'demo_items'")
|
||||||
|
self.assertEqual(int(cur.fetchone()[0]), 7)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_reinit_updates_stale_editable_value(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE _jiangchang_columns SET editable = 0 WHERE table_name = 'demo_items' AND column_name = 'title'"
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
from db.display_metadata import get_column_editable
|
||||||
|
|
||||||
|
self.assertEqual(get_column_editable(conn.cursor(), "demo_items", "title"), 1)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_missing_table_metadata_detected(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
conn.execute("DELETE FROM _jiangchang_tables WHERE table_name = 'demo_items'")
|
||||||
|
conn.commit()
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("demo_items" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_missing_column_metadata_detected(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
conn.execute(
|
||||||
|
"DELETE FROM _jiangchang_columns WHERE table_name = 'demo_items' AND column_name = 'title'"
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("demo_items.title" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_metadata_reference_to_missing_column_detected(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_columns
|
||||||
|
(table_name, column_name, display_name, visible, searchable, editable)
|
||||||
|
VALUES ('demo_items', 'not_exists', '不存在', 1, 1, 0)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("not_exists" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_empty_display_name_detected_for_visible_column(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE _jiangchang_columns SET display_name = '' WHERE table_name = 'demo_items' AND column_name = 'title'"
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("display_name 为空" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_visible_columns_use_chinese_display_name(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT column_name, display_name
|
||||||
|
FROM _jiangchang_columns
|
||||||
|
WHERE table_name = 'demo_items' AND visible = 1
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
for column_name, display_name in cur.fetchall():
|
||||||
|
self.assertTrue(
|
||||||
|
any("\u4e00" <= ch <= "\u9fff" for ch in str(display_name)),
|
||||||
|
msg=f"{column_name} display_name should be Chinese: {display_name!r}",
|
||||||
|
)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_timestamp_fields_type_default_and_editable(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
cur = conn.cursor()
|
||||||
|
for column_name in ("created_at", "updated_at"):
|
||||||
|
cur.execute(f"PRAGMA table_info('demo_items')")
|
||||||
|
info = {row[1]: row for row in cur.fetchall()}
|
||||||
|
row = info[column_name]
|
||||||
|
self.assertIn("INT", str(row[2]).upper())
|
||||||
|
self.assertIn("unixepoch", str(row[4]).lower())
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT editable, display_type FROM _jiangchang_columns
|
||||||
|
WHERE table_name = 'demo_items' AND column_name = ?
|
||||||
|
""",
|
||||||
|
(column_name,),
|
||||||
|
)
|
||||||
|
editable, display_type = cur.fetchone()
|
||||||
|
self.assertEqual(int(editable), 0)
|
||||||
|
self.assertEqual(display_type, "datetime_unix_seconds")
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_physical_order_matches_pragma_cid(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
from db.display_metadata import list_physical_column_names
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
expected = [str(item["column_name"]) for item in DEMO_ITEMS_COLUMN_METADATA]
|
||||||
|
physical = list_physical_column_names(cur, "demo_items")
|
||||||
|
self.assertEqual(physical, expected)
|
||||||
|
cur.execute("PRAGMA table_info('demo_items')")
|
||||||
|
cid_order = [row[1] for row in sorted(cur.fetchall(), key=lambda row: int(row[0]))]
|
||||||
|
self.assertEqual(cid_order, expected)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_options_json_parses_for_enum_field(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT options_json FROM _jiangchang_columns
|
||||||
|
WHERE table_name = 'demo_items' AND column_name = 'status'
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
raw = cur.fetchone()[0]
|
||||||
|
from db.display_metadata_validator import validate_options_json
|
||||||
|
|
||||||
|
errors, _ = validate_options_json(raw)
|
||||||
|
self.assertEqual(errors, [])
|
||||||
|
parsed = json.loads(raw)
|
||||||
|
self.assertEqual(len(parsed), 3)
|
||||||
|
self.assertEqual(parsed[0]["value"], "draft")
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_system_table_no_editable_fields_not_manual_create(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
from db.display_metadata import (
|
||||||
|
init_display_metadata_tables,
|
||||||
|
seed_column_metadata_batch,
|
||||||
|
table_allows_manual_create,
|
||||||
|
upsert_table_metadata,
|
||||||
|
)
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
init_display_metadata_tables(cur)
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
CREATE TABLE source_records (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
item_id TEXT NOT NULL,
|
||||||
|
synced_at INTEGER NOT NULL DEFAULT (unixepoch())
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
upsert_table_metadata(
|
||||||
|
cur,
|
||||||
|
table_name="source_records",
|
||||||
|
display_name="来源记录",
|
||||||
|
description="只由同步流程写入",
|
||||||
|
visible=1,
|
||||||
|
readonly=0,
|
||||||
|
)
|
||||||
|
seed_column_metadata_batch(
|
||||||
|
cur,
|
||||||
|
table_name="source_records",
|
||||||
|
columns=(
|
||||||
|
{"column_name": "id", "display_name": "编号", "editable": 0},
|
||||||
|
{"column_name": "item_id", "display_name": "记录编号", "editable": 0},
|
||||||
|
{"column_name": "synced_at", "display_name": "同步时间", "editable": 0, "display_type": "datetime_unix_seconds"},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
self.assertFalse(table_allows_manual_create(cur, "source_records"))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_table_readonly_blocks_manual_create_even_with_editable_fields(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
conn.execute("UPDATE _jiangchang_tables SET readonly = 1 WHERE table_name = 'demo_items'")
|
||||||
|
conn.commit()
|
||||||
|
from db.display_metadata import table_allows_manual_create
|
||||||
|
|
||||||
|
self.assertFalse(table_allows_manual_create(conn.cursor(), "demo_items"))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_prune_stale_column_metadata(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_columns
|
||||||
|
(table_name, column_name, display_name, visible, searchable, editable)
|
||||||
|
VALUES ('demo_items', 'removed_field', '已删除', 0, 0, 0)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
from db.display_metadata import list_physical_column_names, seed_column_metadata_batch
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
physical = list_physical_column_names(cur, "demo_items")
|
||||||
|
seed_column_metadata_batch(
|
||||||
|
cur,
|
||||||
|
table_name="demo_items",
|
||||||
|
columns=DEMO_ITEMS_COLUMN_METADATA,
|
||||||
|
valid_column_names=physical,
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT 1 FROM _jiangchang_columns WHERE table_name = 'demo_items' AND column_name = 'removed_field'"
|
||||||
|
)
|
||||||
|
self.assertIsNone(cur.fetchone())
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_seed_batch_without_valid_column_names_does_not_prune(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn, prune=False)
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_columns
|
||||||
|
(table_name, column_name, display_name, visible, searchable, editable)
|
||||||
|
VALUES ('demo_items', 'removed_field', '已删除', 0, 0, 0)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
from db.display_metadata import seed_column_metadata_batch
|
||||||
|
|
||||||
|
seed_column_metadata_batch(
|
||||||
|
conn.cursor(),
|
||||||
|
table_name="demo_items",
|
||||||
|
columns=DEMO_ITEMS_COLUMN_METADATA,
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT 1 FROM _jiangchang_columns WHERE table_name = 'demo_items' AND column_name = 'removed_field'"
|
||||||
|
)
|
||||||
|
self.assertIsNotNone(cur.fetchone())
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_seed_batch_accepts_list_columns(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn, prune=False)
|
||||||
|
from db.display_metadata import get_column_editable, seed_column_metadata_batch
|
||||||
|
|
||||||
|
columns = list(DEMO_ITEMS_COLUMN_METADATA)
|
||||||
|
columns[1] = {**columns[1], "display_name": "标题(列表)"}
|
||||||
|
seed_column_metadata_batch(
|
||||||
|
conn.cursor(),
|
||||||
|
table_name="demo_items",
|
||||||
|
columns=columns,
|
||||||
|
valid_column_names=[str(item["column_name"]) for item in DEMO_ITEMS_COLUMN_METADATA],
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT display_name FROM _jiangchang_columns WHERE table_name = 'demo_items' AND column_name = 'title'"
|
||||||
|
)
|
||||||
|
self.assertEqual(cur.fetchone()[0], "标题(列表)")
|
||||||
|
self.assertEqual(get_column_editable(cur, "demo_items", "title"), 1)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_prune_does_not_remove_existing_column_metadata(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
from db.display_metadata import get_column_editable, seed_column_metadata_batch
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
before = get_column_editable(cur, "demo_items", "title")
|
||||||
|
seed_column_metadata_batch(
|
||||||
|
cur,
|
||||||
|
table_name="demo_items",
|
||||||
|
columns=DEMO_ITEMS_COLUMN_METADATA,
|
||||||
|
valid_column_names=[str(item["column_name"]) for item in DEMO_ITEMS_COLUMN_METADATA],
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
self.assertEqual(get_column_editable(cur, "demo_items", "title"), before)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_demo_items_validation_passes(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
_init_demo_items_fixture(conn)
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertTrue(report.ok, msg="; ".join(report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -10,12 +10,20 @@ from _support import IsolatedDataRoot
|
|||||||
class TestDbSmoke(unittest.TestCase):
|
class TestDbSmoke(unittest.TestCase):
|
||||||
def test_init_db_idempotent_and_crud_smoke(self) -> None:
|
def test_init_db_idempotent_and_crud_smoke(self) -> None:
|
||||||
with IsolatedDataRoot():
|
with IsolatedDataRoot():
|
||||||
from db.connection import init_db
|
|
||||||
from db import task_logs_repository as tlr
|
from db import task_logs_repository as tlr
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
init_db()
|
init_db()
|
||||||
init_db() # 幂等
|
init_db() # 幂等
|
||||||
|
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute("SELECT display_name FROM _jiangchang_tables WHERE table_name = 'task_logs'")
|
||||||
|
self.assertEqual(cur.fetchone()[0], "任务日志")
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
new_id = tlr.save_task_log(
|
new_id = tlr.save_task_log(
|
||||||
task_type="demo_task",
|
task_type="demo_task",
|
||||||
target_id="tgt-1",
|
target_id="tgt-1",
|
||||||
|
|||||||
1140
tests/test_development_policy_guard.py
Normal file
1140
tests/test_development_policy_guard.py
Normal file
File diff suppressed because it is too large
Load Diff
512
tests/test_display_metadata.py
Normal file
512
tests/test_display_metadata.py
Normal file
@@ -0,0 +1,512 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""数据管理展示元数据:幂等初始化、中文名称、PRAGMA 字段顺序、校验规则。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sqlite3
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from _support import IsolatedDataRoot, get_skill_root
|
||||||
|
|
||||||
|
|
||||||
|
class TestDisplayMetadata(unittest.TestCase):
|
||||||
|
def test_init_db_metadata_idempotent(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
init_db()
|
||||||
|
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute("SELECT COUNT(*) FROM _jiangchang_tables WHERE table_name = 'task_logs'")
|
||||||
|
self.assertEqual(int(cur.fetchone()[0]), 1)
|
||||||
|
cur.execute("SELECT COUNT(*) FROM _jiangchang_columns WHERE table_name = 'task_logs'")
|
||||||
|
self.assertEqual(int(cur.fetchone()[0]), 10)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_task_logs_has_chinese_table_and_column_names(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT display_name, readonly FROM _jiangchang_tables WHERE table_name = 'task_logs'"
|
||||||
|
)
|
||||||
|
display_name, readonly = cur.fetchone()
|
||||||
|
self.assertEqual(display_name, "任务日志")
|
||||||
|
self.assertEqual(int(readonly), 1)
|
||||||
|
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT column_name, display_name, editable
|
||||||
|
FROM _jiangchang_columns
|
||||||
|
WHERE table_name = 'task_logs'
|
||||||
|
ORDER BY column_name
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
by_name = {row[0]: (row[1], row[2]) for row in cur.fetchall()}
|
||||||
|
self.assertEqual(by_name["status"][0], "状态")
|
||||||
|
self.assertEqual(int(by_name["status"][1]), 0)
|
||||||
|
self.assertEqual(by_name["error_msg"][0], "错误信息")
|
||||||
|
self.assertEqual(int(by_name["error_msg"][1]), 0)
|
||||||
|
self.assertEqual(by_name["created_at"][0], "创建时间")
|
||||||
|
self.assertEqual(int(by_name["created_at"][1]), 0)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_task_logs_not_manual_create_in_host_ui(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata import table_allows_manual_create
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
self.assertFalse(table_allows_manual_create(conn.cursor(), "task_logs"))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_task_logs_physical_order_matches_pragma_cid(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import init_db
|
||||||
|
from db.display_metadata import TASK_LOGS_COLUMN_METADATA, list_physical_column_names
|
||||||
|
from db.connection import get_conn
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
physical = list_physical_column_names(cur, "task_logs")
|
||||||
|
expected = [str(item["column_name"]) for item in TASK_LOGS_COLUMN_METADATA]
|
||||||
|
self.assertEqual(
|
||||||
|
physical,
|
||||||
|
expected,
|
||||||
|
)
|
||||||
|
cur.execute("PRAGMA table_info('task_logs')")
|
||||||
|
cid_order = [row[1] for row in sorted(cur.fetchall(), key=lambda row: int(row[0]))]
|
||||||
|
self.assertEqual(cid_order, expected)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_init_db_sets_task_logs_display_order_null(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT column_name, display_order
|
||||||
|
FROM _jiangchang_columns
|
||||||
|
WHERE table_name = 'task_logs'
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
for column_name, display_order in cur.fetchall():
|
||||||
|
self.assertIsNone(
|
||||||
|
display_order,
|
||||||
|
msg=f"{column_name} display_order should be NULL",
|
||||||
|
)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_reinit_clears_stale_display_order(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
UPDATE _jiangchang_columns
|
||||||
|
SET display_order = 99
|
||||||
|
WHERE table_name = 'task_logs' AND column_name = 'id'
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT display_order FROM _jiangchang_columns
|
||||||
|
WHERE table_name = 'task_logs' AND column_name = 'id'
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
self.assertIsNone(cur.fetchone()[0])
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_legacy_display_order_does_not_change_pragma_physical_order(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata import list_physical_column_names
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
UPDATE _jiangchang_columns
|
||||||
|
SET display_order = 1
|
||||||
|
WHERE table_name = 'task_logs' AND column_name = 'updated_at'
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
UPDATE _jiangchang_columns
|
||||||
|
SET display_order = 99
|
||||||
|
WHERE table_name = 'task_logs' AND column_name = 'id'
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
physical = list_physical_column_names(cur, "task_logs")
|
||||||
|
self.assertEqual(physical[0], "id")
|
||||||
|
self.assertEqual(physical[-1], "updated_at")
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_metadata_tables_are_not_user_tables(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata import iter_user_tables
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
tables = list(iter_user_tables(conn.cursor()))
|
||||||
|
self.assertEqual(tables, ["task_logs"])
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_template_database_validation_passes(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata_validator import validate_template_database
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
report = validate_template_database(conn)
|
||||||
|
self.assertTrue(report.ok, msg="; ".join(report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_validate_missing_both_metadata_tables(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.execute("CREATE TABLE demo_items (id INTEGER PRIMARY KEY, title TEXT)")
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertIn("缺少数据管理元数据表 _jiangchang_tables", report.errors)
|
||||||
|
self.assertIn("缺少数据管理元数据表 _jiangchang_columns", report.errors)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_validate_missing_jiangchang_tables_only(self) -> None:
|
||||||
|
from db.display_metadata import _JIANGCHANG_COLUMNS_DDL
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.execute(_JIANGCHANG_COLUMNS_DDL)
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertIn("缺少数据管理元数据表 _jiangchang_tables", report.errors)
|
||||||
|
self.assertNotIn("缺少数据管理元数据表 _jiangchang_columns", report.errors)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_validate_missing_jiangchang_columns_only(self) -> None:
|
||||||
|
from db.display_metadata import _JIANGCHANG_TABLES_DDL
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.execute(_JIANGCHANG_TABLES_DDL)
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertIn("缺少数据管理元数据表 _jiangchang_columns", report.errors)
|
||||||
|
self.assertNotIn("缺少数据管理元数据表 _jiangchang_tables", report.errors)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_missing_table_metadata_is_reported(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
conn.execute("CREATE TABLE demo_items (id INTEGER PRIMARY KEY, title TEXT)")
|
||||||
|
conn.execute("DELETE FROM _jiangchang_tables WHERE table_name = 'demo_items'")
|
||||||
|
conn.commit()
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("demo_items" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_missing_column_metadata_is_reported(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
conn.execute(
|
||||||
|
"DELETE FROM _jiangchang_columns WHERE table_name = 'task_logs' AND column_name = 'status'"
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("task_logs.status" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_metadata_reference_to_missing_column_is_reported(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_columns
|
||||||
|
(table_name, column_name, display_name, visible, searchable, editable)
|
||||||
|
VALUES ('task_logs', 'not_exists', '不存在', 1, 1, 1)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("not_exists" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_ordering_test_table_not_alphabetized(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.executescript(
|
||||||
|
"""
|
||||||
|
CREATE TABLE ordering_test (
|
||||||
|
z_field TEXT,
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
a_field TEXT,
|
||||||
|
created_at INTEGER,
|
||||||
|
updated_at INTEGER
|
||||||
|
);
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
from db.display_metadata import list_physical_column_names
|
||||||
|
|
||||||
|
physical = list_physical_column_names(conn.cursor(), "ordering_test")
|
||||||
|
self.assertEqual(physical, ["z_field", "id", "a_field", "created_at", "updated_at"])
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_skill_frontmatter_validation_for_template(self) -> None:
|
||||||
|
from db.display_metadata_validator import validate_skill_frontmatter
|
||||||
|
|
||||||
|
report = validate_skill_frontmatter(get_skill_root(), allow_template_placeholders=True)
|
||||||
|
self.assertTrue(report.ok, msg="; ".join(report.errors))
|
||||||
|
|
||||||
|
def test_skill_frontmatter_rejects_english_placeholder_name(self) -> None:
|
||||||
|
import os
|
||||||
|
import tempfile
|
||||||
|
|
||||||
|
from db.display_metadata_validator import validate_skill_frontmatter
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as tmp:
|
||||||
|
skill_md = """---
|
||||||
|
name: My Skill
|
||||||
|
description: demo
|
||||||
|
metadata:
|
||||||
|
openclaw:
|
||||||
|
slug: query-demo-info
|
||||||
|
---
|
||||||
|
"""
|
||||||
|
with open(os.path.join(tmp, "SKILL.md"), "w", encoding="utf-8") as f:
|
||||||
|
f.write(skill_md)
|
||||||
|
report = validate_skill_frontmatter(tmp, allow_template_placeholders=False)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("name" in err for err in report.errors))
|
||||||
|
|
||||||
|
def test_column_order_warning_for_created_at_in_middle(self) -> None:
|
||||||
|
from db.display_metadata_validator import column_order_warnings
|
||||||
|
|
||||||
|
warnings = column_order_warnings(
|
||||||
|
"bad_order",
|
||||||
|
["created_at", "id", "title", "updated_at"],
|
||||||
|
)
|
||||||
|
self.assertTrue(any("id" in item for item in warnings))
|
||||||
|
|
||||||
|
def test_generated_column_editable_must_be_zero(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.executescript(
|
||||||
|
"""
|
||||||
|
CREATE TABLE gen_demo (
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
base_value INTEGER NOT NULL,
|
||||||
|
generated_value INTEGER GENERATED ALWAYS AS (base_value * 2) STORED
|
||||||
|
);
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
from db.display_metadata import init_display_metadata_tables, upsert_column_metadata
|
||||||
|
from db.display_metadata_validator import validate_column_permissions
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
init_display_metadata_tables(cur)
|
||||||
|
upsert_column_metadata(
|
||||||
|
cur,
|
||||||
|
table_name="gen_demo",
|
||||||
|
column_name="generated_value",
|
||||||
|
display_name="生成值",
|
||||||
|
editable=1,
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
errors, _ = validate_column_permissions(cur, "gen_demo")
|
||||||
|
self.assertTrue(any("generated" in err for err in errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_blob_column_editable_must_be_zero(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.execute(
|
||||||
|
"CREATE TABLE blob_demo (id INTEGER PRIMARY KEY, payload BLOB NOT NULL)"
|
||||||
|
)
|
||||||
|
from db.display_metadata import init_display_metadata_tables, upsert_column_metadata
|
||||||
|
from db.display_metadata_validator import validate_column_permissions
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
init_display_metadata_tables(cur)
|
||||||
|
upsert_column_metadata(
|
||||||
|
cur,
|
||||||
|
table_name="blob_demo",
|
||||||
|
column_name="payload",
|
||||||
|
display_name="载荷",
|
||||||
|
editable=1,
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
errors, _ = validate_column_permissions(cur, "blob_demo")
|
||||||
|
self.assertTrue(any("BLOB" in err for err in errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_primary_key_editable_must_be_zero(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.execute("CREATE TABLE pk_demo (id INTEGER PRIMARY KEY, title TEXT)")
|
||||||
|
from db.display_metadata import init_display_metadata_tables, upsert_column_metadata
|
||||||
|
from db.display_metadata_validator import validate_column_permissions
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
init_display_metadata_tables(cur)
|
||||||
|
upsert_column_metadata(
|
||||||
|
cur,
|
||||||
|
table_name="pk_demo",
|
||||||
|
column_name="id",
|
||||||
|
display_name="编号",
|
||||||
|
editable=1,
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
errors, _ = validate_column_permissions(cur, "pk_demo")
|
||||||
|
self.assertTrue(any("主键" in err for err in errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_readonly_table_with_editable_fields_warns(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.executescript(
|
||||||
|
"""
|
||||||
|
CREATE TABLE warn_demo (id INTEGER PRIMARY KEY, title TEXT);
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
from db.display_metadata import (
|
||||||
|
init_display_metadata_tables,
|
||||||
|
upsert_column_metadata,
|
||||||
|
upsert_table_metadata,
|
||||||
|
)
|
||||||
|
from db.display_metadata_validator import validate_column_permissions
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
init_display_metadata_tables(cur)
|
||||||
|
upsert_table_metadata(cur, table_name="warn_demo", display_name="警告演示", readonly=1)
|
||||||
|
upsert_column_metadata(
|
||||||
|
cur,
|
||||||
|
table_name="warn_demo",
|
||||||
|
column_name="title",
|
||||||
|
display_name="标题",
|
||||||
|
editable=1,
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
_, warnings = validate_column_permissions(cur, "warn_demo")
|
||||||
|
self.assertTrue(any("readonly=1" in item for item in warnings))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_writable_table_without_editable_fields_warns(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
conn.executescript(
|
||||||
|
"""
|
||||||
|
CREATE TABLE warn_demo2 (id INTEGER PRIMARY KEY, title TEXT);
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
from db.display_metadata import (
|
||||||
|
init_display_metadata_tables,
|
||||||
|
upsert_column_metadata,
|
||||||
|
upsert_table_metadata,
|
||||||
|
)
|
||||||
|
from db.display_metadata_validator import validate_column_permissions
|
||||||
|
|
||||||
|
cur = conn.cursor()
|
||||||
|
init_display_metadata_tables(cur)
|
||||||
|
upsert_table_metadata(cur, table_name="warn_demo2", display_name="警告演示二", readonly=0)
|
||||||
|
upsert_column_metadata(
|
||||||
|
cur,
|
||||||
|
table_name="warn_demo2",
|
||||||
|
column_name="title",
|
||||||
|
display_name="标题",
|
||||||
|
editable=0,
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
_, warnings = validate_column_permissions(cur, "warn_demo2")
|
||||||
|
self.assertTrue(any("readonly=0" in item and "editable=0" in item for item in warnings))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_schema_md_documents_task_logs_readonly_semantics(self) -> None:
|
||||||
|
path = os.path.join(get_skill_root(), "references", "SCHEMA.md")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
text = f.read()
|
||||||
|
self.assertIn("readonly = 1", text)
|
||||||
|
self.assertIn("task_logs", text)
|
||||||
|
self.assertIn("seed_column_metadata_batch", text)
|
||||||
|
self.assertIn("valid_column_names", text)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -141,6 +141,15 @@ class TestDocsStandards(unittest.TestCase):
|
|||||||
msg="SKILL.md must state README.md is user-facing documentation",
|
msg="SKILL.md must state README.md is user-facing documentation",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_naming_md_exists_and_covers_standards(self) -> None:
|
||||||
|
text = self._read("development/NAMING.md")
|
||||||
|
self.assertIn("verb-noun-platform", text)
|
||||||
|
self.assertIn("48", text)
|
||||||
|
self.assertTrue("LEGACY" in text or "历史" in text)
|
||||||
|
self.assertTrue("verbs.txt" in text or "动词白名单" in text)
|
||||||
|
self.assertTrue("platforms.txt" in text or "平台白名单" in text)
|
||||||
|
self.assertTrue("仅适用于新创建" in text or "新技能" in text)
|
||||||
|
|
||||||
def test_release_workflow_uses_main_channel(self) -> None:
|
def test_release_workflow_uses_main_channel(self) -> None:
|
||||||
text = self._read(".github/workflows/release_skill.yaml")
|
text = self._read(".github/workflows/release_skill.yaml")
|
||||||
uses_line = _extract_workflow_uses_line(text)
|
uses_line = _extract_workflow_uses_line(text)
|
||||||
@@ -163,20 +172,134 @@ class TestDocsStandards(unittest.TestCase):
|
|||||||
self.assertIn("--no-sandbox", text)
|
self.assertIn("--no-sandbox", text)
|
||||||
self.assertIn("--disable-blink-features=AutomationControlled", text)
|
self.assertIn("--disable-blink-features=AutomationControlled", text)
|
||||||
self.assertIn("RpaVideoSession", text)
|
self.assertIn("RpaVideoSession", text)
|
||||||
self.assertIn("1.0.14", text)
|
self.assertIn("1.2.0", text)
|
||||||
|
|
||||||
|
def test_rpa_md_forbids_rpa_helpers_import(self) -> None:
|
||||||
|
text = self._read("development/RPA.md")
|
||||||
|
self.assertIn("rpa_helpers", text)
|
||||||
|
self.assertTrue(
|
||||||
|
"不要 import" in text or "不要" in text and "import" in text,
|
||||||
|
msg="RPA.md must document forbidding rpa_helpers import",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_rpa_md_covers_simulator_playwright_layering(self) -> None:
|
||||||
|
text = self._read("development/RPA.md")
|
||||||
|
self.assertTrue(
|
||||||
|
"simulator_playwright" in text
|
||||||
|
or ("薄 adapter" in text and "playwright.py" in text),
|
||||||
|
msg="RPA.md must describe thin adapter + *_playwright.py layering",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_rpa_md_covers_industry_simulator_portal(self) -> None:
|
||||||
|
text = self._read("development/RPA.md")
|
||||||
|
self.assertTrue(
|
||||||
|
any(marker in text for marker in ("jc2009", "行业仿真", "门户")),
|
||||||
|
msg="RPA.md must mention jc2009 / industry simulator / portal gate",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_simulator_example_readme_covers_async_and_account_manager(self) -> None:
|
||||||
|
text = self._read("examples/simulator_browser_rpa/README.md")
|
||||||
|
self.assertIn("async", text.lower())
|
||||||
|
self.assertTrue(
|
||||||
|
"account-manager" in text.lower() or "pick-web" in text or "pick_web_account" in text,
|
||||||
|
msg="simulator_browser_rpa README must mention async and account-manager",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_development_md_documents_scaffold_and_git_cleanup(self) -> None:
|
||||||
|
text = self._read("development/DEVELOPMENT.md")
|
||||||
|
self.assertTrue(
|
||||||
|
"scaffold_skill" in text or "scaffold_skill.ps1" in text,
|
||||||
|
msg="DEVELOPMENT.md must document scaffold_skill",
|
||||||
|
)
|
||||||
|
self.assertTrue(
|
||||||
|
("Remove-Item" in text and ".git" in text)
|
||||||
|
or ("删除" in text and ".git" in text),
|
||||||
|
msg="DEVELOPMENT.md must document deleting .git",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_naming_md_copy_flow_documents_scaffold_or_git_cleanup(self) -> None:
|
||||||
|
text = self._read("development/NAMING.md")
|
||||||
|
self.assertTrue(
|
||||||
|
"scaffold" in text.lower() or ("清理" in text and ".git" in text),
|
||||||
|
msg="NAMING.md §9 must mention scaffold or Git cleanup",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_scaffold_ps1_exists(self) -> None:
|
||||||
|
path = os.path.join(get_skill_root(), "tools", "scaffold_skill.ps1")
|
||||||
|
self.assertTrue(os.path.isfile(path), msg="tools/scaffold_skill.ps1 must exist")
|
||||||
|
|
||||||
|
def test_actions_manifest_and_docs_exist(self) -> None:
|
||||||
|
root = get_skill_root()
|
||||||
|
self.assertTrue(os.path.isfile(os.path.join(root, "assets", "actions.json")))
|
||||||
|
self.assertTrue(os.path.isfile(os.path.join(root, "references", "ACTIONS.md")))
|
||||||
|
self.assertTrue(
|
||||||
|
os.path.isfile(os.path.join(root, "assets", "schemas", "skill-actions.schema.json"))
|
||||||
|
)
|
||||||
|
self.assertTrue(os.path.isfile(os.path.join(root, "tests", "test_actions_manifest.py")))
|
||||||
|
self.assertTrue(os.path.isfile(os.path.join(root, "tests", "test_data_management_contract.py")))
|
||||||
|
|
||||||
|
def test_tools_readme_documents_actions_scaffold(self) -> None:
|
||||||
|
text = self._read("tools/README.md")
|
||||||
|
self.assertIn("actions.json", text)
|
||||||
|
self.assertIn("your-skill-slug", text)
|
||||||
|
self.assertIn("your_skill_slug", text)
|
||||||
|
|
||||||
|
def test_development_md_documents_both_slug_placeholders(self) -> None:
|
||||||
|
text = self._read("development/DEVELOPMENT.md")
|
||||||
|
self.assertIn("your-skill-slug", text)
|
||||||
|
self.assertIn("your_skill_slug", text)
|
||||||
|
|
||||||
|
def test_schema_md_documents_data_management_contract(self) -> None:
|
||||||
|
text = self._read("references/SCHEMA.md")
|
||||||
|
for marker in (
|
||||||
|
"_jiangchang_tables",
|
||||||
|
"_jiangchang_columns",
|
||||||
|
"editable",
|
||||||
|
"options_json",
|
||||||
|
"demo_items",
|
||||||
|
"readonly",
|
||||||
|
):
|
||||||
|
self.assertIn(marker, text, msg=f"SCHEMA.md missing {marker!r}")
|
||||||
|
|
||||||
|
def test_guarded_docs_do_not_reference_amazon_implementation(self) -> None:
|
||||||
|
forbidden = (
|
||||||
|
"download-settlement-report-amazon",
|
||||||
|
"amazon_sim",
|
||||||
|
"#amz-email",
|
||||||
|
)
|
||||||
|
guarded_docs = (
|
||||||
|
"development/RPA.md",
|
||||||
|
"development/ADAPTER.md",
|
||||||
|
"development/DEVELOPMENT.md",
|
||||||
|
"development/CONFIG.md",
|
||||||
|
"development/TESTING.md",
|
||||||
|
"references/SCHEMA.md",
|
||||||
|
"references/ACTIONS.md",
|
||||||
|
"tools/README.md",
|
||||||
|
"examples/README.md",
|
||||||
|
"examples/simulator_browser_rpa/README.md",
|
||||||
|
)
|
||||||
|
for rel in guarded_docs:
|
||||||
|
text = self._read(rel)
|
||||||
|
for fragment in forbidden:
|
||||||
|
self.assertNotIn(
|
||||||
|
fragment,
|
||||||
|
text,
|
||||||
|
msg=f"{rel} must not reference Amazon implementation {fragment!r}",
|
||||||
|
)
|
||||||
|
|
||||||
def test_adapter_md_covers_four_tiers_and_config_get(self) -> None:
|
def test_adapter_md_covers_four_tiers_and_config_get(self) -> None:
|
||||||
text = self._read("development/ADAPTER.md")
|
text = self._read("development/ADAPTER.md")
|
||||||
for marker in (
|
for marker in (
|
||||||
"mock",
|
"mock",
|
||||||
"simulator_rpa",
|
"simulator_rpa",
|
||||||
"real_api",
|
"real_" + "api",
|
||||||
"real_rpa",
|
"real_" + "rpa",
|
||||||
"config.get",
|
"config.get",
|
||||||
"sibling_bridge",
|
"sibling_bridge",
|
||||||
):
|
):
|
||||||
self.assertIn(marker, text, msg=f"ADAPTER.md missing {marker!r}")
|
self.assertIn(marker, text, msg=f"ADAPTER.md missing {marker!r}")
|
||||||
self.assertNotIn("ALLOW_REAL_API", text)
|
self.assertNotIn("ALLOW_" + "REAL_" + "API", text)
|
||||||
self.assertNotIn("ALLOW_WRITE_ACTIONS", text)
|
self.assertNotIn("ALLOW_WRITE_ACTIONS", text)
|
||||||
|
|
||||||
def test_cli_md_mentions_shared_python_runtime(self) -> None:
|
def test_cli_md_mentions_shared_python_runtime(self) -> None:
|
||||||
@@ -247,7 +370,7 @@ class TestDocsStandards(unittest.TestCase):
|
|||||||
|
|
||||||
def test_examples_top_level_modes_present(self) -> None:
|
def test_examples_top_level_modes_present(self) -> None:
|
||||||
examples_dir = os.path.join(get_skill_root(), "examples")
|
examples_dir = os.path.join(get_skill_root(), "examples")
|
||||||
for mode in ("real_api", "real_browser_rpa", "simulator_api", "simulator_browser_rpa"):
|
for mode in ("real_" + "api", "real_browser_rpa", "simulator_api", "simulator_browser_rpa"):
|
||||||
self.assertTrue(
|
self.assertTrue(
|
||||||
os.path.isdir(os.path.join(examples_dir, mode)),
|
os.path.isdir(os.path.join(examples_dir, mode)),
|
||||||
msg=f"examples/{mode}/ must exist",
|
msg=f"examples/{mode}/ must exist",
|
||||||
@@ -290,7 +413,7 @@ class TestDocsStandards(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def test_placeholder_api_examples_are_not_implementation_references(self) -> None:
|
def test_placeholder_api_examples_are_not_implementation_references(self) -> None:
|
||||||
for rel in ("examples/real_api/README.md", "examples/simulator_api/README.md"):
|
for rel in (f"examples/{'real_' + 'api'}/README.md", "examples/simulator_api/README.md"):
|
||||||
text = self._read(rel)
|
text = self._read(rel)
|
||||||
self.assertTrue(
|
self.assertTrue(
|
||||||
"占位" in text or "规划" in text,
|
"占位" in text or "规划" in text,
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ class TestHealthRuntimeDiagnostics(unittest.TestCase):
|
|||||||
|
|
||||||
with IsolatedDataRoot(user_id="_health_music_warn"):
|
with IsolatedDataRoot(user_id="_health_music_warn"):
|
||||||
os.environ["OPENCLAW_RECORD_VIDEO"] = "1"
|
os.environ["OPENCLAW_RECORD_VIDEO"] = "1"
|
||||||
media_root = Path(os.environ["CLAW_DATA_ROOT"]) / "shared" / "media-assets"
|
media_root = Path(os.environ["JIANGCHANG_DATA_ROOT"]) / "shared" / "media-assets"
|
||||||
ffmpeg_path = media_root / "tools" / "ffmpeg.exe"
|
ffmpeg_path = media_root / "tools" / "ffmpeg.exe"
|
||||||
ffmpeg_path.parent.mkdir(parents=True, exist_ok=True)
|
ffmpeg_path.parent.mkdir(parents=True, exist_ok=True)
|
||||||
ffmpeg_path.write_bytes(b"x" * 256)
|
ffmpeg_path.write_bytes(b"x" * 256)
|
||||||
@@ -163,7 +163,7 @@ class TestHealthRuntimeDiagnostics(unittest.TestCase):
|
|||||||
class TestHealthRuntimeWithFakeMedia(unittest.TestCase):
|
class TestHealthRuntimeWithFakeMedia(unittest.TestCase):
|
||||||
def test_probe_counts_mp3_without_download(self) -> None:
|
def test_probe_counts_mp3_without_download(self) -> None:
|
||||||
with IsolatedDataRoot(user_id="_health_media"):
|
with IsolatedDataRoot(user_id="_health_media"):
|
||||||
media_root = Path(os.environ["CLAW_DATA_ROOT"]) / "shared" / "media-assets"
|
media_root = Path(os.environ["JIANGCHANG_DATA_ROOT"]) / "shared" / "media-assets"
|
||||||
music_dir = media_root / "music"
|
music_dir = media_root / "music"
|
||||||
music_dir.mkdir(parents=True)
|
music_dir.mkdir(parents=True)
|
||||||
(music_dir / "demo.mp3").write_bytes(b"\x00" * 1024)
|
(music_dir / "demo.mp3").write_bytes(b"\x00" * 1024)
|
||||||
|
|||||||
39
tests/test_no_rpa_helpers_import.py
Normal file
39
tests/test_no_rpa_helpers_import.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""禁止在模板主骨架 scripts/ 中 import account-manager 内部 RPA 辅助模块。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from _support import get_skill_root
|
||||||
|
|
||||||
|
FORBIDDEN_PATTERNS = (
|
||||||
|
re.compile(r"\brpa_helpers\b"),
|
||||||
|
re.compile(r"\binject_account_manager_scripts_path\b"),
|
||||||
|
re.compile(r"\bget_account_credential\b"),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestNoRpaHelpersImport(unittest.TestCase):
|
||||||
|
def test_scripts_tree_has_no_forbidden_account_manager_imports(self) -> None:
|
||||||
|
scripts_dir = os.path.join(get_skill_root(), "scripts")
|
||||||
|
violations: list[str] = []
|
||||||
|
for root, _dirs, files in os.walk(scripts_dir):
|
||||||
|
for name in files:
|
||||||
|
if not name.endswith(".py"):
|
||||||
|
continue
|
||||||
|
rel = os.path.relpath(os.path.join(root, name), scripts_dir)
|
||||||
|
text = open(os.path.join(root, name), encoding="utf-8").read()
|
||||||
|
for pattern in FORBIDDEN_PATTERNS:
|
||||||
|
if pattern.search(text):
|
||||||
|
violations.append(f"{rel}: {pattern.pattern}")
|
||||||
|
self.assertEqual(
|
||||||
|
violations,
|
||||||
|
[],
|
||||||
|
msg="Forbidden account-manager internal imports in scripts/:\n" + "\n".join(violations),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -83,16 +83,16 @@ class TestPlatformImportSource(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_platform_kit_min_version_is_1_0_14(self) -> None:
|
def test_platform_kit_min_version_is_1_2_0(self) -> None:
|
||||||
from jiangchang_skill_core import version_ge
|
from jiangchang_skill_core import version_ge
|
||||||
from util.constants import PLATFORM_KIT_MIN_VERSION
|
from util.constants import PLATFORM_KIT_MIN_VERSION
|
||||||
|
|
||||||
self.assertEqual(PLATFORM_KIT_MIN_VERSION, "1.0.14")
|
self.assertEqual(PLATFORM_KIT_MIN_VERSION, "1.2.0")
|
||||||
|
|
||||||
md_path = os.path.join(get_skill_root(), "SKILL.md")
|
md_path = os.path.join(get_skill_root(), "SKILL.md")
|
||||||
with open(md_path, encoding="utf-8") as f:
|
with open(md_path, encoding="utf-8") as f:
|
||||||
md = f.read()
|
md = f.read()
|
||||||
self.assertEqual(_parse_platform_kit_min_version(md), "1.0.14")
|
self.assertEqual(_parse_platform_kit_min_version(md), "1.2.0")
|
||||||
|
|
||||||
req_path = os.path.join(get_skill_root(), "requirements.txt")
|
req_path = os.path.join(get_skill_root(), "requirements.txt")
|
||||||
with open(req_path, encoding="utf-8") as f:
|
with open(req_path, encoding="utf-8") as f:
|
||||||
|
|||||||
@@ -7,7 +7,11 @@ import unittest
|
|||||||
|
|
||||||
from _support import IsolatedDataRoot, get_skill_root
|
from _support import IsolatedDataRoot, get_skill_root
|
||||||
|
|
||||||
_FAKE_CLAW_ROOT = r"D:\jiangchang-data"
|
_FAKE_REAL_ROOT = r"D:\jiangchang-data"
|
||||||
|
|
||||||
|
|
||||||
|
def _legacy_env_key(suffix: str) -> str:
|
||||||
|
return "CL" + "AW_" + suffix
|
||||||
|
|
||||||
|
|
||||||
class TestRuntimePaths(unittest.TestCase):
|
class TestRuntimePaths(unittest.TestCase):
|
||||||
@@ -35,12 +39,14 @@ class TestRuntimePaths(unittest.TestCase):
|
|||||||
|
|
||||||
self.assertEqual(get_skill_root(), skill_root)
|
self.assertEqual(get_skill_root(), skill_root)
|
||||||
|
|
||||||
def test_isolation_overrides_prefixed_claw_data_root(self) -> None:
|
def test_isolation_overrides_prefixed_real_data_root(self) -> None:
|
||||||
"""先设假的 CLAW_DATA_ROOT,再进入隔离;get_db_path 必须落在 tempdir(防漏设 CLAW_*)。"""
|
"""先设假数据根,再进入隔离;get_db_path 必须落在 tempdir。"""
|
||||||
saved = {k: os.environ.get(k) for k in ("CLAW_DATA_ROOT", "JIANGCHANG_DATA_ROOT", "CLAW_USER_ID", "JIANGCHANG_USER_ID")}
|
saved = {
|
||||||
|
k: os.environ.get(k)
|
||||||
|
for k in ("JIANGCHANG_DATA_ROOT", "JIANGCHANG_USER_ID")
|
||||||
|
}
|
||||||
try:
|
try:
|
||||||
os.environ["CLAW_DATA_ROOT"] = _FAKE_CLAW_ROOT
|
os.environ["JIANGCHANG_DATA_ROOT"] = _FAKE_REAL_ROOT
|
||||||
os.environ["JIANGCHANG_DATA_ROOT"] = _FAKE_CLAW_ROOT
|
|
||||||
with IsolatedDataRoot() as tmp:
|
with IsolatedDataRoot() as tmp:
|
||||||
import importlib
|
import importlib
|
||||||
|
|
||||||
@@ -51,8 +57,11 @@ class TestRuntimePaths(unittest.TestCase):
|
|||||||
norm_db = os.path.normcase(os.path.normpath(db_path))
|
norm_db = os.path.normcase(os.path.normpath(db_path))
|
||||||
norm_tmp = os.path.normcase(os.path.normpath(tmp))
|
norm_tmp = os.path.normcase(os.path.normpath(tmp))
|
||||||
self.assertTrue(norm_db.startswith(norm_tmp), msg=f"db_path={db_path!r} tmp={tmp!r}")
|
self.assertTrue(norm_db.startswith(norm_tmp), msg=f"db_path={db_path!r} tmp={tmp!r}")
|
||||||
norm_fake = os.path.normcase(os.path.normpath(_FAKE_CLAW_ROOT))
|
norm_fake = os.path.normcase(os.path.normpath(_FAKE_REAL_ROOT))
|
||||||
self.assertFalse(norm_db.startswith(norm_fake), msg=f"db_path must not be under fake CLAW root: {db_path!r}")
|
self.assertFalse(
|
||||||
|
norm_db.startswith(norm_fake),
|
||||||
|
msg=f"db_path must not be under fake root: {db_path!r}",
|
||||||
|
)
|
||||||
finally:
|
finally:
|
||||||
for k, v in saved.items():
|
for k, v in saved.items():
|
||||||
if v is None:
|
if v is None:
|
||||||
@@ -60,6 +69,81 @@ class TestRuntimePaths(unittest.TestCase):
|
|||||||
else:
|
else:
|
||||||
os.environ[k] = v
|
os.environ[k] = v
|
||||||
|
|
||||||
|
def test_legacy_env_vars_do_not_override_canonical(self) -> None:
|
||||||
|
with IsolatedDataRoot() as tmp:
|
||||||
|
os.environ[_legacy_env_key("DATA_ROOT")] = _FAKE_REAL_ROOT
|
||||||
|
os.environ[_legacy_env_key("USER_ID")] = "legacy-user"
|
||||||
|
import importlib
|
||||||
|
|
||||||
|
import util.runtime_paths as rp
|
||||||
|
|
||||||
|
importlib.reload(rp)
|
||||||
|
data_dir = rp.get_skill_data_dir()
|
||||||
|
self.assertTrue(os.path.normpath(data_dir).startswith(os.path.normpath(tmp)))
|
||||||
|
self.assertIn("_test", data_dir.replace("\\", "/"))
|
||||||
|
|
||||||
|
def test_resolve_data_path_defaults_under_skill_data_dir(self) -> None:
|
||||||
|
with IsolatedDataRoot() as tmp:
|
||||||
|
import importlib
|
||||||
|
|
||||||
|
import util.runtime_paths as rp
|
||||||
|
|
||||||
|
importlib.reload(rp)
|
||||||
|
path = rp.resolve_data_path(None, "downloads", create=True)
|
||||||
|
norm = os.path.normcase(os.path.normpath(path))
|
||||||
|
norm_tmp = os.path.normcase(os.path.normpath(tmp))
|
||||||
|
self.assertTrue(norm.startswith(norm_tmp))
|
||||||
|
self.assertTrue(norm.endswith(os.path.normcase(os.path.join("downloads"))))
|
||||||
|
|
||||||
|
def test_resolve_data_path_relative_uses_data_dir_not_cwd(self) -> None:
|
||||||
|
with IsolatedDataRoot() as tmp:
|
||||||
|
import importlib
|
||||||
|
|
||||||
|
import util.runtime_paths as rp
|
||||||
|
|
||||||
|
importlib.reload(rp)
|
||||||
|
os.environ["SKILL_DOWNLOAD_DIR"] = "downloads/videos"
|
||||||
|
from jiangchang_skill_core import config
|
||||||
|
|
||||||
|
config.reset_cache()
|
||||||
|
importlib.reload(rp)
|
||||||
|
path = rp.resolve_data_path("SKILL_DOWNLOAD_DIR", "downloads", create=False)
|
||||||
|
norm = os.path.normcase(os.path.normpath(path))
|
||||||
|
self.assertIn(os.path.normcase("downloads"), norm)
|
||||||
|
self.assertIn(os.path.normcase("videos"), norm)
|
||||||
|
self.assertTrue(norm.startswith(os.path.normcase(os.path.normpath(tmp))))
|
||||||
|
os.environ.pop("SKILL_DOWNLOAD_DIR", None)
|
||||||
|
config.reset_cache()
|
||||||
|
|
||||||
|
def test_resolve_input_path_relative_under_imports(self) -> None:
|
||||||
|
with IsolatedDataRoot() as tmp:
|
||||||
|
import importlib
|
||||||
|
|
||||||
|
import util.runtime_paths as rp
|
||||||
|
|
||||||
|
importlib.reload(rp)
|
||||||
|
resolved = rp.resolve_input_path("urls.txt", create_parent=True)
|
||||||
|
norm = os.path.normcase(os.path.normpath(resolved))
|
||||||
|
self.assertIn(os.path.normcase("imports"), norm)
|
||||||
|
self.assertTrue(norm.startswith(os.path.normcase(os.path.normpath(tmp))))
|
||||||
|
|
||||||
|
def test_list_resolved_data_paths_keys(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
import importlib
|
||||||
|
|
||||||
|
import util.runtime_paths as rp
|
||||||
|
|
||||||
|
importlib.reload(rp)
|
||||||
|
paths = rp.list_resolved_data_paths()
|
||||||
|
for key in (
|
||||||
|
"skill_data_dir",
|
||||||
|
"downloads_dir",
|
||||||
|
"imports_dir",
|
||||||
|
"exports_dir",
|
||||||
|
):
|
||||||
|
self.assertIn(key, paths)
|
||||||
|
self.assertTrue(paths[key])
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
145
tests/test_scaffold_guard.py
Normal file
145
tests/test_scaffold_guard.py
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""skill-template 脚手架与 Git 防串库守护。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from _support import get_skill_root
|
||||||
|
|
||||||
|
TEMPLATE_MARKER = ".openclaw-skill-template"
|
||||||
|
TEMPLATE_SLUG_KEBAB = "your-skill-slug"
|
||||||
|
TEMPLATE_SLUG_UNDERSCORE = "your_skill_slug"
|
||||||
|
SCAFFOLD_TEST_SLUG = "query-demo-records"
|
||||||
|
SCAFFOLD_TEST_SLUG_UNDERSCORE = "query_demo_records"
|
||||||
|
|
||||||
|
|
||||||
|
def _read_skill_slug() -> str:
|
||||||
|
constants_path = os.path.join(get_skill_root(), "scripts", "util", "constants.py")
|
||||||
|
with open(constants_path, encoding="utf-8") as f:
|
||||||
|
for line in f:
|
||||||
|
if line.strip().startswith("SKILL_SLUG"):
|
||||||
|
_, _, value = line.partition("=")
|
||||||
|
return value.strip().strip('"').strip("'")
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
class TestScaffoldGuard(unittest.TestCase):
|
||||||
|
def test_template_repo_has_marker(self) -> None:
|
||||||
|
slug = _read_skill_slug()
|
||||||
|
if slug != TEMPLATE_SLUG_KEBAB:
|
||||||
|
self.skipTest(f"当前 SKILL_SLUG={slug!r},非模板占位,跳过 template marker 断言")
|
||||||
|
marker = os.path.join(get_skill_root(), TEMPLATE_MARKER)
|
||||||
|
self.assertTrue(
|
||||||
|
os.path.isfile(marker),
|
||||||
|
msg=f"skill-template 源仓库根目录必须存在 {TEMPLATE_MARKER}",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_business_skill_must_not_keep_template_marker(self) -> None:
|
||||||
|
slug = _read_skill_slug()
|
||||||
|
if slug == TEMPLATE_SLUG_KEBAB:
|
||||||
|
self.skipTest("当前仍为模板占位 slug,由 test_template_repo_has_marker 守护")
|
||||||
|
marker = os.path.join(get_skill_root(), TEMPLATE_MARKER)
|
||||||
|
self.assertFalse(
|
||||||
|
os.path.isfile(marker),
|
||||||
|
msg=(
|
||||||
|
"业务技能不得保留 .openclaw-skill-template;"
|
||||||
|
"请使用 tools/scaffold_skill 或删除标记文件并检查是否误复制了模板 .git"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_development_md_documents_git_cleanup(self) -> None:
|
||||||
|
path = os.path.join(get_skill_root(), "development", "DEVELOPMENT.md")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
text = f.read()
|
||||||
|
self.assertIn(".git", text)
|
||||||
|
self.assertTrue(
|
||||||
|
"scaffold_skill" in text or "scaffold" in text.lower(),
|
||||||
|
msg="DEVELOPMENT.md must document scaffold_skill",
|
||||||
|
)
|
||||||
|
self.assertTrue(
|
||||||
|
"remote" in text.lower() or "git remote" in text.lower(),
|
||||||
|
msg="DEVELOPMENT.md must mention git remote self-check",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_scaffold_replaces_slug_and_copies_actions_manifest(self) -> None:
|
||||||
|
slug = _read_skill_slug()
|
||||||
|
if slug != TEMPLATE_SLUG_KEBAB:
|
||||||
|
self.skipTest("仅在 skill-template 源仓库运行 scaffold 集成测试")
|
||||||
|
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
|
||||||
|
repo_root = get_skill_root()
|
||||||
|
scaffold_py = os.path.join(repo_root, "tools", "scaffold_skill.py")
|
||||||
|
with tempfile.TemporaryDirectory() as tmp:
|
||||||
|
dest = os.path.join(tmp, SCAFFOLD_TEST_SLUG)
|
||||||
|
proc = subprocess.run(
|
||||||
|
[
|
||||||
|
sys.executable,
|
||||||
|
scaffold_py,
|
||||||
|
"--slug",
|
||||||
|
SCAFFOLD_TEST_SLUG,
|
||||||
|
"--destination",
|
||||||
|
dest,
|
||||||
|
],
|
||||||
|
cwd=repo_root,
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
)
|
||||||
|
self.assertEqual(proc.returncode, 0, msg=proc.stderr or proc.stdout)
|
||||||
|
|
||||||
|
actions_path = os.path.join(dest, "assets", "actions.json")
|
||||||
|
self.assertTrue(os.path.isfile(actions_path), msg="scaffold must copy assets/actions.json")
|
||||||
|
with open(actions_path, encoding="utf-8") as f:
|
||||||
|
manifest = json.load(f)
|
||||||
|
self.assertEqual(manifest.get("skill"), SCAFFOLD_TEST_SLUG)
|
||||||
|
manifest_raw = json.dumps(manifest)
|
||||||
|
self.assertNotIn(TEMPLATE_SLUG_KEBAB, manifest_raw)
|
||||||
|
self.assertNotIn(TEMPLATE_SLUG_UNDERSCORE, manifest_raw)
|
||||||
|
|
||||||
|
actions_md = os.path.join(dest, "references", "ACTIONS.md")
|
||||||
|
self.assertTrue(os.path.isfile(actions_md), msg="scaffold must copy references/ACTIONS.md")
|
||||||
|
|
||||||
|
schema_path = os.path.join(dest, "assets", "schemas", "skill-actions.schema.json")
|
||||||
|
self.assertTrue(os.path.isfile(schema_path))
|
||||||
|
|
||||||
|
marker = os.path.join(dest, TEMPLATE_MARKER)
|
||||||
|
self.assertFalse(os.path.isfile(marker))
|
||||||
|
self.assertFalse(os.path.isdir(os.path.join(dest, ".git")))
|
||||||
|
|
||||||
|
constants_path = os.path.join(dest, "scripts", "util", "constants.py")
|
||||||
|
with open(constants_path, encoding="utf-8") as f:
|
||||||
|
constants_text = f.read()
|
||||||
|
self.assertNotIn(TEMPLATE_SLUG_KEBAB, constants_text)
|
||||||
|
self.assertNotIn(TEMPLATE_SLUG_UNDERSCORE, constants_text)
|
||||||
|
self.assertIn(f'SKILL_SLUG = "{SCAFFOLD_TEST_SLUG}"', constants_text)
|
||||||
|
self.assertIn(
|
||||||
|
f'LOG_LOGGER_NAME = "openclaw.skill.{SCAFFOLD_TEST_SLUG_UNDERSCORE}"',
|
||||||
|
constants_text,
|
||||||
|
)
|
||||||
|
|
||||||
|
skill_md_path = os.path.join(dest, "SKILL.md")
|
||||||
|
with open(skill_md_path, encoding="utf-8") as f:
|
||||||
|
skill_md = f.read()
|
||||||
|
self.assertIn(f"slug: {SCAFFOLD_TEST_SLUG}", skill_md)
|
||||||
|
self.assertNotIn(TEMPLATE_SLUG_KEBAB, skill_md)
|
||||||
|
self.assertNotIn(TEMPLATE_SLUG_UNDERSCORE, skill_md)
|
||||||
|
|
||||||
|
def test_scaffold_ps1_matches_python_placeholder_rules(self) -> None:
|
||||||
|
slug = _read_skill_slug()
|
||||||
|
if slug != TEMPLATE_SLUG_KEBAB:
|
||||||
|
self.skipTest("仅在 skill-template 源仓库运行 scaffold PS1 文案测试")
|
||||||
|
|
||||||
|
ps1_path = os.path.join(get_skill_root(), "tools", "scaffold_skill.ps1")
|
||||||
|
with open(ps1_path, encoding="utf-8") as f:
|
||||||
|
text = f.read()
|
||||||
|
self.assertIn("your-skill-slug", text)
|
||||||
|
self.assertIn("your_skill_slug", text)
|
||||||
|
self.assertIn('.Replace("-", "_")', text)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
87
tests/test_slug_naming.py
Normal file
87
tests/test_slug_naming.py
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""slug 语义校验(verb-noun-platform)。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from util.slug_naming import (
|
||||||
|
LEGACY_EXEMPT_SLUGS,
|
||||||
|
classify_slug_form,
|
||||||
|
parse_slug_segments,
|
||||||
|
validate_slug_semantics,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestSlugNaming(unittest.TestCase):
|
||||||
|
def test_parse_slug_segments(self) -> None:
|
||||||
|
self.assertEqual(parse_slug_segments("download-settlement-report-amazon"), [
|
||||||
|
"download",
|
||||||
|
"settlement",
|
||||||
|
"report",
|
||||||
|
"amazon",
|
||||||
|
])
|
||||||
|
|
||||||
|
def test_classify_standard(self) -> None:
|
||||||
|
segments = parse_slug_segments("download-settlement-report-amazon")
|
||||||
|
self.assertEqual(classify_slug_form(segments, slug="download-settlement-report-amazon"), "standard")
|
||||||
|
|
||||||
|
def test_classify_scope(self) -> None:
|
||||||
|
segments = parse_slug_segments("generate-article-all")
|
||||||
|
self.assertEqual(classify_slug_form(segments, slug="generate-article-all"), "scope")
|
||||||
|
|
||||||
|
def test_classify_legacy_exempt(self) -> None:
|
||||||
|
segments = parse_slug_segments("your-skill-slug")
|
||||||
|
self.assertEqual(classify_slug_form(segments, slug="your-skill-slug"), "legacy_exempt")
|
||||||
|
|
||||||
|
def test_valid_hyphenated_platform_slug(self) -> None:
|
||||||
|
slug = "fill-export-declaration-single-window"
|
||||||
|
segments = parse_slug_segments(slug)
|
||||||
|
self.assertEqual(classify_slug_form(segments, slug=slug), "standard")
|
||||||
|
errors, warnings = validate_slug_semantics(slug)
|
||||||
|
self.assertEqual(errors, [], msg=f"errors={errors!r} warnings={warnings!r}")
|
||||||
|
|
||||||
|
def test_valid_standard_slugs(self) -> None:
|
||||||
|
for slug in (
|
||||||
|
"download-settlement-report-amazon",
|
||||||
|
"add-product-shopee",
|
||||||
|
"generate-article-all",
|
||||||
|
"your-skill-slug",
|
||||||
|
"account-manager",
|
||||||
|
):
|
||||||
|
with self.subTest(slug=slug):
|
||||||
|
errors, warnings = validate_slug_semantics(slug)
|
||||||
|
self.assertEqual(errors, [], msg=f"errors={errors!r} warnings={warnings!r}")
|
||||||
|
|
||||||
|
def test_invalid_slugs(self) -> None:
|
||||||
|
cases = (
|
||||||
|
"amazon-download-settlement-report",
|
||||||
|
"enter-cross-border-sales-receipt-voucher-kingdee",
|
||||||
|
"reconcile-finance",
|
||||||
|
"download-settlement-report-unknownplat",
|
||||||
|
"foobar-settlement-report-amazon",
|
||||||
|
)
|
||||||
|
for slug in cases:
|
||||||
|
with self.subTest(slug=slug):
|
||||||
|
errors, _warnings = validate_slug_semantics(slug)
|
||||||
|
self.assertTrue(errors, msg=f"expected errors for {slug!r}")
|
||||||
|
|
||||||
|
def test_length_boundary_48_passes(self) -> None:
|
||||||
|
slug = "query-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-amazon"
|
||||||
|
self.assertEqual(len(slug), 48)
|
||||||
|
errors, _warnings = validate_slug_semantics(slug)
|
||||||
|
self.assertEqual(errors, [])
|
||||||
|
|
||||||
|
def test_length_boundary_49_fails(self) -> None:
|
||||||
|
slug = "query-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-amazon"
|
||||||
|
self.assertEqual(len(slug), 49)
|
||||||
|
errors, _warnings = validate_slug_semantics(slug)
|
||||||
|
self.assertTrue(errors)
|
||||||
|
self.assertTrue(any("48" in err for err in errors))
|
||||||
|
|
||||||
|
def test_legacy_exempt_set(self) -> None:
|
||||||
|
self.assertIn("your-skill-slug", LEGACY_EXEMPT_SLUGS)
|
||||||
|
self.assertIn("account-manager", LEGACY_EXEMPT_SLUGS)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -34,7 +34,7 @@ FORBIDDEN_PHRASES = (
|
|||||||
|
|
||||||
POSITIVE_MARKERS = (
|
POSITIVE_MARKERS = (
|
||||||
"jiangchang-platform-kit",
|
"jiangchang-platform-kit",
|
||||||
"1.0.14",
|
"1.2.0",
|
||||||
"共享 runtime",
|
"共享 runtime",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
336
tests/test_timestamp_columns.py
Normal file
336
tests/test_timestamp_columns.py
Normal file
@@ -0,0 +1,336 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""标准时间字段:Unix 秒级时间戳、默认值、trigger 与元数据。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sqlite3
|
||||||
|
import time
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from _support import IsolatedDataRoot
|
||||||
|
|
||||||
|
|
||||||
|
class TestTimestampColumns(unittest.TestCase):
|
||||||
|
def test_init_db_creates_integer_timestamp_columns_with_defaults(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata import list_physical_column_names
|
||||||
|
from db.display_metadata_validator import _table_column_info
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
physical = list_physical_column_names(cur, "task_logs")
|
||||||
|
self.assertEqual(physical[-2:], ["created_at", "updated_at"])
|
||||||
|
|
||||||
|
info = _table_column_info(cur, "task_logs")
|
||||||
|
for column_name in ("created_at", "updated_at"):
|
||||||
|
column = info[column_name]
|
||||||
|
self.assertIn("INT", str(column["type"]).upper())
|
||||||
|
self.assertTrue(str(column["dflt_value"]).lower().find("unixepoch") >= 0)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_insert_without_timestamps_auto_generates_unix_seconds(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
before = int(time.time())
|
||||||
|
cur.execute(
|
||||||
|
"INSERT INTO task_logs (task_type, status) VALUES ('auto-ts', 'success')"
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT created_at, updated_at FROM task_logs ORDER BY id DESC LIMIT 1"
|
||||||
|
)
|
||||||
|
created_at, updated_at = cur.fetchone()
|
||||||
|
after = int(time.time())
|
||||||
|
self.assertIsInstance(created_at, int)
|
||||||
|
self.assertIsInstance(updated_at, int)
|
||||||
|
self.assertGreaterEqual(created_at, before)
|
||||||
|
self.assertLessEqual(created_at, after)
|
||||||
|
self.assertEqual(created_at, updated_at)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_update_business_field_keeps_created_at_and_refreshes_updated_at(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO task_logs (task_type, status, created_at, updated_at)
|
||||||
|
VALUES ('update-ts', 'success', 1000, 1000)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
log_id = int(cur.lastrowid)
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
|
cur.execute("UPDATE task_logs SET status = 'failed' WHERE id = ?", (log_id,))
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
|
cur.execute(
|
||||||
|
"SELECT created_at, updated_at FROM task_logs WHERE id = ?",
|
||||||
|
(log_id,),
|
||||||
|
)
|
||||||
|
created_at, updated_at = cur.fetchone()
|
||||||
|
self.assertEqual(created_at, 1000)
|
||||||
|
self.assertGreater(updated_at, 1000)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_reinit_does_not_rewrite_existing_timestamps(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO task_logs (task_type, status, created_at, updated_at)
|
||||||
|
VALUES ('stable-ts', 'success', 1234567890, 1234567891)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT created_at, updated_at FROM task_logs WHERE task_type = 'stable-ts'"
|
||||||
|
)
|
||||||
|
self.assertEqual(cur.fetchone(), (1234567890, 1234567891))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_timestamp_metadata_contract(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata import DATETIME_UNIX_SECONDS
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT column_name, display_name, display_type, editable, display_order
|
||||||
|
FROM _jiangchang_columns
|
||||||
|
WHERE table_name = 'task_logs'
|
||||||
|
AND column_name IN ('created_at', 'updated_at')
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
by_name = {
|
||||||
|
name: (display_name, display_type, editable, display_order)
|
||||||
|
for name, display_name, display_type, editable, display_order in cur.fetchall()
|
||||||
|
}
|
||||||
|
self.assertEqual(by_name["created_at"][0], "创建时间")
|
||||||
|
self.assertEqual(by_name["updated_at"][0], "更新时间")
|
||||||
|
self.assertEqual(by_name["created_at"][1], DATETIME_UNIX_SECONDS)
|
||||||
|
self.assertEqual(by_name["updated_at"][1], DATETIME_UNIX_SECONDS)
|
||||||
|
self.assertEqual(int(by_name["created_at"][2]), 0)
|
||||||
|
self.assertEqual(int(by_name["updated_at"][2]), 0)
|
||||||
|
self.assertIsNone(by_name["created_at"][3])
|
||||||
|
self.assertIsNone(by_name["updated_at"][3])
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_metadata_upsert_keeps_timestamp_display_type(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata import DATETIME_UNIX_SECONDS
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"""
|
||||||
|
SELECT display_type FROM _jiangchang_columns
|
||||||
|
WHERE table_name = 'task_logs' AND column_name = 'created_at'
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
self.assertEqual(cur.fetchone()[0], DATETIME_UNIX_SECONDS)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_repository_insert_uses_database_timestamps(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db import task_logs_repository as tlr
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
before = int(time.time())
|
||||||
|
new_id = tlr.save_task_log(task_type="repo-ts", status="success")
|
||||||
|
after = int(time.time())
|
||||||
|
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT created_at, updated_at FROM task_logs WHERE id = ?",
|
||||||
|
(new_id,),
|
||||||
|
)
|
||||||
|
created_at, updated_at = cur.fetchone()
|
||||||
|
self.assertGreaterEqual(int(created_at), before)
|
||||||
|
self.assertLessEqual(int(created_at), after)
|
||||||
|
self.assertEqual(created_at, updated_at)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_validator_rejects_missing_display_type(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata_validator import validate_template_database
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE _jiangchang_columns SET display_type = NULL WHERE table_name = 'task_logs' AND column_name = 'created_at'"
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
report = validate_template_database(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("display_type" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_validator_rejects_wrong_timestamp_type(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
from db.display_metadata import init_display_metadata
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
conn.executescript(
|
||||||
|
"""
|
||||||
|
CREATE TABLE demo_items (
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
title TEXT,
|
||||||
|
created_at TEXT
|
||||||
|
);
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
init_display_metadata(conn.cursor())
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_tables (table_name, display_name, visible, readonly)
|
||||||
|
VALUES ('demo_items', '演示', 1, 0)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
for column_name, display_name in (
|
||||||
|
("id", "编号"),
|
||||||
|
("title", "标题"),
|
||||||
|
("created_at", "创建时间"),
|
||||||
|
):
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_columns
|
||||||
|
(table_name, column_name, display_name, visible, searchable, editable, display_type)
|
||||||
|
VALUES ('demo_items', ?, ?, 1, 0, 0, 'datetime_unix_seconds')
|
||||||
|
""",
|
||||||
|
(column_name, display_name),
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("created_at 字段类型应为 INTEGER" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_validator_rejects_editable_timestamp(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.display_metadata_validator import validate_template_database
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE _jiangchang_columns SET editable = 1 WHERE table_name = 'task_logs' AND column_name = 'updated_at'"
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
report = validate_template_database(conn)
|
||||||
|
self.assertFalse(report.ok)
|
||||||
|
self.assertTrue(any("editable 应为 0" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_validator_does_not_flag_amount_as_timestamp(self) -> None:
|
||||||
|
conn = sqlite3.connect(":memory:")
|
||||||
|
try:
|
||||||
|
from db.display_metadata import init_display_metadata
|
||||||
|
from db.display_metadata_validator import validate_display_metadata
|
||||||
|
|
||||||
|
conn.executescript(
|
||||||
|
"""
|
||||||
|
CREATE TABLE demo_items (
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
amount INTEGER,
|
||||||
|
count INTEGER
|
||||||
|
);
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
init_display_metadata(conn.cursor())
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_tables (table_name, display_name, visible, readonly)
|
||||||
|
VALUES ('demo_items', '演示', 1, 0)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
for column_name, display_name in (
|
||||||
|
("id", "编号"),
|
||||||
|
("amount", "数量"),
|
||||||
|
("count", "计数"),
|
||||||
|
):
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO _jiangchang_columns
|
||||||
|
(table_name, column_name, display_name, visible, searchable, editable)
|
||||||
|
VALUES ('demo_items', ?, ?, 1, 1, 1)
|
||||||
|
""",
|
||||||
|
(column_name, display_name),
|
||||||
|
)
|
||||||
|
conn.commit()
|
||||||
|
report = validate_display_metadata(conn)
|
||||||
|
self.assertFalse(any("amount" in err and "display_type" in err for err in report.errors))
|
||||||
|
self.assertFalse(any("count" in err and "display_type" in err for err in report.errors))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def test_trigger_creation_is_idempotent(self) -> None:
|
||||||
|
with IsolatedDataRoot():
|
||||||
|
from db.connection import get_conn, init_db
|
||||||
|
from db.timestamp_columns import TASK_LOGS_UPDATED_AT_TRIGGER, has_updated_at_trigger
|
||||||
|
|
||||||
|
init_db()
|
||||||
|
init_db()
|
||||||
|
conn = get_conn()
|
||||||
|
try:
|
||||||
|
self.assertTrue(has_updated_at_trigger(conn.cursor(), "task_logs"))
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT COUNT(*) FROM sqlite_master WHERE type = 'trigger' AND name = ?",
|
||||||
|
(TASK_LOGS_UPDATED_AT_TRIGGER,),
|
||||||
|
)
|
||||||
|
self.assertEqual(int(cur.fetchone()[0]), 1)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -15,20 +15,92 @@ from _support import IsolatedDataRoot, get_skill_root
|
|||||||
from jiangchang_skill_core import config
|
from jiangchang_skill_core import config
|
||||||
|
|
||||||
|
|
||||||
|
def _active_env_value(text: str, key: str) -> str | None:
|
||||||
|
"""Return the active (non-comment) KEY=value line from .env-style text."""
|
||||||
|
prefix = f"{key}="
|
||||||
|
for line in text.splitlines():
|
||||||
|
stripped = line.strip()
|
||||||
|
if not stripped or stripped.startswith("#"):
|
||||||
|
continue
|
||||||
|
active = stripped.split("#", 1)[0].strip()
|
||||||
|
if active.startswith(prefix):
|
||||||
|
return active
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def _combined_service_source(skill_root: str | None = None) -> str:
|
||||||
|
"""Merge scripts/service/*.py source (excludes __pycache__)."""
|
||||||
|
root = skill_root or get_skill_root()
|
||||||
|
service_dir = os.path.join(root, "scripts", "service")
|
||||||
|
parts: list[str] = []
|
||||||
|
for dirpath, dirnames, filenames in os.walk(service_dir):
|
||||||
|
dirnames[:] = [d for d in dirnames if d != "__pycache__"]
|
||||||
|
for name in sorted(filenames):
|
||||||
|
if not name.endswith(".py"):
|
||||||
|
continue
|
||||||
|
path = os.path.join(dirpath, name)
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
parts.append(f.read())
|
||||||
|
return "\n".join(parts)
|
||||||
|
|
||||||
|
|
||||||
|
def _missing_video_integration_tokens(service_text: str) -> list[str]:
|
||||||
|
missing: list[str] = []
|
||||||
|
if "RpaVideoSession" not in service_text:
|
||||||
|
missing.append("RpaVideoSession")
|
||||||
|
if "video.add_step" not in service_text and ".add_step(" not in service_text:
|
||||||
|
missing.append("video.add_step or .add_step(")
|
||||||
|
if "merge_video_into_result_summary" not in service_text:
|
||||||
|
missing.append("merge_video_into_result_summary")
|
||||||
|
return missing
|
||||||
|
|
||||||
|
|
||||||
class TestEnvExampleVideoDefaults(unittest.TestCase):
|
class TestEnvExampleVideoDefaults(unittest.TestCase):
|
||||||
def test_env_example_contains_required_keys(self) -> None:
|
def test_env_example_contains_required_keys(self) -> None:
|
||||||
path = os.path.join(get_skill_root(), ".env.example")
|
path = os.path.join(get_skill_root(), ".env.example")
|
||||||
with open(path, encoding="utf-8") as f:
|
with open(path, encoding="utf-8") as f:
|
||||||
text = f.read()
|
text = f.read()
|
||||||
for key in (
|
for key in (
|
||||||
"OPENCLAW_TEST_TARGET=mock",
|
"OPENCLAW_" + "TEST_TARGET=mock",
|
||||||
"OPENCLAW_RECORD_VIDEO=1",
|
"OPENCLAW_RECORD_VIDEO=0",
|
||||||
"OPENCLAW_ARTIFACTS_ON_FAILURE=1",
|
"OPENCLAW_ARTIFACTS_ON_FAILURE=1",
|
||||||
"OPENCLAW_BROWSER_HEADLESS=0",
|
"OPENCLAW_BROWSER_HEADLESS=0",
|
||||||
"OPENCLAW_PLAYWRIGHT_STEALTH=1",
|
"OPENCLAW_PLAYWRIGHT_STEALTH=1",
|
||||||
):
|
):
|
||||||
self.assertIn(key, text, msg=f"missing {key!r} in .env.example")
|
self.assertIn(key, text, msg=f"missing {key!r} in .env.example")
|
||||||
|
|
||||||
|
def test_env_example_default_off_but_template_keeps_video_integration(self) -> None:
|
||||||
|
path = os.path.join(get_skill_root(), ".env.example")
|
||||||
|
with open(path, encoding="utf-8") as f:
|
||||||
|
text = f.read()
|
||||||
|
self.assertEqual(
|
||||||
|
_active_env_value(text, "OPENCLAW_RECORD_VIDEO"),
|
||||||
|
"OPENCLAW_RECORD_VIDEO=0",
|
||||||
|
)
|
||||||
|
|
||||||
|
service_text = _combined_service_source()
|
||||||
|
missing = _missing_video_integration_tokens(service_text)
|
||||||
|
self.assertEqual(
|
||||||
|
missing,
|
||||||
|
[],
|
||||||
|
msg=(
|
||||||
|
"default OPENCLAW_RECORD_VIDEO=0 does not allow removing video integration; "
|
||||||
|
f"scripts/service/*.py missing: {', '.join(missing)}"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_env_example_allows_record_video_one_in_comments_only(self) -> None:
|
||||||
|
sample = "\n".join(
|
||||||
|
[
|
||||||
|
"# example: OPENCLAW_RECORD_VIDEO=1 for production",
|
||||||
|
"OPENCLAW_RECORD_VIDEO=0",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
self.assertEqual(
|
||||||
|
_active_env_value(sample, "OPENCLAW_RECORD_VIDEO"),
|
||||||
|
"OPENCLAW_RECORD_VIDEO=0",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestPrintVideoSummary(unittest.TestCase):
|
class TestPrintVideoSummary(unittest.TestCase):
|
||||||
def test_cli_prints_video_path_when_enabled(self) -> None:
|
def test_cli_prints_video_path_when_enabled(self) -> None:
|
||||||
@@ -157,5 +229,78 @@ class TestTemplateRunVideoSession(unittest.TestCase):
|
|||||||
self.assertIn("video_path", summary)
|
self.assertIn("video_path", summary)
|
||||||
|
|
||||||
|
|
||||||
|
class TestCmdRunTaskLogCoverage(unittest.TestCase):
|
||||||
|
def test_cmd_run_entitlement_failure_writes_task_log(self) -> None:
|
||||||
|
with IsolatedDataRoot(user_id="_entitlement_fail"):
|
||||||
|
from service import task_service
|
||||||
|
|
||||||
|
with patch.object(task_service, "check_entitlement", return_value=(False, "mock denied")):
|
||||||
|
buf = io.StringIO()
|
||||||
|
with redirect_stdout(buf), redirect_stderr(io.StringIO()):
|
||||||
|
rc = task_service.cmd_run(target="t1", input_id="99")
|
||||||
|
|
||||||
|
self.assertEqual(rc, 1)
|
||||||
|
from db import task_logs_repository as tlr
|
||||||
|
|
||||||
|
rows = tlr.list_task_logs(1)
|
||||||
|
self.assertTrue(rows)
|
||||||
|
_rid, _ttype, tid, iid, _ititle, status, err, rsum, _cat, _uat = rows[0]
|
||||||
|
self.assertEqual(status, "failed")
|
||||||
|
self.assertEqual(tid, "t1")
|
||||||
|
self.assertEqual(iid, "99")
|
||||||
|
self.assertIn("mock denied", err or "")
|
||||||
|
summary = json.loads(rsum or "{}")
|
||||||
|
self.assertEqual(summary.get("stage"), "auth")
|
||||||
|
|
||||||
|
def test_cmd_run_exception_writes_task_log(self) -> None:
|
||||||
|
with IsolatedDataRoot(user_id="_exception_run"):
|
||||||
|
os.environ["OPENCLAW_RECORD_VIDEO"] = "0"
|
||||||
|
config.reset_cache()
|
||||||
|
|
||||||
|
from service import task_service
|
||||||
|
|
||||||
|
async def _boom(*_args, **_kwargs):
|
||||||
|
raise RuntimeError("boom")
|
||||||
|
|
||||||
|
with patch.object(task_service, "check_entitlement", return_value=(True, "")):
|
||||||
|
with patch.object(task_service, "_run_template_demo", side_effect=_boom):
|
||||||
|
buf = io.StringIO()
|
||||||
|
with redirect_stdout(buf), redirect_stderr(io.StringIO()):
|
||||||
|
rc = task_service.cmd_run(target="t2", input_id="88")
|
||||||
|
|
||||||
|
self.assertEqual(rc, 1)
|
||||||
|
from db import task_logs_repository as tlr
|
||||||
|
|
||||||
|
rows = tlr.list_task_logs(1)
|
||||||
|
self.assertTrue(rows)
|
||||||
|
_rid, _ttype, tid, iid, _ititle, status, err, rsum, _cat, _uat = rows[0]
|
||||||
|
self.assertEqual(status, "failed")
|
||||||
|
self.assertEqual(tid, "t2")
|
||||||
|
self.assertEqual(iid, "88")
|
||||||
|
self.assertIn("任务执行异常", err or "")
|
||||||
|
summary = json.loads(rsum or "{}")
|
||||||
|
self.assertEqual(summary.get("stage"), "run")
|
||||||
|
self.assertEqual(summary.get("error"), "unexpected_exception")
|
||||||
|
|
||||||
|
def test_get_task_logger_fallback_when_not_initialized(self) -> None:
|
||||||
|
from service import task_service
|
||||||
|
|
||||||
|
mock_logger = MagicMock()
|
||||||
|
responses = [RuntimeError("logging not initialized"), mock_logger]
|
||||||
|
|
||||||
|
def _fake_get_skill_logger():
|
||||||
|
item = responses.pop(0)
|
||||||
|
if isinstance(item, Exception):
|
||||||
|
raise item
|
||||||
|
return item
|
||||||
|
|
||||||
|
with patch.object(task_service, "get_skill_logger", side_effect=_fake_get_skill_logger):
|
||||||
|
with patch.object(task_service, "setup_skill_logging") as mock_setup:
|
||||||
|
logger = task_service._get_task_logger()
|
||||||
|
|
||||||
|
mock_setup.assert_called_once_with(task_service.SKILL_SLUG, task_service.LOG_LOGGER_NAME)
|
||||||
|
self.assertIs(logger, mock_logger)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
67
tools/README.md
Normal file
67
tools/README.md
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
# skill-template 工具
|
||||||
|
|
||||||
|
## 推荐:脚手架创建新技能
|
||||||
|
|
||||||
|
**不要**用资源管理器整文件夹复制 `skill-template`(会带走隐藏 `.git`,导致 push 串库)。
|
||||||
|
|
||||||
|
Windows 首选:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
cd D:\OpenClaw\client-commons\skill-template
|
||||||
|
.\tools\scaffold_skill.ps1 -Slug my-new-skill -Destination D:\OpenClaw\client-gdcm\my-new-skill
|
||||||
|
```
|
||||||
|
|
||||||
|
跨平台(Python 3.10+):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python tools/scaffold_skill.py --slug my-new-skill --destination /path/to/my-new-skill
|
||||||
|
```
|
||||||
|
|
||||||
|
脚本行为:
|
||||||
|
|
||||||
|
- 复制模板到 `-Destination`(目录末段须与 `-Slug` 一致)
|
||||||
|
- **排除**:`.git`、`.pytest_cache`、`__pycache__`、`.env`、`.env.local`、`*.pyc`
|
||||||
|
- 删除目标中的 `.openclaw-skill-template` 标记
|
||||||
|
- 将文本文件中的模板占位 slug 替换为新 slug:
|
||||||
|
- `your-skill-slug` → 新技能 kebab-case slug(如 `scrape-demo-records`)
|
||||||
|
- `your_skill_slug` → 连字符替换为下划线(如 `scrape_demo_records`,用于 `LOG_LOGGER_NAME` 等)
|
||||||
|
- 覆盖 `assets/actions.json`、`SKILL.md`、`scripts/util/constants.py` 等生成文件;文档中的路径示例可保留占位,但生成后的技能文件不得残留占位符
|
||||||
|
- **不**自动修改 `actions.json` 中的 CLI 业务命令;技能作者自行增删 action
|
||||||
|
- **不**移除 Schema 中的 `bind.tables` 支持,**不**把 `bind` 当模板残留清理
|
||||||
|
- **不**自动生成业务表名,**不**给 `health` / `version` / `config-path` 自动加 `toolbar`
|
||||||
|
- **不**生成任何具体平台业务 Action
|
||||||
|
- **不**自动 `git init`;打印后续 Git 与测试命令
|
||||||
|
|
||||||
|
目标目录若已存在且非空,需加 `-Force` / `--force`(且目标**不得**含 `.git`)。
|
||||||
|
|
||||||
|
## 脚手架复制后必须保留 / 修改 / 可删除的文件
|
||||||
|
|
||||||
|
| 文件 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| `assets/actions.json` | 默认复制;不需要宿主 Action 入口时可删除 |
|
||||||
|
| `references/ACTIONS.md` | 契约文档;无 `actions.json` 时可保留作参考或按需精简 |
|
||||||
|
| `assets/schemas/skill-actions.schema.json` | manifest 规范;无 action 时可保留 |
|
||||||
|
| `tests/test_actions_manifest.py` | 若删除 `actions.json`,应同步删除或改写此测试 |
|
||||||
|
| `tests/test_data_management_contract.py` | 通用契约测试;建议保留,按需扩展本技能表结构测试 |
|
||||||
|
|
||||||
|
`demo_items` 等示例表仅存在于模板测试中,**不会**作为 scaffold 后的默认业务表复制进新技能。
|
||||||
|
|
||||||
|
## 手工复制后的补救
|
||||||
|
|
||||||
|
若已整目录复制,必须先清理再初始化:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
cd <新技能目录>
|
||||||
|
Remove-Item -Recurse -Force .git
|
||||||
|
Remove-Item -Recurse -Force .pytest_cache -ErrorAction SilentlyContinue
|
||||||
|
Remove-Item -Force .openclaw-skill-template -ErrorAction SilentlyContinue
|
||||||
|
git init
|
||||||
|
git remote add origin <新技能仓库 URL>
|
||||||
|
git remote -v
|
||||||
|
```
|
||||||
|
|
||||||
|
确认 `origin` **不是** skill-template 的远端 URL。
|
||||||
|
|
||||||
|
## 模板标记
|
||||||
|
|
||||||
|
源仓库根目录有 `.openclaw-skill-template`(仅 template 保留)。业务技能不得保留该文件;`tests/test_scaffold_guard.py` 会守护。
|
||||||
140
tools/scaffold_skill.ps1
Normal file
140
tools/scaffold_skill.ps1
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
#Requires -Version 5.1
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Scaffold a new skill directory from skill-template (excludes .git).
|
||||||
|
|
||||||
|
.EXAMPLE
|
||||||
|
.\tools\scaffold_skill.ps1 -Slug my-new-skill -Destination D:\OpenClaw\client-gdcm\my-new-skill
|
||||||
|
#>
|
||||||
|
[CmdletBinding()]
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory = $true)]
|
||||||
|
[string]$Slug,
|
||||||
|
|
||||||
|
[Parameter(Mandatory = $true)]
|
||||||
|
[string]$Destination,
|
||||||
|
|
||||||
|
[switch]$Force
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = "Stop"
|
||||||
|
|
||||||
|
function Test-KebabSlug([string]$Value) {
|
||||||
|
return $Value -match '^[a-z0-9]+(-[a-z0-9]+)*$'
|
||||||
|
}
|
||||||
|
|
||||||
|
function Write-ScaffoldNextSteps([string]$TargetPath) {
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host "=== 脚手架复制完成 ===" -ForegroundColor Green
|
||||||
|
Write-Host ("目标目录: " + $TargetPath)
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host "请在本机继续执行(未自动 git init,避免误操作):" -ForegroundColor Yellow
|
||||||
|
Write-Host (' cd "' + $TargetPath + '"')
|
||||||
|
Write-Host " Remove-Item -Recurse -Force .git -ErrorAction SilentlyContinue"
|
||||||
|
Write-Host " git init"
|
||||||
|
Write-Host " git remote add origin <你的新技能仓库 URL>"
|
||||||
|
Write-Host " git remote -v"
|
||||||
|
Write-Host " # 确认 assets/actions.json 中 skill 已替换为新 slug;不需要 Action 时可删除该文件"
|
||||||
|
Write-Host " python tests/run_tests.py -v"
|
||||||
|
Write-Host ""
|
||||||
|
}
|
||||||
|
|
||||||
|
$TemplateRoot = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path
|
||||||
|
$TargetPath = $Destination
|
||||||
|
|
||||||
|
if (-not (Test-KebabSlug $Slug)) {
|
||||||
|
throw "Slug must be kebab-case. Got: $Slug"
|
||||||
|
}
|
||||||
|
|
||||||
|
$leaf = Split-Path -Leaf ($TargetPath.TrimEnd('\', '/'))
|
||||||
|
if ($leaf -ne $Slug) {
|
||||||
|
throw "Destination leaf '$leaf' must match -Slug '$Slug'."
|
||||||
|
}
|
||||||
|
|
||||||
|
$parent = Split-Path -Parent $TargetPath
|
||||||
|
if (-not $parent -or -not (Test-Path -LiteralPath $parent)) {
|
||||||
|
throw "Parent directory does not exist: $parent"
|
||||||
|
}
|
||||||
|
|
||||||
|
$gitPath = Join-Path $TargetPath ".git"
|
||||||
|
if (Test-Path -LiteralPath $gitPath) {
|
||||||
|
throw "Target already has .git at $gitPath . Remove it first or use an empty destination."
|
||||||
|
}
|
||||||
|
|
||||||
|
$targetExists = Test-Path -LiteralPath $TargetPath
|
||||||
|
if ($targetExists) {
|
||||||
|
$entries = @(Get-ChildItem -LiteralPath $TargetPath -Force -ErrorAction SilentlyContinue)
|
||||||
|
if ($entries.Count -gt 0 -and -not $Force) {
|
||||||
|
throw "Target exists and is not empty: $TargetPath . Use -Force or pick an empty directory."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$excludeDirs = @(".git", ".pytest_cache", "__pycache__")
|
||||||
|
$excludeFiles = @(".env", ".env.local")
|
||||||
|
$templatePlaceholderSlugKebab = "your-skill-slug"
|
||||||
|
$templatePlaceholderSlugUnderscore = "your_skill_slug"
|
||||||
|
$textFileSuffixes = @(".md", ".py", ".json", ".yaml", ".yml", ".txt", ".ini", ".ps1", ".sample")
|
||||||
|
|
||||||
|
function Copy-TemplateTree {
|
||||||
|
param(
|
||||||
|
[string]$Source,
|
||||||
|
[string]$Dest
|
||||||
|
)
|
||||||
|
if (-not (Test-Path -LiteralPath $Dest)) {
|
||||||
|
New-Item -ItemType Directory -Path $Dest -Force | Out-Null
|
||||||
|
}
|
||||||
|
Get-ChildItem -LiteralPath $Source -Force | ForEach-Object {
|
||||||
|
$name = $_.Name
|
||||||
|
if ($excludeDirs -contains $name) { return }
|
||||||
|
if ($excludeFiles -contains $name) { return }
|
||||||
|
if ($name -like "*.pyc") { return }
|
||||||
|
|
||||||
|
$srcPath = $_.FullName
|
||||||
|
$dstPath = Join-Path $Dest $name
|
||||||
|
if ($_.PSIsContainer) {
|
||||||
|
Copy-TemplateTree -Source $srcPath -Dest $dstPath
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Copy-Item -LiteralPath $srcPath -Destination $dstPath -Force
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Replace-TemplatePlaceholders {
|
||||||
|
param(
|
||||||
|
[string]$Root,
|
||||||
|
[string]$Slug
|
||||||
|
)
|
||||||
|
$underscoreSlug = $Slug.Replace("-", "_")
|
||||||
|
Get-ChildItem -LiteralPath $Root -Recurse -File -Force | ForEach-Object {
|
||||||
|
$name = $_.Name
|
||||||
|
if ($excludeFiles -contains $name) { return }
|
||||||
|
$ext = $_.Extension.ToLowerInvariant()
|
||||||
|
if ($textFileSuffixes -notcontains $ext -and $name -ne ".env.example") { return }
|
||||||
|
try {
|
||||||
|
$text = [System.IO.File]::ReadAllText($_.FullName)
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
$text -notlike "*$templatePlaceholderSlugKebab*" -and
|
||||||
|
$text -notlike "*$templatePlaceholderSlugUnderscore*"
|
||||||
|
) { return }
|
||||||
|
$updated = $text.Replace($templatePlaceholderSlugKebab, $Slug)
|
||||||
|
$updated = $updated.Replace($templatePlaceholderSlugUnderscore, $underscoreSlug)
|
||||||
|
[System.IO.File]::WriteAllText($_.FullName, $updated)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Host "Copy template: $TemplateRoot -> $TargetPath" -ForegroundColor Cyan
|
||||||
|
Copy-TemplateTree -Source $TemplateRoot -Dest $TargetPath
|
||||||
|
|
||||||
|
$marker = Join-Path $TargetPath ".openclaw-skill-template"
|
||||||
|
if (Test-Path -LiteralPath $marker) {
|
||||||
|
Remove-Item -LiteralPath $marker -Force
|
||||||
|
}
|
||||||
|
|
||||||
|
Replace-TemplatePlaceholders -Root $TargetPath -Slug $Slug
|
||||||
|
|
||||||
|
Write-ScaffoldNextSteps -TargetPath (Resolve-Path -LiteralPath $TargetPath).Path
|
||||||
161
tools/scaffold_skill.py
Normal file
161
tools/scaffold_skill.py
Normal file
@@ -0,0 +1,161 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""跨平台 skill-template 脚手架(与 scaffold_skill.ps1 行为一致)。"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import re
|
||||||
|
import shutil
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
EXCLUDE_DIR_NAMES = {".git", ".pytest_cache", "__pycache__"}
|
||||||
|
EXCLUDE_FILE_NAMES = {".env", ".env.local"}
|
||||||
|
KEBAB_SLUG = re.compile(r"^[a-z0-9]+(-[a-z0-9]+)*$")
|
||||||
|
TEMPLATE_PLACEHOLDER_SLUG_KEBAB = "your-skill-slug"
|
||||||
|
TEMPLATE_PLACEHOLDER_SLUG_UNDERSCORE = "your_skill_slug"
|
||||||
|
TEXT_FILE_SUFFIXES = {
|
||||||
|
".md",
|
||||||
|
".py",
|
||||||
|
".json",
|
||||||
|
".yaml",
|
||||||
|
".yml",
|
||||||
|
".txt",
|
||||||
|
".ini",
|
||||||
|
".ps1",
|
||||||
|
".sample",
|
||||||
|
".env.example",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _ignore_copy(_dir: str, names: list[str]) -> set[str]:
|
||||||
|
ignored: set[str] = set()
|
||||||
|
for name in names:
|
||||||
|
if name in EXCLUDE_DIR_NAMES or name in EXCLUDE_FILE_NAMES:
|
||||||
|
ignored.add(name)
|
||||||
|
elif name.endswith(".pyc"):
|
||||||
|
ignored.add(name)
|
||||||
|
return ignored
|
||||||
|
|
||||||
|
|
||||||
|
def _should_replace_placeholders(path: Path) -> bool:
|
||||||
|
if path.name in EXCLUDE_FILE_NAMES:
|
||||||
|
return False
|
||||||
|
if path.suffix.lower() in TEXT_FILE_SUFFIXES:
|
||||||
|
return True
|
||||||
|
if path.name == ".env.example":
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def _slug_to_underscore(slug: str) -> str:
|
||||||
|
return slug.replace("-", "_")
|
||||||
|
|
||||||
|
|
||||||
|
def _replace_template_placeholders(target: Path, slug: str) -> None:
|
||||||
|
"""将模板占位 slug 替换为新技能 slug(不修改 action 业务命令结构)。"""
|
||||||
|
underscore_slug = _slug_to_underscore(slug)
|
||||||
|
for path in target.rglob("*"):
|
||||||
|
if not path.is_file():
|
||||||
|
continue
|
||||||
|
if path.name in EXCLUDE_FILE_NAMES:
|
||||||
|
continue
|
||||||
|
if path.suffix.lower() not in TEXT_FILE_SUFFIXES and path.name != ".env.example":
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
text = path.read_text(encoding="utf-8")
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
continue
|
||||||
|
if (
|
||||||
|
TEMPLATE_PLACEHOLDER_SLUG_KEBAB not in text
|
||||||
|
and TEMPLATE_PLACEHOLDER_SLUG_UNDERSCORE not in text
|
||||||
|
):
|
||||||
|
continue
|
||||||
|
updated = text.replace(TEMPLATE_PLACEHOLDER_SLUG_KEBAB, slug)
|
||||||
|
updated = updated.replace(TEMPLATE_PLACEHOLDER_SLUG_UNDERSCORE, underscore_slug)
|
||||||
|
path.write_text(updated, encoding="utf-8")
|
||||||
|
|
||||||
|
|
||||||
|
def _print_next_steps(target: Path) -> None:
|
||||||
|
print()
|
||||||
|
print("=== 脚手架复制完成 ===")
|
||||||
|
print(f"目标目录: {target}")
|
||||||
|
print()
|
||||||
|
print("请在本机继续执行(未自动 git init,避免误操作):")
|
||||||
|
print(f' cd "{target}"')
|
||||||
|
print(" Remove-Item -Recurse -Force .git -ErrorAction SilentlyContinue # 若曾手工复制漏删")
|
||||||
|
print(" git init")
|
||||||
|
print(" git remote add origin <你的新技能仓库 URL>")
|
||||||
|
print(" git remote -v # 确认 remote 不是 skill-template")
|
||||||
|
print(" # 确认 assets/actions.json 中 skill 已替换为新 slug;不需要 Action 时可删除该文件")
|
||||||
|
print(" python tests/run_tests.py -v")
|
||||||
|
print()
|
||||||
|
|
||||||
|
|
||||||
|
def main(argv: list[str] | None = None) -> int:
|
||||||
|
parser = argparse.ArgumentParser(description="从 skill-template 脚手架复制新技能目录")
|
||||||
|
parser.add_argument("--slug", required=True, help="kebab-case slug,须与目标目录名一致")
|
||||||
|
parser.add_argument("--destination", required=True, help="新技能完整目标路径")
|
||||||
|
parser.add_argument("--force", action="store_true", help="目标非空时允许覆盖(目标不得含 .git)")
|
||||||
|
args = parser.parse_args(argv)
|
||||||
|
|
||||||
|
slug = args.slug.strip()
|
||||||
|
if not KEBAB_SLUG.match(slug):
|
||||||
|
print(f"ERROR: Slug 必须是 kebab-case,当前: {slug}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
target = Path(args.destination).resolve()
|
||||||
|
if target.name != slug:
|
||||||
|
print(
|
||||||
|
f"ERROR: 目标目录末段 '{target.name}' 与 slug '{slug}' 不一致。",
|
||||||
|
file=sys.stderr,
|
||||||
|
)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
parent = target.parent
|
||||||
|
if not parent.is_dir():
|
||||||
|
print(f"ERROR: 父目录不存在: {parent}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
if (target / ".git").exists():
|
||||||
|
print(
|
||||||
|
f"ERROR: 目标已存在 .git,请先删除: {target / '.git'}",
|
||||||
|
file=sys.stderr,
|
||||||
|
)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
template_root = Path(__file__).resolve().parent.parent
|
||||||
|
if target.exists():
|
||||||
|
entries = list(target.iterdir())
|
||||||
|
if entries and not args.force:
|
||||||
|
print(
|
||||||
|
f"ERROR: 目标目录已存在且非空: {target}\n请加 --force 或换空目录。",
|
||||||
|
file=sys.stderr,
|
||||||
|
)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
target.mkdir(parents=True, exist_ok=True)
|
||||||
|
print(f"复制模板: {template_root} -> {target}")
|
||||||
|
for item in template_root.iterdir():
|
||||||
|
name = item.name
|
||||||
|
if name in EXCLUDE_DIR_NAMES or name in EXCLUDE_FILE_NAMES:
|
||||||
|
continue
|
||||||
|
if name.endswith(".pyc"):
|
||||||
|
continue
|
||||||
|
dest = target / name
|
||||||
|
if item.is_dir():
|
||||||
|
shutil.copytree(item, dest, ignore=_ignore_copy, dirs_exist_ok=True)
|
||||||
|
else:
|
||||||
|
shutil.copy2(item, dest)
|
||||||
|
|
||||||
|
marker = target / ".openclaw-skill-template"
|
||||||
|
if marker.is_file():
|
||||||
|
marker.unlink()
|
||||||
|
|
||||||
|
_replace_template_placeholders(target, slug)
|
||||||
|
|
||||||
|
_print_next_steps(target)
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
raise SystemExit(main())
|
||||||
Reference in New Issue
Block a user