@pippit-dev/cli 1.0.22 → 1.0.23

package/skills/xyq-nest-skill/scripts/xyq_common.py

@@ -1,26 +1,45 @@
-"""小云雀 agent-im OpenAPI 公共模块：创建会话、查询会话（鉴权为 Authorization: Bearer <access_key>）"""
+"""小云雀 agent-im OpenAPI 公共模块：查询会话（鉴权为 Authorization: Bearer <access_key>）"""
 
 import json
 import os
 import sys
 import urllib.request
 import urllib.error
+import urllib.parse
 
-XYQ_BASE = os.environ.get("XYQ_OPENAPI_BASE", os.environ.get("XYQ_BASE_URL", "https://xyq.jianying.com"))
+# Credentials may only be sent to the fixed production HTTPS origin.
+XYQ_BASE = "https://xyq.jianying.com"
 ACCESS_KEY = os.environ.get("XYQ_ACCESS_KEY", "")
 
 # API 路径常量
-SUBMIT_RUN_PATH = "/api/biz/v1/skill/submit_run"
 GET_THREAD_PATH = "/api/biz/v1/skill/get_thread"
-UPLOAD_FILE_PATH = "/api/biz/v1/skill/upload_file"
 HTTP_TIMEOUT_SECONDS = 30 * 60
 
-if not ACCESS_KEY:
-    print("错误：请设置 XYQ_ACCESS_KEY 环境变量", file=sys.stderr)
-    sys.exit(1)
+
+class _NoRedirect(urllib.request.HTTPRedirectHandler):
+    def redirect_request(self, req, fp, code, msg, headers, newurl):
+        # Never forward credentials or request bodies through a redirect.
+        raise urllib.error.HTTPError(req.full_url, code, "API 重定向已拒绝", headers, fp)
+
+
+def authenticated_open(req):
+    target = urllib.parse.urlsplit(req.full_url)
+    if (target.scheme != "https" or target.hostname != "xyq.jianying.com"
+            or target.port not in (None, 443) or target.username is not None
+            or target.password is not None):
+        raise urllib.error.URLError("仅允许小云雀生产 HTTPS 地址")
+    return urllib.request.build_opener(_NoRedirect()).open(req, timeout=HTTP_TIMEOUT_SECONDS)
+
+
+def redact_error(value):
+    text = str(value)
+    return text.replace(ACCESS_KEY, "[REDACTED]") if ACCESS_KEY else text
 
 
 def _headers():
+    if not ACCESS_KEY:
+        print("错误：请设置 XYQ_ACCESS_KEY 环境变量", file=sys.stderr)
+        sys.exit(1)
     return {
         "Authorization": f"Bearer {ACCESS_KEY}",
         "Content-Type": "application/json",
@@ -38,14 +57,14 @@ def api_post(path: str, body: dict) -> dict:
         headers=_headers(),
     )
     try:
-        with urllib.request.urlopen(req, timeout=HTTP_TIMEOUT_SECONDS) as resp:
+        with authenticated_open(req) as resp:
             return json.loads(resp.read().decode("utf-8"))
     except urllib.error.HTTPError as e:
         err_body = e.read().decode("utf-8") if e.fp else ""
-        print(f"API 错误 {e.code}: {err_body}", file=sys.stderr)
+        print(f"API 错误 {e.code}: {redact_error(err_body)}", file=sys.stderr)
         sys.exit(1)
     except urllib.error.URLError as e:
-        print(f"网络错误: {e.reason}", file=sys.stderr)
+        print(f"网络错误: {redact_error(e.reason)}", file=sys.stderr)
         sys.exit(1)
 
 
@@ -54,14 +73,14 @@ def api_get(path: str) -> dict:
     url = f"{XYQ_BASE.rstrip('/')}{path}"
     req = urllib.request.Request(url, method="GET", headers=_headers())
     try:
-        with urllib.request.urlopen(req, timeout=HTTP_TIMEOUT_SECONDS) as resp:
+        with authenticated_open(req) as resp:
             return json.loads(resp.read().decode("utf-8"))
     except urllib.error.HTTPError as e:
         err_body = e.read().decode("utf-8") if e.fp else ""
-        print(f"API 错误 {e.code}: {err_body}", file=sys.stderr)
+        print(f"API 错误 {e.code}: {redact_error(err_body)}", file=sys.stderr)
         sys.exit(1)
     except urllib.error.URLError as e:
-        print(f"网络错误: {e.reason}", file=sys.stderr)
+        print(f"网络错误: {redact_error(e.reason)}", file=sys.stderr)
         sys.exit(1)
 
 
@@ -74,27 +93,11 @@ def parse_response(resp: dict) -> dict:
     ret = resp.get("ret", "")
     if ret != "0":
         errmsg = resp.get("errmsg", "未知错误")
-        print(f"错误码: {ret}, 错误信息: {errmsg}", file=sys.stderr)
+        print(f"错误码: {redact_error(ret)}, 错误信息: {redact_error(errmsg)}", file=sys.stderr)
         sys.exit(1)
     return resp.get("data", {})
 
 
-def submit_run(thread_id: str = "", message: str = "", asset_ids: list = None) -> dict:
-    """
-    创建会话或向已有会话发消息。
-    返回 data: { projectUuid, sessionId }。
-    """
-    body = {}
-    if thread_id:
-        body["thread_id"] = thread_id
-    if message:
-        body["message"] = message
-    if asset_ids:
-        body["asset_ids"] = asset_ids
-    resp = api_post(SUBMIT_RUN_PATH, body)
-    return parse_response(resp)
-
-
 def get_thread(thread_id: str, run_id: str = "", after_seq: int = 0) -> dict:
     """
     查询会话消息列表。
@@ -124,7 +127,7 @@ def get_thread(thread_id: str, run_id: str = "", after_seq: int = 0) -> dict:
     elif run_state == 4:
         # 失败
         fail_reason = run.get("fail_reason", "未知失败原因")
-        print(f"错误：{fail_reason}", file=sys.stderr)
+        print(f"错误：{redact_error(fail_reason)}", file=sys.stderr)
         sys.exit(1)
     elif run_state == 5:
         # 取消

package/skills/xyq-nest-skill/scripts/download_results.py

@@ -1,105 +0,0 @@
-#!/usr/bin/env python3
-"""下载生成结果：从会话中提取所有图片/视频 URL 并批量下载到本地"""
-
-import argparse
-import json
-import os
-import sys
-import urllib.request
-import urllib.error
-from concurrent.futures import ThreadPoolExecutor, as_completed
-
-sys.path.insert(0, os.path.dirname(__file__))
-
-HTTP_TIMEOUT_SECONDS = 30 * 60
-
-
-def download_file(url, filepath):
-    """下载单个文件"""
-    import shutil
-    req = urllib.request.Request(url, headers={"User-Agent": "XYQ-Nest-Skill/1.0"})
-    tmp_path = filepath + ".tmp"
-    try:
-        with urllib.request.urlopen(req, timeout=HTTP_TIMEOUT_SECONDS) as resp:
-            with open(tmp_path, "wb") as f:
-                shutil.copyfileobj(resp, f, length=1024 * 1024)
-        os.replace(tmp_path, filepath)
-        return filepath, None
-    except Exception as e:
-        if os.path.exists(tmp_path):
-            os.remove(tmp_path)
-        return filepath, str(e)
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="根据产物URL，下载生成的产物到本地，支持指定输出目录和文件名前缀",
-        epilog="""
-使用方式:
-  # 直接下载指定 URL 列表
-  python3 download_results.py --urls URL1 URL2 URL3 --output-dir ./output --prefix "storyboard"
-        """,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    parser.add_argument("--urls", nargs="+", required=True, help="直接指定要下载的 URL 列表")
-    parser.add_argument("--output-dir", default="", help="输出目录（默认 ./xyq_output")
-    parser.add_argument("--prefix", default="", help="文件名前缀（如 'storyboard' → storyboard_01.png）")
-    parser.add_argument("--workers", type=int, default=5, help="并行下载线程数（默认 5）")
-    args = parser.parse_args()
-    
-    # 准备输出目录
-    output_dir = args.output_dir or "./xyq_output"
-    os.makedirs(output_dir, exist_ok=True)
-
-    def _get_ext(url):
-        """从 URL 中提取文件扩展名，优先从 query 的 filename 参数取，其次从路径取"""
-        from urllib.parse import urlparse, parse_qs
-        parsed = urlparse(url)
-        qs = parse_qs(parsed.query)
-        filenames = qs.get("filename", [])
-        if filenames:
-            _, ext = os.path.splitext(filenames[0])
-            if ext:
-                return ext
-        _, ext = os.path.splitext(parsed.path)
-        return ext or ".bin"
-
-    # 构建下载任务
-    tasks = []
-    for i, url in enumerate(args.urls, 1):
-        ext = _get_ext(url)
-        if args.prefix:
-            filename = f"{args.prefix}_{i:02d}{ext}"
-        else:
-            filename = f"{i:02d}{ext}"
-        filepath = os.path.join(output_dir, filename)
-        tasks.append((url, filepath))
-
-    # 并行下载
-    results = []
-    errors = []
-    with ThreadPoolExecutor(max_workers=args.workers) as pool:
-        futures = {pool.submit(download_file, url, fp): (url, fp) for url, fp in tasks}
-        for future in as_completed(futures):
-            fp, err = future.result()
-            if err:
-                errors.append({"file": fp, "error": err})
-            else:
-                results.append(fp)
-
-    # 按文件名排序输出
-    results.sort()
-
-    output = {
-        "output_dir": output_dir,
-        "downloaded": results,
-        "total": len(results),
-    }
-    if errors:
-        output["errors"] = errors
-
-    print(json.dumps(output, ensure_ascii=False, indent=2))
-
-
-if __name__ == "__main__":
-    main()

package/skills/xyq-nest-skill/scripts/submit_run.py

@@ -1,76 +0,0 @@
-#!/usr/bin/env python3
-"""创建会话 / 向会话发送消息（生图、生视频等）：POST /api/biz/v1/skill/submit_run"""
-
-import argparse
-import json
-import sys
-import os
-
-sys.path.insert(0, os.path.dirname(__file__))
-from xyq_common import submit_run
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="创建会话或向已有会话发送消息（仅用于生视频）",
-        epilog="""
-环境变量:
-  XYQ_ACCESS_KEY  必填，Bearer 鉴权
-  XYQ_OPENAPI_BASE 或 XYQ_BASE_URL  可选，默认 https://xyq.jianying.com
-
-示例:
-  # 创建新会话并发送「生一个动漫视频」
-  python3 submit_run.py --message 生一个动漫视频
-
-  # 向已有会话发送消息
-  python3 submit_run.py --message 再生成一个动漫视频 --thread-id 90f05e0c-5d08-4148-be40-e30fc7c7bedf
-
-  # 传入文件资产 ID
-  python3 submit_run.py --message 生成视频 --asset-ids asset123
-
-  # 传入多个文件资产 ID
-  python3 submit_run.py --message 生成视频 --asset-ids asset123 asset456 asset789
-        """,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    parser.add_argument(
-        "--message",
-        required=True,
-        help="要发送的消息内容（生图/生视频描述等），必填",
-    )
-    parser.add_argument(
-        "--thread-id",
-        default="",
-        help="已有会话 ID，不传则创建新会话或返回已有默认会话",
-    )
-    parser.add_argument(
-        "--asset-ids",
-        nargs="+",
-        default=[],
-        help="资产 ID 列表，可传入多个，例如：--asset-ids id1 id2 id3",
-    )
-    args = parser.parse_args()
-
-    data = submit_run(
-        thread_id=args.thread_id or "",
-        message=args.message or "",
-        asset_ids=args.asset_ids if args.asset_ids else None
-    )
-    run_data = data.get("run", {})
-    web_thread_link = data.get("web_thread_link", "")
-    thread_id = run_data.get("thread_id", "")
-    run_id = run_data.get("run_id", "")
-
-    if not thread_id:
-        print("错误：未返回 thread_id", file=sys.stderr)
-        sys.exit(1)
-    if not run_id:
-        print("错误：未返回 run_id", file=sys.stderr)
-        sys.exit(1)
-
-    out = {"thread_id": thread_id, "run_id": run_id, "web_thread_link": web_thread_link}
-    print(json.dumps(out, ensure_ascii=False, indent=2))
-
-
-if __name__ == "__main__":
-    main()

package/skills/xyq-nest-skill/scripts/upload_file.py

@@ -1,133 +0,0 @@
-#!/usr/bin/env python3
-"""上传图片/视频/mp3或wav音频到小云雀资产库：POST /api/biz/v1/skill/upload_file（multipart/form-data）"""
-
-import argparse
-import json
-import mimetypes
-import os
-import sys
-import uuid
-import urllib.request
-import urllib.error
-
-sys.path.insert(0, os.path.dirname(__file__))
-from xyq_common import XYQ_BASE, ACCESS_KEY, UPLOAD_FILE_PATH, HTTP_TIMEOUT_SECONDS, parse_response
-
-# 允许的 MIME 类型前缀
-ALLOWED_PREFIXES = ("image/", "video/")
-ALLOWED_AUDIO_EXTENSIONS = {".mp3", ".wav"}
-EXTRA_MIME_MAP = {
-    ".mp3": "audio/mpeg",
-    ".wav": "audio/wav",
-}
-
-
-def upload_file(file_path: str) -> dict:
-    """
-    上传本地文件到小云雀资产库。
-    返回 data: { asset_id: str }。
-    """
-    if not os.path.isfile(file_path):
-        print(f"错误：文件不存在: {file_path}", file=sys.stderr)
-        sys.exit(1)
-
-    # 检查 MIME 类型
-    ext = os.path.splitext(file_path)[1].lower()
-    mime_type, _ = mimetypes.guess_type(file_path)
-    if not mime_type:
-        mime_type = EXTRA_MIME_MAP.get(ext)
-    is_supported_media = bool(mime_type) and any(mime_type.startswith(p) for p in ALLOWED_PREFIXES)
-    is_supported_audio = bool(mime_type) and mime_type.startswith("audio/") and ext in ALLOWED_AUDIO_EXTENSIONS
-    if not is_supported_media and not is_supported_audio:
-        print(f"错误：不支持的文件类型: {mime_type or '未知'}，仅支持图片、视频和 .mp3/.wav 音频", file=sys.stderr)
-        sys.exit(1)
-
-    # 构建 multipart/form-data 请求体
-    boundary = f"----PythonUpload{uuid.uuid4().hex}"
-    filename = os.path.basename(file_path)
-
-    body_parts = []
-
-    # accessKey 字段
-    body_parts.append(f"--{boundary}\r\n".encode())
-    body_parts.append(b'Content-Disposition: form-data; name="accessKey"\r\n\r\n')
-    body_parts.append(f"{ACCESS_KEY}\r\n".encode())
-
-    # file 字段
-    content_type = mime_type or "application/octet-stream"
-    body_parts.append(f"--{boundary}\r\n".encode())
-    body_parts.append(
-        f'Content-Disposition: form-data; name="file"; filename="{filename}"\r\n'.encode()
-    )
-    body_parts.append(f"Content-Type: {content_type}\r\n\r\n".encode())
-    with open(file_path, "rb") as f:
-        body_parts.append(f.read())
-    body_parts.append(b"\r\n")
-
-    # 结束边界
-    body_parts.append(f"--{boundary}--\r\n".encode())
-
-    data = b"".join(body_parts)
-
-    url = f"{XYQ_BASE.rstrip('/')}{UPLOAD_FILE_PATH}"
-    req = urllib.request.Request(
-        url,
-        data=data,
-        method="POST",
-        headers={
-            "Authorization": f"Bearer {ACCESS_KEY}",
-            "Content-Type": f"multipart/form-data; boundary={boundary}"
-        },
-    )
-    try:
-        with urllib.request.urlopen(req, timeout=HTTP_TIMEOUT_SECONDS) as resp:
-            result = json.loads(resp.read().decode("utf-8"))
-            return parse_response(result)
-    except urllib.error.HTTPError as e:
-        err_body = e.read().decode("utf-8") if e.fp else ""
-        print(f"API 错误 {e.code}: {err_body}", file=sys.stderr)
-        sys.exit(1)
-    except urllib.error.URLError as e:
-        print(f"网络错误: {e.reason}", file=sys.stderr)
-        sys.exit(1)
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="上传图片、视频或 mp3/wav 音频文件到小云雀资产库",
-        epilog="""
-环境变量:
-  XYQ_ACCESS_KEY  必填，Bearer 鉴权
-  XYQ_OPENAPI_BASE 或 XYQ_BASE_URL  可选，默认 https://xyq.jianying.com
-
-示例:
-  # 上传图片
-  python3 upload_file.py /path/to/image.png
-
-  # 上传视频
-  python3 upload_file.py /path/to/video.mp4
-
-  # 上传音频
-  python3 upload_file.py /path/to/audio.mp3
-        """,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    parser.add_argument(
-        "file",
-        help="要上传的图片、视频或 mp3/wav 音频文件路径",
-    )
-    args = parser.parse_args()
-
-    data = upload_file(args.file)
-    asset_id = data.get("pippit_asset_id", "")
-
-    if not asset_id:
-        print("错误：未返回 asset_id", file=sys.stderr)
-        sys.exit(1)
-
-    out = {"asset_id": asset_id}
-    print(json.dumps(out, ensure_ascii=False, indent=2))
-
-
-if __name__ == "__main__":
-    main()