@lingjingai/lj-awb-cli-pre 0.3.18 → 0.4.5

package/packages/awb-core/src/commands.js

@@ -2,6 +2,7 @@ import { fetchProjectGroupUsers, fetchTeams, fetchUserInfo } from './api.js';
 import * as artifact from './artifact.js';
 import { clearAuth, loadAuth, saveAccessKey, summarizeAuth } from './auth.js';
 import { LingjingAwbCliError, maskSecret, toBool, trimSecret } from './common.js';
+import { runCliUpdate } from './update.js';
 import {
   assetGroupCreate,
   assetGroupGet,
@@ -10,6 +11,8 @@ import {
   assetMatchActor,
   assetReviewModels,
   assetRegister,
+  authLogin,
+  authLogout,
   creditsBalance,
   creditsUsageSummary,
   createProjectGroupCommand,
@@ -39,6 +42,9 @@ import {
   subjectWait,
   subtitleRemove,
   subtitleStatus,
+  videoSuperResolution,
+  videoSuperResolutionFee,
+  videoSuperResolutionStatus,
   taskList,
   taskRecordPoll,
   taskRecords,
@@ -85,6 +91,9 @@ const MODEL_LIST_ARGS = [
 const TASK_RECORD_ARG = { name: 'task-record-file', valueName: 'path', description: '任务台账 JSONL 文件；也可用 LINGJING_AWB_TASK_RECORD_FILE' };
 const RESOURCE_ARG = { name: 'resource', valueName: 'spec', description: '统一素材，格式 type:usage[:key]=path|url|asset，可重复传；音频参考用 audio:reference=./music.mp3' };
 const RESOURCES_JSON_ARG = { name: 'resources-json', valueName: 'json|path', description: 'resources 数组 JSON 或 JSON 文件路径' };
+const MODEL_PARAM_ARG = { name: 'model-param', valueName: 'key=value', description: '通用模型配置参数，可重复传；key 来自 model options.params[]，例如 generation_effort=high' };
+const MODEL_PARAMS_JSON_ARG = { name: 'model-params-json', valueName: 'json|path', description: '通用模型配置参数对象 JSON 或 JSON 文件路径；显式 --ratio/--quality 等命令参数优先' };
+const MODEL_PARAM_ARGS = [MODEL_PARAM_ARG, MODEL_PARAMS_JSON_ARG];
 const CREATE_WAIT_ARGS = [
   { name: 'wait-seconds', valueName: 'seconds', description: '提交后顺带等待结果的秒数；默认 0 不等待' },
   { name: 'poll-interval-ms', valueName: 'ms', description: '任务轮询间隔毫秒数，默认 5000' },
@@ -125,6 +134,25 @@ export function registerAwbCommands(cli) {
     func: async (_ctx, kwargs) => doctor(kwargs),
   });
 
+  cli({
+    name: 'update',
+    description: commandHelp('检查并更新 CLI 到最新版本；默认只在需要时安装新版本', {
+      examples: [
+        'lj-awb update --check',
+        'lj-awb update',
+        'lj-awb update --force',
+      ],
+      hint: '普通命令只会做非阻塞更新检查；真正安装请显式运行 update。',
+    }),
+    args: [
+      { name: 'check', description: '只检查是否有新版本，不安装' },
+      { name: 'force', description: '强制重新检查并执行安装，忽略缓存' },
+      { name: 'registry', valueName: 'url', description: 'npm registry 地址；默认读取环境变量或 npm 默认 registry' },
+      { name: 'package-name', valueName: 'name', description: '要更新的包名；默认自动识别当前 CLI 包' },
+    ],
+    func: async (_ctx, kwargs) => runCliUpdate(kwargs),
+  });
+
   cli({
     name: 'auth status',
     description: commandHelp('查看本地 access key 是否已配置；不联网', {
@@ -163,50 +191,27 @@ export function registerAwbCommands(cli) {
 
   cli({
     name: 'auth login',
-    description: commandHelp('登录：使用 access key 校验身份，并保存到本地认证文件', {
+    description: commandHelp('登录：默认走浏览器授权登录；也支持直接传 access key 保存', {
       examples: [
+        'lj-awb auth login',
+        'lj-awb auth login --no-wait',
+        'lj-awb auth login --flow-id <flowId>',
         'lj-awb auth login --access-key <key>',
         'LINGJING_AWB_ACCESS_KEY=<key> lj-awb auth login',
         'lj-awb auth login --access-key <key> --skip-verify',
       ],
-      hint: '不要写成 lj-awb auth <key>。不传 --access-key 时只读取 LINGJING_AWB_ACCESS_KEY 环境变量。',
+      hint: '不传 --access-key（且无 LINGJING_AWB_ACCESS_KEY 环境变量）时走浏览器授权：创建登录任务、展示链接、轮询直到授权成功并自动保存 access key。命令最长阻塞约 10 分钟；AI agent 可先用 --no-wait --json 拿 flow_id，再用 --flow-id <id> 续轮询，不要重复发起新的 login。',
     }),
     args: [
-      { name: 'access-key', valueName: 'key', description: '平台 access key；不传时读取环境变量' },
+      { name: 'access-key', valueName: 'key', description: '平台 access key；传了则跳过浏览器授权直接保存，不传时读取环境变量' },
+      { name: 'flow-id', valueName: 'flowId', description: '复用已有登录任务的 flow_id 继续轮询；不传则新建登录任务' },
+      { name: 'no-wait', description: '只创建登录任务并返回 flow_id / verify_url，不阻塞轮询；适合 AI agent / 脚本' },
+      { name: 'wait-seconds', valueName: 'seconds', description: '浏览器授权最长轮询秒数，默认 600' },
+      { name: 'poll-interval-ms', valueName: 'ms', description: '授权状态轮询间隔毫秒数，默认 3000' },
       { name: 'skip-verify', description: '只保存 key，不调用 userInfo 校验；仅用于本地调试' },
       DRY_RUN_ARG,
     ],
-    func: async (_ctx, kwargs) => {
-      const skipVerify = toBool(kwargs.skipVerify);
-      const accessKey = trimSecret(kwargs.accessKey || process.env.LINGJING_AWB_ACCESS_KEY || '');
-      if (!accessKey) {
-        throw new LingjingAwbCliError('缺少 access key', {
-          type: 'argument_error',
-          exitCode: 2,
-          hint: '传 --access-key <key>，或设置 LINGJING_AWB_ACCESS_KEY 环境变量。',
-        });
-      }
-      if (toBool(kwargs.dryRun)) {
-        return {
-          dryRun: true,
-          saved: false,
-          verified: false,
-          accessKey: maskSecret(accessKey),
-        };
-      }
-      let user = null;
-      if (!skipVerify) {
-        process.env.LINGJING_AWB_ACCESS_KEY = accessKey;
-        user = normalizeUserInfo(await fetchUserInfo());
-      }
-      const { auth } = await saveAccessKey(accessKey, { verified: !skipVerify });
-      return {
-        auth: summarizeAuth(auth, { accessKey, source: 'saved', sourceName: 'auth' }),
-        accessKey: maskSecret(accessKey),
-        verified: !skipVerify,
-        user,
-      };
-    },
+    func: async (_ctx, kwargs) => authLogin(kwargs),
   });
 
   cli({
@@ -224,6 +229,16 @@ export function registerAwbCommands(cli) {
     },
   });
 
+  cli({
+    name: 'auth logout',
+    description: commandHelp('退出登录：清除本地保存的 access key', {
+      examples: ['lj-awb auth logout'],
+      hint: '只清本地认证文件，不清当前 shell 中的 LINGJING_AWB_ACCESS_KEY 环境变量；下次使用前重新运行 lj-awb auth login。',
+    }),
+    args: [],
+    func: async () => authLogout(),
+  });
+
   cli({
     name: 'account info',
     description: commandHelp('查看当前 AWB 用户、团队、项目组和积分摘要', {
@@ -497,10 +512,12 @@ export function registerAwbCommands(cli) {
       { name: 'ratio', valueName: 'ratio', description: '画幅比例，如 9:16' },
       { name: 'quality', valueName: 'quality', description: '清晰度，如 2K' },
       { name: 'generate-num', valueName: 'n', description: '生成张数' },
+      ...MODEL_PARAM_ARGS,
       RESOURCE_ARG,
       RESOURCES_JSON_ARG,
       FEE_DRY_RUN_ARG,
     ],
+    allowDynamicModelParams: true,
     func: async (_ctx, kwargs) => imageFee(kwargs),
   });
 
@@ -521,6 +538,7 @@ export function registerAwbCommands(cli) {
       { name: 'ratio', valueName: 'ratio', description: '画幅比例' },
       { name: 'quality', valueName: 'quality', description: '清晰度' },
       { name: 'generate-num', valueName: 'n', description: '生成张数' },
+      ...MODEL_PARAM_ARGS,
       RESOURCE_ARG,
       RESOURCES_JSON_ARG,
       TASK_RECORD_ARG,
@@ -528,6 +546,7 @@ export function registerAwbCommands(cli) {
       DRY_RUN_ARG,
       YES_ARG,
     ],
+    allowDynamicModelParams: true,
     func: async (_ctx, kwargs) => imageCreate(kwargs),
   });
 
@@ -538,17 +557,19 @@ export function registerAwbCommands(cli) {
         'lj-awb create image-batch --input-file ./prompts.txt --model-group-code <code> --dry-run',
         'lj-awb create image-batch --input-file ./image-input.jsonl --model-group-code <code> --concurrency 3 --yes',
       ],
-      hint: 'JSON/JSONL 每项只写任务差异字段：prompt、ratio、quality、generate_num、resources、resource、customBizId。',
+      hint: 'JSON/JSONL 每项只写任务差异字段：prompt、ratio、quality、generate_num、resources、resource、model_params、customBizId；新增模型配置参数也可直接写入每项。',
     }),
     args: [
       { name: 'input-file', valueName: 'path', description: '批量输入文件' },
       MODEL_GROUP_ARG,
       PROJECT_GROUP_ARG,
+      ...MODEL_PARAM_ARGS,
       { name: 'concurrency', valueName: 'n', description: '并发数，默认 1' },
       TASK_RECORD_ARG,
       DRY_RUN_ARG,
       YES_ARG,
     ],
+    allowDynamicModelParams: true,
     func: async (_ctx, kwargs) => imageCreateBatch(kwargs),
   });
 
@@ -577,10 +598,12 @@ export function registerAwbCommands(cli) {
       { name: 'quality', valueName: 'quality', description: '清晰度，如 720' },
       { name: 'duration', valueName: 'seconds', description: '生成时长秒数' },
       { name: 'need-audio', valueName: 'bool', description: '输出音效开关：是否让模型在视频中生成音效（true/false）。不接收音频文件；参考音频请用 --resource audio:reference=...' },
+      ...MODEL_PARAM_ARGS,
       RESOURCE_ARG,
       RESOURCES_JSON_ARG,
       FEE_DRY_RUN_ARG,
     ],
+    allowDynamicModelParams: true,
     func: async (_ctx, kwargs) => videoFee(kwargs),
   });
 
@@ -604,6 +627,7 @@ export function registerAwbCommands(cli) {
       { name: 'quality', valueName: 'quality', description: '清晰度' },
       { name: 'duration', valueName: 'seconds', description: '生成时长秒数' },
       { name: 'need-audio', valueName: 'bool', description: '输出音效开关：是否让模型在视频中生成音效（true/false）。不接收音频文件；参考音频请用 --resource audio:reference=...' },
+      ...MODEL_PARAM_ARGS,
       RESOURCE_ARG,
       RESOURCES_JSON_ARG,
       TASK_RECORD_ARG,
@@ -611,6 +635,7 @@ export function registerAwbCommands(cli) {
       DRY_RUN_ARG,
       YES_ARG,
     ],
+    allowDynamicModelParams: true,
     func: async (_ctx, kwargs) => videoCreate(kwargs),
   });
 
@@ -621,17 +646,19 @@ export function registerAwbCommands(cli) {
         'lj-awb create video-batch --input-file ./prompts.txt --model-group-code <code> --dry-run',
         'lj-awb create video-batch --input-file ./video-input.jsonl --model-group-code <code> --concurrency 2 --yes',
       ],
-      hint: 'JSON/JSONL 每项只写任务差异字段：prompt、ratio、quality、duration、need_audio、resources、resource、customBizId。',
+      hint: 'JSON/JSONL 每项只写任务差异字段：prompt、ratio、quality、duration、need_audio、resources、resource、model_params、customBizId；新增模型配置参数也可直接写入每项。',
     }),
     args: [
       { name: 'input-file', valueName: 'path', description: '批量输入文件' },
       MODEL_GROUP_ARG,
       PROJECT_GROUP_ARG,
+      ...MODEL_PARAM_ARGS,
       { name: 'concurrency', valueName: 'n', description: '并发数，默认 1' },
       TASK_RECORD_ARG,
       DRY_RUN_ARG,
       YES_ARG,
     ],
+    allowDynamicModelParams: true,
     func: async (_ctx, kwargs) => videoCreateBatch(kwargs),
   });
 
@@ -660,6 +687,35 @@ export function registerAwbCommands(cli) {
     func: async (_ctx, kwargs) => subtitleRemove(kwargs),
   });
 
+  cli({
+    name: 'create video-super-resolution-fee',
+    description: commandHelp('计算视频超分预计积分；传入 objectName', {
+      examples: ['lj-awb create video-super-resolution-fee --object-name material/video-super/example.mp4 --project-group-no <no>'],
+      hint: 'objectName 通常是 material backendPath 或 COS 对象路径；正式超分前先看一次估价。',
+    }),
+    args: [
+      { name: 'object-name', valueName: 'path', description: '视频对象路径；通常是 material backendPath 或 COS 对象路径' },
+      PROJECT_GROUP_ARG,
+    ],
+    func: async (_ctx, kwargs) => videoSuperResolutionFee(kwargs),
+  });
+
+  cli({
+    name: 'create video-super-resolution',
+    description: commandHelp('基于 objectName 提交视频超分任务', {
+      examples: ['lj-awb create video-super-resolution --object-name material/video-super/example.mp4 --project-group-no <no> --dry-run'],
+      hint: '正式执行需要 --yes；会先按 objectName 读取视频信息，再选择 1080P / 2K 模型组。',
+    }),
+    args: [
+      { name: 'object-name', valueName: 'path', description: '视频对象路径；通常是 material backendPath 或 COS 对象路径' },
+      PROJECT_GROUP_ARG,
+      TASK_RECORD_ARG,
+      DRY_RUN_ARG,
+      YES_ARG,
+    ],
+    func: async (_ctx, kwargs) => videoSuperResolution(kwargs),
+  });
+
   cli({
     name: 'task video-subtitle-status',
     description: commandHelp('查询 material 去字幕任务状态', {
@@ -672,13 +728,25 @@ export function registerAwbCommands(cli) {
     func: async (_ctx, kwargs) => subtitleStatus(kwargs),
   });
 
+  cli({
+    name: 'task video-super-resolution-status',
+    description: commandHelp('查询 material 视频超分任务状态', {
+      examples: ['lj-awb task video-super-resolution-status --task-id <superResolutionTaskId>'],
+    }),
+    args: [
+      { name: 'task-id', valueName: 'id', description: 'material 视频超分任务 ID' },
+      PROJECT_GROUP_ARG,
+    ],
+    func: async (_ctx, kwargs) => videoSuperResolutionStatus(kwargs),
+  });
+
   cli({
     name: 'task list',
     description: commandHelp('查询项目组近期任务流', {
       examples: ['lj-awb task list --task-type IMAGE_CREATE --project-group-no <no>'],
     }),
     args: [
-      { name: 'task-type', valueName: 'type', description: 'IMAGE_CREATE / IMAGE_EDIT / VIDEO_GROUP' },
+      { name: 'task-type', valueName: 'type', description: 'IMAGE_CREATE / IMAGE_EDIT / VIDEO_GROUP / VIDEO_SUPER_RESOLUTION / VIDEO_SUBTITLE_REMOVAL' },
       PROJECT_GROUP_ARG,
       { name: 'page-size', valueName: 'n', description: '每页任务数' },
       { name: 'min-time', valueName: 'ms', description: '任务流 minTime，默认当前时间' },
@@ -694,7 +762,7 @@ export function registerAwbCommands(cli) {
     }),
     args: [
       { name: 'task-id', valueName: 'id', description: '任务 ID' },
-      { name: 'task-type', valueName: 'type', description: 'IMAGE_CREATE / VIDEO_GROUP' },
+      { name: 'task-type', valueName: 'type', description: 'IMAGE_CREATE / VIDEO_GROUP；material 扩展任务优先用 task video-subtitle-status / task video-super-resolution-status' },
       PROJECT_GROUP_ARG,
       ...TASK_WAIT_ARGS,
     ],
@@ -811,7 +879,11 @@ export function registerAwbCommands(cli) {
   cli({
     name: 'create asset',
     description: commandHelp('把 COS 路径 / URL / 本地文件注册成平台素材', {
-      examples: ['lj-awb create asset --group-id <id> --platform JIMENG --url "asset-review/upload/a.png" --name "女主正面" --dry-run'],
+      examples: [
+        'lj-awb create asset --group-id <id> --platform JIMENG --url "asset-review/upload/a.png" --name "女主正面" --dry-run',
+        'lj-awb create asset --group-id <id> --platform JIMENG --file ./clip.mp4 --name "参考视频" --dry-run',
+      ],
+      hint: 'CLI 会按扩展名自动设置 assetType=Image/Video/Audio；本地文件会用 ffprobe 预校验图片/视频尺寸、视频时长/FPS/像素数和音频时长，缺少 ffprobe/ffmpeg 时 macOS + Homebrew 会自动安装 ffmpeg。',
     }),
     args: [
       { name: 'group-id', valueName: 'id', description: '素材组 ID' },
@@ -819,6 +891,7 @@ export function registerAwbCommands(cli) {
       { name: 'file', valueName: 'path', description: '本地素材文件；会先上传' },
       { name: 'url', valueName: 'url', description: '素材 URL 或 COS 路径' },
       { name: 'backend-path', valueName: 'path', description: 'upload files 返回的 backendPath' },
+      { name: 'auto-convert', description: '本地素材不符合加白规格时自动转换为合法规格后继续' },
       ASSET_PLATFORM_ARG,
       DRY_RUN_ARG,
       YES_ARG,

package/packages/awb-core/src/common.js

@@ -318,11 +318,19 @@ export function guessMimeType(filePath) {
       return 'image/png';
     case '.jpg':
     case '.jpeg':
+    case '.jfif':
       return 'image/jpeg';
+    case '.tif':
+    case '.tiff':
+      return 'image/tiff';
     case '.webp':
       return 'image/webp';
     case '.gif':
       return 'image/gif';
+    case '.heic':
+      return 'image/heic';
+    case '.heif':
+      return 'image/heif';
     case '.mp3':
       return 'audio/mpeg';
     case '.wav':