Merge pull request #661 from opendatalab/fix/default-option

gary-Shen · web-flow · commit 1e302acd5794 · 2025-04-30T19:09:10.000+08:00
Fix/default option
diff --git a/apps/frontend/src/pages/tasks.[id].samples.[id]/components/annotationRightCorner/index.tsx b/apps/frontend/src/pages/tasks.[id].samples.[id]/components/annotationRightCorner/index.tsx
@@ -18,6 +18,7 @@ import { updateSampleState, updateSampleAnnotationResult } from '@/api/services/
 import { message } from '@/StaticAnt';
 import useMe from '@/hooks/useMe';
 import { UserAvatar } from '@/components/UserAvatar';
+import { generateDefaultValues } from '@/utils/generateGlobalToolDefaultValues';
 
 import AnnotationContext from '../../annotation.context';
 
@@ -247,6 +248,23 @@ const AnnotationRightCorner = ({ noSave, fetchNext, totalSize }: AnnotationRight
       innerSample = await audioAnnotationRef?.current?.getSample();
     }
 
+    // 全局标注没有值的话，填充默认值
+    if (!result.tagTool?.result?.length) {
+      const tagConfig = task.config.tools.find((tool) => tool.tool === 'tagTool');
+      result.tagTool = {
+        toolName: 'tagTool',
+        result: generateDefaultValues(tagConfig?.config.attributes),
+      };
+    }
+
+    if (!result.textTool?.result?.length) {
+      const textConfig = task.config.tools.find((tool) => tool.tool === 'textTool');
+      result.textTool = {
+        toolName: 'textTool',
+        result: generateDefaultValues(textConfig?.config.attributes),
+      };
+    }
+
     // 防止sampleid保存错乱，使用标注时传入的sampleid
     const body = set('data.result')(JSON.stringify(result))(currentSample);
 
@@ -255,7 +273,7 @@ const AnnotationRightCorner = ({ noSave, fetchNext, totalSize }: AnnotationRight
       annotated_count: getAnnotationCount(body.data!.result),
       state: SampleState.DONE,
     });
-  }, [currentSample, isMeTheCurrentUser, noSave, task.media_type, taskId]);
+  }, [currentSample, isMeTheCurrentUser, noSave, task?.config.tools, task?.media_type, taskId]);
 
   const handleComplete = useCallback(async () => {
     await saveCurrentSample();
diff --git a/apps/frontend/src/pages/tasks.[id].samples.[id]/index.tsx b/apps/frontend/src/pages/tasks.[id].samples.[id]/index.tsx
@@ -101,13 +101,13 @@ const AnnotationPage = () => {
     }
 
     if (task?.media_type === MediaType.IMAGE) {
-      return convertImageAnnotations(_annotations, preAnnotationConfig);
+      return convertImageAnnotations(_annotations);
     } else if (task?.media_type === MediaType.VIDEO || task?.media_type === MediaType.AUDIO) {
-      return convertMediaAnnotations(task.media_type, _annotations, preAnnotationConfig);
+      return convertMediaAnnotations(task.media_type, _annotations);
     }
 
     return {};
-  }, [preAnnotation, preAnnotationConfig, task?.media_type]);
+  }, [preAnnotation, task?.media_type]);
 
   const [searchParams] = useSearchParams();
   const taskConfig = _.get(task, 'config');
@@ -204,11 +204,11 @@ const AnnotationPage = () => {
 
   const editingSample = useMemo(() => {
     if (task?.media_type === MediaType.IMAGE) {
-      return convertImageSample(sample?.data, editorConfig);
+      return convertImageSample(sample?.data);
     } else if (task?.media_type === MediaType.VIDEO || task?.media_type === MediaType.AUDIO) {
-      return convertAudioAndVideoSample(sample?.data, editorConfig, task.media_type);
+      return convertAudioAndVideoSample(sample?.data, task.media_type);
     }
-  }, [editorConfig, sample?.data, task?.media_type]);
+  }, [sample?.data, task?.media_type]);
 
   const renderSidebar = useMemo(() => {
     return () => leftSiderContent;
diff --git a/apps/frontend/src/utils/convertAudioAndVideoSample.ts b/apps/frontend/src/utils/convertAudioAndVideoSample.ts
@@ -1,13 +1,12 @@
 import _ from 'lodash';
-import type { AnnotationsWithGlobal, MediaAnnotatorConfig, MediaSample } from '@labelu/audio-annotator-react';
+import type { AnnotationsWithGlobal, MediaSample } from '@labelu/audio-annotator-react';
 
 import type { ParsedResult, SampleResponse } from '@/api/types';
 import { MediaType } 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) {
   // annotation
   const pool = [
     ['segment', MediaType.VIDEO === mediaType ? 'videoSegmentTool' : 'audioSegmentTool'],
@@ -20,11 +19,6 @@ export function convertMediaAnnotations(mediaType: MediaType, result: ParsedResu
     .map(([type, key]) => {
       const items = _.get(result, [key, 'result'], []);
 
-      if (!items.length && (type === 'tag' || type === 'text')) {
-        // 生成全局工具的默认值
-        return [type, generateDefaultValues(config?.[type])];
-      }
-
       return [
         type,
         _.map(items, (item) => {
@@ -39,11 +33,7 @@ export function convertMediaAnnotations(mediaType: MediaType, result: ParsedResu
     .value() as AnnotationsWithGlobal;
 }
 
-export function convertAudioAndVideoSample(
-  sample: SampleResponse,
-  config: MediaAnnotatorConfig,
-  mediaType?: MediaType,
-): MediaSample | undefined {
+export function convertAudioAndVideoSample(sample: SampleResponse, mediaType?: MediaType): MediaSample | undefined {
   if (!sample) {
     return;
   }
@@ -60,6 +50,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),
   };
 }
diff --git a/apps/frontend/src/utils/convertImageSample.ts b/apps/frontend/src/utils/convertImageSample.ts
@@ -1,18 +1,14 @@
 import _ from 'lodash';
-import type { GlobalToolConfig, ImageAnnotatorOptions, ImageSample } from '@labelu/image-annotator-react';
+import type { ImageSample } from '@labelu/image-annotator-react';
 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 { jsonParse } from './index';
-import { generateDefaultValues } from './generateGlobalToolDefaultValues';
 
-export function convertImageAnnotations(
-  result: ParsedResult,
-  config: Pick<ImageAnnotatorOptions, ToolName> & GlobalToolConfig,
-) {
+export function convertImageAnnotations(result: ParsedResult) {
   // annotation
   const pool = [
     ['line', 'lineTool'],
@@ -31,10 +27,6 @@ export function convertImageAnnotations(
       }
 
       const items = _.get(result, [key, 'result']) || _.get(result, [type, 'result'], []);
-      if (!items.length && (type === 'tag' || type === 'text')) {
-        // 生成全局工具的默认值
-        return [type, generateDefaultValues(config?.[type])];
-      }
 
       return [
         type,
@@ -61,10 +53,7 @@ export function convertImageAnnotations(
     .value();
 }
 
-export function convertImageSample(
-  sample: SampleResponse | undefined,
-  config: Pick<ImageAnnotatorOptions, ToolName> & GlobalToolConfig,
-): ImageSample | undefined {
+export function convertImageSample(sample: SampleResponse | undefined): ImageSample | undefined {
   if (!sample) {
     return;
   }
@@ -80,7 +69,7 @@ export function convertImageSample(
   return {
     id,
     url,
-    data: convertImageAnnotations(resultParsed, config),
+    data: convertImageAnnotations(resultParsed),
     meta: _.pick(resultParsed, ['width', 'height', 'rotate']),
   };
 }
diff --git a/packages/audio-annotator-react/src/AttributePanel/index.tsx b/packages/audio-annotator-react/src/AttributePanel/index.tsx
@@ -209,6 +209,7 @@ export function AttributePanel() {
   } = useAnnotationCtx();
   const [collapsed, setCollapsed] = useState<boolean>(false);
   const { t } = useTranslation();
+  const [modified, setModified] = useState<boolean>(false);
 
   const { globalAnnotations, globalAnnotationsWithPreAnnotation, mediaAnnotationGroup, defaultActiveKeys } =
     useMemo(() => {
@@ -223,13 +224,12 @@ export function AttributePanel() {
         ...(preAnnotationsWithGlobal?.frame ?? []),
       ] as MediaAnnotationInUI[];
 
-      // 传入了预标注说明样本没有人工标注内容
-      if (preAnnotationsWithGlobal?.tag?.length) {
-        _globalAnnotationsWithPreAnnotation.push(...(preAnnotationsWithGlobal?.tag as GlobalAnnotation[]));
-      }
-
-      if (preAnnotationsWithGlobal?.text?.length) {
-        _globalAnnotationsWithPreAnnotation.push(...(preAnnotationsWithGlobal?.text as GlobalAnnotation[]));
+      if (!_globalAnnotations.length && !modified) {
+        [preAnnotationsWithGlobal?.tag, preAnnotationsWithGlobal?.text].forEach((values) => {
+          if (values) {
+            _globalAnnotationsWithPreAnnotation.push(...(values as GlobalAnnotation[]));
+          }
+        });
       }
 
       for (const item of sortedMediaAnnotations) {
@@ -262,6 +262,7 @@ export function AttributePanel() {
       preAnnotationsWithGlobal?.tag,
       preAnnotationsWithGlobal?.text,
       sortedMediaAnnotations,
+      modified,
     ]);
 
   const globals = useMemo(() => {
@@ -400,6 +401,8 @@ export function AttributePanel() {
       return;
     }
 
+    setModified(true);
+
     onAnnotationClear();
   };
 
diff --git a/packages/components-react/src/AttributeTree/index.tsx b/packages/components-react/src/AttributeTree/index.tsx
@@ -194,12 +194,13 @@ export function AttributeTree({ data, config, onChange, className, disabled }: A
     });
 
     tagConfig?.forEach((item) => {
+      const defaultValue = item.options.filter((option) => option.isDefault).map((option) => option.value);
       if (!_tagData[item.value]) {
         _tagData[item.value] = {
           id: uid(),
           type: 'tag',
           value: {
-            [item.value]: [],
+            [item.value]: defaultValue,
           },
         } as TagAnnotationEntity;
       }
@@ -211,7 +212,7 @@ export function AttributeTree({ data, config, onChange, className, disabled }: A
           id: uid(),
           type: 'text',
           value: {
-            [item.value]: '',
+            [item.value]: item.defaultValue,
           },
         } as TextAnnotationEntity;
       }
diff --git a/packages/image-annotator-react/src/AttributePanel/index.tsx b/packages/image-annotator-react/src/AttributePanel/index.tsx
@@ -213,11 +213,13 @@ export function AttributePanel() {
     disabled,
   } = useAnnotationCtx();
   const [collapsed, setCollapsed] = useState<boolean>(false);
+  const [modified, setModified] = useState<boolean>(false);
   const globalAnnotations = useMemo(() => {
     return Object.values(annotationsWithGlobal).filter((item) =>
       ['text', 'tag'].includes((item as GlobalAnnotation).type),
     ) as GlobalAnnotation[];
   }, [annotationsWithGlobal]);
+
   // @ts-ignore
   const { t } = useTranslation();
 
@@ -269,23 +271,17 @@ export function AttributePanel() {
 
   const flatGlobalTagAnnotations = useMemo(() => {
     const result = globalAnnotations;
-    const preResult = [] as GlobalAnnotation[];
-
-    // 传入了预标注说明样本没有人工标注内容
-    if (preAnnotationsWithGlobal?.tag?.length) {
-      preResult.push(...(preAnnotationsWithGlobal?.tag as GlobalAnnotation[]));
-    }
-
-    if (preAnnotationsWithGlobal?.text?.length) {
-      preResult.push(...(preAnnotationsWithGlobal?.text as GlobalAnnotation[]));
-    }
 
-    if (preResult.length) {
-      return preResult;
+    if (globalAnnotations.length === 0 && !modified) {
+      [preAnnotationsWithGlobal?.tag, preAnnotationsWithGlobal?.text].forEach((values) => {
+        if (values) {
+          result.push(...(values as GlobalAnnotation[]));
+        }
+      });
     }
 
     return result;
-  }, [globalAnnotations, preAnnotationsWithGlobal]);
+  }, [globalAnnotations, preAnnotationsWithGlobal?.tag, preAnnotationsWithGlobal?.text, modified]);
 
   const titles = useMemo(() => {
     const _titles = [];
@@ -392,6 +388,8 @@ export function AttributePanel() {
       return;
     }
 
+    setModified(true);
+
     onAnnotationClear();
     if (activeKey === 'label') {
       engine?.clearData();
diff --git a/packages/image-annotator-react/src/ImageAnnotator.tsx b/packages/image-annotator-react/src/ImageAnnotator.tsx
@@ -593,7 +593,6 @@ function ForwardAnnotator(
     // 删除标记
     const handleDelete = (annotation: AnnotationData) => {
       const newAnnotations = omit(annotationsWithGlobal, annotation.id);
-      console.log('newAnnotations', newAnnotations);
       updateAnnotationsWithGlobal(newAnnotations);
       setSelectedAnnotation((pre) => {
         if (pre?.id === annotation.id) {
