You've already forked DataMate
feat: 完善数据标注导出格式兼容性验证
- 后端:添加 YOLO 格式对 TEXT 数据集的限制验证 - 后端:统一 COCO/YOLO 兼容性校验规则(仅允许图像类或目标检测类数据集) - 后端:修复 datasetType 字段传递,在任务列表响应中补充 dataset_type - 前端:在导出对话框中禁用 TEXT 数据集的 COCO/YOLO 选项 - 前端:添加 datasetType 和 labelingType 字段传递 - 前端:对齐前后端 COCO/YOLO 兼容性规则 - 前端:优化提示文案,明确说明格式适用范围 修改文件: - runtime/datamate-python/app/module/annotation/service/export.py - runtime/datamate-python/app/module/annotation/service/mapping.py - runtime/datamate-python/app/module/annotation/schema/mapping.py - frontend/src/pages/DataAnnotation/Home/ExportAnnotationDialog.tsx - frontend/src/pages/DataAnnotation/Home/DataAnnotation.tsx - frontend/src/pages/DataAnnotation/annotation.const.tsx
This commit is contained in:
@@ -378,6 +378,8 @@ export default function DataAnnotation() {
|
||||
open={!!exportTask}
|
||||
projectId={exportTask?.id || ""}
|
||||
projectName={exportTask?.name || ""}
|
||||
datasetType={exportTask?.datasetType}
|
||||
labelingType={exportTask?.labelingType}
|
||||
onClose={() => setExportTask(null)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -11,7 +11,7 @@ import {
|
||||
message,
|
||||
Alert,
|
||||
} from "antd";
|
||||
import { FileTextOutlined, CheckCircleOutlined } from "@ant-design/icons";
|
||||
import { FileTextOutlined, CheckCircleOutlined, InfoCircleOutlined } from "@ant-design/icons";
|
||||
import {
|
||||
getExportStatsUsingGet,
|
||||
downloadAnnotationsUsingGet,
|
||||
@@ -22,6 +22,8 @@ interface ExportAnnotationDialogProps {
|
||||
open: boolean;
|
||||
projectId: string;
|
||||
projectName: string;
|
||||
datasetType?: string;
|
||||
labelingType?: string;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
@@ -57,6 +59,8 @@ export default function ExportAnnotationDialog({
|
||||
open,
|
||||
projectId,
|
||||
projectName,
|
||||
datasetType,
|
||||
labelingType,
|
||||
onClose,
|
||||
}: ExportAnnotationDialogProps) {
|
||||
const [form] = Form.useForm();
|
||||
@@ -67,6 +71,15 @@ export default function ExportAnnotationDialog({
|
||||
annotatedFiles: number;
|
||||
} | null>(null);
|
||||
|
||||
const normalizedDatasetType = datasetType?.toUpperCase().replace(/-/g, "_") || "";
|
||||
const normalizedLabelingType = labelingType?.toUpperCase().replace(/-/g, "_") || "";
|
||||
const hasDatasetType = Boolean(normalizedDatasetType);
|
||||
const isTextDataset = normalizedDatasetType === "TEXT";
|
||||
const isDetectionCompatible =
|
||||
normalizedDatasetType === "IMAGE" ||
|
||||
normalizedDatasetType === "OBJECT_DETECTION" ||
|
||||
normalizedLabelingType === "OBJECT_DETECTION";
|
||||
|
||||
// 加载导出统计信息
|
||||
useEffect(() => {
|
||||
if (open && projectId) {
|
||||
@@ -176,20 +189,46 @@ export default function ExportAnnotationDialog({
|
||||
rules={[{ required: true, message: "请选择导出格式" }]}
|
||||
>
|
||||
<Select
|
||||
options={FORMAT_OPTIONS.map((opt) => ({
|
||||
label: (
|
||||
<div className="py-1">
|
||||
<div className="font-medium">{opt.label}</div>
|
||||
<div className="text-xs text-gray-400">{opt.description}</div>
|
||||
</div>
|
||||
),
|
||||
value: opt.value,
|
||||
simpleLabel: opt.label,
|
||||
}))}
|
||||
options={FORMAT_OPTIONS.map((opt) => {
|
||||
const isDetectionFormat = opt.value === "coco" || opt.value === "yolo";
|
||||
const isDisabledForText = isDetectionFormat && isTextDataset;
|
||||
const isDisabledForIncompatibleType =
|
||||
isDetectionFormat && hasDatasetType && !isTextDataset && !isDetectionCompatible;
|
||||
const isDisabled = isDisabledForText || isDisabledForIncompatibleType;
|
||||
return {
|
||||
label: (
|
||||
<div className="py-1 relative">
|
||||
<div className={`font-medium ${isDisabled ? "text-gray-400" : ""}`}>{opt.label}</div>
|
||||
<div className={`text-xs ${isDisabled ? "text-gray-300" : "text-gray-400"}`}>
|
||||
{opt.description}
|
||||
{isDisabled && (
|
||||
<span className="block mt-1 text-orange-500">
|
||||
<InfoCircleOutlined className="mr-1" />
|
||||
仅适用于图像类或目标检测类数据集
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
),
|
||||
value: opt.value,
|
||||
simpleLabel: opt.label,
|
||||
disabled: isDisabled,
|
||||
};
|
||||
})}
|
||||
optionLabelProp="simpleLabel"
|
||||
/>
|
||||
</Form.Item>
|
||||
|
||||
{(isTextDataset || (hasDatasetType && !isDetectionCompatible)) && (
|
||||
<Alert
|
||||
type="info"
|
||||
message="导出格式兼容性提示"
|
||||
description="COCO 和 YOLO 格式仅适用于图像类或目标检测类数据集,当前项目建议使用 JSON、JSON Lines 或 CSV 格式导出。"
|
||||
showIcon
|
||||
className="mt-4"
|
||||
/>
|
||||
)}
|
||||
|
||||
<Form.Item name="onlyAnnotated" valuePropName="checked">
|
||||
<Checkbox>仅导出已标注数据</Checkbox>
|
||||
</Form.Item>
|
||||
|
||||
@@ -23,6 +23,8 @@ type AnnotationTaskPayload = {
|
||||
datasetId?: string;
|
||||
datasetName?: string;
|
||||
dataset_name?: string;
|
||||
datasetType?: string;
|
||||
dataset_type?: string;
|
||||
labelingType?: string;
|
||||
labeling_type?: string;
|
||||
template?: {
|
||||
@@ -54,6 +56,7 @@ export type AnnotationTaskListItem = {
|
||||
description?: string;
|
||||
datasetId?: string;
|
||||
datasetName?: string;
|
||||
datasetType?: string;
|
||||
labelingType?: string;
|
||||
totalCount?: number;
|
||||
annotatedCount?: number;
|
||||
@@ -97,6 +100,7 @@ export function mapAnnotationTask(task: AnnotationTaskPayload): AnnotationTaskLi
|
||||
const labelingProjId = task?.labelingProjId || task?.labelingProjectId || task?.projId || task?.labeling_project_id || "";
|
||||
const segmentationEnabled = task?.segmentationEnabled ?? task?.segmentation_enabled ?? false;
|
||||
const inProgressCount = task?.inProgressCount ?? task?.in_progress_count ?? 0;
|
||||
const datasetType = task?.datasetType || task?.dataset_type;
|
||||
const labelingType =
|
||||
task?.labelingType ||
|
||||
task?.labeling_type ||
|
||||
@@ -119,6 +123,7 @@ export function mapAnnotationTask(task: AnnotationTaskPayload): AnnotationTaskLi
|
||||
projId: labelingProjId,
|
||||
segmentationEnabled,
|
||||
inProgressCount,
|
||||
datasetType,
|
||||
labelingType,
|
||||
name: task.name,
|
||||
description: task.description || "",
|
||||
|
||||
Reference in New Issue
Block a user