@lingjingai/lj-awb-cli-pre 0.4.7 → 0.4.8

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

@@ -435,136 +435,6 @@ function normalizeList(data = {}, keys) {
   });
 }
 
-function normalizeArtifactList(commandName, data) {
-  if (Array.isArray(data)) {
-    return compactRecord({ count: data.length, items: cleanNested(data) });
-  }
-  if (!isPlainObject(data)) return cleanNested(data);
-  const arrayKey = Object.keys(data).find((key) => Array.isArray(data[key]));
-  if (arrayKey) {
-    return compactRecord({
-      count: data.count ?? data[arrayKey].length,
-      [arrayKey]: cleanNested(data[arrayKey]),
-      ...Object.fromEntries(
-        Object.entries(data)
-          .filter(([key]) => key !== arrayKey && key !== 'raw')
-          .map(([key, value]) => [key, cleanNested(value)]),
-      ),
-    });
-  }
-  return cleanNested(data);
-}
-
-function normalizeArtifactRecord(data) {
-  if (!isPlainObject(data)) return cleanNested(data);
-  const out = compactRecord({
-    id: data.id,
-    projectId: data.projectId,
-    rowKind: data.rowKind,
-    entityKey: data.entityKey,
-    parentKey: data.parentKey,
-    sortOrder: data.sortOrder,
-    actorKey: data.actorKey,
-    propKey: data.propKey,
-    locationKey: data.locationKey,
-    stateKey: data.stateKey,
-    episodeId: data.episodeId,
-    sceneId: data.sceneId,
-    clipId: data.clipId,
-    videoEpisodeId: data.videoEpisodeId,
-    status: data.status,
-    title: data.title,
-    name: data.name,
-    displayName: data.displayName,
-    description: data.description,
-  });
-  for (const [key, value] of Object.entries(data)) {
-    if (key in out) continue;
-    if (Array.isArray(value)) out[`${key}Count`] = value.length;
-    else if (!isPlainObject(value)) out[key] = value;
-  }
-  return cleanNested(out);
-}
-
-function normalizeArtifactFull(data) {
-  if (!isPlainObject(data)) return cleanNested(data);
-  const out = compactRecord({
-    projectId: data.projectId,
-    id: data.id,
-    title: data.title,
-    status: data.status,
-  });
-  for (const [key, value] of Object.entries(data)) {
-    if (Array.isArray(value)) out[`${key}Count`] = value.length;
-    else if (isPlainObject(value)) {
-      const innerKey = Object.keys(value).find((k) => Array.isArray(value[k]));
-      if (innerKey) out[`${key}.${innerKey}Count`] = value[innerKey].length;
-    } else if (!(key in out)) out[key] = value;
-  }
-  return out;
-}
-
-function normalizeArtifactImport(data = {}) {
-  if (!isPlainObject(data)) return cleanNested(data);
-  return compactRecord({
-    imported: data.imported,
-    dryRun: data.dryRun,
-    action: data.action,
-    projectId: data.projectId,
-    sourceFile: data.sourceFile,
-    inputDir: data.inputDir,
-    inputFile: data.inputFile,
-    rowCount: data.rowCount,
-    actorCount: data.actorCount,
-    propCount: data.propCount,
-    locationCount: data.locationCount,
-    episodeCount: data.episodeCount,
-    sceneCount: data.sceneCount,
-    clipCount: data.clipCount,
-    batchCount: Array.isArray(data.batch) ? data.batch.length : undefined,
-    rowsByKind: data.rowsByKind,
-    files: isPlainObject(data.files)
-      ? compactRecord({
-          actors: data.files.actorsFile,
-          props: data.files.propsFile,
-          locations: data.files.locationsFile,
-        })
-      : undefined,
-  });
-}
-
-function normalizeArtifactWrite(data) {
-  if (!isPlainObject(data)) return cleanNested(data);
-  return normalizeArtifactRecord(data);
-}
-
-function normalizeArtifactDelete(data) {
-  if (!isPlainObject(data)) return cleanNested(data);
-  return compactRecord({
-    deleted: data.deleted ?? true,
-    action: data.action,
-    projectId: data.projectId,
-    key: data.key,
-    stateKey: data.stateKey,
-    episodeId: data.episodeId,
-    sceneId: data.sceneId,
-    clipId: data.clipId,
-    videoEpisodeId: data.videoEpisodeId,
-    rowKind: data.rowKind,
-    entityKey: data.entityKey,
-  });
-}
-
-function normalizeArtifactStatus(data) {
-  if (!isPlainObject(data)) return cleanNested(data);
-  return compactRecord({
-    updated: data.updated ?? true,
-    videoEpisodeId: data.videoEpisodeId ?? data.id,
-    status: data.status,
-    messageCount: Array.isArray(data.messages) ? data.messages.length : undefined,
-  });
-}
-
 export function normalizeOutputData(commandName, data) {
   if (!isPlainObject(data)) return cleanNested(data);
   switch (commandName) {
@@ -595,7 +465,7 @@ export function normalizeOutputData(commandName, data) {
     case 'credits balance':
       return normalizeCredits(data);
     case 'project current':
-    case 'project use':
+    case 'project switch':
     case 'project create':
     case 'project update':
     case 'project ensure':
@@ -645,88 +515,6 @@ export function normalizeOutputData(commandName, data) {
     default:
       break;
   }
-  if (commandName?.startsWith('artifact ')) {
-    return normalizeArtifactByCommand(commandName, data);
-  }
-  return cleanNested(data);
-}
-
-const ARTIFACT_LIST_COMMANDS = new Set([
-  'artifact script rows',
-  'artifact script children',
-  'artifact asset actors',
-  'artifact asset props',
-  'artifact asset locations',
-  'artifact video episodes',
-  'artifact video scenes',
-  'artifact video clips',
-  'artifact clip episodes',
-]);
-
-const ARTIFACT_RECORD_COMMANDS = new Set([
-  'artifact script document',
-  'artifact script row',
-  'artifact asset actor',
-  'artifact asset prop',
-  'artifact asset location',
-  'artifact video episode',
-  'artifact video scene',
-  'artifact video clip',
-  'artifact clip episode',
-  'artifact clip episode-by-id',
-]);
-
-const ARTIFACT_FULL_COMMANDS = new Set([
-  'artifact script get',
-  'artifact asset get',
-  'artifact video get',
-  'artifact clip get',
-]);
-
-const ARTIFACT_IMPORT_COMMANDS = new Set([
-  'artifact script import',
-  'artifact asset import',
-  'artifact video import-storyboard',
-  'artifact clip upsert-batch',
-]);
-
-const ARTIFACT_WRITE_COMMANDS = new Set([
-  'artifact script upsert-row',
-  'artifact asset upsert-actor',
-  'artifact asset upsert-prop',
-  'artifact asset upsert-location',
-  'artifact asset upsert-actor-state',
-  'artifact asset upsert-prop-state',
-  'artifact asset upsert-location-state',
-  'artifact video upsert-episode',
-  'artifact video upsert-scene',
-  'artifact video upsert-clip',
-  'artifact video update-clip-urls',
-  'artifact clip upsert-episode',
-]);
-
-const ARTIFACT_DELETE_COMMANDS = new Set([
-  'artifact script delete-row',
-  'artifact asset delete-actor',
-  'artifact asset delete-prop',
-  'artifact asset delete-location',
-  'artifact asset delete-actor-state',
-  'artifact asset delete-prop-state',
-  'artifact asset delete-location-state',
-  'artifact video delete-episode',
-  'artifact video delete-scene',
-  'artifact video delete-clip',
-  'artifact clip delete-episode',
-]);
-
-function normalizeArtifactByCommand(commandName, data) {
-  if (ARTIFACT_LIST_COMMANDS.has(commandName)) return normalizeArtifactList(commandName, data);
-  if (ARTIFACT_RECORD_COMMANDS.has(commandName)) return normalizeArtifactRecord(data);
-  if (ARTIFACT_FULL_COMMANDS.has(commandName)) return normalizeArtifactFull(data);
-  if (ARTIFACT_IMPORT_COMMANDS.has(commandName)) return normalizeArtifactImport(data);
-  if (ARTIFACT_WRITE_COMMANDS.has(commandName)) return normalizeArtifactWrite(data);
-  if (ARTIFACT_DELETE_COMMANDS.has(commandName)) return normalizeArtifactDelete(data);
-  if (commandName === 'artifact clip update-status') return normalizeArtifactStatus(data);
   return cleanNested(data);
 }
 
@@ -1393,7 +1181,7 @@ const OUTPUT_KIND_BY_COMMAND = {
   'account switch-team': 'generic',
   'project list': 'project_list',
   'project current': 'project_summary',
-  'project use': 'generic',
+  'project switch': 'generic',
   'project users': 'project_user_list',
   'project create': 'generic',
   'project update': 'generic',
@@ -1432,57 +1220,6 @@ const OUTPUT_KIND_BY_COMMAND = {
   'create asset-group': 'asset_group_write_result',
   'create asset-group-update': 'asset_group_write_result',
   'create asset': 'asset_register_result',
-  'artifact script get': 'artifact_full',
-  'artifact script document': 'artifact_record',
-  'artifact script rows': 'artifact_list',
-  'artifact script row': 'artifact_record',
-  'artifact script children': 'artifact_list',
-  'artifact script upsert-row': 'artifact_write_result',
-  'artifact script delete-row': 'artifact_delete_result',
-  'artifact script import': 'artifact_import_result',
-  'artifact asset get': 'artifact_full',
-  'artifact asset actors': 'artifact_list',
-  'artifact asset actor': 'artifact_record',
-  'artifact asset props': 'artifact_list',
-  'artifact asset prop': 'artifact_record',
-  'artifact asset locations': 'artifact_list',
-  'artifact asset location': 'artifact_record',
-  'artifact asset upsert-actor': 'artifact_write_result',
-  'artifact asset upsert-prop': 'artifact_write_result',
-  'artifact asset upsert-location': 'artifact_write_result',
-  'artifact asset upsert-actor-state': 'artifact_write_result',
-  'artifact asset upsert-prop-state': 'artifact_write_result',
-  'artifact asset upsert-location-state': 'artifact_write_result',
-  'artifact asset delete-actor': 'artifact_delete_result',
-  'artifact asset delete-prop': 'artifact_delete_result',
-  'artifact asset delete-location': 'artifact_delete_result',
-  'artifact asset delete-actor-state': 'artifact_delete_result',
-  'artifact asset delete-prop-state': 'artifact_delete_result',
-  'artifact asset delete-location-state': 'artifact_delete_result',
-  'artifact asset import': 'artifact_import_result',
-  'artifact video get': 'artifact_full',
-  'artifact video episodes': 'artifact_list',
-  'artifact video episode': 'artifact_record',
-  'artifact video scenes': 'artifact_list',
-  'artifact video scene': 'artifact_record',
-  'artifact video clips': 'artifact_list',
-  'artifact video clip': 'artifact_record',
-  'artifact video upsert-episode': 'artifact_write_result',
-  'artifact video upsert-scene': 'artifact_write_result',
-  'artifact video upsert-clip': 'artifact_write_result',
-  'artifact video update-clip-urls': 'artifact_write_result',
-  'artifact video delete-episode': 'artifact_delete_result',
-  'artifact video delete-scene': 'artifact_delete_result',
-  'artifact video delete-clip': 'artifact_delete_result',
-  'artifact video import-storyboard': 'artifact_import_result',
-  'artifact clip get': 'artifact_full',
-  'artifact clip episodes': 'artifact_list',
-  'artifact clip episode': 'artifact_record',
-  'artifact clip episode-by-id': 'artifact_record',
-  'artifact clip upsert-episode': 'artifact_write_result',
-  'artifact clip upsert-batch': 'artifact_import_result',
-  'artifact clip update-status': 'artifact_status_update',
-  'artifact clip delete-episode': 'artifact_delete_result',
   'create subject-list': 'subject_list',
   'create subject': 'subject_publish_result',
   'create subject-wait': 'subject_status',
@@ -1495,13 +1232,6 @@ const OUTPUT_KIND_BY_COMMAND = {
 
 const KIND_TITLES = {
   account_summary: '账号概览',
-  artifact_delete_result: '最终产物删除结果',
-  artifact_full: '最终产物详情',
-  artifact_import_result: '最终产物导入结果',
-  artifact_list: '最终产物列表',
-  artifact_record: '最终产物记录',
-  artifact_status_update: '剪辑状态更新结果',
-  artifact_write_result: '最终产物写入结果',
   asset_group_detail: '素材组详情',
   asset_group_list: '素材组列表',
   asset_group_write_result: '素材组写入结果',
@@ -1552,7 +1282,7 @@ const COMMAND_TITLES = {
   'auth clear': '清空认证结果',
   'auth logout': '退出登录结果',
   'account switch-team': '团队切换结果',
-  'project use': '项目组切换结果',
+  'project switch': '项目组切换结果',
   'project create': '项目组创建结果',
   'project update': '项目组更新结果',
   'project ensure': '项目组确保结果',
@@ -1757,12 +1487,6 @@ const FIELD_LABELS = {
 
 const DETAIL_FIELDS_BY_KIND = {
   account_summary: ['userId', 'userName', 'groupId', 'groupName', 'currentProjectGroupNo', 'currentProjectGroupName', 'billingPointBalance', 'projectBudgetBalance', 'projectBudgetMax'],
-  artifact_delete_result: ['deleted', 'action', 'projectId', 'rowKind', 'entityKey', 'key', 'stateKey', 'episodeId', 'sceneId', 'clipId', 'videoEpisodeId'],
-  artifact_full: ['projectId', 'id', 'title', 'status', 'rowCount', 'actorCount', 'propCount', 'locationCount', 'episodeCount', 'sceneCount', 'clipCount'],
-  artifact_import_result: ['imported', 'dryRun', 'action', 'projectId', 'sourceFile', 'inputDir', 'inputFile', 'rowCount', 'actorCount', 'propCount', 'locationCount', 'episodeCount', 'sceneCount', 'clipCount', 'batchCount'],
-  artifact_record: ['id', 'projectId', 'rowKind', 'entityKey', 'parentKey', 'actorKey', 'propKey', 'locationKey', 'stateKey', 'episodeId', 'sceneId', 'clipId', 'videoEpisodeId', 'status', 'title', 'name', 'displayName', 'description'],
-  artifact_status_update: ['updated', 'videoEpisodeId', 'status', 'messageCount'],
-  artifact_write_result: ['id', 'projectId', 'rowKind', 'entityKey', 'parentKey', 'actorKey', 'propKey', 'locationKey', 'stateKey', 'episodeId', 'sceneId', 'clipId', 'videoEpisodeId', 'status', 'title', 'name', 'displayName'],
   asset_group_detail: ['groupId', 'platform', 'name', 'projectName', 'description', 'status', 'assetCount'],
   asset_group_write_result: ['created', 'updated', 'groupId', 'platform', 'name', 'projectName', 'assetPath'],
   asset_register_result: ['created', 'updated', 'registered', 'assetId', 'groupId', 'platform', 'assetType', 'name', 'projectName', 'assetPath', 'validationLegal', 'conversionRequired', 'converted', 'conversionReason', 'conversionTargetFormat', 'conversionTargetWidth', 'conversionTargetHeight', 'conversionTargetPixels', 'conversionTargetFps', 'conversionTargetDuration', 'uploadBackendPath', 'uploadUrl'],
@@ -1796,7 +1520,7 @@ const DRY_RUN_FIELDS_BY_COMMAND = {
   'auth login': ['dryRun', 'saved', 'verified', 'accessKey'],
   'auth clear': ['dryRun', 'action', 'cleared'],
   'account switch-team': ['dryRun', 'action', 'groupId', 'selected'],
-  'project use': ['dryRun', 'action', 'projectGroupNo', 'selected'],
+  'project switch': ['dryRun', 'action', 'projectGroupNo', 'selected'],
   'project create': ['dryRun', 'action', 'projectGroupName', 'point', 'memberCount', 'note'],
   'project update': ['dryRun', 'action', 'projectGroupNo', 'projectGroupName', 'point', 'memberCount'],
   'project ensure': ['dryRun', 'action', 'projectGroupName', 'point', 'memberCount', 'note'],
@@ -1815,15 +1539,9 @@ const DRY_RUN_FIELDS_BY_COMMAND = {
   'create subject': ['dryRun', 'action', 'name', 'modelCode', 'elementFrontalImage', 'assetCount', 'localFileCount', 'nextRefSubject'],
   'create subject-voice': ['dryRun', 'action', 'name', 'voiceName', 'voiceUrl', 'remoteUrl', 'remoteUpload', 'localFileCount', 'nextVoiceArg'],
   'create subject-batch': ['dryRun', 'count', 'modelCode'],
-  'artifact script import': ['dryRun', 'action', 'projectId', 'sourceFile', 'inputFile', 'rowCount', 'actorCount', 'episodeCount', 'sceneCount', 'clipCount'],
-  'artifact asset import': ['dryRun', 'action', 'projectId', 'inputDir', 'actorCount', 'propCount', 'locationCount'],
-  'artifact video import-storyboard': ['dryRun', 'action', 'projectId', 'inputFile', 'episodeId', 'sceneCount', 'clipCount'],
-  'artifact clip upsert-batch': ['dryRun', 'action', 'projectId', 'episodeCount'],
-  'artifact clip update-status': ['dryRun', 'action', 'projectId', 'videoEpisodeId', 'status', 'messageCount'],
 };
 
 const LIST_KEY_BY_KIND = {
-  artifact_list: 'items',
   asset_group_list: 'groups',
   asset_match_list: 'matches',
   asset_review_model_list: 'models',

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

@@ -746,13 +746,13 @@ export async function selectProjectGroupCommand(kwargs = {}) {
   if (toBool(kwargs.dryRun)) {
     return {
       dryRun: true,
-      action: 'project use',
+      action: 'project switch',
       selected: false,
       request: { projectGroupNo },
     };
   }
   ensureConfirmed(kwargs, '切换项目组会改变后续生成任务归属，需要确认', {
-    action: 'project use',
+    action: 'project switch',
     projectGroupNo,
   });
   await awbApi.selectProjectGroup(projectGroupNo);