fix(frontend): pre-annotation is higher priority than default options

Author: gary-Shen

apps/frontend/src/utils/convertAudioAndVideoSample.ts

@@ -2,12 +2,17 @@ import _ from 'lodash';
 import type { AnnotationsWithGlobal, MediaAnnotatorConfig, MediaSample } from '@labelu/audio-annotator-react';
 
 import type { ParsedResult, SampleResponse } from '@/api/types';
-import { MediaType } from '@/api/types';
+import { MediaType, SampleState } from '@/api/types';
 
 import { jsonParse } from './index';
 import { generateDefaultValues } from './generateGlobalToolDefaultValues';
 
-export function convertMediaAnnotations(mediaType: MediaType, result: ParsedResult, config: MediaAnnotatorConfig) {
+export function convertMediaAnnotations(
+  mediaType: MediaType,
+  result: ParsedResult,
+  config: MediaAnnotatorConfig,
+  state?: SampleState,
+) {
   // annotation
   const pool = [
     ['segment', MediaType.VIDEO === mediaType ? 'videoSegmentTool' : 'audioSegmentTool'],
@@ -20,7 +25,7 @@ export function convertMediaAnnotations(mediaType: MediaType, result: ParsedResu
     .map(([type, key]) => {
       const items = _.get(result, [key, 'result'], []);
 
-      if (!items.length && (type === 'tag' || type === 'text')) {
+      if (!items.length && (type === 'tag' || type === 'text') && state !== SampleState.NEW) {
         // 生成全局工具的默认值
         return [type, generateDefaultValues(config?.[type])];
       }
@@ -60,6 +65,6 @@ export function convertAudioAndVideoSample(
     url: [MediaType.VIDEO, MediaType.AUDIO].includes(mediaType as MediaType)
       ? sample.file.url.replace('attachment', 'partial')
       : sample.file.url,
-    data: convertMediaAnnotations(mediaType!, resultParsed, config),
+    data: convertMediaAnnotations(mediaType!, resultParsed, config, sample.state),
   };
 }

apps/frontend/src/utils/convertImageSample.ts

@@ -4,14 +4,15 @@ import { omit } from 'lodash/fp';
 import type { ToolName } from '@labelu/image';
 import { TOOL_NAMES } from '@labelu/image';
 
-import type { ParsedResult, SampleResponse } from '@/api/types';
+import { SampleState, type ParsedResult, type SampleResponse } from '@/api/types';
 
 import { jsonParse } from './index';
 import { generateDefaultValues } from './generateGlobalToolDefaultValues';
 
 export function convertImageAnnotations(
   result: ParsedResult,
   config: Pick<ImageAnnotatorOptions, ToolName> & GlobalToolConfig,
+  state?: SampleState,
 ) {
   // annotation
   const pool = [
@@ -31,7 +32,7 @@ export function convertImageAnnotations(
       }
 
       const items = _.get(result, [key, 'result']) || _.get(result, [type, 'result'], []);
-      if (!items.length && (type === 'tag' || type === 'text')) {
+      if (!items.length && (type === 'tag' || type === 'text') && state !== SampleState.NEW) {
         // 生成全局工具的默认值
         return [type, generateDefaultValues(config?.[type])];
       }
@@ -80,7 +81,7 @@ export function convertImageSample(
   return {
     id,
     url,
-    data: convertImageAnnotations(resultParsed, config),
+    data: convertImageAnnotations(resultParsed, config, sample.state),
     meta: _.pick(resultParsed, ['width', 'height', 'rotate']),
   };
 }