* New pic (#4858) * 更新数据集相关类型,添加图像文件ID和预览URL支持;优化数据集导入功能,新增图像数据集处理组件;修复部分国际化文本;更新文件上传逻辑以支持新功能。 * 与原先代码的差别 * 新增 V4.9.10 更新说明,支持 PG 设置`systemEnv.hnswMaxScanTuples`参数,优化 LLM stream 调用超时,修复全文检索多知识库排序问题。同时更新数据集索引,移除 datasetId 字段以简化查询。 * 更换成fileId_image逻辑,并增加训练队列匹配的逻辑 * 新增图片集合判断逻辑,优化预览URL生成流程,确保仅在数据集为图片集合时生成预览URL,并添加相关日志输出以便调试。 * Refactor Docker Compose configuration to comment out exposed ports for production environments, update image versions for pgvector, fastgpt, and mcp_server, and enhance Redis service with a health check. Additionally, standardize dataset collection labels in constants and improve internationalization strings across multiple languages. * Enhance TrainingStates component by adding internationalization support for the imageParse training mode and update defaultCounts to include imageParse mode in trainingDetail API. * Enhance dataset import context by adding additional steps for image dataset import process and improve internationalization strings for modal buttons in the useEditTitle hook. * Update DatasetImportContext to conditionally render MyStep component based on data source type, improving the import process for non-image datasets. * Refactor image dataset handling by improving internationalization strings, enhancing error messages, and streamlining the preview URL generation process. * 图片上传到新建的 dataset_collection_images 表,逻辑跟随更改 * 修改了除了controller的其他部分问题 * 把图片数据集的逻辑整合到controller里面 * 补充i18n * 补充i18n * resolve评论:主要是上传逻辑的更改和组件复用 * 图片名称的图标显示 * 修改编译报错的命名问题 * 删除不需要的collectionid部分 * 多余文件的处理和改动一个删除按钮 * 除了loading和统一的imageId,其他都resolve掉的 * 处理图标报错 * 复用了MyPhotoView并采用全部替换的方式将imageFileId变成imageId * 去除不必要文件修改 * 报错和字段修改 * 增加上传成功后删除临时文件的逻辑以及回退一些修改 * 删除path字段,将图片保存到gridfs内,并修改增删等操作的代码 * 修正编译错误 --------- Co-authored-by: archer <545436317@qq.com> * perf: image dataset * feat: insert image * perf: image icon * fix: training state --------- Co-authored-by: Zhuangzai fa <143257420+ctrlz526@users.noreply.github.com>
95 lines
3.2 KiB
TypeScript
95 lines
3.2 KiB
TypeScript
import React, { useState } from 'react';
|
|
import MyModal from '@fastgpt/web/components/common/MyModal';
|
|
import { useTranslation } from 'next-i18next';
|
|
import { Box, Button, HStack, ModalBody, ModalFooter, VStack } from '@chakra-ui/react';
|
|
import FileSelector, { type SelectFileItemType } from '../components/FileSelector';
|
|
import MyIcon from '@fastgpt/web/components/common/Icon';
|
|
import MyIconButton from '@fastgpt/web/components/common/Icon/button';
|
|
import { postBackupDatasetCollection } from '@/web/core/dataset/api';
|
|
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
|
|
import { DatasetPageContext } from '@/web/core/dataset/context/datasetPageContext';
|
|
import { useContextSelector } from 'use-context-selector';
|
|
import LightTip from '@fastgpt/web/components/common/LightTip';
|
|
|
|
const BackupImportModal = ({
|
|
onFinish,
|
|
onClose
|
|
}: {
|
|
onFinish: () => void;
|
|
onClose: () => void;
|
|
}) => {
|
|
const { t } = useTranslation();
|
|
const datasetId = useContextSelector(DatasetPageContext, (v) => v.datasetId);
|
|
|
|
const [selectFiles, setSelectFiles] = useState<SelectFileItemType[]>([]);
|
|
const [percent, setPercent] = useState(0);
|
|
|
|
const { runAsync: onBackupImport, loading: isBackupLoading } = useRequest2(
|
|
async () => {
|
|
await postBackupDatasetCollection({
|
|
datasetId,
|
|
file: selectFiles[0].file,
|
|
percentListen: setPercent
|
|
});
|
|
},
|
|
{
|
|
onSuccess() {
|
|
onFinish();
|
|
onClose();
|
|
},
|
|
successToast: t('dataset:backup_dataset_success')
|
|
}
|
|
);
|
|
|
|
return (
|
|
<MyModal iconSrc="backup" iconColor={'primary.600'} isOpen title={t('dataset:backup_dataset')}>
|
|
<ModalBody>
|
|
<LightTip mb={3} icon="common/info" text={t('dataset:backup_dataset_tip')} />
|
|
|
|
<FileSelector
|
|
maxCount={1}
|
|
fileType="csv"
|
|
selectFiles={selectFiles}
|
|
setSelectFiles={(e) => setSelectFiles(e)}
|
|
/>
|
|
{/* File render */}
|
|
{selectFiles.length > 0 && (
|
|
<VStack mt={4} gap={2}>
|
|
{selectFiles.map((item, index) => (
|
|
<HStack key={index} w={'100%'}>
|
|
<MyIcon name={item.icon as any} w={'1rem'} />
|
|
<Box color={'myGray.900'}>{item.name}</Box>
|
|
<Box fontSize={'xs'} color={'myGray.500'} flex={1}>
|
|
{item.size}
|
|
</Box>
|
|
<MyIconButton
|
|
icon="delete"
|
|
hoverColor="red.500"
|
|
hoverBg="red.50"
|
|
onClick={() => {
|
|
setSelectFiles(selectFiles.filter((_, i) => i !== index));
|
|
}}
|
|
/>
|
|
</HStack>
|
|
))}
|
|
</VStack>
|
|
)}
|
|
</ModalBody>
|
|
<ModalFooter>
|
|
<Button isLoading={isBackupLoading} variant="whiteBase" mr={2} onClick={onClose}>
|
|
{t('common:Close')}
|
|
</Button>
|
|
<Button onClick={onBackupImport} isDisabled={selectFiles.length === 0 || isBackupLoading}>
|
|
{isBackupLoading
|
|
? percent === 100
|
|
? t('dataset:backup_data_parse')
|
|
: t('dataset:backup_data_uploading', { num: percent })
|
|
: t('common:Import')}
|
|
</Button>
|
|
</ModalFooter>
|
|
</MyModal>
|
|
);
|
|
};
|
|
|
|
export default BackupImportModal;
|