V4.6.6-2 (#673)

projects/app/src/pages/api/admin/initv46-2.ts

@@ -2,11 +2,9 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { delay } from '@fastgpt/global/common/system/utils';
-import { PgClient } from '@fastgpt/service/common/pg';
-import {
-  DatasetDataIndexTypeEnum,
-  PgDatasetTableName
-} from '@fastgpt/global/core/dataset/constant';
+import { PgClient } from '@fastgpt/service/common/vectorStore/pg';
+import { DatasetDataIndexTypeEnum } from '@fastgpt/global/core/dataset/constant';
+import { PgDatasetTableName } from '@fastgpt/global/common/vectorStore/constants';
 
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';

projects/app/src/pages/api/admin/initv46-fix.ts

@@ -2,8 +2,8 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { delay } from '@fastgpt/global/common/system/utils';
-import { PgClient } from '@fastgpt/service/common/pg';
-import { PgDatasetTableName } from '@fastgpt/global/core/dataset/constant';
+import { PgClient } from '@fastgpt/service/common/vectorStore/pg';
+import { PgDatasetTableName } from '@fastgpt/global/common/vectorStore/constants';
 
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';

projects/app/src/pages/api/admin/initv46.ts

@@ -13,8 +13,8 @@ import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
 import { PermissionTypeEnum } from '@fastgpt/global/support/permission/constant';
 import { MongoDatasetCollection } from '@fastgpt/service/core/dataset/collection/schema';
 import { MongoDatasetTraining } from '@fastgpt/service/core/dataset/training/schema';
-import { PgClient } from '@fastgpt/service/common/pg';
-import { PgDatasetTableName } from '@fastgpt/global/core/dataset/constant';
+import { PgClient } from '@fastgpt/service/common/vectorStore/pg';
+import { PgDatasetTableName } from '@fastgpt/global/common/vectorStore/constants';
 import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
 import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
 import { MongoApp } from '@fastgpt/service/core/app/schema';

projects/app/src/pages/api/admin/initv462-2.ts

@@ -1,80 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
-import { connectToDatabase } from '@/service/mongo';
-import { delay } from '@fastgpt/global/common/system/utils';
-import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import { MongoApp } from '@fastgpt/service/core/app/schema';
-import { FlowNodeInputTypeEnum, FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
-import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constant';
-import { ModuleIOValueTypeEnum, ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
-import { ModuleItemType } from '@fastgpt/global/core/module/type';
-
-let success = 0;
-/* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    const { limit = 50 } = req.body as { limit: number };
-    await authCert({ req, authRoot: true });
-    await connectToDatabase();
-    success = 0;
-
-    console.log('total', await MongoApp.countDocuments());
-
-    await initApp(limit);
-
-    jsonRes(res, {
-      message: 'success'
-    });
-  } catch (error) {
-    console.log(error);
-
-    jsonRes(res, {
-      code: 500,
-      error
-    });
-  }
-}
-export async function initApp(limit = 50): Promise<any> {
-  try {
-    const apps = await MongoApp.find({ inited: false }).limit(limit);
-    if (apps.length === 0) return;
-
-    const result = await Promise.allSettled(
-      apps.map(async (app) => {
-        // 遍历app的modules，找到 datasetSearch, 如果 rerank=true， searchMode = embFullTextReRank, 否则等于embedding
-        const modules = JSON.parse(JSON.stringify(app.modules)) as ModuleItemType[];
-        modules.forEach((module) => {
-          if (module.flowType === FlowNodeTypeEnum.datasetSearchNode) {
-            module.inputs.forEach((input, i) => {
-              if (input.key === 'rerank') {
-                const val = !!input.value as boolean;
-                module.inputs.splice(i, 1, {
-                  key: ModuleInputKeyEnum.datasetSearchMode,
-                  type: FlowNodeInputTypeEnum.hidden,
-                  label: 'core.dataset.search.Mode',
-                  valueType: ModuleIOValueTypeEnum.string,
-                  showTargetInApp: false,
-                  showTargetInPlugin: false,
-                  value: val
-                    ? DatasetSearchModeEnum.embFullTextReRank
-                    : DatasetSearchModeEnum.embedding
-                });
-              }
-            });
-          }
-        });
-        app.modules = modules;
-        app.inited = true;
-        await app.save();
-      })
-    );
-
-    success += result.filter((item) => item.status === 'fulfilled').length;
-    console.log(`success: ${success}`);
-    return initApp(limit);
-  } catch (error) {
-    console.log(error);
-    await delay(1000);
-    return initApp(limit);
-  }
-}

projects/app/src/pages/api/admin/initv462.ts

@@ -4,7 +4,7 @@ import { connectToDatabase } from '@/service/mongo';
 import { delay } from '@fastgpt/global/common/system/utils';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
-import { jiebaSplit } from '@/service/core/dataset/utils';
+import { jiebaSplit } from '@/service/common/string/jieba';
 
 let success = 0;
 /* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */

projects/app/src/pages/api/admin/initv463-2.ts

@@ -4,7 +4,7 @@ import { connectToDatabase } from '@/service/mongo';
 import { delay } from '@fastgpt/global/common/system/utils';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
-import { jiebaSplit } from '@/service/core/dataset/utils';
+import { jiebaSplit } from '@/service/common/string/jieba';
 
 let success = 0;
 /* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */

projects/app/src/pages/api/admin/initv464.ts

@@ -2,8 +2,8 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
 
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import { PgClient } from '@fastgpt/service/common/pg';
-import { PgDatasetTableName } from '@fastgpt/global/core/dataset/constant';
+import { PgClient } from '@fastgpt/service/common/vectorStore/pg';
+import { PgDatasetTableName } from '@fastgpt/global/common/vectorStore/constants';
 import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
 import { connectToDatabase } from '@/service/mongo';