@aiyiran/myclaw 1.1.44 → 1.1.46

package/skills/yiran-course-template-pipeline/scripts/migrate_templates.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+"""
+migrate_templates.py
+
+将旧版平铺结构迁移到版本化结构：
+  templates/{folder}/*.html  →  templates/{folder}/v1/*.html
+
+同时为没有 _id 的模板颁发 ID，写入 __teacher__.json。
+
+用法：
+    python3 scripts/migrate_templates.py [--dry-run]
+"""
+import json
+import re
+import secrets
+import shutil
+import sys
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parent.parent
+TEMPLATES_DIR = ROOT / 'templates'
+INDEX_SCRIPT = ROOT / 'scripts' / 'build_template_index.py'
+
+
+def load_json(path: Path) -> dict:
+    try:
+        return json.loads(path.read_text(encoding='utf-8'))
+    except Exception:
+        return {}
+
+
+def save_json(path: Path, data: dict):
+    path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + '\n', encoding='utf-8')
+
+
+def gen_id() -> str:
+    return secrets.token_hex(4)
+
+
+def has_version_subdir(folder: Path) -> bool:
+    for d in folder.iterdir():
+        if d.is_dir() and re.match(r'^v\d+$', d.name):
+            return True
+    return False
+
+
+def main():
+    dry_run = '--dry-run' in sys.argv
+    if dry_run:
+        print('🔍 DRY RUN 模式，不实际修改文件\n')
+
+    if not TEMPLATES_DIR.exists():
+        print('❌ templates/ 目录不存在')
+        sys.exit(1)
+
+    folders = sorted(d for d in TEMPLATES_DIR.iterdir() if d.is_dir())
+    migrated = 0
+
+    for folder in folders:
+        if has_version_subdir(folder):
+            print(f'✓ 跳过（已版本化）: {folder.name}')
+            continue
+
+        # 列出所有直接子文件（排除目录）
+        files = [f for f in folder.iterdir() if f.is_file()]
+        if not files:
+            print(f'⚠️  空目录，跳过: {folder.name}')
+            continue
+
+        teacher_path = folder / '__teacher__.json'
+        teacher = load_json(teacher_path)
+
+        # 补充 _id
+        if not teacher.get('_id'):
+            teacher['_id'] = gen_id()
+            print(f'🆔 颁发 ID {teacher["_id"]}: {folder.name}')
+
+        # 补充 _version
+        if not teacher.get('_version'):
+            teacher['_version'] = 1
+
+        if not dry_run:
+            # 先写回 __teacher__.json
+            save_json(teacher_path, teacher)
+
+            # 创建 v1/ 并移动所有文件
+            v1_dir = folder / 'v1'
+            v1_dir.mkdir(exist_ok=True)
+            for f in files:
+                shutil.move(str(f), str(v1_dir / f.name))
+
+        print(f'📦 迁移: {folder.name}  →  {folder.name}/v1/')
+        migrated += 1
+
+    print(f'\n{"[DRY RUN] " if dry_run else ""}共迁移 {migrated} 个模板')
+
+    if not dry_run and migrated > 0:
+        import subprocess
+        subprocess.run(['python3', str(INDEX_SCRIPT)], check=True)
+        print('✅ 索引已重建')
+
+
+if __name__ == '__main__':
+    main()

package/skills/yiran-course-template-pipeline/scripts/move_template_task.py

@@ -1,4 +1,19 @@
 #!/usr/bin/env python3
+"""
+move_template_task.py
+
+将模板源目录纳入 pipeline（复制，不删除原目录）。
+
+流程：
+1. 校验必需文件
+2. 调用 identify_template.py（颁发/校准身份，写回源目录）
+3. 读取更新后的 __teacher__.json，拼出目标路径
+4. 复制到 templates/{folder_name}/v{N}/
+5. 重建 template-index.json
+
+用法：
+    python3 move_template_task.py <模板目录> [目标根目录]
+"""
 import json
 import re
 import shutil
@@ -8,86 +23,71 @@ from pathlib import Path
 
 ROOT = Path(__file__).resolve().parent.parent
 DEFAULT_TARGET = ROOT / 'templates'
+IDENTIFY_SCRIPT = ROOT / 'scripts' / 'identify_template.py'
 INDEX_SCRIPT = ROOT / 'scripts' / 'build_template_index.py'
-REQUIRED_FILES = ['__demo__.html', '__student__.json', '__teacher__.json', '__student-view__.html', '__teacher-view__.html']
-
-
-def load_json(path):
-    with path.open('r', encoding='utf-8') as f:
-        return json.load(f)
-
-
-def save_json(path, data):
-    path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + '\n', encoding='utf-8')
-
-
-def normalize_category(teacher):
-    category = str(teacher['任务类别']).upper()
-    if category not in {'A', 'B', 'C'}:
-        raise ValueError('任务类别只能是 A、B、C')
-    return category
-
+REQUIRED_FILES = [
+    '__demo__.html', '__student__.json', '__teacher__.json',
+    '__student-view__.html', '__teacher-view__.html',
+]
 
-def sanitize_name(name):
-    return str(name).replace('/', '_').replace(' ', '_')
 
+def load_json(path: Path) -> dict:
+    try:
+        return json.loads(path.read_text(encoding='utf-8'))
+    except Exception:
+        return {}
 
-def find_next_available_number(category, target_root):
-    used = set()
-    pattern = re.compile(r'^([a-zA-Z])(\d{3})_')
 
-    for folder in target_root.iterdir() if target_root.exists() else []:
-        if not folder.is_dir():
-            continue
-        m = pattern.match(folder.name)
-        if not m:
-            continue
-        if m.group(1).upper() != category:
-            continue
-        used.add(int(m.group(2)))
-
-    for num in range(100, 1000):
-        if num not in used:
-            return f'{num:03d}'
-    raise RuntimeError(f'{category} 类编号已用尽')
-
-
-def task_folder_name(teacher, target_root):
-    category = normalize_category(teacher)
-    number = find_next_available_number(category, target_root)
-    teacher['任务编号'] = number
-    name = sanitize_name(teacher['任务名称'])
-    return f'{category.lower()}{number}_{name}'
+def sanitize_name(name: str) -> str:
+    return re.sub(r'[/\\ ]', '_', str(name).strip())
 
 
 def main():
     if len(sys.argv) < 2:
-        print('用法: python3 move_template_task.py <已有文件夹> [目标目录]')
+        print('用法: python3 move_template_task.py <模板目录> [目标根目录]')
         sys.exit(1)
 
     source_dir = Path(sys.argv[1]).expanduser().resolve()
     target_root = Path(sys.argv[2]).expanduser().resolve() if len(sys.argv) > 2 else DEFAULT_TARGET
 
+    if not source_dir.is_dir():
+        print(f'❌ 目录不存在: {source_dir}')
+        sys.exit(1)
+
+    # 1. 校验必需文件
     for filename in REQUIRED_FILES:
         if not (source_dir / filename).exists():
-            raise FileNotFoundError(f'缺少必需文件: {filename}')
+            print(f'❌ 缺少必需文件: {filename}')
+            sys.exit(1)
 
-    teacher_path = source_dir / '__teacher__.json'
-    teacher = load_json(teacher_path)
-    target_root.mkdir(parents=True, exist_ok=True)
-    folder_name = task_folder_name(teacher, target_root)
-    save_json(teacher_path, teacher)
+    # 2. 颁发/校准身份（写回源目录的 __teacher__.json）
+    print('\n── 身份认证 ────────────────────────────────')
+    subprocess.run([sys.executable, str(IDENTIFY_SCRIPT), str(source_dir)], check=True)
+
+    # 3. 读取更新后的身份信息
+    teacher = load_json(source_dir / '__teacher__.json')
+    category = teacher.get('任务类别', '').upper()
+    number = teacher.get('任务编号', '100')
+    name = sanitize_name(teacher.get('任务名称', 'untitled'))
+    version = teacher.get('_version', 1)
+
+    folder_name = f'{category.lower()}{number}_{name}'
+    version_str = f'v{version}'
+    target_dir = target_root / folder_name / version_str
 
-    target_dir = target_root / folder_name
     if target_dir.exists():
-        raise FileExistsError(f'目标目录已存在: {target_dir}')
+        print(f'❌ 目标目录已存在（重复操作？）: {target_dir}')
+        sys.exit(1)
 
-    shutil.move(str(source_dir), str(target_dir))
-    print(f'已移动并改名到: {target_dir}')
-    print(f'已自动分配编号: {teacher["任务编号"]}')
+    # 4. 复制到 templates/{folder}/v{N}/
+    print(f'\n── 复制文件 ────────────────────────────────')
+    target_root.mkdir(parents=True, exist_ok=True)
+    shutil.copytree(str(source_dir), str(target_dir))
+    print(f'✅ 已复制到: {target_dir}')
 
-    subprocess.run(['python3', str(INDEX_SCRIPT)], check=True)
-    print('已自动重建 templates 索引')
+    # 5. 重建 index
+    print(f'\n── 重建索引 ────────────────────────────────')
+    subprocess.run([sys.executable, str(INDEX_SCRIPT)], check=True)
 
 
 if __name__ == '__main__':

package/skills/yiran-course-template-pipeline/scripts/publish_template.py

@@ -4,85 +4,99 @@ publish_template.py
 
 发布模板文件夹到七牛 CDN，完成后重建并上传 template-index.json。
 
-流程：
-1. 把文件夹内所有文件无脑上传到七牛（强制覆盖）
-2. 重建 template-index.json 并上传到 CDN
+CDN 路径：{CDN_PREFIX}/{folder_name}/{version}/{filename}
+版本号从 templates/{folder}/v{N}/ 子目录读取（以本地最新版本为准）。
 
 用法：
     python3 scripts/publish_template.py <模板文件夹路径>
     python3 scripts/publish_template.py --all
-
-例：
-    python3 scripts/publish_template.py templates/a103_做一个介绍页面
-    python3 scripts/publish_template.py --all
 """
-
 import argparse
+import re
 import subprocess
 import sys
 from pathlib import Path
 
 from qiniu import Auth, put_file_v2, CdnManager
 
-# ── 七牛配置（与 server 保持一致）──────────────────────────────────────────
 QINIU_KEY    = "T3tgxM7EMx1j4VESw4m4PIfFXoOvBo-wQEOQewXX"
 QINIU_SECRET = "PVZvlKVOjX2RqlV2ILMg-QwpNMssOlpVbaEzypz0"
 QINIU_BUCKET = "yiran1"
 CDN_DOMAIN   = "https://cdn.yiranlaoshi.com"
-CDN_PREFIX   = "myclaw/live/yiran/skills/yiran-playground-template-use/templates"
+CDN_INDEX_KEY = "myclaw/live/yiran/skills/yiran-playground-template-use/template-index.json"
+CDN_PREFIX    = "myclaw/live/yiran/skills/yiran-playground-template-use/templates"
 
 q           = Auth(QINIU_KEY, QINIU_SECRET)
 cdn_manager = CdnManager(q)
 
 
-def upload_file(local_path, folder_name):
-    """上传单个文件到七牛（强制覆盖），返回 CDN URL。"""
-    key = "{}/{}/{}".format(CDN_PREFIX, folder_name, local_path.name)
-    token = q.upload_token(QINIU_BUCKET, key, 3600, policy={'insertOnly': 0})
-    ret, info = put_file_v2(token, key, str(local_path))
+def get_latest_version_dir(folder: Path):
+    """返回最新 v{N} 子目录和版本号，没有则返回 (None, 0)"""
+    max_v = 0
+    result = None
+    for d in folder.iterdir():
+        if d.is_dir():
+            m = re.match(r'^v(\d+)$', d.name)
+            if m:
+                v = int(m.group(1))
+                if v > max_v:
+                    max_v = v
+                    result = d
+    return result, max_v
+
+
+def upload_file(local_path: Path, cdn_key: str) -> str:
+    token = q.upload_token(QINIU_BUCKET, cdn_key, 3600, policy={'insertOnly': 0})
+    ret, info = put_file_v2(token, cdn_key, str(local_path))
     if info.status_code != 200:
-        raise RuntimeError("上传失败 {}: {}".format(local_path.name, info))
-    cdn_url = "{}/{}".format(CDN_DOMAIN, key)
+        raise RuntimeError('上传失败 {}: {}'.format(local_path.name, info))
+    cdn_url = '{}/{}'.format(CDN_DOMAIN, cdn_key)
     cdn_manager.refresh_urls([cdn_url])
     return cdn_url
 
 
-def publish(folder_path):
+def publish(folder_path: Path):
     folder_name = folder_path.name
-    files = [f for f in folder_path.iterdir() if f.is_file()]
+    version_dir, version_num = get_latest_version_dir(folder_path)
+
+    if not version_dir:
+        print('⚠️  {} 没有版本子目录，跳过'.format(folder_name))
+        return
+
+    version_str = 'v{}'.format(version_num)
+    files = [f for f in version_dir.rglob('*') if f.is_file() and f.name != '.sync-done']
 
     if not files:
-        print("⚠️  文件夹为空：{}".format(folder_path))
+        print('⚠️  文件夹为空: {}/{}'.format(folder_name, version_str))
         return
 
-    print("📂 发布文件夹：{}".format(folder_name))
+    print('📂 发布: {}/{}'.format(folder_name, version_str))
     for f in sorted(files):
-        cdn_url = upload_file(f, folder_name)
-        print("  ⬆️  {} → {}".format(f.name, cdn_url))
-
-    print("\n✅ 发布完成：{}".format(folder_name))
+        rel = f.relative_to(version_dir)
+        cdn_key = '{}/{}/{}/{}'.format(CDN_PREFIX, folder_name, version_str, rel.as_posix())
+        cdn_url = upload_file(f, cdn_key)
+        print('  ⬆️  {} → {}'.format(rel, cdn_url))
 
+    print('✅ 完成: {}/{}\n'.format(folder_name, version_str))
 
 
 def publish_index(pipeline_root: Path):
-    """重建 template-index.json 并上传到 CDN。"""
     index_script = pipeline_root / 'scripts' / 'build_template_index.py'
-    print("\n🔄 重建 template-index.json ...")
+    print('🔄 重建 template-index.json ...')
     subprocess.run(['python3', str(index_script)], check=True)
 
     index_file = pipeline_root / 'template-index.json'
     if not index_file.is_file():
-        print("⚠️  template-index.json 未生成，跳过上传")
+        print('⚠️  template-index.json 未生成，跳过上传')
         return
 
-    key = f"{CDN_PREFIX.rsplit('/templates', 1)[0]}/template-index.json"
-    token = q.upload_token(QINIU_BUCKET, key, 3600, policy={'insertOnly': 0})
-    ret, info = put_file_v2(token, key, str(index_file))
+    token = q.upload_token(QINIU_BUCKET, CDN_INDEX_KEY, 3600, policy={'insertOnly': 0})
+    ret, info = put_file_v2(token, CDN_INDEX_KEY, str(index_file))
     if info.status_code != 200:
-        raise RuntimeError(f"index 上传失败: {info}")
-    cdn_url = f"{CDN_DOMAIN}/{key}"
+        raise RuntimeError('index 上传失败: {}'.format(info))
+    cdn_url = '{}/{}'.format(CDN_DOMAIN, CDN_INDEX_KEY)
     cdn_manager.refresh_urls([cdn_url])
-    print(f"  ⬆️  已上传索引 → {cdn_url}")
+    print('  ⬆️  已上传索引 → {}'.format(cdn_url))
 
 
 def main():
@@ -98,15 +112,15 @@ def main():
         templates_dir = pipeline_root / 'templates'
         folders = sorted(d for d in templates_dir.iterdir() if d.is_dir())
         if not folders:
-            print("⚠️  templates/ 下没有找到任何模板文件夹")
+            print('⚠️  templates/ 下没有找到任何模板文件夹')
             sys.exit(0)
-        print(f"📦 共 {len(folders)} 个模板，开始全量发布...\n")
+        print('📦 共 {} 个模板，开始全量发布...\n'.format(len(folders)))
         for folder in folders:
             publish(folder)
     else:
         folder = Path(args.folder).expanduser().resolve()
         if not folder.is_dir():
-            print(f"❌ 路径不存在或不是文件夹: {folder}")
+            print('❌ 路径不存在或不是文件夹: {}'.format(folder))
             sys.exit(1)
         publish(folder)