4.7 (#50)

* fix docker-compose download url (labring#994) original code is a bad url with '404 NOT FOUND' return. fix docker-compose download url, add 'v' before docker-compose version * Update ai_settings.md (labring#1000) * Update configuration.md * Update configuration.md * Fix history in classifyQuestion and extract modules (labring#1012) * Fix history in classifyQuestion and extract modules * Add chatValue2RuntimePrompt import and update text formatting * flow controller to packages * fix: rerank select * modal ui * perf: modal code path * point not sufficient * feat: http url support variable * fix http key * perf: prompt * perf: ai setting modal * simple edit ui --------- Co-authored-by: entorick <[email protected]> Co-authored-by: liujianglc <[email protected]> Co-authored-by: Fengrui Liu <[email protected]>
c121914yu · Mar 20, 2024 · 0261bc2 · 0261bc2
1 parent 695db95
commit 0261bc2
Show file tree

Hide file tree

Showing 146 changed files with 1,914 additions and 2,150 deletions.
diff --git a/README.md b/README.md
@@ -122,9 +122,9 @@ fastgpt.run 域名会弃用。
 
 ## 🏘️ 社区交流群
 
-添加 wx 小助手加入：
+wx 扫一下加入：
 
-![](https://otnvvf-imgs.oss.laf.run/wx300.jpg)
+![](https://oss.laf.run/htr4n1-images/fastgpt-qr-code.jpg)
 
 <a href="#readme">
     <img src="https://img.shields.io/badge/-返回顶部-7d09f1.svg" alt="#" align="right">

diff --git a/README_en.md b/README_en.md
@@ -116,14 +116,12 @@ Project tech stack: NextJs + TS + ChakraUI + Mongo + Postgres (Vector plugin)
 - [Configuring Multiple Models](https://doc.fastgpt.in/docs/installation/reference/models)
 - [Version Updates & Upgrades](https://doc.fastgpt.in/docs/installation/upgrading)
 
-<!-- ## :point_right: RoadMap
-- [FastGPT RoadMap](https://kjqvjse66l.feishu.cn/docx/RVUxdqE2WolDYyxEKATcM0XXnte) -->
 
-<!-- ## 🏘️ Community
+## 🏘️ Community
 
-| Community Group                                   | Assistant                                      |
-| ------------------------------------------------- | ---------------------------------------------- |
-| ![](https://otnvvf-imgs.oss.laf.run/wxqun300.jpg) | ![](https://otnvvf-imgs.oss.laf.run/wx300.jpg) | -->
+| Community Group                                   | 
+| ------------------------------------------------- | 
+| ![](https://oss.laf.run/htr4n1-images/fastgpt-qr-code.jpg) | 
 
 <a href="#readme">
     <img src="https://img.shields.io/badge/-Back_to_Top-7d09f1.svg" alt="#" align="right">

diff --git a/packages/global/common/error/code/team.ts b/packages/global/common/error/code/team.ts
@@ -15,7 +15,7 @@ export enum TeamErrEnum {
 const teamErr = [
   { statusText: TeamErrEnum.teamOverSize, message: 'error.team.overSize' },
   { statusText: TeamErrEnum.unAuthTeam, message: '无权操作该团队' },
-  { statusText: TeamErrEnum.aiPointsNotEnough, message: 'AI积分已用完~' },
+  { statusText: TeamErrEnum.aiPointsNotEnough, message: '' },
   { statusText: TeamErrEnum.datasetSizeNotEnough, message: '知识库容量不足，请先扩容~' },
   { statusText: TeamErrEnum.datasetAmountNotEnough, message: '知识库数量已达上限~' },
   { statusText: TeamErrEnum.appAmountNotEnough, message: '应用数量已达上限~' },

diff --git a/packages/global/common/error/utils.ts b/packages/global/common/error/utils.ts
@@ -1,7 +1,7 @@
 import { replaceSensitiveText } from '../string/tools';
 
 export const getErrText = (err: any, def = '') => {
-  const msg: string = typeof err === 'string' ? err : err?.message || def || '';
+  const msg: string = typeof err === 'string' ? err : err?.message ?? def;
   msg && console.log('error =>', msg);
   return replaceSensitiveText(msg);
 };
diff --git a/...ects/app/src/global/core/prompt/AIChat.ts → packages/global/core/ai/prompt/AIChat.ts b/...ects/app/src/global/core/prompt/AIChat.ts → packages/global/core/ai/prompt/AIChat.ts
@@ -1,4 +1,4 @@
-import { PromptTemplateItem } from '@fastgpt/global/core/ai/type.d';
+import { PromptTemplateItem } from '../type.d';
 
 export const Prompt_QuoteTemplateList: PromptTemplateItem[] = [
   {

diff --git a/projects/app/src/global/core/prompt/agent.ts → packages/global/core/ai/prompt/agent.ts b/projects/app/src/global/core/prompt/agent.ts → packages/global/core/ai/prompt/agent.ts
@@ -58,5 +58,3 @@ Human："{{question}}"
 
 类型ID=
 `;
-
-export const Prompt_QuestionGuide = `我不太清楚问你什么问题，请帮我生成 3 个问题，引导我继续提问。问题的长度应小于20个字符，按 JSON 格式返回: ["问题1", "问题2", "问题3"]`;
diff --git a/packages/global/core/app/type.d.ts b/packages/global/core/app/type.d.ts
@@ -1,7 +1,7 @@
 import type { AppTTSConfigType, ModuleItemType, VariableItemType } from '../module/type.d';
 import { AppTypeEnum } from './constants';
 import { PermissionTypeEnum } from '../../support/permission/constant';
-import type { AIChatModuleProps, DatasetModuleProps } from '../module/node/type.d';
+import type { DatasetModuleProps } from '../module/node/type.d';
 import { VariableInputEnum } from '../module/constants';
 import { SelectedDatasetType } from '../module/api';
 import { DatasetSearchModeEnum } from '../dataset/constants';
@@ -36,19 +36,6 @@ export type AppDetailType = AppSchema & {
   canWrite: boolean;
 };
 
-// export type AppSimpleEditFormType = {
-//   aiSettings: AIChatModuleProps;
-//   dataset: DatasetModuleProps & {
-//     searchEmptyText: string;
-//   };
-//   userGuide: {
-//     welcomeText: string;
-//     variables: VariableItemType[];
-//     questionGuide: boolean;
-//     tts: AppTTSConfigType;
-//   };
-// };
-// Since useform cannot infer enumeration types, all enumeration keys can only be undone manually
 export type AppSimpleEditFormType = {
   // templateId: string;
   aiSettings: {

diff --git a/packages/global/core/app/utils.ts b/packages/global/core/app/utils.ts
@@ -47,7 +47,10 @@ export const appModules2Form = ({ modules }: { modules: ModuleItemType[] }) => {
   };
 
   modules.forEach((module) => {
-    if (module.flowType === FlowNodeTypeEnum.chatNode) {
+    if (
+      module.flowType === FlowNodeTypeEnum.chatNode ||
+      module.flowType === FlowNodeTypeEnum.tools
+    ) {
       defaultAppForm.aiSettings.model = findInputValueByKey(
         module.inputs,
         ModuleInputKeyEnum.aiModel

diff --git a/packages/global/core/module/node/constant.ts b/packages/global/core/module/node/constant.ts
@@ -21,6 +21,7 @@ export enum FlowNodeInputTypeEnum {
 
   // ai model select
   selectLLMModel = 'selectLLMModel',
+  settingLLMModel = 'settingLLMModel',
 
   // dataset special input
   selectDataset = 'selectDataset',

diff --git a/packages/global/core/module/node/type.d.ts b/packages/global/core/module/node/type.d.ts
@@ -102,6 +102,12 @@ export type EditNodeFieldType = {
 };
 
 /* ------------- item type --------------- */
+export type SettingAIDataType = {
+  model: string;
+  temperature: number;
+  maxToken: number;
+  isResponseAnswerText?: boolean;
+};
 /* ai chat modules props */
 export type AIChatModuleProps = {
   [ModuleInputKeyEnum.aiModel]: string;

diff --git a/packages/global/core/module/template/input.ts b/packages/global/core/module/template/input.ts
@@ -59,7 +59,7 @@ export const Input_Template_DynamicInput: FlowNodeInputItemType = {
   hideInApp: true
 };
 
-export const Input_Template_AiModel: FlowNodeInputItemType = {
+export const Input_Template_SelectAIModel: FlowNodeInputItemType = {
   key: ModuleInputKeyEnum.aiModel,
   type: FlowNodeInputTypeEnum.selectLLMModel,
   label: 'core.module.input.label.aiModel',
@@ -68,6 +68,15 @@ export const Input_Template_AiModel: FlowNodeInputItemType = {
   showTargetInApp: false,
   showTargetInPlugin: false
 };
+export const Input_Template_SettingAiModel: FlowNodeInputItemType = {
+  key: ModuleInputKeyEnum.aiModel,
+  type: FlowNodeInputTypeEnum.settingLLMModel,
+  label: 'core.module.input.label.aiModel',
+  required: true,
+  valueType: ModuleIOValueTypeEnum.string,
+  showTargetInApp: false,
+  showTargetInPlugin: false
+};
 
 export const Input_Template_System_Prompt: FlowNodeInputItemType = {
   key: ModuleInputKeyEnum.aiSystemPrompt,

diff --git a/packages/global/core/module/template/system/aiChat.ts b/packages/global/core/module/template/system/aiChat.ts
@@ -11,7 +11,7 @@ import {
   FlowNodeTemplateTypeEnum
 } from '../../constants';
 import {
-  Input_Template_AiModel,
+  Input_Template_SettingAiModel,
   Input_Template_Dataset_Quote,
   Input_Template_History,
   Input_Template_Switch,
@@ -32,7 +32,7 @@ export const AiChatModule: FlowNodeTemplateType = {
   isTool: true,
   inputs: [
     Input_Template_Switch,
-    Input_Template_AiModel,
+    Input_Template_SettingAiModel,
     // --- settings modal
     {
       key: ModuleInputKeyEnum.aiChatTemperature,
@@ -83,14 +83,6 @@ export const AiChatModule: FlowNodeTemplateType = {
       showTargetInApp: false,
       showTargetInPlugin: false
     },
-    {
-      key: ModuleInputKeyEnum.aiChatSettingModal,
-      type: FlowNodeInputTypeEnum.aiSettings,
-      label: '',
-      valueType: ModuleIOValueTypeEnum.any,
-      showTargetInApp: false,
-      showTargetInPlugin: false
-    },
     // settings modal ---
     {
       ...Input_Template_System_Prompt,

diff --git a/packages/global/core/module/template/system/classifyQuestion.ts b/packages/global/core/module/template/system/classifyQuestion.ts
@@ -10,7 +10,7 @@ import {
   FlowNodeTemplateTypeEnum
 } from '../../constants';
 import {
-  Input_Template_AiModel,
+  Input_Template_SelectAIModel,
   Input_Template_History,
   Input_Template_Switch,
   Input_Template_UserChatInput
@@ -30,7 +30,7 @@ export const ClassifyQuestionModule: FlowNodeTemplateType = {
   inputs: [
     Input_Template_Switch,
     {
-      ...Input_Template_AiModel,
+      ...Input_Template_SelectAIModel,
       llmModelType: LLMModelTypeEnum.classify
     },
     {

diff --git a/packages/global/core/module/template/system/contextExtract.ts b/packages/global/core/module/template/system/contextExtract.ts
@@ -10,7 +10,11 @@ import {
   ModuleOutputKeyEnum,
   FlowNodeTemplateTypeEnum
 } from '../../constants';
-import { Input_Template_AiModel, Input_Template_History, Input_Template_Switch } from '../input';
+import {
+  Input_Template_SelectAIModel,
+  Input_Template_History,
+  Input_Template_Switch
+} from '../input';
 import { LLMModelTypeEnum } from '../../../ai/constants';
 
 export const ContextExtractModule: FlowNodeTemplateType = {
@@ -25,7 +29,7 @@ export const ContextExtractModule: FlowNodeTemplateType = {
   inputs: [
     Input_Template_Switch,
     {
-      ...Input_Template_AiModel,
+      ...Input_Template_SelectAIModel,
       llmModelType: LLMModelTypeEnum.extractFields
     },
     {

diff --git a/packages/global/core/module/template/system/queryExtension.ts b/packages/global/core/module/template/system/queryExtension.ts
@@ -14,7 +14,7 @@ import {
   Input_Template_History,
   Input_Template_Switch,
   Input_Template_UserChatInput,
-  Input_Template_AiModel
+  Input_Template_SelectAIModel
 } from '../input';
 import { Output_Template_UserChatInput } from '../output';
 import { LLMModelTypeEnum } from '../../../ai/constants';
@@ -31,7 +31,7 @@ export const AiQueryExtension: FlowNodeTemplateType = {
   inputs: [
     Input_Template_Switch,
     {
-      ...Input_Template_AiModel,
+      ...Input_Template_SelectAIModel,
       llmModelType: LLMModelTypeEnum.queryExtension
     },
     {

diff --git a/packages/global/core/module/template/system/tools.ts b/packages/global/core/module/template/system/tools.ts
@@ -1,12 +1,17 @@
-import { FlowNodeOutputTypeEnum, FlowNodeTypeEnum } from '../../node/constant';
+import {
+  FlowNodeInputTypeEnum,
+  FlowNodeOutputTypeEnum,
+  FlowNodeTypeEnum
+} from '../../node/constant';
 import { FlowNodeTemplateType } from '../../type.d';
 import {
   ModuleIOValueTypeEnum,
   ModuleOutputKeyEnum,
-  FlowNodeTemplateTypeEnum
+  FlowNodeTemplateTypeEnum,
+  ModuleInputKeyEnum
 } from '../../constants';
 import {
-  Input_Template_AiModel,
+  Input_Template_SettingAiModel,
   Input_Template_History,
   Input_Template_Switch,
   Input_Template_System_Prompt,
@@ -27,9 +32,33 @@ export const ToolModule: FlowNodeTemplateType = {
   inputs: [
     Input_Template_Switch,
     {
-      ...Input_Template_AiModel,
+      ...Input_Template_SettingAiModel,
       llmModelType: LLMModelTypeEnum.toolCall
     },
+    {
+      key: ModuleInputKeyEnum.aiChatTemperature,
+      type: FlowNodeInputTypeEnum.hidden, // Set in the pop-up window
+      label: '',
+      value: 0,
+      valueType: ModuleIOValueTypeEnum.number,
+      min: 0,
+      max: 10,
+      step: 1,
+      showTargetInApp: false,
+      showTargetInPlugin: false
+    },
+    {
+      key: ModuleInputKeyEnum.aiChatMaxToken,
+      type: FlowNodeInputTypeEnum.hidden, // Set in the pop-up window
+      label: '',
+      value: 2000,
+      valueType: ModuleIOValueTypeEnum.number,
+      min: 100,
+      max: 4000,
+      step: 50,
+      showTargetInApp: false,
+      showTargetInPlugin: false
+    },
     {
       ...Input_Template_System_Prompt,
       label: 'core.ai.Prompt',

diff --git a/packages/global/package.json b/packages/global/package.json
@@ -8,7 +8,8 @@
     "js-tiktoken": "^1.0.7",
     "openai": "4.28.0",
     "nanoid": "^4.0.1",
-    "timezones-list": "^3.0.2"
+    "timezones-list": "^3.0.2",
+    "next": "13.5.2"
   },
   "devDependencies": {
     "@types/node": "^20.8.5"

diff --git a/...ts/app/src/service/common/censor/index.ts → ...ages/service/common/api/requestPlusApi.ts b/...ts/app/src/service/common/censor/index.ts → ...ages/service/common/api/requestPlusApi.ts
@@ -1,4 +1,4 @@
-import { POST } from '@fastgpt/service/common/api/plusRequest';
+import { POST } from './plusRequest';
 
 export const postTextCensor = (data: { text: string }) =>
   POST<{ code?: number; message: string }>('/common/censor/text_baidu', data)