fix: dataset image will expired (#5021)

packages/service/core/dataset/collection/controller.ts

@@ -41,7 +41,6 @@ import { clearCollectionImages, removeDatasetImageExpiredTime } from '../image/u
 export const createCollectionAndInsertData = async ({
 export const createCollectionAndInsertData = async ({
   dataset,
   dataset,
   rawText,
   rawText,
-  relatedId,
   imageIds,
   imageIds,
   createCollectionParams,
   createCollectionParams,
   backupParse = false,
   backupParse = false,
@@ -50,7 +49,6 @@ export const createCollectionAndInsertData = async ({
 }: {
 }: {
   dataset: DatasetSchemaType;
   dataset: DatasetSchemaType;
   rawText?: string;
   rawText?: string;
-  relatedId?: string;
   imageIds?: string[];
   imageIds?: string[];
   createCollectionParams: CreateOneCollectionParams;
   createCollectionParams: CreateOneCollectionParams;
 
 
@@ -258,23 +256,6 @@ export const createCollectionAndInsertData = async ({
       collectionId,
       collectionId,
       session
       session
     });
     });
-    if (relatedId) {
-      await MongoImage.updateMany(
-        {
-          teamId,
-          'metadata.relatedId': relatedId
-        },
-        {
-          // Remove expiredTime to avoid ttl expiration
-          $unset: {
-            expiredTime: 1
-          }
-        },
-        {
-          session
-        }
-      );
-    }
 
 
     return {
     return {
       collectionId: String(collectionId),
       collectionId: String(collectionId),

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

@@ -46,7 +46,6 @@ async function handler(
 
 
   const { collectionId, insertResults } = await createCollectionAndInsertData({
   const { collectionId, insertResults } = await createCollectionAndInsertData({
     dataset,
     dataset,
-    relatedId: apiFileId,
     createCollectionParams: {
     createCollectionParams: {
       ...body,
       ...body,
       teamId,
       teamId,

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

@@ -31,9 +31,7 @@ async function handler(req: NextApiRequest): CreateCollectionResponse {
         webPageSelector: body?.metadata?.webPageSelector
         webPageSelector: body?.metadata?.webPageSelector
       },
       },
       rawLink: link
       rawLink: link
-    },
-
-    relatedId: link
+    }
   });
   });
 
 
   return {
   return {

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

@@ -62,7 +62,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>): CreateCo
     // 3. Create collection
     // 3. Create collection
     const { collectionId, insertResults } = await createCollectionAndInsertData({
     const { collectionId, insertResults } = await createCollectionAndInsertData({
       dataset,
       dataset,
-      relatedId: relatedImgId,
       createCollectionParams: {
       createCollectionParams: {
         ...collectionData,
         ...collectionData,
         name: collectionName,
         name: collectionName,

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

@@ -44,7 +44,6 @@ async function handler(
 
 
     const { collectionId } = await createCollectionAndInsertData({
     const { collectionId } = await createCollectionAndInsertData({
       dataset: collection.dataset,
       dataset: collection.dataset,
-      relatedId: collection.metadata?.relatedImgId,
       createCollectionParams: {
       createCollectionParams: {
         ...collection,
         ...collection,
         ...data,
         ...data,

projects/app/src/service/core/dataset/queues/datasetParse.ts

@@ -30,6 +30,7 @@ import { MongoDatasetCollection } from '@fastgpt/service/core/dataset/collection
 import { hashStr } from '@fastgpt/global/common/string/tools';
 import { hashStr } from '@fastgpt/global/common/string/tools';
 import { POST } from '@fastgpt/service/common/api/plusRequest';
 import { POST } from '@fastgpt/service/common/api/plusRequest';
 import { pushLLMTrainingUsage } from '@fastgpt/service/support/wallet/usage/controller';
 import { pushLLMTrainingUsage } from '@fastgpt/service/support/wallet/usage/controller';
+import { MongoImage } from '@fastgpt/service/common/file/image/schema';
 
 
 const requestLLMPargraph = async ({
 const requestLLMPargraph = async ({
   rawText,
   rawText,
@@ -321,6 +322,26 @@ export const datasetParseQueue = async (): Promise<any> => {
           session
           session
         }
         }
       );
       );
+
+      // 8. Remove image ttl
+      const relatedImgId = collection.metadata?.relatedImgId;
+      if (relatedImgId) {
+        await MongoImage.updateMany(
+          {
+            teamId: collection.teamId,
+            'metadata.relatedId': relatedImgId
+          },
+          {
+            // Remove expiredTime to avoid ttl expiration
+            $unset: {
+              expiredTime: 1
+            }
+          },
+          {
+            session
+          }
+        );
+      }
     });
     });
 
 
     addLog.debug(`[Parse Queue] Finish`, {
     addLog.debug(`[Parse Queue] Finish`, {