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

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

@@ -47,6 +47,7 @@ function requestSummary(request = {}) {
   const promptParams = request.promptParams || {};
   return compactRecord({
     requestSource: request.requestSource,
+    modelCode: request.modelCode,
     modelGroupCode: request.modelGroupCode,
     projectGroupNo: request.projectGroupNo,
     customBizId: request.customBizId,
@@ -159,6 +160,9 @@ 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,
   });
 }
 
@@ -185,8 +189,17 @@ function normalizeTaskSubmission(data = {}) {
 function normalizeSubtitleSubmission(data = {}) {
   return compactRecord({
     submitted: data.submitted,
-    remoteTaskId: data.remoteTaskId,
-    publicId: data.publicId,
+    taskId: data.taskId,
+    taskType: data.taskType,
+    sourceTaskId: data.sourceTaskId,
+    projectGroupNo: data.projectGroupNo,
+    pointCost: data.pointCost,
+    billingPointBalance: data.billingPointBalance ?? data.teamPointBalance,
+    billingPointRemainingAfter: data.billingPointRemainingAfter ?? data.teamPointRemainingAfter,
+    projectBudgetBalance: data.projectBudgetBalance ?? data.projectPointBalance,
+    projectBudgetMax: data.projectBudgetMax ?? data.projectPointMax,
+    projectBudgetRemainingAfter: data.projectBudgetRemainingAfter ?? data.projectPointRemainingAfter,
+    nextCommand: rewriteCommandPrefix(data.nextCommand),
   });
 }
 
@@ -293,11 +306,31 @@ function normalizeSubject(data = {}) {
     elementId: data.elementId,
     subjectId: data.subjectId,
     externalId: data.externalId,
+    modelCode: data.modelCode ?? data.request?.modelCode ?? data.subject?.modelCode,
     status: data.status,
+    taskStatus: data.taskStatus ?? data.subject?.taskStatus,
+    errorMessage: data.errorMessage ?? data.subject?.errorMessage,
+    isTerminal: data.isTerminal ?? data.subject?.isTerminal,
     nextRefSubject: data.nextRefSubject,
   });
 }
 
+function normalizeSubjectVoice(data = {}) {
+  return compactRecord({
+    created: data.created,
+    name: data.name,
+    voiceRecordId: data.voiceRecordId,
+    reqTaskId: data.reqTaskId,
+    voiceId: data.voiceId ?? data.externalId,
+    externalId: data.externalId,
+    status: data.status,
+    taskStatus: data.taskStatus ?? data.voice?.taskStatus,
+    errorMessage: data.errorMessage ?? data.voice?.errorMessage,
+    isTerminal: data.isTerminal ?? data.voice?.isTerminal,
+    nextVoiceArg: data.nextVoiceArg,
+  });
+}
+
 function normalizeAsset(data = {}) {
   return compactRecord({
     created: data.created,
@@ -466,13 +499,13 @@ export function normalizeOutputData(commandName, data) {
   }
   if (data.dryRun) return normalizeDryRun(data);
   switch (commandName) {
-    case 'image create':
-    case 'video create':
+    case 'create image':
+    case 'create video':
       return normalizeTaskSubmission(data);
-    case 'video subtitle-remove':
+    case 'create video-subtitle-removal':
       return normalizeSubtitleSubmission(data);
-    case 'image fee':
-    case 'video fee':
+    case 'create image-fee':
+    case 'create video-fee':
       return normalizeFee(data);
     case 'account info':
       return normalizeAccountInfo(data);
@@ -486,17 +519,20 @@ export function normalizeOutputData(commandName, data) {
       return normalizeProjectSummary(data);
     case 'credits usage':
       return normalizeCreditsUsage(data);
-    case 'image status':
-    case 'video status':
+    case 'task image-status':
+    case 'task video-status':
     case 'task wait':
-    case 'video subtitle-status':
+    case 'task video-subtitle-status':
       return normalizeTaskStatus(data);
-    case 'subject publish':
-    case 'subject wait':
+    case 'create subject':
+    case 'create subject-wait':
       return normalizeSubject(data);
-    case 'asset group-create':
-    case 'asset group-update':
-    case 'asset register':
+    case 'create subject-voice':
+    case 'create subject-voice-wait':
+      return normalizeSubjectVoice(data);
+    case 'create asset-group':
+    case 'create asset-group-update':
+    case 'create asset':
       return normalizeAsset(data);
     case 'model image-models':
     case 'model video-models':
@@ -511,12 +547,14 @@ export function normalizeOutputData(commandName, data) {
       return normalizeList(data, ['tasks']);
     case 'task records':
       return normalizeList(data, ['records']);
-    case 'asset groups':
+    case 'create asset-groups':
       return normalizeList(data, ['groups']);
-    case 'asset match-actor':
+    case 'create asset-match-actor':
       return normalizeList(data, ['matches']);
-    case 'subject list':
+    case 'create subject-list':
       return normalizeList(data, ['subjects']);
+    case 'create subject-voice-list':
+      return normalizeList(data, ['voices']);
     default:
       break;
   }
@@ -663,6 +701,7 @@ function rowSummary(row) {
     'modelGroupCode',
     'provider',
     'displayName',
+    'modelDesc',
     'modelStatus',
     'taskQueueNum',
     'feeCalcType',
@@ -721,7 +760,10 @@ function rowSummary(row) {
     'imageUrl',
     'subjectId',
     'elementId',
+    'voiceRecordId',
+    'voiceId',
     'externalId',
+    'nextVoiceArg',
     'label',
     'assetPath',
     'isPrimary',
@@ -797,7 +839,7 @@ function rowSummary(row) {
     .join(' ');
 }
 
-function textSources(values = []) {
+function textValueShapes(values = []) {
   const names = {
     local_file: 'file',
     http_url: 'url',
@@ -905,7 +947,7 @@ function formatModelOptionsOutput(data = {}) {
         mode: item.mode,
         media: item.mediaType,
         usage: item.usage,
-        sources: textSources(item.sources),
+        valueShapes: textValueShapes(item.valueShapes),
         formats: textResourceFormats(item),
         webpInput: textWebpInput(item),
         autoConvert: textResourceAutoConvert(item),
@@ -920,7 +962,7 @@ function formatModelOptionsOutput(data = {}) {
         'mode',
         'media',
         'usage',
-        'sources',
+        'valueShapes',
         'formats',
         'webpInput',
         'autoConvert',
@@ -1035,14 +1077,17 @@ function modelListNextCommand(commandName) {
 
 function statusNextCommand(commandName, normalized) {
   if (!isPlainObject(normalized) || normalized.isTerminal !== false || !normalized.taskId) return null;
-  const taskType = normalized.taskType || (commandName === 'video status' ? 'VIDEO_GROUP' : 'IMAGE_CREATE');
+  const taskType = normalized.taskType || (commandName === 'task video-status' ? 'VIDEO_GROUP' : 'IMAGE_CREATE');
   return `${commandPrefix()} task wait --task-id ${normalized.taskId} --task-type ${taskType} --wait-seconds 180`;
 }
 
 function subtitleRemoveNextCommand(commandName, normalized) {
-  if (commandName !== 'video status' && commandName !== 'task wait') return null;
-  if (!Array.isArray(normalized.originUrls) || !normalized.originUrls.length) return null;
-  return `${commandPrefix()} video subtitle-remove --video-url <originUrl[0]> --dry-run`;
+  if (commandName !== 'task video-status' && commandName !== 'task wait') return null;
+  if (!normalized.taskId || normalized.taskStatus !== 'SUCCESS') return null;
+  const taskType = String(normalized.taskType || '');
+  if (taskType && taskType !== 'VIDEO_GROUP' && !taskType.startsWith('VIDEO_') && !taskType.startsWith('LIP_SYNC')) return null;
+  const projectGroupPart = normalized.projectGroupNo ? ` --project-group-no ${normalized.projectGroupNo}` : '';
+  return `${commandPrefix()} create video-subtitle-removal --source-task-id ${normalized.taskId}${projectGroupPart} --dry-run`;
 }
 
 export function formatTextOutput(commandName, data, context = {}) {
@@ -1071,6 +1116,10 @@ export function formatTextOutput(commandName, data, context = {}) {
       'pointNo',
       'taskType',
       'taskStatus',
+      'modelCode',
+      'resolvedModelCode',
+      'resolvedFrom',
+      'resolvedFromValue',
       'modelGroupCode',
       'projectGroupNo',
       'projectId',
@@ -1078,6 +1127,8 @@ export function formatTextOutput(commandName, data, context = {}) {
       'groupName',
       'assetId',
       'elementId',
+      'voiceRecordId',
+      'voiceId',
       'externalId',
       'status',
       'imported',