feat: persist COCO and YOLO imports for resume
This commit is contained in:
parent
238ff296c3
commit
e18c1a6e33
4 changed files with 21 additions and 2 deletions
|
|
@ -3,6 +3,7 @@ import toast from 'react-hot-toast'
|
||||||
import { listUploads } from '@/services/uploadStore'
|
import { listUploads } from '@/services/uploadStore'
|
||||||
import { resumeStoredUpload } from '@/services/uploadQueue'
|
import { resumeStoredUpload } from '@/services/uploadQueue'
|
||||||
import { resumeStoredZip } from '@/services/uploadQueue'
|
import { resumeStoredZip } from '@/services/uploadQueue'
|
||||||
|
import { resumeStoredAnnotationImport } from '@/services/uploadQueue'
|
||||||
|
|
||||||
let started = false
|
let started = false
|
||||||
|
|
||||||
|
|
@ -19,6 +20,11 @@ export function UploadResumeBootstrap() {
|
||||||
toast.success(`ZIP đã hoàn tất: ${job.files[0]?.name ?? 'dataset'}`)
|
toast.success(`ZIP đã hoàn tất: ${job.files[0]?.name ?? 'dataset'}`)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (job.kind === 'coco' || job.kind === 'yolo') {
|
||||||
|
await resumeStoredAnnotationImport(job)
|
||||||
|
toast.success(`Import ${job.kind.toUpperCase()} đã hoàn tất`)
|
||||||
|
return
|
||||||
|
}
|
||||||
await resumeStoredUpload(job, (done, total) => {
|
await resumeStoredUpload(job, (done, total) => {
|
||||||
if (done === 0 || done === total) return
|
if (done === 0 || done === total) return
|
||||||
toast(`Đang tiếp tục upload ${done}/${total}: ${job.files[0]?.name ?? ''}`)
|
toast(`Đang tiếp tục upload ${done}/${total}: ${job.files[0]?.name ?? ''}`)
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import {
|
||||||
type UploadTask,
|
type UploadTask,
|
||||||
} from '@/services/uploadQueue'
|
} from '@/services/uploadQueue'
|
||||||
import { api } from '@/services/api'
|
import { api } from '@/services/api'
|
||||||
import { saveUpload } from '@/services/uploadStore'
|
import { deleteUpload, saveUpload } from '@/services/uploadStore'
|
||||||
import { API_BASE_URL, STORAGE_KEYS } from '@/app/constants'
|
import { API_BASE_URL, STORAGE_KEYS } from '@/app/constants'
|
||||||
import { getStorageItem } from '@/utils/storage'
|
import { getStorageItem } from '@/utils/storage'
|
||||||
import {
|
import {
|
||||||
|
|
@ -275,9 +275,12 @@ export const DataTab: React.FC<DataTabProps> = ({
|
||||||
const handleCocoSelected = async (files: FileList | null) => {
|
const handleCocoSelected = async (files: FileList | null) => {
|
||||||
const file = files?.[0]
|
const file = files?.[0]
|
||||||
if (!file) return
|
if (!file) return
|
||||||
|
const storedId = `coco:${project.id}:${file.name}:${file.size}:${file.lastModified}`
|
||||||
setIsImporting(true)
|
setIsImporting(true)
|
||||||
try {
|
try {
|
||||||
|
await saveUpload({ id: storedId, projectId: project.id, jobId: '', files: [file], kind: 'coco', createdAt: Date.now() })
|
||||||
summarizeImport(await importCocoFile(project.id, file), 'COCO')
|
summarizeImport(await importCocoFile(project.id, file), 'COCO')
|
||||||
|
await deleteUpload(storedId)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast.error(err instanceof Error ? err.message : 'Nhập COCO thất bại')
|
toast.error(err instanceof Error ? err.message : 'Nhập COCO thất bại')
|
||||||
} finally {
|
} finally {
|
||||||
|
|
@ -287,9 +290,12 @@ export const DataTab: React.FC<DataTabProps> = ({
|
||||||
|
|
||||||
const handleYoloSelected = async (files: FileList | null) => {
|
const handleYoloSelected = async (files: FileList | null) => {
|
||||||
if (!files || files.length === 0) return
|
if (!files || files.length === 0) return
|
||||||
|
const storedId = `yolo:${project.id}:${Array.from(files).map((file) => `${file.name}:${file.size}:${file.lastModified}`).join('|')}`
|
||||||
setIsImporting(true)
|
setIsImporting(true)
|
||||||
try {
|
try {
|
||||||
|
await saveUpload({ id: storedId, projectId: project.id, jobId: '', files: Array.from(files), kind: 'yolo', createdAt: Date.now() })
|
||||||
summarizeImport(await importYoloFiles(project.id, Array.from(files)), 'YOLO')
|
summarizeImport(await importYoloFiles(project.id, Array.from(files)), 'YOLO')
|
||||||
|
await deleteUpload(storedId)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast.error(err instanceof Error ? err.message : 'Nhập YOLO thất bại')
|
toast.error(err instanceof Error ? err.message : 'Nhập YOLO thất bại')
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import { api } from './api'
|
||||||
import { deleteUpload, prepareUploadStorage, saveUpload, type StoredUpload } from './uploadStore'
|
import { deleteUpload, prepareUploadStorage, saveUpload, type StoredUpload } from './uploadStore'
|
||||||
import { API_BASE_URL, STORAGE_KEYS } from '@/app/constants'
|
import { API_BASE_URL, STORAGE_KEYS } from '@/app/constants'
|
||||||
import { getStorageItem } from '@/utils/storage'
|
import { getStorageItem } from '@/utils/storage'
|
||||||
|
import { importCocoFile, importYoloFiles } from './datasetImportService'
|
||||||
|
|
||||||
export type UploadTaskStatus = 'pending' | 'uploading' | 'done' | 'error' | 'skipped'
|
export type UploadTaskStatus = 'pending' | 'uploading' | 'done' | 'error' | 'skipped'
|
||||||
|
|
||||||
|
|
@ -455,3 +456,9 @@ export async function resumeStoredZip(stored: StoredUpload, onProgress?: (messag
|
||||||
onProgress?.(`Đang import ZIP ${done}/${total} ảnh…`))
|
onProgress?.(`Đang import ZIP ${done}/${total} ảnh…`))
|
||||||
await deleteUpload(stored.id)
|
await deleteUpload(stored.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function resumeStoredAnnotationImport(stored: StoredUpload) {
|
||||||
|
if (stored.kind === 'coco') await importCocoFile(stored.projectId, stored.files[0]!)
|
||||||
|
else await importYoloFiles(stored.projectId, stored.files)
|
||||||
|
await deleteUpload(stored.id)
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ export interface StoredUpload {
|
||||||
jobId: string
|
jobId: string
|
||||||
files: File[]
|
files: File[]
|
||||||
createdAt: number
|
createdAt: number
|
||||||
kind?: 'images' | 'zip' | 'zip-import'
|
kind?: 'images' | 'zip' | 'zip-import' | 'coco' | 'yolo'
|
||||||
r2Key?: string
|
r2Key?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue