增加上传成功后删除临时文件的逻辑以及回退一些修改

Author: ctrlz526

projects/app/src/components/core/chat/ChatContainer/ChatBox/components/QuoteList.tsx

@@ -56,9 +56,9 @@ const QuoteList = React.memo(function QuoteList({
         const currentFilterItem = quoteList.find((res) => res._id === item.id);
         return {
           ...item,
-          q: currentFilterItem?.q || item.q,
-          a: currentFilterItem?.a || item.a,
-          imageId: currentFilterItem?.imageId || item.imageId
+          q: currentFilterItem?.q || '',
+          a: currentFilterItem?.a || '',
+          imageId: currentFilterItem?.imageId || item.imageId || ''
         };
       }
 

projects/app/src/pageComponents/dataset/detail/DataCard.tsx

@@ -169,25 +169,27 @@ const DataCard = () => {
               <TagsPopOver currentCollection={collection} />
             )}
           </Box>
-          {datasetDetail.type !== 'websiteDataset' && !!collection?.chunkSize && (
-            <Button
-              ml={2}
-              variant={'whitePrimary'}
-              size={['sm', 'md']}
-              onClick={() => {
-                router.push({
-                  query: {
-                    datasetId,
-                    currentTab: TabEnum.import,
-                    source: ImportDataSourceEnum.reTraining,
-                    collectionId
-                  }
-                });
-              }}
-            >
-              {t('dataset:retain_collection')}
-            </Button>
-          )}
+          {datasetDetail.type !== 'websiteDataset' &&
+            !!collection?.chunkSize &&
+            collection.permission?.hasWritePer && (
+              <Button
+                ml={2}
+                variant={'whitePrimary'}
+                size={['sm', 'md']}
+                onClick={() => {
+                  router.push({
+                    query: {
+                      datasetId,
+                      currentTab: TabEnum.import,
+                      source: ImportDataSourceEnum.reTraining,
+                      collectionId
+                    }
+                  });
+                }}
+              >
+                {t('dataset:retain_collection')}
+              </Button>
+            )}
           {canWrite && (
             <Button
               ml={2}

projects/app/src/pageComponents/dataset/detail/MetaDataCard.tsx

@@ -92,7 +92,7 @@ const MetaDataCard = ({ datasetId }: { datasetId: string }) => {
             }
           ]
         : []),
-      ...(collection.autoIndexes !== undefined && !isImageCollection
+      ...(collection.autoIndexes !== undefined
         ? [
             {
               label: t('dataset:auto_indexes'),

projects/app/src/pages/api/core/dataset/collection/create/images.ts

@@ -1,5 +1,5 @@
 import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
-import { type FileIdCreateDatasetCollectionParams } from '@fastgpt/global/core/dataset/api';
+import { type CreateDatasetCollectionParams } from '@fastgpt/global/core/dataset/api';
 import { createCollectionAndInsertData } from '@fastgpt/service/core/dataset/collection/controller';
 import {
   DatasetCollectionTypeEnum,
@@ -8,32 +8,22 @@ import {
 import { NextAPI } from '@/service/middleware/entry';
 import { type ApiRequestProps } from '@fastgpt/service/type/next';
 import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
-import { type CreateCollectionResponse } from '@/global/core/dataset/api';
 import { getDatasetImage } from '@fastgpt/service/core/dataset/image/controller';
 import { getVlmModelList } from '@fastgpt/service/core/ai/model';
+import { removeFilesByPaths } from '@fastgpt/service/common/file/utils';
 
-async function handler(
-  req: ApiRequestProps<
-    FileIdCreateDatasetCollectionParams & {
-      collectionName: string;
-      metadata?: Record<string, any>;
-      imageIds?: string[];
-    }
-  >
-): CreateCollectionResponse {
+type RequestBody = {
+  datasetId: string;
+  collectionName: string;
+  imageIds: string[];
+};
+
+async function handler(req: ApiRequestProps<RequestBody>) {
   if (getVlmModelList().length === 0) {
     throw new Error('Image_dataset_requires_VLM_model_to_be_configured');
   }
 
-  const { imageIds, collectionName, metadata, ...body } = req.body;
-
-  const { teamId, tmbId, dataset } = await authDataset({
-    req,
-    authToken: true,
-    authApiKey: true,
-    per: WritePermissionVal,
-    datasetId: body.datasetId
-  });
+  const { imageIds, datasetId, collectionName } = req.body;
 
   if (!imageIds || imageIds.length === 0) {
     throw new Error('No image IDs provided');
@@ -43,26 +33,45 @@ async function handler(
     throw new Error('Collection name is required');
   }
 
-  const { collectionId, insertResults } = await createCollectionAndInsertData({
-    dataset,
+  // Verify permissions
+  const authData = await authDataset({
+    datasetId,
+    per: WritePermissionVal,
+    req,
+    authToken: true
+  });
+
+  // Get all image paths before creating collection
+  const filePaths: string[] = [];
+  for (const imageId of imageIds) {
+    const image = await getDatasetImage(imageId);
+    if (image?.path) {
+      filePaths.push(image.path);
+    }
+  }
+
+  // Create collection
+  const result = await createCollectionAndInsertData({
+    dataset: authData.dataset,
     createCollectionParams: {
-      ...body,
-      teamId,
-      tmbId,
-      imageIdList: imageIds,
-      trainingType: DatasetCollectionDataProcessModeEnum.imageParse,
-      type: DatasetCollectionTypeEnum.images,
+      teamId: authData.teamId,
+      tmbId: authData.tmbId,
+      datasetId,
       name: collectionName,
-      metadata
+      type: DatasetCollectionTypeEnum.images,
+      trainingType: DatasetCollectionDataProcessModeEnum.imageParse,
+      imageIdList: imageIds
     }
   });
 
+  // Delete temporary files after successful import
+  if (filePaths.length > 0) {
+    removeFilesByPaths(filePaths);
+  }
+
   return {
-    collectionId: collectionId,
-    results: {
-      insertLen: insertResults.insertLen,
-      message: insertResults.message
-    }
+    collectionId: result.collectionId,
+    results: result.insertResults
   };
 }
 

projects/app/src/pages/api/core/dataset/image/[imageId].ts

@@ -9,8 +9,14 @@ import jwt from 'jsonwebtoken';
 
 const previewableExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'];
 
+interface VerifyImageTokenParams {
+  token: string;
+  imageId: string;
+  req: NextApiRequest;
+}
+
 // Verify dataset image access token
-const verifyImageToken = async (token: string, imageId: string, req: NextApiRequest) => {
+const verifyImageToken = async ({ token, imageId, req }: VerifyImageTokenParams) => {
   try {
     if (!process.env.FILE_TOKEN_KEY) {
       throw new Error('FILE_TOKEN_KEY not configured');
@@ -27,7 +33,7 @@ const verifyImageToken = async (token: string, imageId: string, req: NextApiRequ
     // Get image info for permission verification
     const imageInfo = await getDatasetImage(imageId);
     if (!imageInfo) {
-      throw new Error('Image not found');
+      return Promise.reject(new Error('Image not found'));
     }
 
     // Verify dataset permissions
@@ -64,15 +70,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     }
 
     // Verify token and permissions
-    const imageInfo = await verifyImageToken(token, imageId, req);
-
-    // Check if file exists
-    if (!fs.existsSync(imageInfo.path)) {
-      return jsonRes(res, {
-        code: 500,
-        error: 'Image file not found on disk'
-      });
-    }
+    const imageInfo = await verifyImageToken({
+      token,
+      imageId,
+      req
+    });
 
     // Get file extension
     const extension = path.extname(imageInfo.name).toLowerCase().slice(1);