4.6.8-alpha (labring#804)

* perf: redirect request and err log replace perf: dataset openapi feat: session fix: retry input error feat: 468 doc sub page feat: standard sub perf: rerank tip perf: rerank tip perf: api sdk perf: openapi sub plan perf: sub ui fix: ts * perf: init log * fix: variable select * sub page * icon * perf: llm model config * perf: menu ux * perf: system store * perf: publish app name * fix: init data * perf: flow edit ux * fix: value type format and ux * fix prompt editor default value (labring#13) * fix prompt editor default value * fix prompt editor update when not focus * add key with variable --------- Co-authored-by: Archer <[email protected]> * fix: value type * doc * i18n * import path * home page * perf: mongo session running * fix: ts * perf: use toast * perf: flow edit * perf: sse response * slider ui * fetch error * fix prompt editor rerender when not focus by key defaultvalue (labring#14) * perf: prompt editor * feat: dataset search concat * perf: doc * fix:ts * perf: doc * fix json editor onblur value (labring#15) * faq * vector model default config * ipv6 --------- Co-authored-by: heheer <[email protected]>
chenrui2200 · Feb 1, 2024 · 34602b2 · 34602b2
1 parent fc19c4c
commit 34602b2
Show file tree

Hide file tree

Showing 285 changed files with 10,392 additions and 11,270 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -78,7 +78,7 @@ COPY --from=builder /app/projects/$name/package.json ./package.json
 COPY --from=workerDeps /app/worker /app/worker
 # copy config
 COPY ./projects/$name/data /app/data
-
+RUN chown -R nextjs:nodejs /app/data
 
 ENV NODE_ENV production
 ENV NEXT_TELEMETRY_DISABLED 1

diff --git a/README.md b/README.md
@@ -208,10 +208,6 @@ https://github.com/labring/FastGPT/assets/15308462/7d3a38df-eb0e-4388-9250-2409b
     <img src="https://img.shields.io/badge/-返回顶部-7d09f1.svg" alt="#" align="right">
 </a>
 
-## Translations
-
-[![inlang status badge](https://badge.inlang.com/?url=github.com/labring/FastGPT)](https://fink.inlang.com/github.com/labring/FastGPT?ref=badge)
-
 ## 使用协议
 
 本仓库遵循 [FastGPT Open Source License](./LICENSE) 开源协议。

diff --git a/docSite/assets/imgs/sealos1.png b/docSite/assets/imgs/sealos1.png
diff --git a/docSite/content/docs/development/configuration.md b/docSite/content/docs/development/configuration.md
@@ -13,23 +13,25 @@ weight: 708
 
 这个配置文件中包含了系统级参数、AI 对话的模型、function 模型等……
 
+## 4.6.8 以前版本完整配置参数
 
-## 旧版本配置文件
+**使用时，请务必去除注释！**
 
-以下配置适合 4.6.6-alpha 之前
+以下配置适用于V4.6.6-alpha版本以后
 
 ```json
 {
-  "SystemParams": {
+  "systemEnv": {
     "vectorMaxProcess": 15, // 向量生成最大进程，结合数据库性能和 key 来设置
     "qaMaxProcess": 15,  // QA 生成最大进程，结合数据库性能和 key 来设置
     "pgHNSWEfSearch": 100  // pg vector 索引参数，越大精度高但速度慢
   },
-  "ChatModels": [ // 对话模型
+  "chatModels": [ // 对话模型
     {
       "model": "gpt-3.5-turbo-1106",
       "name": "GPT35-1106",
-      "price": 0, // 除以 100000 后等于1个token的价格
+      "inputPrice": 0, // 输入价格。 xx元/1k tokens
+      "outputPrice": 0, // 输出价格。 xx元/1k tokens
       "maxContext": 16000, // 最大上下文长度
       "maxResponse": 4000, // 最大回复长度
       "quoteMaxToken": 2000, // 最大引用内容长度
@@ -43,7 +45,8 @@ weight: 708
       "name": "GPT35-16k",
       "maxContext": 16000,
       "maxResponse": 16000,
-      "price": 0,
+      "inputPrice": 0,
+      "outputPrice": 0,
       "quoteMaxToken": 8000,
       "maxTemperature": 1.2,
       "censor": false,
@@ -55,7 +58,8 @@ weight: 708
       "name": "GPT4-8k",
       "maxContext": 8000,
       "maxResponse": 8000,
-      "price": 0,
+      "inputPrice": 0,
+      "outputPrice": 0,
       "quoteMaxToken": 4000,
       "maxTemperature": 1.2,
       "censor": false,
@@ -67,30 +71,33 @@ weight: 708
       "name": "GPT4-Vision",
       "maxContext": 128000,
       "maxResponse": 4000,
-      "price": 0,
+      "inputPrice": 0,
+      "outputPrice": 0,
       "quoteMaxToken": 100000,
       "maxTemperature": 1.2,
       "censor": false,
       "vision": true,
       "defaultSystemChatPrompt": ""
     }
   ],
-  "QAModels": [ // QA 生成模型
+  "qaModels": [ // QA 生成模型
     {
       "model": "gpt-3.5-turbo-16k",
       "name": "GPT35-16k",
       "maxContext": 16000,
       "maxResponse": 16000,
-      "price": 0
+      "inputPrice": 0,
+      "outputPrice": 0
     }
   ],
-  "CQModels": [ // 问题分类模型
+  "cqModels": [ // 问题分类模型
     {
       "model": "gpt-3.5-turbo-1106",
       "name": "GPT35-1106",
       "maxContext": 16000,
       "maxResponse": 4000,
-      "price": 0,
+      "inputPrice": 0,
+      "outputPrice": 0,
       "toolChoice": true, // 是否支持openai的 toolChoice， 不支持的模型需要设置为 false，会走提示词生成
       "functionPrompt": ""
     },
@@ -99,46 +106,49 @@ weight: 708
       "name": "GPT4-8k",
       "maxContext": 8000,
       "maxResponse": 8000,
-      "price": 0,
+      "inputPrice": 0,
+      "outputPrice": 0,
       "toolChoice": true,
       "functionPrompt": ""
     }
   ],
-  "ExtractModels": [ // 内容提取模型
+  "extractModels": [ // 内容提取模型
     {
       "model": "gpt-3.5-turbo-1106",
       "name": "GPT35-1106",
       "maxContext": 16000,
       "maxResponse": 4000,
-      "price": 0,
+      "inputPrice": 0,
+      "outputPrice": 0,
       "toolChoice": true,
       "functionPrompt": ""
     }
   ],
-  "QGModels": [ // 生成下一步指引
+  "qgModels": [ // 生成下一步指引
     {
       "model": "gpt-3.5-turbo-1106",
       "name": "GPT35-1106",
       "maxContext": 1600,
       "maxResponse": 4000,
-      "price": 0
+      "inputPrice": 0,
+      "outputPrice": 0
     }
   ],
-  "VectorModels": [ // 向量模型
+  "vectorModels": [ // 向量模型
     {
       "model": "text-embedding-ada-002",
       "name": "Embedding-2",
-      "price": 0.2,
+      "inputPrice": 0,
       "defaultToken": 700,
       "maxToken": 3000
     }
   ],
-  "ReRankModels": [], // 重排模型,暂时填空数组
-  "AudioSpeechModels": [
+  "reRankModels": [], // 重排模型,暂时填空数组
+  "audioSpeechModels": [
     {
       "model": "tts-1",
       "name": "OpenAI TTS1",
-      "price": 0,
+      "inputPrice": 0,
       "baseUrl": "",
       "key": "",
       "voices": [
@@ -151,152 +161,123 @@ weight: 708
       ]
     }
   ],
-  "WhisperModel": {
+  "whisperModel": {
     "model": "whisper-1",
     "name": "Whisper1",
-    "price": 0
+    "inputPrice": 0
   }
 }
 ```
 
-## 4.6.6-alpha 版本完整配置参数
-
-**使用时，请务必去除注释！**
+## 4.6.8 新配置文件
 
-以下配置适用于V4.6.6-alpha版本以后
+llm模型全部合并
 
 ```json
 {
   "systemEnv": {
-    "vectorMaxProcess": 15, // 向量生成最大进程，结合数据库性能和 key 来设置
-    "qaMaxProcess": 15,  // QA 生成最大进程，结合数据库性能和 key 来设置
-    "pgHNSWEfSearch": 100  // pg vector 索引参数，越大精度高但速度慢
+    "openapiPrefix": "fastgpt",
+    "vectorMaxProcess": 15,
+    "qaMaxProcess": 15,
+    "pgHNSWEfSearch": 100
   },
-  "chatModels": [ // 对话模型
+  "llmModels": [
     {
-      "model": "gpt-3.5-turbo-1106",
-      "name": "GPT35-1106",
-      "inputPrice": 0, // 输入价格。 xx元/1k tokens
-      "outputPrice": 0, // 输出价格。 xx元/1k tokens
-      "maxContext": 16000, // 最大上下文长度
-      "maxResponse": 4000, // 最大回复长度
-      "quoteMaxToken": 2000, // 最大引用内容长度
-      "maxTemperature": 1.2, // 最大温度值
-      "censor": false, // 是否开启敏感词过滤(商业版)
-      "vision": false, // 支持图片输入
-      "defaultSystemChatPrompt": ""
+      "model": "gpt-3.5-turbo-1106", // 模型名
+      "name": "gpt-3.5-turbo", // 别名
+      "maxContext": 16000, // 最大上下文
+      "maxResponse": 4000, // 最大回复
+      "quoteMaxToken": 13000, // 最大引用内容
+      "maxTemperature": 1.2, // 最大温度
+      "inputPrice": 0, 
+      "outputPrice": 0,
+      "censor": false,
+      "vision": false, // 是否支持图片输入
+      "datasetProcess": false, // 是否设置为知识库处理模型
+      "toolChoice": true, // 是否支持工具选择
+      "functionCall": false, // 是否支持函数调用
+      "customCQPrompt": "", // 自定义文本分类提示词（不支持工具和函数调用的模型
+      "customExtractPrompt": "", // 自定义内容提取提示词
+      "defaultSystemChatPrompt": "", // 对话默认携带的系统提示词
+      "defaultConfig":{}  // 对话默认配置（比如 GLM4 的 top_p
     },
     {
       "model": "gpt-3.5-turbo-16k",
-      "name": "GPT35-16k",
+      "name": "gpt-3.5-turbo-16k",
       "maxContext": 16000,
       "maxResponse": 16000,
+      "quoteMaxToken": 13000,
+      "maxTemperature": 1.2,
       "inputPrice": 0,
       "outputPrice": 0,
-      "quoteMaxToken": 8000,
-      "maxTemperature": 1.2,
       "censor": false,
       "vision": false,
-      "defaultSystemChatPrompt": ""
+      "datasetProcess": true,
+      "toolChoice": true,
+      "functionCall": false,
+      "customCQPrompt": "",
+      "customExtractPrompt": "",
+      "defaultSystemChatPrompt": "",
+      "defaultConfig":{} 
     },
     {
-      "model": "gpt-4",
-      "name": "GPT4-8k",
-      "maxContext": 8000,
-      "maxResponse": 8000,
+      "model": "gpt-4-0125-preview",
+      "name": "gpt-4-turbo",
+      "maxContext": 125000,
+      "maxResponse": 125000,
+      "quoteMaxToken": 100000,
+      "maxTemperature": 1.2,
       "inputPrice": 0,
       "outputPrice": 0,
-      "quoteMaxToken": 4000,
-      "maxTemperature": 1.2,
       "censor": false,
       "vision": false,
-      "defaultSystemChatPrompt": ""
+      "datasetProcess": false,
+      "toolChoice": true,
+      "functionCall": false,
+      "customCQPrompt": "",
+      "customExtractPrompt": "",
+      "defaultSystemChatPrompt": "",
+      "defaultConfig":{} 
     },
     {
       "model": "gpt-4-vision-preview",
-      "name": "GPT4-Vision",
+      "name": "gpt-4-vision",
       "maxContext": 128000,
       "maxResponse": 4000,
-      "inputPrice": 0,
-      "outputPrice": 0,
       "quoteMaxToken": 100000,
       "maxTemperature": 1.2,
-      "censor": false,
-      "vision": true,
-      "defaultSystemChatPrompt": ""
-    }
-  ],
-  "qaModels": [ // QA 生成模型
-    {
-      "model": "gpt-3.5-turbo-16k",
-      "name": "GPT35-16k",
-      "maxContext": 16000,
-      "maxResponse": 16000,
-      "inputPrice": 0,
-      "outputPrice": 0
-    }
-  ],
-  "cqModels": [ // 问题分类模型
-    {
-      "model": "gpt-3.5-turbo-1106",
-      "name": "GPT35-1106",
-      "maxContext": 16000,
-      "maxResponse": 4000,
-      "inputPrice": 0,
-      "outputPrice": 0,
-      "toolChoice": true, // 是否支持openai的 toolChoice， 不支持的模型需要设置为 false，会走提示词生成
-      "functionPrompt": ""
-    },
-    {
-      "model": "gpt-4",
-      "name": "GPT4-8k",
-      "maxContext": 8000,
-      "maxResponse": 8000,
-      "inputPrice": 0,
-      "outputPrice": 0,
-      "toolChoice": true,
-      "functionPrompt": ""
-    }
-  ],
-  "extractModels": [ // 内容提取模型
-    {
-      "model": "gpt-3.5-turbo-1106",
-      "name": "GPT35-1106",
-      "maxContext": 16000,
-      "maxResponse": 4000,
       "inputPrice": 0,
       "outputPrice": 0,
+      "censor": false,
+      "vision": false,
+      "datasetProcess": false,
       "toolChoice": true,
-      "functionPrompt": ""
-    }
-  ],
-  "qgModels": [ // 生成下一步指引
-    {
-      "model": "gpt-3.5-turbo-1106",
-      "name": "GPT35-1106",
-      "maxContext": 1600,
-      "maxResponse": 4000,
-      "inputPrice": 0,
-      "outputPrice": 0
+      "functionCall": false,
+      "customCQPrompt": "",
+      "customExtractPrompt": "",
+      "defaultSystemChatPrompt": "",
+      "defaultConfig":{} 
     }
   ],
-  "vectorModels": [ // 向量模型
+  "vectorModels": [
     {
       "model": "text-embedding-ada-002",
       "name": "Embedding-2",
       "inputPrice": 0,
+      "outputPrice": 0,
       "defaultToken": 700,
-      "maxToken": 3000
+      "maxToken": 3000,
+      "weight": 100,
+      "defaultConfig":{}  // 默认配置。例如，如果希望使用 embedding3-large 的话，可以传入 dimensions:1024，来返回1024维度的向量。（目前必须小于1536维度）
     }
   ],
-  "reRankModels": [], // 重排模型,暂时填空数组
+  "reRankModels": [],
   "audioSpeechModels": [
     {
       "model": "tts-1",
       "name": "OpenAI TTS1",
       "inputPrice": 0,
-      "baseUrl": "",
-      "key": "",
+      "outputPrice": 0,
       "voices": [
         { "label": "Alloy", "value": "alloy", "bufferId": "openai-Alloy" },
         { "label": "Echo", "value": "echo", "bufferId": "openai-Echo" },
@@ -310,7 +291,8 @@ weight: 708
   "whisperModel": {
     "model": "whisper-1",
     "name": "Whisper1",
-    "inputPrice": 0
+    "inputPrice": 0,
+    "outputPrice": 0
   }
 }
 ```