V4.6.5-alpha (#609)

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

@@ -6,7 +6,7 @@ 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 { ModuleDataTypeEnum, ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
+import { ModuleIOValueTypeEnum, ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
 import { ModuleItemType } from '@fastgpt/global/core/module/type';
 
 let success = 0;
@@ -52,7 +52,7 @@ export async function initApp(limit = 50): Promise<any> {
                   key: ModuleInputKeyEnum.datasetSearchMode,
                   type: FlowNodeInputTypeEnum.hidden,
                   label: 'core.dataset.search.Mode',
-                  valueType: ModuleDataTypeEnum.string,
+                  valueType: ModuleIOValueTypeEnum.string,
                   showTargetInApp: false,
                   showTargetInPlugin: false,
                   value: val

projects/app/src/pages/api/core/app/form2Modules/fastgpt-universal.ts

@@ -7,7 +7,7 @@ import { jsonRes } from '@fastgpt/service/common/response';
 import type { AppSimpleEditFormType } from '@fastgpt/global/core/app/type.d';
 import type { ModuleItemType } from '@fastgpt/global/core/module/type';
 import { FlowNodeInputTypeEnum, FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
-import { ModuleDataTypeEnum } from '@fastgpt/global/core/module/constants';
+import { ModuleIOValueTypeEnum } from '@fastgpt/global/core/module/constants';
 import { ModuleInputKeyEnum } from '@fastgpt/global/core/module/constants';
 import type { FlowNodeInputItemType } from '@fastgpt/global/core/module/node/type.d';
 import { FormatForm2ModulesProps } from '@fastgpt/global/core/app/api';
@@ -317,7 +317,7 @@ function datasetTemplate(formData: AppSimpleEditFormType): ModuleItemType[] {
                 key: ModuleInputKeyEnum.answerText,
                 value: formData.dataset.searchEmptyText,
                 type: FlowNodeInputTypeEnum.textarea,
-                valueType: ModuleDataTypeEnum.string,
+                valueType: ModuleIOValueTypeEnum.string,
                 label: '回复的内容',
                 connected: true
               }

projects/app/src/pages/api/core/dataset/exportAll.ts

@@ -6,11 +6,10 @@ import { addLog } from '@fastgpt/service/common/system/log';
 import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
 import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
 import { findDatasetIdTreeByTopDatasetId } from '@fastgpt/service/core/dataset/controller';
-import { Readable } from 'stream';
-import type { Cursor } from '@fastgpt/service/common/mongo';
 import { limitCheck } from './checkExportLimit';
+import { withNextCors } from '@fastgpt/service/common/middle/cors';
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
     await connectToDatabase();
     let { datasetId } = req.query as {
@@ -81,7 +80,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       error: err
     });
   }
-}
+});
 
 export const config = {
   api: {

projects/app/src/pages/api/core/plugin/templates.ts

@@ -33,7 +33,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       })),
       ...(global.communityPlugins?.map((plugin) => ({
         id: plugin.id,
-        templateType: ModuleTemplateTypeEnum.communityPlugin,
+        templateType: plugin.templateType ?? ModuleTemplateTypeEnum.other,
         flowType: FlowNodeTypeEnum.pluginModule,
         avatar: plugin.avatar,
         name: plugin.name,

projects/app/src/pages/api/plugins/TFSwitch/index.ts

@@ -0,0 +1,69 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import type { HttpBodyType } from '@fastgpt/global/core/module/api.d';
+import { getErrText } from '@fastgpt/global/common/error/utils';
+
+type Props = HttpBodyType<{
+  input: string;
+  rule?: string;
+}>;
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+  try {
+    const {
+      data: { input, rule = '' }
+    } = req.body as Props;
+
+    const result = (() => {
+      if (typeof input === 'string') {
+        const defaultReg: any[] = [
+          undefined,
+          'undefined',
+          null,
+          'null',
+          false,
+          'false',
+          0,
+          '0',
+          'none'
+        ];
+        const customReg = rule.split('\n');
+        defaultReg.push(...customReg);
+
+        return !defaultReg.find((item) => {
+          const reg = typeof item === 'string' ? stringToRegex(item) : null;
+          if (reg) {
+            return reg.test(input);
+          }
+          return input === item;
+        });
+      }
+
+      return !!input;
+    })();
+
+    res.json({
+      ...(result
+        ? {
+            true: true
+          }
+        : {
+            false: false
+          })
+    });
+  } catch (err) {
+    console.log(err);
+    res.status(500).send(getErrText(err));
+  }
+}
+
+function stringToRegex(str: string) {
+  const regexFormat = /^\/(.+)\/([gimuy]*)$/;
+  const match = str.match(regexFormat);
+
+  if (match) {
+    const [, pattern, flags] = match;
+    return new RegExp(pattern, flags);
+  } else {
+    return null;
+  }
+}

projects/app/src/pages/api/plugins/textEditor/index.ts

@@ -0,0 +1,26 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import type { HttpBodyType } from '@fastgpt/global/core/module/api.d';
+import { getErrText } from '@fastgpt/global/common/error/utils';
+import { replaceVariable } from '@fastgpt/global/common/string/tools';
+
+type Props = HttpBodyType<{
+  text: string;
+  [key: string]: any;
+}>;
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+  try {
+    const {
+      data: { text, ...obj }
+    } = req.body as Props;
+
+    const textResult = replaceVariable(text, obj);
+
+    res.json({
+      text: textResult
+    });
+  } catch (err) {
+    console.log(err);
+    res.status(500).send(getErrText(err));
+  }
+}

projects/app/src/pages/api/system/getInitData.ts

@@ -19,9 +19,10 @@ import {
 } from '@fastgpt/global/core/ai/model';
 import { SimpleModeTemplate_FastGPT_Universal } from '@/global/core/app/constants';
 import { getSimpleTemplatesFromPlus } from '@/service/core/app/utils';
-import { PluginTypeEnum } from '@fastgpt/global/core/plugin/constants';
+import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
 import { getFastGPTFeConfig } from '@fastgpt/service/common/system/config/controller';
 import { connectToDatabase } from '@/service/mongo';
+import { PluginTemplateType } from '@fastgpt/global/core/plugin/type';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   await getInitConfig();
@@ -251,12 +252,12 @@ function getSystemPlugin() {
   const filterFiles = files.filter((item) => item.endsWith('.json'));
 
   // read json file
-  const fileTemplates = filterFiles.map((item) => {
-    const content = readFileSync(`${basePath}/${item}`, 'utf-8');
+  const fileTemplates: PluginTemplateType[] = filterFiles.map((filename) => {
+    const content = readFileSync(`${basePath}/${filename}`, 'utf-8');
     return {
-      id: `${PluginTypeEnum.community}-${item.replace('.json', '')}`,
-      type: PluginTypeEnum.community,
-      ...JSON.parse(content)
+      ...JSON.parse(content),
+      id: `${PluginSourceEnum.community}-${filename.replace('.json', '')}`,
+      source: PluginSourceEnum.community
     };
   });
 

projects/app/src/pages/api/v1/chat/completions.ts

@@ -138,6 +138,11 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
 
       // openapi key
       if (authType === AuthUserTypeEnum.apikey) {
+        if (!apiKeyAppId) {
+          return Promise.reject(
+            'Key is error. You need to use the app key rather than the account key.'
+          );
+        }
         const app = await MongoApp.findById(apiKeyAppId);
 
         if (!app) {

projects/app/src/pages/api/v1/rerank.ts

@@ -27,7 +27,8 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     const { total } = pushReRankBill({
       teamId,
       tmbId,
-      source: 'api'
+      source: 'api',
+      inputs
     });
 
     if (apikey) {