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

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

@@ -160,9 +160,6 @@ function normalizeDryRun(data = {}) {
     localFiles,
     results: Array.isArray(data.results) ? data.results.map((row) => normalizeDryRunResult(row)) : data.results,
     nextRefSubject: data.nextRefSubject,
-    resolvedModelCode: data.resolvedModelCode,
-    resolvedFrom: data.resolvedFrom,
-    resolvedFromValue: data.resolvedFromValue,
   });
 }
 
@@ -338,6 +335,7 @@ function normalizeAsset(data = {}) {
     registered: data.registered,
     groupId: data.groupId,
     assetId: data.assetId,
+    platform: data.platform,
     name: data.name,
     projectName: data.projectName,
     assetPath: data.assetPath,
@@ -536,6 +534,7 @@ export function normalizeOutputData(commandName, data) {
       return normalizeAsset(data);
     case 'model image-models':
     case 'model video-models':
+    case 'model asset-review-models':
       return normalizeList(data, ['models', 'items', 'rows']);
     case 'account teams':
       return normalizeList(data, ['teams']);
@@ -682,6 +681,42 @@ function renderRecord(record, preferredKeys = [], excludedKeys = []) {
   return keys.map((key) => `${key}=${shortValue(record[key])}`).join(' ');
 }
 
+function recordScalarKeys(record, preferredKeys = [], excludedKeys = []) {
+  const excluded = new Set(excludedKeys);
+  return [
+    ...preferredKeys.filter((key) => !excluded.has(key) && record[key] !== undefined),
+    ...Object.keys(record).filter((key) => !excluded.has(key) && !preferredKeys.includes(key) && !Array.isArray(record[key]) && !isPlainObject(record[key])),
+  ];
+}
+
+function pushSectionRecord(lines, title, record, preferredKeys = []) {
+  const compacted = compactRecord(record);
+  lines.push(`${title}:`);
+  for (const key of recordScalarKeys(compacted, preferredKeys)) {
+    lines.push(`  ${key}=${shortValue(compacted[key])}`);
+  }
+}
+
+function pushSectionCount(lines, title, count) {
+  lines.push(`${title}:`);
+  lines.push(`  count=${count}`);
+}
+
+function pushSectionKeyValue(lines, key, value) {
+  if (value === undefined || value === null || value === '') return;
+  lines.push(`  ${key}=${value}`);
+}
+
+function pushSectionItem(lines, index, value) {
+  if (value === undefined || value === null || value === '') return;
+  lines.push(`  [${index}]=${value}`);
+}
+
+function pushSectionRecordItem(lines, index, record, preferredKeys = []) {
+  const rendered = renderRecord(compactRecord(record), preferredKeys);
+  if (rendered) lines.push(`  [${index}]: ${rendered}`);
+}
+
 function firstList(data) {
   for (const [key, value] of Object.entries(data || {})) {
     if (['resultUrls', 'originUrls'].includes(key)) continue;
@@ -699,6 +734,7 @@ function rowSummary(row) {
     'remoteTaskId',
     'taskType',
     'modelGroupCode',
+    'platform',
     'provider',
     'displayName',
     'modelDesc',
@@ -925,70 +961,71 @@ function formatModelOptionsOutput(data = {}) {
   const resources = Array.isArray(data.resources) ? data.resources : [];
   const constraints = Array.isArray(data.constraints) ? data.constraints : [];
   const lines = ['ok model options'];
-  lines.push(renderRecord(compactRecord({
+  pushSectionRecord(lines, 'summary', {
     modelGroupCode: data.modelGroupCode,
     taskKind: data.taskKind,
-  }), ['modelGroupCode', 'taskKind']));
-  lines.push(`params.count=${params.length}`);
+  }, ['modelGroupCode', 'taskKind']);
+  pushSectionCount(lines, 'params', params.length);
   for (const [index, param] of params.entries()) {
-    lines.push(`param[${index}]: ${renderRecord(compactRecord({
+    pushSectionRecordItem(lines, index, {
       key: param.key,
       type: param.valueType,
       values: valueList(param.values),
       default: param.defaultValue,
       maxLength: param.maxLength,
       required: param.required,
-    }), ['key', 'type', 'values', 'default', 'maxLength', 'required'])}`);
+    }, ['key', 'type', 'values', 'default', 'maxLength', 'required']);
   }
-  if (resources.length) {
-    lines.push(`resources.count=${resources.length}`);
-    for (const [index, item] of resources.entries()) {
-      lines.push(`resource[${index}]: ${renderRecord(compactRecord({
-        mode: item.mode,
-        media: item.mediaType,
-        usage: item.usage,
-        valueShapes: textValueShapes(item.valueShapes),
-        formats: textResourceFormats(item),
-        webpInput: textWebpInput(item),
-        autoConvert: textResourceAutoConvert(item),
-        files: textFileCount(item),
-        maxSizeKB: item.maxSizeKB,
-        durationMs: textDurationRange(item),
-        totalDurationMs: item.maxTotalDurationMs != null ? `<=${item.maxTotalDurationMs}` : undefined,
-        items: textItemCount(item),
-        maxPromptLength: item.maxPromptLength,
-        lastFrameOnly: item.supportLastFrameOnly,
-      }), [
-        'mode',
-        'media',
-        'usage',
-        'valueShapes',
-        'formats',
-        'webpInput',
-        'autoConvert',
-        'files',
-        'maxSizeKB',
-        'durationMs',
-        'totalDurationMs',
-        'items',
-        'maxPromptLength',
-        'lastFrameOnly',
-      ])}`);
-    }
+  pushSectionCount(lines, 'resources', resources.length);
+  for (const [index, item] of resources.entries()) {
+    pushSectionRecordItem(lines, index, {
+      mode: item.mode,
+      media: item.mediaType,
+      usage: item.usage,
+      valueShapes: textValueShapes(item.valueShapes),
+      formats: textResourceFormats(item),
+      webpInput: textWebpInput(item),
+      autoConvert: textResourceAutoConvert(item),
+      files: textFileCount(item),
+      maxSizeKB: item.maxSizeKB,
+      durationMs: textDurationRange(item),
+      totalDurationMs: item.maxTotalDurationMs != null ? `<=${item.maxTotalDurationMs}` : undefined,
+      items: textItemCount(item),
+      maxPromptLength: item.maxPromptLength,
+      lastFrameOnly: item.supportLastFrameOnly,
+    }, [
+      'mode',
+      'media',
+      'usage',
+      'valueShapes',
+      'formats',
+      'webpInput',
+      'autoConvert',
+      'files',
+      'maxSizeKB',
+      'durationMs',
+      'totalDurationMs',
+      'items',
+      'maxPromptLength',
+      'lastFrameOnly',
+    ]);
   }
-  if (constraints.length) {
-    lines.push(`constraints.count=${constraints.length}`);
-    for (const [index, item] of constraints.entries()) {
-      lines.push(`constraint[${index}]: ${renderRecord(compactRecord({
-        target: item.target,
-        targetConfig: item.targetConfigCode && item.targetConfigCode !== item.target ? item.targetConfigCode : undefined,
-        allowedValues: textAllowValues(item.allowValues),
-        when: textConstraintConditions(item.conditions),
-        effect: item.effect,
-        priority: item.priority,
-        name: item.name,
-      }), ['target', 'targetConfig', 'allowedValues', 'when', 'effect', 'priority', 'name'])}`);
-    }
+  pushSectionCount(lines, 'constraints', constraints.length);
+  for (const [index, item] of constraints.entries()) {
+    pushSectionRecordItem(lines, index, {
+      target: item.target,
+      targetConfig: item.targetConfigCode && item.targetConfigCode !== item.target ? item.targetConfigCode : undefined,
+      allowedValues: textAllowValues(item.allowValues),
+      when: textConstraintConditions(item.conditions),
+      effect: item.effect,
+      priority: item.priority,
+      name: item.name,
+    }, ['target', 'targetConfig', 'allowedValues', 'when', 'effect', 'priority', 'name']);
+  }
+  if (data.modelGroupCode) {
+    lines.push('next:');
+    pushSectionKeyValue(lines, 'createSpec', `${commandPrefix()} model create-spec --model-group-code ${data.modelGroupCode}`);
+    pushSectionKeyValue(lines, 'reason', '读取创建命令写法、资源语法、fee/dry-run 前置步骤和示例');
   }
   return `${lines.join('\n')}\n`;
 }
@@ -1000,44 +1037,63 @@ function textKeyBinding(value) {
   return value;
 }
 
+function modelFeeNextCommand(data = {}) {
+  if (!data.feeCommand || !data.modelGroupCode) return null;
+  const args = [
+    `${commandPrefix()} ${data.feeCommand}`,
+    `--model-group-code ${data.modelGroupCode}`,
+    '--prompt "<prompt>"',
+  ];
+  if (data.taskKind === 'video') args.push('--duration <duration>', '--ratio <ratio>', '--quality <quality>');
+  if (data.taskKind === 'image') args.push('--ratio <ratio>', '--quality <quality>');
+  return args.join(' ');
+}
+
+function modelCreateExampleWithCode(example, modelGroupCode) {
+  if (!example || !modelGroupCode) return rewriteCommandPrefix(example);
+  return rewriteCommandPrefix(String(example).replaceAll('--model-group-code <code>', `--model-group-code ${modelGroupCode}`));
+}
+
 function formatModelCreateSpecOutput(data = {}) {
   const intents = Array.isArray(data.supportedIntents) ? data.supportedIntents : [];
   const examples = Array.isArray(data.examples) ? data.examples : [];
   const lines = ['ok model create-spec'];
-  lines.push(renderRecord(compactRecord({
+  pushSectionRecord(lines, 'summary', {
     modelGroupCode: data.modelGroupCode,
     taskKind: data.taskKind,
     create: data.createCommand,
     fee: data.feeCommand,
     statusTaskType: data.statusCommandTaskType,
-  }), ['modelGroupCode', 'taskKind', 'create', 'fee', 'statusTaskType']));
-  lines.push(renderRecord(compactRecord({
-    input: data.inputRequirement?.summary,
+  }, ['modelGroupCode', 'taskKind', 'create', 'fee', 'statusTaskType']);
+  pushSectionRecord(lines, 'input', {
+    summary: data.inputRequirement?.summary,
     acceptedModes: valueList(data.inputRequirement?.acceptedModes),
-  }), ['input', 'acceptedModes']));
-  lines.push(`intents.count=${intents.length}`);
+  }, ['summary', 'acceptedModes']);
+  pushSectionCount(lines, 'intents', intents.length);
   for (const [index, intent] of intents.entries()) {
-    lines.push(`intent[${index}]: ${renderRecord(compactRecord({
+    pushSectionRecordItem(lines, index, {
       mode: intent.mode,
       intent: intent.intent,
       args: valueList(intent.requiredArgs),
       usage: valueList(intent.resourceUsages),
       resources: valueList(intent.resourceSyntax),
       key: textKeyBinding(intent.promptBinding),
-    }), ['mode', 'intent', 'args', 'usage', 'resources', 'key'])}`);
-  }
-  if (examples.length) {
-    lines.push(`examples.count=${examples.length}`);
-    for (const [index, example] of examples.entries()) lines.push(`example[${index}]=${example}`);
+    }, ['mode', 'intent', 'args', 'usage', 'resources', 'key']);
   }
-  if (data.optionsCommand) lines.push(`options=${commandPrefix()} ${data.optionsCommand}`);
+  pushSectionCount(lines, 'examples', examples.length);
+  for (const [index, example] of examples.entries()) pushSectionItem(lines, index, rewriteCommandPrefix(example));
+  lines.push('next:');
+  if (data.optionsCommand) pushSectionKeyValue(lines, 'options', `${commandPrefix()} ${data.optionsCommand}`);
+  const feeNext = modelFeeNextCommand(data);
+  if (feeNext) pushSectionKeyValue(lines, 'fee', feeNext);
+  if (examples.length) pushSectionKeyValue(lines, 'dryRun', modelCreateExampleWithCode(examples[0], data.modelGroupCode));
   return `${lines.join('\n')}\n`;
 }
 
 function formatGuideTableRows(rows = []) {
   return (Array.isArray(rows) ? rows : []).map((item, index) => {
     const values = valueList(item.values);
-    return `field[${index}]: ${renderRecord(compactRecord({
+    return `  [${index}]: ${renderRecord(compactRecord({
       name: item.field,
       values,
       desc: item.description,
@@ -1047,20 +1103,20 @@ function formatGuideTableRows(rows = []) {
 
 function formatModelInputGuideOutput(data = {}) {
   const lines = ['ok model input-guide'];
-  lines.push('commonFields.count=' + (Array.isArray(data.commonFields) ? data.commonFields.length : 0));
+  pushSectionCount(lines, 'commonFields', Array.isArray(data.commonFields) ? data.commonFields.length : 0);
   lines.push(...formatGuideTableRows(data.commonFields));
-  lines.push('resourceFields.count=' + (Array.isArray(data.resourceFields) ? data.resourceFields.length : 0));
+  pushSectionCount(lines, 'resourceFields', Array.isArray(data.resourceFields) ? data.resourceFields.length : 0);
   lines.push(...formatGuideTableRows(data.resourceFields));
   const rules = Array.isArray(data.resourceRules) ? data.resourceRules : [];
-  if (rules.length) {
-    lines.push(`resourceRules.count=${rules.length}`);
-    for (const [index, rule] of rules.entries()) lines.push(`rule[${index}]=${rule}`);
-  }
+  pushSectionCount(lines, 'resourceRules', rules.length);
+  for (const [index, rule] of rules.entries()) pushSectionItem(lines, index, rule);
   const referenceKeyGuide = Array.isArray(data.referenceKeyGuide) ? data.referenceKeyGuide : [];
-  if (referenceKeyGuide.length) {
-    lines.push(`referenceKey.count=${referenceKeyGuide.length}`);
-    for (const [index, item] of referenceKeyGuide.entries()) lines.push(`referenceKey[${index}]=${item}`);
-  }
+  pushSectionCount(lines, 'referenceKey', referenceKeyGuide.length);
+  for (const [index, item] of referenceKeyGuide.entries()) pushSectionItem(lines, index, item);
+  lines.push('next:');
+  pushSectionKeyValue(lines, 'imageModels', `${commandPrefix()} model image-models --model <keyword>`);
+  pushSectionKeyValue(lines, 'videoModels', `${commandPrefix()} model video-models --model <keyword>`);
+  pushSectionKeyValue(lines, 'options', `${commandPrefix()} model options --model-group-code <modelGroupCode>`);
   return `${lines.join('\n')}\n`;
 }
 
@@ -1072,9 +1128,17 @@ function modelListNextCommand(commandName) {
   if (commandName === 'model image-models' || commandName === 'model video-models') {
     return `${commandPrefix()} model options --model-group-code <modelGroupCode>`;
   }
+  if (commandName === 'model asset-review-models') {
+    return `${commandPrefix()} create asset-groups --platform <platform> --name "<keyword>"`;
+  }
   return null;
 }
 
+function modelListAgentHint(commandName) {
+  if (commandName !== 'model image-models' && commandName !== 'model video-models') return null;
+  return '对每个候选运行 model options，并把候选模型、参数取值、默认值和资源能力展示给用户后再推荐或进入 fee/dry-run。';
+}
+
 function statusNextCommand(commandName, normalized) {
   if (!isPlainObject(normalized) || normalized.isTerminal !== false || !normalized.taskId) return null;
   const taskType = normalized.taskType || (commandName === 'task video-status' ? 'VIDEO_GROUP' : 'IMAGE_CREATE');
@@ -1117,10 +1181,8 @@ export function formatTextOutput(commandName, data, context = {}) {
       'taskType',
       'taskStatus',
       'modelCode',
-      'resolvedModelCode',
-      'resolvedFrom',
-      'resolvedFromValue',
       'modelGroupCode',
+      'platform',
       'projectGroupNo',
       'projectId',
       'groupId',
@@ -1208,6 +1270,8 @@ export function formatTextOutput(commandName, data, context = {}) {
   if (normalized.dryRun && !context.confirmCommand && context.executeCommand) lines.push(`next=${context.executeCommand}`);
   const modelNext = modelListNextCommand(commandName);
   if (modelNext) lines.push(`next=${modelNext}`);
+  const modelHint = modelListAgentHint(commandName);
+  if (modelHint) lines.push(`agentHint=${shortValue(modelHint)}`);
   const waitNext = statusNextCommand(commandName, normalized);
   if (waitNext) lines.push(`next=${waitNext}`);
   const subtitleNext = subtitleRemoveNextCommand(commandName, normalized);