Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 095b75ee by Archer Committed by GitHub
Options

V4.9.12 feature (#5022) 

* New chatinput (#4995)

* feat: Change border style

* refactor: Improve layout and styling of ChatInput component

* style: Update ChatInput component styling and mobile layout

* fix: update key detection for Enter key in ChatInput component

* feat: 添加 WelcomePage 组件，支持变量输入和欢迎信息展示

* style: Updated the PC voice input interface of the VoiceInput component and optimized the layout and style

* style: Optimize the layout and style of the WelcomePage component, and adjust the responsive design

* feat: Dynamically load the WelcomePage component and optimize the welcome information display logic

* refactor: Adjust the style and behavior of the ChatInput component and delete the WelcomePage component

* style: Modify the minimum height setting of the ChatInput component to simplify responsive design

* style: Optimize the layout and style of PC voice input components, and enhance the processing and drawing logic of waveform data

* style: Adjust ChatInput component's margin and textarea height logic for improved layout and responsiveness; refine PCVoiceInput component's positioning and display elements

* style: Enhance PCVoiceInput component's time display styling with custom font properties

* feat: Change border style

* refactor: Improve layout and styling of ChatInput component

* style: Update ChatInput component styling and mobile layout

* fix: update key detection for Enter key in ChatInput component

* feat: 添加 WelcomePage 组件，支持变量输入和欢迎信息展示

* style: Updated the PC voice input interface of the VoiceInput component and optimized the layout and style

* style: Optimize the layout and style of the WelcomePage component, and adjust the responsive design

* feat: Dynamically load the WelcomePage component and optimize the welcome information display logic

* refactor: Adjust the style and behavior of the ChatInput component and delete the WelcomePage component

* style: Modify the minimum height setting of the ChatInput component to simplify responsive design

* style: Optimize the layout and style of PC voice input components, and enhance the processing and drawing logic of waveform data

* style: Adjust ChatInput component's margin and textarea height logic for improved layout and responsiveness; refine PCVoiceInput component's positioning and display elements

* style: Enhance PCVoiceInput component's time display styling with custom font properties

* style: Add new 'xxl' size to theme spacing for improved layout options

* style: Update close icon fill color to use currentColor for better theming support

* style: Enhance voice input functionality and UI responsiveness; improve waveform sensitivity and amplitude

* style: Conditionally render file preview based on voice input state

* style: 优化移动端音频波形渲染，增强清晰度和敏感度

* style: Update comments to English to enhance code readability and consistency

* style: Adjust the mobile audio waveform update frequency and optimize rendering performance

* style: Optimize the file preview rendering logic in voice input mode to enhance user experience

* style: Optimize the file preview rendering logic in voice input mode to enhance user experience

* style: Adjust the chat input box placeholder color and border color to enhance visual effects

* fix: pg test

* Test secret (#5011)

* add http header auth config (#4982)

* add http header auth config

* optimize code

* add mcp tools header auth

* fix build

* fix ui

* fix

* teamid

* secret value encrypt (#5002)

* perf: secret code

* header auth ui (#5012)

* header auth ui

* fix i18n

* doc

* perf: type

* header secret ui

* reset ui

* perf: check secret invalid

---------

Co-authored-by: heheer <heheer@sealos.io>

* feat: cq and extrat AI memory (#5013)

* fix: login xss

* feat: Users can download the invoice by self (#5015)

* Users can download the invoice by themselves

* Direct file stream implementation for transmission presentation

* i18n

* Chatbox-fix (#5018)

* feat: Change border style

* refactor: Improve layout and styling of ChatInput component

* style: Update ChatInput component styling and mobile layout

* fix: update key detection for Enter key in ChatInput component

* feat: 添加 WelcomePage 组件，支持变量输入和欢迎信息展示

* style: Updated the PC voice input interface of the VoiceInput component and optimized the layout and style

* style: Optimize the layout and style of the WelcomePage component, and adjust the responsive design

* feat: Dynamically load the WelcomePage component and optimize the welcome information display logic

* refactor: Adjust the style and behavior of the ChatInput component and delete the WelcomePage component

* style: Modify the minimum height setting of the ChatInput component to simplify responsive design

* style: Optimize the layout and style of PC voice input components, and enhance the processing and drawing logic of waveform data

* style: Adjust ChatInput component's margin and textarea height logic for improved layout and responsiveness; refine PCVoiceInput component's positioning and display elements

* style: Enhance PCVoiceInput component's time display styling with custom font properties

* feat: Change border style

* refactor: Improve layout and styling of ChatInput component

* style: Update ChatInput component styling and mobile layout

* fix: update key detection for Enter key in ChatInput component

* feat: 添加 WelcomePage 组件，支持变量输入和欢迎信息展示

* style: Updated the PC voice input interface of the VoiceInput component and optimized the layout and style

* style: Optimize the layout and style of the WelcomePage component, and adjust the responsive design

* feat: Dynamically load the WelcomePage component and optimize the welcome information display logic

* refactor: Adjust the style and behavior of the ChatInput component and delete the WelcomePage component

* style: Modify the minimum height setting of the ChatInput component to simplify responsive design

* style: Optimize the layout and style of PC voice input components, and enhance the processing and drawing logic of waveform data

* style: Adjust ChatInput component's margin and textarea height logic for improved layout and responsiveness; refine PCVoiceInput component's positioning and display elements

* style: Enhance PCVoiceInput component's time display styling with custom font properties

* style: Add new 'xxl' size to theme spacing for improved layout options

* style: Update close icon fill color to use currentColor for better theming support

* style: Enhance voice input functionality and UI responsiveness; improve waveform sensitivity and amplitude

* style: Conditionally render file preview based on voice input state

* style: 优化移动端音频波形渲染，增强清晰度和敏感度

* style: Update comments to English to enhance code readability and consistency

* style: Adjust the mobile audio waveform update frequency and optimize rendering performance

* style: Optimize the file preview rendering logic in voice input mode to enhance user experience

* style: Optimize the file preview rendering logic in voice input mode to enhance user experience

* style: Adjust the chat input box placeholder color and border color to enhance visual effects

* New chatinput (#4995)

* feat: Change border style

* refactor: Improve layout and styling of ChatInput component

* style: Update ChatInput component styling and mobile layout

* fix: update key detection for Enter key in ChatInput component

* feat: 添加 WelcomePage 组件，支持变量输入和欢迎信息展示

* style: Updated the PC voice input interface of the VoiceInput component and optimized the layout and style

* style: Optimize the layout and style of the WelcomePage component, and adjust the responsive design

* feat: Dynamically load the WelcomePage component and optimize the welcome information display logic

* refactor: Adjust the style and behavior of the ChatInput component and delete the WelcomePage component

* style: Modify the minimum height setting of the ChatInput component to simplify responsive design

* style: Optimize the layout and style of PC voice input components, and enhance the processing and drawing logic of waveform data

* style: Adjust ChatInput component's margin and textarea height logic for improved layout and responsiveness; refine PCVoiceInput component's positioning and display elements

* style: Enhance PCVoiceInput component's time display styling with custom font properties

* feat: Change border style

* refactor: Improve layout and styling of ChatInput component

* style: Update ChatInput component styling and mobile layout

* fix: update key detection for Enter key in ChatInput component

* feat: 添加 WelcomePage 组件，支持变量输入和欢迎信息展示

* style: Updated the PC voice input interface of the VoiceInput component and optimized the layout and style

* style: Optimize the layout and style of the WelcomePage component, and adjust the responsive design

* feat: Dynamically load the WelcomePage component and optimize the welcome information display logic

* refactor: Adjust the style and behavior of the ChatInput component and delete the WelcomePage component

* style: Modify the minimum height setting of the ChatInput component to simplify responsive design

* style: Optimize the layout and style of PC voice input components, and enhance the processing and drawing logic of waveform data

* style: Adjust ChatInput component's margin and textarea height logic for improved layout and responsiveness; refine PCVoiceInput component's positioning and display elements

* style: Enhance PCVoiceInput component's time display styling with custom font properties

* style: Add new 'xxl' size to theme spacing for improved layout options

* style: Update close icon fill color to use currentColor for better theming support

* style: Enhance voice input functionality and UI responsiveness; improve waveform sensitivity and amplitude

* style: Conditionally render file preview based on voice input state

* style: 优化移动端音频波形渲染，增强清晰度和敏感度

* style: Update comments to English to enhance code readability and consistency

* style: Adjust the mobile audio waveform update frequency and optimize rendering performance

* style: Optimize the file preview rendering logic in voice input mode to enhance user experience

* style: Optimize the file preview rendering logic in voice input mode to enhance user experience

* style: Adjust the chat input box placeholder color and border color to enhance visual effects

* fix: pg test

* Test secret (#5011)

* add http header auth config (#4982)

* add http header auth config

* optimize code

* add mcp tools header auth

* fix build

* fix ui

* fix

* teamid

* secret value encrypt (#5002)

* perf: secret code

* header auth ui (#5012)

* header auth ui

* fix i18n

* doc

* perf: type

* header secret ui

* reset ui

* perf: check secret invalid

---------

Co-authored-by: heheer <heheer@sealos.io>

* feat: cq and extrat AI memory (#5013)

* refactor: Refactored the ChatInput component, optimized the layout of the text area and button group, and improved the user experience

* refactor: Updated ChatInput component, optimized layout and style, and enhanced user experience

* feat: update docs

---------

Co-authored-by: archer <545436317@qq.com>
Co-authored-by: heheer <heheer@sealos.io>

* input ui

* fix: chat input ux

* Return in JSON format to handle checkres (#5019)

* Users can download the invoice by themselves

* Direct file stream implementation for transmission presentation

* Return in JSON format to handle checkres

* fix: invoice

* fix: ui

* doc

* update package

* fix: ts

* fix: login checker

* fix: team plan

* perf: aiproxy ux

---------

Co-authored-by: Theresa <63280168+sd0ric4@users.noreply.github.com>
Co-authored-by: heheer <heheer@sealos.io>
Co-authored-by: Zhuangzai fa <143257420+ctrlz526@users.noreply.github.com>
parent 30ca3e3d
Showing with 1101 additions and 991 deletions
deploy/docker/docker-compose-pgvector.yml
......@@ -23,7 +23,7 @@ services:
volumes:
- ./pg/data:/var/lib/postgresql/data
healthcheck:
test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'postgres']
test: ['CMD', 'pg_isready', '-U', 'username', '-d', 'postgres']
interval: 5s
timeout: 5s
retries: 10
......
deploy/helm/fastgpt/templates/configmap-config.yaml
......@@ -26,8 +26,6 @@ data:
"usedInToolCall": true,
"toolChoice": true,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {}
},
......@@ -47,8 +45,6 @@ data:
"usedInToolCall": true,
"toolChoice": true,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {}
},
......@@ -68,8 +64,6 @@ data:
"usedInToolCall": true,
"toolChoice": true,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {}
},
......@@ -89,8 +83,6 @@ data:
"usedInToolCall": false,
"toolChoice": true,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {}
}
......
docSite/content/zh-cn/docs/development/custom-models/xinference.md
......@@ -146,8 +146,6 @@ curl --location --request POST 'https://<oneapi_url>/v1/chat/completions' \
"usedInToolCall": true, // 是否用于工具调用（务必保证至少有一个为true）
"toolChoice": true, // 是否支持工具选择（分类，内容提取，工具调用会用到。）
"functionCall": false, // 是否支持函数调用（分类，内容提取，工具调用会用到。会优先使用 toolChoice，如果为false，则使用 functionCall，如果仍为 false，则使用提示词模式）
"customCQPrompt": "", // 自定义文本分类提示词（不支持工具和函数调用的模型
"customExtractPrompt": "", // 自定义内容提取提示词
"defaultSystemChatPrompt": "", // 对话默认携带的系统提示词
"defaultConfig": {} // 请求API时，挟带一些默认配置（比如 GLM4 的 top_p）
}
......
docSite/content/zh-cn/docs/development/faq.md
......@@ -59,11 +59,10 @@ images: []
可以。需要准备好向量模型和LLM模型。
### 其他模型没法进行问题分类/内容提取
### 其他模型没法进行内容提取
看日志。如果提示 JSON invalid，not support tool 之类的，说明该模型不支持工具调用或函数调用，需要设置`toolChoice=false`和`functionCall=false`，就会默认走提示词模式。目前内置提示词仅针对了商业模型API进行测试。问题分类基本可用，内容提取不太行。
1. 看日志。如果提示 JSON invalid，not support tool 之类的，说明该模型不支持工具调用或函数调用，需要设置`toolChoice=false`和`functionCall=false`，就会默认走提示词模式。目前内置提示词仅针对了商业模型API进行测试。问题分类基本可用，内容提取不太行。
2. 如果已经配置正常，并且没有错误日志，则说明可能提示词不太适合该模型，可以通过修改`customCQPrompt`来自定义提示词。
### 页面崩溃
1. 关闭翻译
......
docSite/content/zh-cn/docs/development/modelConfig/intro.md
......@@ -111,8 +111,6 @@ weight: 744
"usedInToolCall": true, // 是否用于工具调用（务必保证至少有一个为true）
"toolChoice": true, // 是否支持工具选择（分类，内容提取，工具调用会用到。）
"functionCall": false, // 是否支持函数调用（分类，内容提取，工具调用会用到。会优先使用 toolChoice，如果为false，则使用 functionCall，如果仍为 false，则使用提示词模式）
"customCQPrompt": "", // 自定义文本分类提示词（不支持工具和函数调用的模型
"customExtractPrompt": "", // 自定义内容提取提示词
"defaultSystemChatPrompt": "", // 对话默认携带的系统提示词
"defaultConfig": {}, // 请求API时，挟带一些默认配置（比如 GLM4 的 top_p）
"fieldMap": {} // 字段映射（o1 模型需要把 max_tokens 映射为 max_completion_tokens）
......@@ -322,8 +320,6 @@ OneAPI 的语言识别接口，无法正确的识别其他模型（会始终识
"usedInToolCall": true, // 是否用于工具调用（务必保证至少有一个为true）
"toolChoice": true, // 是否支持工具选择（分类，内容提取，工具调用会用到。）
"functionCall": false, // 是否支持函数调用（分类，内容提取，工具调用会用到。会优先使用 toolChoice，如果为false，则使用 functionCall，如果仍为 false，则使用提示词模式）
"customCQPrompt": "", // 自定义文本分类提示词（不支持工具和函数调用的模型
"customExtractPrompt": "", // 自定义内容提取提示词
"defaultSystemChatPrompt": "", // 对话默认携带的系统提示词
"defaultConfig": {}, // 请求API时，挟带一些默认配置（比如 GLM4 的 top_p）
"fieldMap": {} // 字段映射（o1 模型需要把 max_tokens 映射为 max_completion_tokens）
......@@ -345,8 +341,6 @@ OneAPI 的语言识别接口，无法正确的识别其他模型（会始终识
"usedInToolCall": true,
"toolChoice": true,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {}
......@@ -368,8 +362,6 @@ OneAPI 的语言识别接口，无法正确的识别其他模型（会始终识
"usedInToolCall": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {
"temperature": 1,
......@@ -394,8 +386,6 @@ OneAPI 的语言识别接口，无法正确的识别其他模型（会始终识
"usedInToolCall": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {
"temperature": 1,
......
docSite/content/zh-cn/docs/development/upgrading/4811.md
......@@ -33,7 +33,6 @@ weight: 813
"usedInToolCall": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {
......@@ -57,7 +56,6 @@ weight: 813
"usedInToolCall": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {
......
docSite/content/zh-cn/docs/development/upgrading/4816.md
......@@ -38,7 +38,6 @@ weight: 808
"usedInQueryExtension": true,
"toolChoice": true,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {},
......
docSite/content/zh-cn/docs/development/upgrading/4912.md
......@@ -10,7 +10,9 @@ weight: 788
## 🚀 新增内容
1. AI proxy 监控完善，支持以图表/表格形式查看模型调用和性能情况。
2. 商业版支持知识库分块时，LLM 进行自动分段识别。
2. HTTP 节点和 MCP 支持单独“鉴权配置”，鉴权配置明文不会二次返回客户端，以保障数据安全。
3. 问题分类和内容提取，提示词中自动加入上一轮结果进行额外引导。
4. 商业版支持知识库分块时，LLM 进行自动分段识别。
## ⚙️ 优化
......@@ -18,8 +20,12 @@ weight: 788
2. 后端全量计算知识库 chunk 参数，避免自动模式下部分参数未正确使用默认值。
3. 将文本分块移至 worker 线程，避免阻塞。
4. 展示更多套餐用量信息。
5. 优化输入框样式，桌面和移动端的语音输入样式更新。
## 🐛 修复
1. 自定义问答提取提示词被覆盖。
2. 模板导入时，存在空 indexes 时，导致数据插入失败。
\ No newline at end of file
2. 模板导入时，存在空 indexes 时，导致数据插入失败。
3. 登录页可能存在的 XSS 攻击。
4. 输入框语音输入时候会丢失文件列表的问题。
5. 知识库文档中图片 TTL 字段未清除，导致图片过期。
\ No newline at end of file
env.d.ts
......@@ -5,6 +5,7 @@ declare global {
DEFAULT_ROOT_PSW: string;
DB_MAX_LINK: string;
FILE_TOKEN_KEY: string;
AES256_SECRET_KEY: string;
ROOT_KEY: string;
OPENAI_BASE_URL: string;
CHAT_API_KEY: string;
......
packages/global/common/secret/constants.ts 0 → 100644
import { i18nT } from '../../../web/i18n/utils';
export enum HeaderSecretTypeEnum {
None = 'None',
Bearer = 'Bearer',
Basic = 'Basic',
Custom = 'Custom'
}
packages/global/common/secret/type.d.ts 0 → 100644
export type SecretValueType = {
value: string;
secret: string;
};
export type StoreSecretValueType = Record<string, SecretValueType>;
packages/global/core/ai/model.d.ts
......@@ -51,9 +51,6 @@ export type LLMModelItemType = PriceType &
functionCall: boolean;
toolChoice: boolean;
customCQPrompt: string;
customExtractPrompt: string;
defaultSystemChatPrompt?: string;
defaultConfig?: Record<string, any>;
fieldMap?: Record<string, string>;
......
packages/global/core/ai/model.ts
......@@ -26,8 +26,6 @@ export const defaultQAModels: LLMModelItemType[] = [
datasetProcess: true,
toolChoice: true,
functionCall: false,
customCQPrompt: '',
customExtractPrompt: '',
defaultSystemChatPrompt: '',
defaultConfig: {}
}
......
packages/global/core/ai/prompt/agent.ts
import { getPromptByVersion } from './utils';
export const Prompt_AgentQA = {
description: `<Context></Context> 标记中是一段文本，学习和分析它，并整理学习成果：
- 提出问题并给出每个问题的答案。
......@@ -27,73 +25,140 @@ A2:
`
};
export const getExtractJsonPrompt = (version?: string) => {
const promptMap: Record<string, string> = {
['4.9.2']: `你可以从 <对话记录></对话记录> 中提取指定 Json 信息，你仅需返回 Json 字符串，无需回答问题。
<提取要求>
{{description}}
</提取要求>
<提取规则>
- 本次需提取的 json 字符串，需符合 JsonSchema 的规则。
- type 代表数据类型; key 代表字段名; description 代表字段的描述; enum 是枚举值，代表可选的 value。
- 如果没有可提取的内容，忽略该字段。
</提取规则>
<JsonSchema>
{{json}}
</JsonSchema>
<对话记录>
{{text}}
</对话记录>
提取的 json 字符串:`
};
return getPromptByVersion(version, promptMap);
};
export const getExtractJsonToolPrompt = (version?: string) => {
const promptMap: Record<string, string> = {
['4.9.2']: `我正在执行一个函数，需要你提供一些参数，请以 JSON 字符串格式返回这些参数，要求：
"""
- {{description}}
export const getExtractJsonPrompt = ({
schema,
systemPrompt,
memory
}: {
schema?: string;
systemPrompt?: string;
memory?: string;
}) => {
const list = [
'【历史记录】',
'【用户输入】',
systemPrompt ? '【背景知识】' : '',
memory ? '【历史提取结果】' : ''
].filter(Boolean);
const prompt = `## 背景
用户需要执行一个函数，该函数需要一些参数，需要你结合${list.join('、')}，来生成对应的参数
## 基本要求
- 严格根据 JSON Schema 的描述来生成参数。
- 不是每个参数都是必须生成的，如果没有合适的参数值，不要生成该参数，或返回空字符串。
- 需要结合历史记录，一起生成合适的参数。
"""
本次输入内容: """{{content}}"""
`
};
return getPromptByVersion(version, promptMap);
};
${
systemPrompt
? `## 特定要求
${systemPrompt}`
: ''
}
export const getCQPrompt = (version?: string) => {
const promptMap: Record<string, string> = {
['4.9.2']: `请帮我执行一个"问题分类"任务，将问题分类为以下几种类型之一：
${
memory
? `## 历史提取结果
${memory}`
: ''
}
"""
{{typeList}}
"""
## JSON Schema
## 背景知识
{{systemPrompt}}
${schema}
## 对话记录
{{history}}
## 输出要求
## 开始任务
- 严格输出 json 字符串。
- 不要回答问题。`.replace(/\n{3,}/g, '\n\n');
现在，我们开始分类，我会给你一个"问题"，请结合背景知识和对话记录，将问题分类到对应的类型中，并返回类型ID。
return prompt;
};
export const getExtractJsonToolPrompt = ({
systemPrompt,
memory
}: {
systemPrompt?: string;
memory?: string;
}) => {
const list = [
'【历史记录】',
'【用户输入】',
systemPrompt ? '【背景知识】' : '',
memory ? '【历史提取结果】' : ''
].filter(Boolean);
const prompt = `## 背景
用户需要执行一个叫 "request_function" 的函数，该函数需要你结合${list.join('、')}，来生成对应的参数
## 基本要求
问题："{{question}}"
类型ID=
`
};
- 不是每个参数都是必须生成的，如果没有合适的参数值，不要生成该参数，或返回空字符串。
- 需要结合历史记录，一起生成合适的参数。最新的记录优先级更高。
- 即使无法调用函数，也要返回一个 JSON 字符串，而不是回答问题。
${
systemPrompt
? `## 特定要求
${systemPrompt}`
: ''
}
${
memory
? `## 历史提取结果
${memory}`
: ''
}`.replace(/\n{3,}/g, '\n\n');
return prompt;
};
return getPromptByVersion(version, promptMap);
export const getCQSystemPrompt = ({
systemPrompt,
memory,
typeList
}: {
systemPrompt?: string;
memory?: string;
typeList: string;
}) => {
const list = [
systemPrompt ? '【背景知识】' : '',
'【历史记录】',
memory ? '【上一轮分类结果】' : ''
].filter(Boolean);
const CLASSIFY_QUESTION_SYSTEM_PROMPT = `## 角色
你是一个"分类助手"，可以结合${list.join('、')}，来判断用户当前问题属于哪一个分类，并输出分类标记。
${
systemPrompt
? `## 背景知识
${systemPrompt}`
: ''
}
${
memory
? `## 上一轮分类结果
${memory}`
: ''
}
## 分类清单
${typeList}
## 分类要求
1. 分类结果必须从分类清单中选择。
2. 连续对话时，如果分类不明确，且用户未变更话题，则保持上一轮分类结果不变。
3. 存在分类冲突或模糊分类时， 主语指向的分类优先级更高。
## 输出格式
只需要输出分类的 id 即可，无需输出额外内容。`.replace(/\n{3,}/g, '\n\n');
return CLASSIFY_QUESTION_SYSTEM_PROMPT;
};
export const QuestionGuidePrompt = `You are an AI assistant tasked with predicting the user's next question based on the conversation history. Your goal is to generate 3 potential questions that will guide the user to continue the conversation. When generating these questions, adhere to the following rules:
......
packages/global/core/app/mcpTools/utils.ts
......@@ -8,15 +8,18 @@ import { nanoid } from 'nanoid';
import { type McpToolConfigType } from '../type';
import { i18nT } from '../../../../web/i18n/utils';
import { type RuntimeNodeItemType } from '../../workflow/runtime/type';
import { type StoreSecretValueType } from '../../../common/secret/type';
export const getMCPToolSetRuntimeNode = ({
url,
toolList,
headerSecret,
name,
avatar
}: {
url: string;
toolList: McpToolConfigType[];
headerSecret?: StoreSecretValueType;
name?: string;
avatar?: string;
}): RuntimeNodeItemType => {
......@@ -31,7 +34,11 @@ export const getMCPToolSetRuntimeNode = ({
label: 'Tool Set Data',
valueType: WorkflowIOValueTypeEnum.object,
renderTypeList: [FlowNodeInputTypeEnum.hidden],
value: { url, toolList }
value: {
url,
toolList,
headerSecret
}
}
],
outputs: [],
......@@ -43,10 +50,12 @@ export const getMCPToolSetRuntimeNode = ({
export const getMCPToolRuntimeNode = ({
tool,
url,
headerSecret,
avatar = 'core/app/type/mcpToolsFill'
}: {
tool: McpToolConfigType;
url: string;
headerSecret?: StoreSecretValueType;
avatar?: string;
}): RuntimeNodeItemType => {
return {
......@@ -60,7 +69,11 @@ export const getMCPToolRuntimeNode = ({
label: 'Tool Data',
valueType: WorkflowIOValueTypeEnum.object,
renderTypeList: [FlowNodeInputTypeEnum.hidden],
value: { ...tool, url }
value: {
...tool,
url,
headerSecret
}
},
...Object.entries(tool.inputSchema?.properties || {}).map(([key, value]) => ({
key,
......
packages/global/core/app/utils.ts
......@@ -7,9 +7,6 @@ import { type StoreNodeItemType } from '../workflow/type/node';
import { DatasetSearchModeEnum } from '../dataset/constants';
import { type WorkflowTemplateBasicType } from '../workflow/type';
import { AppTypeEnum } from './constants';
import { AppErrEnum } from '../../common/error/code/app';
import { PluginErrEnum } from '../../common/error/code/plugin';
import { i18nT } from '../../../web/i18n/utils';
import appErrList from '../../common/error/code/app';
import pluginErrList from '../../common/error/code/plugin';
......
packages/global/core/chat/type.d.ts
......@@ -93,6 +93,7 @@ export type AIChatItemValueItemType = {
export type AIChatItemType = {
obj: ChatRoleEnum.AI;
value: AIChatItemValueItemType[];
memories?: Record<string, any>;
userGoodFeedback?: string;
userBadFeedback?: string;
customFeedbacks?: string[];
......
packages/global/core/workflow/constants.ts
......@@ -129,6 +129,7 @@ export enum NodeInputKeyEnum {
textareaInput = 'system_textareaInput',
addInputParam = 'system_addInputParam',
forbidStream = 'system_forbid_stream',
headerSecret = 'system_header_secret',
// history
historyMaxAmount = 'maxContext',
......
packages/global/core/workflow/runtime/constants.ts
......@@ -25,10 +25,10 @@ export enum DispatchNodeResponseKeyEnum {
toolResponses = 'toolResponses', // The result is passed back to the tool node for use
assistantResponses = 'assistantResponses', // assistant response
rewriteHistories = 'rewriteHistories', // If have the response, workflow histories will be rewrite
interactive = 'INTERACTIVE', // is interactive
runTimes = 'runTimes', // run times
newVariables = 'newVariables' // new variables
newVariables = 'newVariables', // new variables
memories = 'system_memories' // memories
}
export const needReplaceReferenceInputTypeList = [
......
packages/global/core/workflow/runtime/type.d.ts
......@@ -246,6 +246,7 @@ export type DispatchNodeResultType<T = {}> = {
[DispatchNodeResponseKeyEnum.rewriteHistories]?: ChatItemType[];
[DispatchNodeResponseKeyEnum.runTimes]?: number;
[DispatchNodeResponseKeyEnum.newVariables]?: Record<string, any>;
[DispatchNodeResponseKeyEnum.memories]?: Record<string, any>;
} & T;
/* Single node props */
......
packages/global/core/workflow/template/system/classifyQuestion/index.ts
......@@ -39,9 +39,9 @@ export const ClassifyQuestionModule: FlowNodeTemplateType = {
},
{
...Input_Template_System_Prompt,
label: 'core.module.input.label.Background',
description: 'core.module.input.description.Background',
placeholder: 'core.module.input.placeholder.Classify background'
label: i18nT('common:core.module.input.label.Background'),
description: i18nT('common:core.module.input.description.Background'),
placeholder: i18nT('common:core.module.input.placeholder.Classify background')
},
Input_Template_History,
Input_Template_UserChatInput,
......
packages/global/core/workflow/template/system/http468.ts
......@@ -66,6 +66,13 @@ export const HttpNode468: FlowNodeTemplateType = {
required: false
},
{
key: NodeInputKeyEnum.headerSecret,
renderTypeList: [FlowNodeInputTypeEnum.hidden],
valueType: WorkflowIOValueTypeEnum.object,
label: '',
required: false
},
{
key: NodeInputKeyEnum.httpHeaders,
renderTypeList: [FlowNodeInputTypeEnum.custom],
valueType: WorkflowIOValueTypeEnum.any,
......
packages/global/support/wallet/bill/invoice/type.d.ts 0 → 100644
export type InvoiceFileInfo = {
data: string; // base64 encoded file data
mimeType: string;
filename: string;
size: number;
};
packages/service/common/secret/aes256gcm.ts 0 → 100644
import crypto from 'crypto';
import { AES256_SECRET_KEY } from './constants';
export const encryptSecret = (text: string) => {
const iv = crypto.randomBytes(16);
const key = crypto.scryptSync(AES256_SECRET_KEY, 'salt', 32);
const cipher = crypto.createCipheriv('aes-256-gcm', key, iv);
const encrypted = Buffer.concat([cipher.update(text, 'utf8'), cipher.final()]);
const authTag = cipher.getAuthTag();
return `${iv.toString('hex')}:${encrypted.toString('hex')}:${authTag.toString('hex')}`;
};
export const decryptSecret = (encryptedText: string) => {
const [ivHex, encryptedHex, authTagHex] = encryptedText.split(':');
if (!ivHex || !encryptedHex || !authTagHex) {
return '';
}
const iv = Buffer.from(ivHex, 'hex');
const encrypted = Buffer.from(encryptedHex, 'hex');
const authTag = Buffer.from(authTagHex, 'hex');
const key = crypto.scryptSync(AES256_SECRET_KEY, 'salt', 32);
const decipher = crypto.createDecipheriv('aes-256-gcm', key, iv);
decipher.setAuthTag(authTag);
const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]);
return decrypted.toString('utf8');
};
packages/service/common/secret/constants.ts 0 → 100644
export const AES256_SECRET_KEY = process.env.AES256_SECRET_KEY || 'fastgptkey';
packages/service/common/secret/utils.ts 0 → 100644
import { decryptSecret, encryptSecret } from './aes256gcm';
import type { SecretValueType } from '@fastgpt/global/common/secret/type';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
import { HeaderSecretTypeEnum } from '@fastgpt/global/common/secret/constants';
export const storeSecretValue = (
storeSecret: StoreSecretValueType
): Record<string, SecretValueType> => {
return Object.fromEntries(
Object.entries(storeSecret).map(([key, value]) => [
key,
{
secret: encryptSecret(value.value),
value: ''
}
])
);
};
export const getSecretValue = ({
storeSecret
}: {
storeSecret?: StoreSecretValueType;
}): Record<string, string> => {
if (!storeSecret) return {};
return Object.entries(storeSecret).reduce(
(acc: Record<string, string>, [key, { secret, value }]) => {
const actualValue = value || decryptSecret(secret);
if (key === HeaderSecretTypeEnum.Bearer) {
acc['Authorization'] = `Bearer ${actualValue}`;
} else if (key === HeaderSecretTypeEnum.Basic) {
acc['Authorization'] = `Basic ${actualValue}`;
} else {
acc[key] = actualValue;
}
return acc;
},
{}
);
};
packages/service/core/ai/config/provider/ChatGLM.json
......@@ -9,10 +9,7 @@
"quoteMaxToken": 120000,
"maxTemperature": 0.99,
"showTopP": true,
"responseFormatList": [
"text",
"json_object"
],
"responseFormatList": ["text", "json_object"],
"showStopSign": true,
"vision": false,
"toolChoice": true,
......@@ -20,10 +17,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -37,10 +32,7 @@
"quoteMaxToken": 120000,
"maxTemperature": 0.99,
"showTopP": true,
"responseFormatList": [
"text",
"json_object"
],
"responseFormatList": ["text", "json_object"],
"showStopSign": true,
"vision": false,
"toolChoice": true,
......@@ -48,10 +40,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -65,10 +55,7 @@
"quoteMaxToken": 900000,
"maxTemperature": 0.99,
"showTopP": true,
"responseFormatList": [
"text",
"json_object"
],
"responseFormatList": ["text", "json_object"],
"showStopSign": true,
"vision": false,
"toolChoice": false,
......@@ -76,10 +63,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -93,10 +78,7 @@
"quoteMaxToken": 120000,
"maxTemperature": 0.99,
"showTopP": true,
"responseFormatList": [
"text",
"json_object"
],
"responseFormatList": ["text", "json_object"],
"showStopSign": true,
"vision": false,
"toolChoice": true,
......@@ -104,10 +86,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -128,10 +108,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -152,10 +130,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -172,4 +148,4 @@
"type": "embedding"
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/Claude.json
......@@ -16,10 +16,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -40,10 +38,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -64,10 +60,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -88,10 +82,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -112,10 +104,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -136,10 +126,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -160,10 +148,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......
packages/service/core/ai/config/provider/DeepSeek.json
......@@ -17,10 +17,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"type": "llm"
},
......@@ -38,10 +36,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......
packages/service/core/ai/config/provider/Doubao.json
......@@ -16,10 +16,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -40,10 +38,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -64,10 +60,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -88,10 +82,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -112,10 +104,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -136,10 +126,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -158,10 +146,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -182,10 +168,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -206,10 +190,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -230,10 +212,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -254,10 +234,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -278,10 +256,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......
packages/service/core/ai/config/provider/Ernie.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -38,10 +36,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -62,10 +58,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -86,10 +80,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -112,4 +104,4 @@
"type": "embedding"
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/Gemini.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -38,10 +36,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -62,10 +58,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -86,10 +80,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -110,10 +102,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -134,10 +124,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -158,10 +146,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -182,10 +168,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -206,10 +190,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -230,10 +212,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......
packages/service/core/ai/config/provider/Grok.json
......@@ -16,10 +16,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -40,10 +38,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -64,10 +60,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -88,10 +82,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......
packages/service/core/ai/config/provider/Groq.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"type": "llm",
......@@ -37,10 +35,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"type": "llm",
......@@ -48,4 +44,4 @@
"showStopSign": true
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/Hunyuan.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -38,10 +36,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -62,10 +58,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -86,10 +80,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -110,10 +102,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -134,10 +124,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -158,10 +146,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -177,4 +163,4 @@
"type": "embedding"
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/Intern.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -38,10 +36,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -50,4 +46,4 @@
"showStopSign": true
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/MiniMax.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -38,10 +36,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -241,4 +237,4 @@
"type": "tts"
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/MistralAI.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -38,10 +36,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -62,10 +58,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -86,10 +80,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -98,4 +90,4 @@
"showStopSign": true
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/Moonshot.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -39,10 +37,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -64,10 +60,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -89,10 +83,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -114,10 +106,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -139,10 +129,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......
packages/service/core/ai/config/provider/OpenAI.json
......@@ -17,9 +17,7 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -41,9 +39,7 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -65,9 +61,7 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -89,9 +83,7 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -113,10 +105,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -135,10 +125,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {
......@@ -161,10 +149,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {
......@@ -187,10 +173,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {
......@@ -213,10 +197,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {
......@@ -239,10 +221,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {
......@@ -265,10 +245,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": false
......@@ -295,10 +273,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"type": "llm"
},
......@@ -317,10 +293,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"type": "llm"
},
......
packages/service/core/ai/config/provider/Qwen.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -39,10 +37,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -63,10 +59,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -88,10 +82,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"type": "llm",
"showTopP": true,
......@@ -110,10 +102,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -136,10 +126,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -164,10 +152,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -192,10 +178,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -220,10 +204,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -248,10 +230,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -276,10 +256,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -304,10 +282,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -332,10 +308,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -360,10 +334,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": false,
"usedInClassify": false,
"customCQPrompt": "",
"usedInExtractFields": false,
"usedInQueryExtension": false,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -387,10 +359,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": false,
"usedInClassify": false,
"customCQPrompt": "",
"usedInExtractFields": false,
"usedInQueryExtension": false,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {
"stream": true
......@@ -413,10 +383,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -437,10 +405,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -462,10 +428,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -487,10 +451,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -512,10 +474,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -537,10 +497,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": false,
"usedInClassify": false,
"customCQPrompt": "",
"usedInExtractFields": false,
"usedInQueryExtension": false,
"customExtractPrompt": "",
"usedInToolCall": false,
"defaultConfig": {},
"fieldMap": {},
......
packages/service/core/ai/config/provider/Siliconflow.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -40,8 +38,6 @@
"usedInToolCall": false,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"type": "llm",
......@@ -61,10 +57,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -207,4 +201,4 @@
"type": "rerank"
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/SparkDesk.json
......@@ -16,8 +16,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -38,8 +36,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -60,8 +56,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -82,8 +76,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -102,10 +94,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -126,10 +116,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -138,4 +126,4 @@
"showStopSign": true
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/StepFun.json
......@@ -16,8 +16,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -38,8 +36,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -60,8 +56,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -82,8 +76,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -104,8 +96,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -126,8 +116,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -148,8 +136,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -170,8 +156,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -192,8 +176,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -214,8 +196,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -236,8 +216,6 @@
"usedInQueryExtension": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"type": "llm",
"showTopP": true,
......@@ -327,4 +305,4 @@
"type": "tts"
}
]
}
\ No newline at end of file
}
packages/service/core/ai/config/provider/Yi.json
......@@ -14,10 +14,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -38,10 +36,8 @@
"defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"customCQPrompt": "",
"usedInExtractFields": true,
"usedInQueryExtension": true,
"customExtractPrompt": "",
"usedInToolCall": true,
"defaultConfig": {},
"fieldMap": {},
......@@ -50,4 +46,4 @@
"showStopSign": true
}
]
}
\ No newline at end of file
}
packages/service/core/app/controller.ts
import { type AppSchema } from '@fastgpt/global/core/app/type';
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { getLLMModel } from '../ai/model';
import { MongoApp } from './schema';
import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
import { storeSecretValue } from '../../common/secret/utils';
export const beforeUpdateAppFormat = <T extends AppSchema['modules'] | undefined>({
nodes,
isPlugin
}: {
nodes: T;
isPlugin: boolean;
}) => {
return {
nodes
};
export const beforeUpdateAppFormat = ({ nodes }: { nodes?: StoreNodeItemType[] }) => {
if (!nodes) return;
nodes.forEach((node) => {
// Format header secret
node.inputs.forEach((input) => {
if (input.key === NodeInputKeyEnum.headerSecret && typeof input.value === 'object') {
input.value = storeSecretValue(input.value);
}
});
// Format dataset search
if (node.flowNodeType === FlowNodeTypeEnum.datasetSearchNode) {
node.inputs.forEach((input) => {
if (input.key === NodeInputKeyEnum.datasetSelectList) {
const val = input.value as undefined | { datasetId: string }[] | { datasetId: string };
if (!val) {
input.value = [];
} else if (Array.isArray(val)) {
// Not rewrite reference value
if (val.length === 2 && val.every((item) => typeof item === 'string')) {
return;
}
input.value = val
.map((dataset: { datasetId: string }) => ({
datasetId: dataset.datasetId
}))
.filter((item) => !!item.datasetId);
} else if (typeof val === 'object' && val !== null) {
input.value = [
{
datasetId: val.datasetId
}
];
}
}
});
}
});
};
/* Get apps */
......
packages/service/core/app/mcp.ts
......@@ -8,9 +8,11 @@ import { retryFn } from '@fastgpt/global/common/system/utils';
export class MCPClient {
private client: Client;
private url: string;
private headers: Record<string, any> = {};
constructor(config: { url: string }) {
constructor(config: { url: string; headers: Record<string, any> }) {
this.url = config.url;
this.headers = config.headers;
this.client = new Client({
name: 'FastGPT-MCP-client',
version: '1.0.0'
......@@ -19,11 +21,34 @@ export class MCPClient {
private async getConnection(): Promise<Client> {
try {
const transport = new StreamableHTTPClientTransport(new URL(this.url));
const transport = new StreamableHTTPClientTransport(new URL(this.url), {
requestInit: {
headers: this.headers
}
});
await this.client.connect(transport);
return this.client;
} catch (error) {
await this.client.connect(new SSEClientTransport(new URL(this.url)));
await this.client.connect(
new SSEClientTransport(new URL(this.url), {
requestInit: {
headers: this.headers
},
eventSourceInit: {
fetch: (url, init) => {
const headers = new Headers({
...init?.headers,
...this.headers
});
return fetch(url, {
...init,
headers
});
}
}
})
);
return this.client;
}
}
......
packages/service/core/app/utils.ts
......@@ -83,8 +83,6 @@ export async function rewriteAppWorkflowToDetail({
})
);
/* Add node(App Type) versionlabel and latest sign ==== */
// Get all dataset ids from nodes
nodes.forEach((node) => {
if (node.flowNodeType !== FlowNodeTypeEnum.datasetSearchNode) return;
......@@ -170,34 +168,3 @@ export async function rewriteAppWorkflowToDetail({
return nodes;
}
export async function rewriteAppWorkflowToSimple(formatNodes: StoreNodeItemType[]) {
formatNodes.forEach((node) => {
if (node.flowNodeType !== FlowNodeTypeEnum.datasetSearchNode) return;
node.inputs.forEach((input) => {
if (input.key === NodeInputKeyEnum.datasetSelectList) {
const val = input.value as undefined | { datasetId: string }[] | { datasetId: string };
if (!val) {
input.value = [];
} else if (Array.isArray(val)) {
// Not rewrite reference value
if (val.length === 2 && val.every((item) => typeof item === 'string')) {
return;
}
input.value = val
.map((dataset: { datasetId: string }) => ({
datasetId: dataset.datasetId
}))
.filter((item) => !!item.datasetId);
} else if (typeof val === 'object' && val !== null) {
input.value = [
{
datasetId: val.datasetId
}
];
}
}
});
});
}
packages/service/core/chat/chatItemSchema.ts
import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
const { Schema, model, models } = connectionMongo;
import { connectionMongo, getMongoModel } from '../../common/mongo';
const { Schema } = connectionMongo;
import { type ChatItemSchema as ChatItemType } from '@fastgpt/global/core/chat/type';
import { ChatRoleMap } from '@fastgpt/global/core/chat/constants';
import { getNanoid } from '@fastgpt/global/common/string/tools';
......@@ -61,16 +61,13 @@ const ChatItemSchema = new Schema({
type: Array,
default: []
},
memories: Object,
errorMsg: String,
userGoodFeedback: {
type: String
},
userGoodFeedback: String,
userBadFeedback: {
type: String
},
customFeedbacks: {
type: [String]
},
customFeedbacks: [String],
adminFeedback: {
type: {
datasetId: String,
......
packages/service/core/chat/controller.ts
import type { ChatItemType, ChatItemValueItemType } from '@fastgpt/global/core/chat/type';
import type { ChatItemType } from '@fastgpt/global/core/chat/type';
import { MongoChatItem } from './chatItemSchema';
import { addLog } from '../../common/system/log';
import { ChatItemValueTypeEnum } from '@fastgpt/global/core/chat/constants';
import { delFileByFileIdList, getGFSCollection } from '../../common/file/gridfs/controller';
import { BucketNameEnum } from '@fastgpt/global/common/file/constants';
import { MongoChat } from './chatSchema';
......@@ -29,29 +28,9 @@ export async function getChatItems({
]);
histories.reverse();
histories.forEach((item) => {
// @ts-ignore
item.value = adaptStringValue(item.value);
});
return { histories, total };
}
/* Temporary adaptation for old conversation records */
export const adaptStringValue = (value: any): ChatItemValueItemType[] => {
if (typeof value === 'string') {
return [
{
type: ChatItemValueTypeEnum.text,
text: {
content: value
}
}
];
}
return value;
};
export const addCustomFeedbacks = async ({
appId,
chatId,
......
packages/service/core/workflow/dispatch/abandoned/runApp.ts
......@@ -59,25 +59,27 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
const chatHistories = getHistories(history, histories);
const { files } = chatValue2RuntimePrompt(query);
const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
...props,
runningAppInfo: {
id: String(appData._id),
teamId: String(appData.teamId),
tmbId: String(appData.tmbId)
},
runtimeNodes: storeNodes2RuntimeNodes(
appData.modules,
getWorkflowEntryNodeIds(appData.modules)
),
runtimeEdges: storeEdges2RuntimeEdges(appData.edges),
histories: chatHistories,
query: runtimePrompt2ChatsValue({
files,
text: userChatInput
}),
variables: props.variables
});
const { flowResponses, flowUsages, assistantResponses, system_memories } = await dispatchWorkFlow(
{
...props,
runningAppInfo: {
id: String(appData._id),
teamId: String(appData.teamId),
tmbId: String(appData.tmbId)
},
runtimeNodes: storeNodes2RuntimeNodes(
appData.modules,
getWorkflowEntryNodeIds(appData.modules)
),
runtimeEdges: storeEdges2RuntimeEdges(appData.edges),
histories: chatHistories,
query: runtimePrompt2ChatsValue({
files,
text: userChatInput
}),
variables: props.variables
}
);
const completeMessages = chatHistories.concat([
{
......@@ -94,6 +96,7 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
return {
assistantResponses,
system_memories,
[DispatchNodeResponseKeyEnum.nodeResponse]: {
moduleLogo: appData.avatar,
query: userChatInput,
......
packages/service/core/workflow/dispatch/agent/classifyQuestion.ts
......@@ -11,19 +11,17 @@ import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
import { getCQPrompt } from '@fastgpt/global/core/ai/prompt/agent';
import { getCQSystemPrompt } from '@fastgpt/global/core/ai/prompt/agent';
import { type LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
import { getLLMModel } from '../../../ai/model';
import { getHistories } from '../utils';
import { formatModelChars2Points } from '../../../../support/wallet/usage/utils';
import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
import { getHandleId } from '@fastgpt/global/core/workflow/utils';
import { loadRequestMessages } from '../../../chat/utils';
import { llmCompletionsBodyFormat, formatLLMResponse } from '../../../ai/utils';
import { addLog } from '../../../../common/system/log';
import { ModelTypeEnum } from '../../../../../global/core/ai/model';
import { replaceVariable } from '@fastgpt/global/common/string/tools';
type Props = ModuleDispatchProps<{
[NodeInputKeyEnum.aiModel]: string;
......@@ -35,12 +33,16 @@ type Props = ModuleDispatchProps<{
type CQResponse = DispatchNodeResultType<{
[NodeOutputKeyEnum.cqResult]: string;
}>;
type ActionProps = Props & { cqModel: LLMModelItemType };
type ActionProps = Props & {
cqModel: LLMModelItemType;
lastMemory?: ClassifyQuestionAgentItemType;
};
/* request openai chat */
export const dispatchClassifyQuestion = async (props: Props): Promise<CQResponse> => {
const {
externalProvider,
runningAppInfo,
node: { nodeId, name },
histories,
params: { model, history = 6, agents, userChatInput }
......@@ -52,10 +54,16 @@ export const dispatchClassifyQuestion = async (props: Props): Promise<CQResponse
const cqModel = getLLMModel(model);
const memoryKey = `${runningAppInfo.id}-${nodeId}`;
const chatHistories = getHistories(history, histories);
// @ts-ignore
const lastMemory = chatHistories[chatHistories.length - 1]?.memories?.[
memoryKey
] as ClassifyQuestionAgentItemType;
const { arg, inputTokens, outputTokens } = await completions({
...props,
lastMemory,
histories: chatHistories,
cqModel
});
......@@ -74,6 +82,9 @@ export const dispatchClassifyQuestion = async (props: Props): Promise<CQResponse
[DispatchNodeResponseKeyEnum.skipHandleId]: agents
.filter((item) => item.key !== result.key)
.map((item) => getHandleId(nodeId, 'source', item.key)),
[DispatchNodeResponseKeyEnum.memories]: {
[memoryKey]: result
},
[DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: externalProvider.openaiAccount?.key ? 0 : totalPoints,
model: modelName,
......@@ -100,29 +111,38 @@ const completions = async ({
cqModel,
externalProvider,
histories,
params: { agents, systemPrompt = '', userChatInput },
node: { version }
lastMemory,
params: { agents, systemPrompt = '', userChatInput }
}: ActionProps) => {
const messages: ChatItemType[] = [
{
obj: ChatRoleEnum.Human,
obj: ChatRoleEnum.System,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: replaceVariable(cqModel.customCQPrompt || getCQPrompt(version), {
systemPrompt: systemPrompt || 'null',
typeList: agents
.map((item) => `{"类型ID":"${item.key}", "问题类型":"${item.value}"}`)
.join('\n------\n'),
history: histories
.map((item) => `${item.obj}:${chatValue2RuntimePrompt(item.value).text}`)
.join('\n------\n'),
question: userChatInput
content: getCQSystemPrompt({
systemPrompt,
memory: lastMemory ? JSON.stringify(lastMemory) : '',
typeList: JSON.stringify(
agents.map((item) => ({ id: item.key, description: item.value }))
)
})
}
}
]
},
...histories,
{
obj: ChatRoleEnum.Human,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: userChatInput
}
}
]
}
];
const requestMessages = await loadRequestMessages({
......@@ -145,7 +165,6 @@ const completions = async ({
const { text: answer, usage } = await formatLLMResponse(response);
// console.log(JSON.stringify(chats2GPTMessages({ messages, reserveId: false }), null, 2));
// console.log(answer, '----');
const id =
agents.find((item) => answer.includes(item.key))?.key ||
......
packages/service/core/workflow/dispatch/agent/extract.ts
......@@ -13,7 +13,7 @@ import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { NodeOutputKeyEnum, toolValueTypeList } from '@fastgpt/global/core/workflow/constants';
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
import { replaceVariable, sliceJsonStr } from '@fastgpt/global/common/string/tools';
import { sliceJsonStr } from '@fastgpt/global/common/string/tools';
import { type LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
import { getHistories } from '../utils';
import { getLLMModel } from '../../../ai/model';
......@@ -21,12 +21,10 @@ import { formatModelChars2Points } from '../../../../support/wallet/usage/utils'
import json5 from 'json5';
import {
type ChatCompletionMessageParam,
type ChatCompletionTool,
type UnStreamChatType
type ChatCompletionTool
} from '@fastgpt/global/core/ai/type';
import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/global/core/ai/constants';
import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
import { llmCompletionsBodyFormat, formatLLMResponse } from '../../../ai/utils';
import { ModelTypeEnum } from '../../../../../global/core/ai/model';
import {
......@@ -46,14 +44,15 @@ type Response = DispatchNodeResultType<{
[NodeOutputKeyEnum.contextExtractFields]: string;
}>;
type ActionProps = Props & { extractModel: LLMModelItemType };
type ActionProps = Props & { extractModel: LLMModelItemType; lastMemory?: Record<string, any> };
const agentFunName = 'request_function';
export async function dispatchContentExtract(props: Props): Promise<Response> {
const {
externalProvider,
node: { name },
runningAppInfo,
node: { nodeId, name },
histories,
params: { content, history = 6, model, description, extractKeys }
} = props;
......@@ -65,18 +64,27 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
const extractModel = getLLMModel(model);
const chatHistories = getHistories(history, histories);
const memoryKey = `${runningAppInfo.id}-${nodeId}`;
// @ts-ignore
const lastMemory = chatHistories[chatHistories.length - 1]?.memories?.[memoryKey] as Record<
string,
any
>;
const { arg, inputTokens, outputTokens } = await (async () => {
if (extractModel.toolChoice) {
return toolChoice({
...props,
histories: chatHistories,
extractModel
extractModel,
lastMemory
});
}
return completions({
...props,
histories: chatHistories,
extractModel
extractModel,
lastMemory
});
})();
......@@ -121,6 +129,9 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
return {
[NodeOutputKeyEnum.success]: success,
[NodeOutputKeyEnum.contextExtractFields]: JSON.stringify(arg),
[DispatchNodeResponseKeyEnum.memories]: {
[memoryKey]: arg
},
...arg,
[DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: externalProvider.openaiAccount?.key ? 0 : totalPoints,
......@@ -144,13 +155,52 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
};
}
const getFunctionCallSchema = async ({
extractModel,
histories,
params: { content, extractKeys, description },
node: { version }
}: ActionProps) => {
const getJsonSchema = ({ params: { extractKeys } }: ActionProps) => {
const properties: Record<
string,
{
type: string;
description: string;
}
> = {};
extractKeys.forEach((item) => {
const jsonSchema = (
toolValueTypeList.find((type) => type.value === item.valueType) || toolValueTypeList[0]
)?.jsonSchema;
properties[item.key] = {
...jsonSchema,
description: item.desc,
...(item.enum ? { enum: item.enum.split('\n').filter(Boolean) } : {})
};
});
return properties;
};
const toolChoice = async (props: ActionProps) => {
const {
externalProvider,
extractModel,
histories,
params: { content, description },
lastMemory
} = props;
const messages: ChatItemType[] = [
{
obj: ChatRoleEnum.System,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: getExtractJsonToolPrompt({
systemPrompt: description,
memory: lastMemory ? JSON.stringify(lastMemory) : undefined
})
}
}
]
},
...histories,
{
obj: ChatRoleEnum.Human,
......@@ -158,10 +208,7 @@ const getFunctionCallSchema = async ({
{
type: ChatItemValueTypeEnum.text,
text: {
content: replaceVariable(getExtractJsonToolPrompt(version), {
description,
content
})
content
}
}
]
......@@ -177,49 +224,20 @@ const getFunctionCallSchema = async ({
useVision: false
});
const properties: Record<
string,
{
type: string;
description: string;
}
> = {};
extractKeys.forEach((item) => {
const jsonSchema = (
toolValueTypeList.find((type) => type.value === item.valueType) || toolValueTypeList[0]
)?.jsonSchema;
properties[item.key] = {
...jsonSchema,
description: item.desc,
...(item.enum ? { enum: item.enum.split('\n').filter(Boolean) } : {})
};
});
// function body
const agentFunction = {
name: agentFunName,
description: '需要执行的函数',
parameters: {
type: 'object',
properties,
required: []
}
};
return {
filterMessages: requestMessages,
agentFunction
};
};
const toolChoice = async (props: ActionProps) => {
const { externalProvider, extractModel } = props;
const { filterMessages, agentFunction } = await getFunctionCallSchema(props);
const schema = getJsonSchema(props);
const tools: ChatCompletionTool[] = [
{
type: 'function',
function: agentFunction
function: {
name: agentFunName,
description: '需要执行的函数',
parameters: {
type: 'object',
properties: schema,
required: []
}
}
}
];
......@@ -228,12 +246,13 @@ const toolChoice = async (props: ActionProps) => {
stream: true,
model: extractModel.model,
temperature: 0.01,
messages: filterMessages,
messages: requestMessages,
tools,
tool_choice: { type: 'function', function: { name: agentFunName } }
},
extractModel
);
const { response } = await createChatCompletion({
body,
userKey: externalProvider.openaiAccount
......@@ -242,7 +261,7 @@ const toolChoice = async (props: ActionProps) => {
const arg: Record<string, any> = (() => {
try {
return json5.parse(toolCalls?.[0]?.function?.arguments || '');
return json5.parse(toolCalls?.[0]?.function?.arguments || text || '');
} catch (error) {
console.log('body', body);
console.log('AI response', text, toolCalls?.[0]?.function);
......@@ -267,40 +286,39 @@ const toolChoice = async (props: ActionProps) => {
};
};
const completions = async ({
extractModel,
externalProvider,
histories,
params: { content, extractKeys, description = 'No special requirements' },
node: { version }
}: ActionProps) => {
const completions = async (props: ActionProps) => {
const {
extractModel,
externalProvider,
histories,
lastMemory,
params: { content, description }
} = props;
const messages: ChatItemType[] = [
{
obj: ChatRoleEnum.System,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: getExtractJsonPrompt({
systemPrompt: description,
memory: lastMemory ? JSON.stringify(lastMemory) : undefined,
schema: JSON.stringify(getJsonSchema(props))
})
}
}
]
},
...histories,
{
obj: ChatRoleEnum.Human,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: replaceVariable(
extractModel.customExtractPrompt || getExtractJsonPrompt(version),
{
description,
json: extractKeys
.map((item) => {
const valueType = item.valueType || 'string';
if (valueType !== 'string' && valueType !== 'number') {
item.enum = undefined;
}
return `{"type":${item.valueType || 'string'}, "key":"${item.key}", "description":"${item.desc}" ${
item.enum ? `, "enum":"[${item.enum.split('\n')}]"` : ''
}}`;
})
.join('\n'),
text: `${histories.map((item) => `${item.obj}:${chatValue2RuntimePrompt(item.value).text}`).join('\n')}
Human: ${content}`
}
)
content
}
}
]
......
packages/service/core/workflow/dispatch/index.ts
......@@ -223,6 +223,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
interactiveResponse: InteractiveNodeResponseType;
}
| undefined;
let system_memories: Record<string, any> = {}; // Workflow node memories
/* Store special response field */
function pushStore(
......@@ -235,7 +236,8 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
toolResponses,
assistantResponses,
rewriteHistories,
runTimes = 1
runTimes = 1,
system_memories: newMemories
}: Omit<
DispatchNodeResultType<{
[NodeOutputKeyEnum.answerText]?: string;
......@@ -249,6 +251,13 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
workflowRunTimes += runTimes;
props.maxRunTimes -= runTimes;
if (newMemories) {
system_memories = {
...system_memories,
...newMemories
};
}
if (responseData) {
chatResponses.push(responseData);
}
......@@ -771,7 +780,12 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
[DispatchNodeResponseKeyEnum.assistantResponses]:
mergeAssistantResponseAnswerText(chatAssistantResponse),
[DispatchNodeResponseKeyEnum.toolResponses]: toolRunResponse,
newVariables: removeSystemVariable(variables, externalProvider.externalWorkflowVariables),
[DispatchNodeResponseKeyEnum.newVariables]: removeSystemVariable(
variables,
externalProvider.externalWorkflowVariables
),
[DispatchNodeResponseKeyEnum.memories]:
Object.keys(system_memories).length > 0 ? system_memories : undefined,
durationSeconds
};
} catch (error) {
......
packages/service/core/workflow/dispatch/plugin/run.ts
......@@ -80,32 +80,33 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
appId: String(plugin.id),
...(externalProvider ? externalProvider.externalWorkflowVariables : {})
};
const { flowResponses, flowUsages, assistantResponses, runTimes } = await dispatchWorkFlow({
...props,
// Rewrite stream mode
...(system_forbid_stream
? {
stream: false,
workflowStreamResponse: undefined
}
: {}),
runningAppInfo: {
id: String(plugin.id),
// 如果系统插件有 teamId 和 tmbId，则使用系统插件的 teamId 和 tmbId（管理员指定了插件作为系统插件）
teamId: plugin.teamId || runningAppInfo.teamId,
tmbId: plugin.tmbId || runningAppInfo.tmbId,
isChildApp: true
},
variables: runtimeVariables,
query: getPluginRunUserQuery({
pluginInputs: getPluginInputsFromStoreNodes(plugin.nodes),
const { flowResponses, flowUsages, assistantResponses, runTimes, system_memories } =
await dispatchWorkFlow({
...props,
// Rewrite stream mode
...(system_forbid_stream
? {
stream: false,
workflowStreamResponse: undefined
}
: {}),
runningAppInfo: {
id: String(plugin.id),
// 如果系统插件有 teamId 和 tmbId，则使用系统插件的 teamId 和 tmbId（管理员指定了插件作为系统插件）
teamId: plugin.teamId || runningAppInfo.teamId,
tmbId: plugin.tmbId || runningAppInfo.tmbId,
isChildApp: true
},
variables: runtimeVariables,
files
}).value,
chatConfig: {},
runtimeNodes,
runtimeEdges: storeEdges2RuntimeEdges(plugin.edges)
});
query: getPluginRunUserQuery({
pluginInputs: getPluginInputsFromStoreNodes(plugin.nodes),
variables: runtimeVariables,
files
}).value,
chatConfig: {},
runtimeNodes,
runtimeEdges: storeEdges2RuntimeEdges(plugin.edges)
});
const output = flowResponses.find((item) => item.moduleType === FlowNodeTypeEnum.pluginOutput);
if (output) {
output.moduleLogo = plugin.avatar;
......@@ -119,6 +120,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
return {
// 嵌套运行时，如果 childApp stream=false，实际上不会有任何内容输出给用户，所以不需要存储
assistantResponses: system_forbid_stream ? [] : assistantResponses,
system_memories,
// responseData, // debug
[DispatchNodeResponseKeyEnum.runTimes]: runTimes,
[DispatchNodeResponseKeyEnum.nodeResponse]: {
......
packages/service/core/workflow/dispatch/plugin/runApp.ts
......@@ -124,30 +124,36 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
? query
: runtimePrompt2ChatsValue({ files: userInputFiles, text: userChatInput });
const { flowResponses, flowUsages, assistantResponses, runTimes, workflowInteractiveResponse } =
await dispatchWorkFlow({
...props,
lastInteractive: childrenInteractive,
// Rewrite stream mode
...(system_forbid_stream
? {
stream: false,
workflowStreamResponse: undefined
}
: {}),
runningAppInfo: {
id: String(appData._id),
teamId: String(appData.teamId),
tmbId: String(appData.tmbId),
isChildApp: true
},
runtimeNodes,
runtimeEdges,
histories: chatHistories,
variables: childrenRunVariables,
query: theQuery,
chatConfig
});
const {
flowResponses,
flowUsages,
assistantResponses,
runTimes,
workflowInteractiveResponse,
system_memories
} = await dispatchWorkFlow({
...props,
lastInteractive: childrenInteractive,
// Rewrite stream mode
...(system_forbid_stream
? {
stream: false,
workflowStreamResponse: undefined
}
: {}),
runningAppInfo: {
id: String(appData._id),
teamId: String(appData.teamId),
tmbId: String(appData.tmbId),
isChildApp: true
},
runtimeNodes,
runtimeEdges,
histories: chatHistories,
variables: childrenRunVariables,
query: theQuery,
chatConfig
});
const completeMessages = chatHistories.concat([
{
......@@ -165,6 +171,7 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
const usagePoints = flowUsages.reduce((sum, item) => sum + (item.totalPoints || 0), 0);
return {
system_memories,
[DispatchNodeResponseKeyEnum.interactive]: workflowInteractiveResponse
? {
type: 'childrenInteractive',
......
packages/service/core/workflow/dispatch/plugin/runTool.ts
......@@ -6,11 +6,14 @@ import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runti
import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { MCPClient } from '../../../app/mcp';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
import { getSecretValue } from '../../../../common/secret/utils';
type RunToolProps = ModuleDispatchProps<{
toolData: {
name: string;
url: string;
headerSecret: StoreSecretValueType;
};
}>;
......@@ -27,7 +30,12 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
const { toolData, ...restParams } = params;
const { name: toolName, url } = toolData;
const mcpClient = new MCPClient({ url });
const mcpClient = new MCPClient({
url,
headers: getSecretValue({
storeSecret: toolData.headerSecret
})
});
try {
const result = await mcpClient.toolCall(toolName, restParams);
......
packages/service/core/workflow/dispatch/tools/http468.ts
......@@ -29,6 +29,8 @@ import { createFileToken } from '../../../../support/permission/controller';
import { JSONPath } from 'jsonpath-plus';
import type { SystemPluginSpecialResponse } from '../../../../../plugins/type';
import json5 from 'json5';
import { getSecretValue } from '../../../../common/secret/utils';
import type { StoreSecretValueType } from '@fastgpt/global/common/secret/type';
type PropsArrType = {
key: string;
......@@ -37,6 +39,7 @@ type PropsArrType = {
};
type HttpRequestProps = ModuleDispatchProps<{
[NodeInputKeyEnum.abandon_httpUrl]: string;
[NodeInputKeyEnum.headerSecret]?: StoreSecretValueType;
[NodeInputKeyEnum.httpMethod]: string;
[NodeInputKeyEnum.httpReqUrl]: string;
[NodeInputKeyEnum.httpHeaders]?: PropsArrType[];
......@@ -83,6 +86,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
system_httpFormBody: httpFormBody = [],
system_httpContentType: httpContentType = ContentTypes.json,
system_httpTimeout: httpTimeout = 60,
system_header_secret: headerSecret,
[NodeInputKeyEnum.addInputParam]: dynamicInput,
...body
}
......@@ -156,110 +160,6 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
return String(val);
};
// Test cases for variable replacement in JSON body
// const bodyTest = () => {
// const testData = [
// // 基本字符串替换
// {
// body: `{"name":"{{name}}","age":"18"}`,
// variables: [{ key: '{{name}}', value: '测试' }],
// result: `{"name":"测试","age":"18"}`
// },
// // 特殊字符处理
// {
// body: `{"text":"{{text}}"}`,
// variables: [{ key: '{{text}}', value: '包含"引号"和\\反斜杠' }],
// result: `{"text":"包含\\"引号\\"和\\反斜杠"}`
// },
// // 数字类型处理
// {
// body: `{"count":{{count}},"price":{{price}}}`,
// variables: [
// { key: '{{count}}', value: '42' },
// { key: '{{price}}', value: '99.99' }
// ],
// result: `{"count":42,"price":99.99}`
// },
// // 布尔值处理
// {
// body: `{"isActive":{{isActive}},"hasData":{{hasData}}}`,
// variables: [
// { key: '{{isActive}}', value: 'true' },
// { key: '{{hasData}}', value: 'false' }
// ],
// result: `{"isActive":true,"hasData":false}`
// },
// // 对象类型处理
// {
// body: `{"user":{{user}},"user2":"{{user2}}"}`,
// variables: [
// { key: '{{user}}', value: `{"id":1,"name":"张三"}` },
// { key: '{{user2}}', value: `{"id":1,"name":"张三"}` }
// ],
// result: `{"user":{"id":1,"name":"张三"},"user2":"{\\"id\\":1,\\"name\\":\\"张三\\"}"}`
// },
// // 数组类型处理
// {
// body: `{"items":{{items}}}`,
// variables: [{ key: '{{items}}', value: '[1, 2, 3]' }],
// result: `{"items":[1,2,3]}`
// },
// // null 和 undefined 处理
// {
// body: `{"nullValue":{{nullValue}},"undefinedValue":{{undefinedValue}}}`,
// variables: [
// { key: '{{nullValue}}', value: 'null' },
// { key: '{{undefinedValue}}', value: 'undefined' }
// ],
// result: `{"nullValue":null,"undefinedValue":null}`
// },
// // 嵌套JSON结构
// {
// body: `{"data":{"nested":{"value":"{{nestedValue}}"}}}`,
// variables: [{ key: '{{nestedValue}}', value: '嵌套值' }],
// result: `{"data":{"nested":{"value":"嵌套值"}}}`
// },
// // 多变量替换
// {
// body: `{"first":"{{first}}","second":"{{second}}","third":{{third}}}`,
// variables: [
// { key: '{{first}}', value: '第一' },
// { key: '{{second}}', value: '第二' },
// { key: '{{third}}', value: '3' }
// ],
// result: `{"first":"第一","second":"第二","third":3}`
// },
// // JSON字符串作为变量值
// {
// body: `{"config":{{config}}}`,
// variables: [{ key: '{{config}}', value: '{"setting":"enabled","mode":"advanced"}' }],
// result: `{"config":{"setting":"enabled","mode":"advanced"}}`
// }
// ];
// for (let i = 0; i < testData.length; i++) {
// const item = testData[i];
// let bodyStr = item.body;
// for (const variable of item.variables) {
// const isQuote = isVariableInQuotes(bodyStr, variable.key);
// bodyStr = bodyStr.replace(variable.key, valToStr(variable.value, isQuote));
// }
// bodyStr = bodyStr.replace(/(".*?")\s*:\s*undefined\b/g, '$1:null');
// console.log(bodyStr === item.result, i);
// if (bodyStr !== item.result) {
// console.log(bodyStr);
// console.log(item.result);
// } else {
// try {
// JSON.parse(item.result);
// } catch (error) {
// console.log('反序列化异常', i, item.result);
// }
// }
// }
// };
// bodyTest();
// 1. Replace {{key.key}} variables
const regex1 = /\{\{\$([^.]+)\.([^$]+)\$\}\}/g;
......@@ -313,16 +213,13 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
httpReqUrl = replaceStringVariables(httpReqUrl);
// parse header
const headers = await (() => {
const publicHeaders = await (async () => {
try {
const contentType = contentTypeMap[httpContentType];
if (contentType) {
httpHeader = [{ key: 'Content-Type', value: contentType, type: 'string' }, ...httpHeader];
}
if (!httpHeader || httpHeader.length === 0) return {};
// array
return httpHeader.reduce((acc: Record<string, string>, item) => {
const key = replaceStringVariables(item.key);
const value = replaceStringVariables(item.value);
......@@ -333,6 +230,9 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
return Promise.reject('Header 为非法 JSON 格式');
}
})();
const sensitiveHeaders = getSecretValue({
storeSecret: headerSecret
});
const params = httpParams.reduce((acc: Record<string, string>, item) => {
const key = replaceStringVariables(item.key);
......@@ -418,7 +318,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
return fetchData({
method: httpMethod,
url: httpReqUrl,
headers,
headers: { ...sensitiveHeaders, ...publicHeaders },
body: requestBody,
params,
timeout: httpTimeout
......@@ -471,7 +371,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
totalPoints: 0,
params: Object.keys(params).length > 0 ? params : undefined,
body: Object.keys(formattedRequestBody).length > 0 ? formattedRequestBody : undefined,
headers: Object.keys(headers).length > 0 ? headers : undefined,
headers: Object.keys(publicHeaders).length > 0 ? publicHeaders : undefined,
httpResult: rawResponse
},
[DispatchNodeResponseKeyEnum.toolResponses]:
......@@ -486,7 +386,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
[DispatchNodeResponseKeyEnum.nodeResponse]: {
params: Object.keys(params).length > 0 ? params : undefined,
body: Object.keys(formattedRequestBody).length > 0 ? formattedRequestBody : undefined,
headers: Object.keys(headers).length > 0 ? headers : undefined,
headers: Object.keys(publicHeaders).length > 0 ? publicHeaders : undefined,
httpResult: { error: formatHttpError(error) }
},
[NodeOutputKeyEnum.httpRawResponse]: getErrText(error)
......
packages/service/core/workflow/dispatch/type.d.ts
......@@ -25,7 +25,8 @@ export type DispatchFlowResponse = {
[DispatchNodeResponseKeyEnum.toolResponses]: ToolRunResponseItemType;
[DispatchNodeResponseKeyEnum.assistantResponses]: AIChatItemValueItemType[];
[DispatchNodeResponseKeyEnum.runTimes]: number;
newVariables: Record<string, string>;
[DispatchNodeResponseKeyEnum.memories]?: Record<string, any>;
[DispatchNodeResponseKeyEnum.newVariables]: Record<string, string>;
durationSeconds: number;
};
......
packages/service/core/workflow/dispatch/utils.ts
......@@ -164,11 +164,18 @@ export const rewriteRuntimeWorkFlow = (
const toolList =
toolSetNode.inputs.find((input) => input.key === 'toolSetData')?.value?.toolList || [];
const url = toolSetNode.inputs.find((input) => input.key === 'toolSetData')?.value?.url;
const headerSecret = toolSetNode.inputs.find((input) => input.key === 'toolSetData')?.value
?.headerSecret;
const incomingEdges = edges.filter((edge) => edge.target === toolSetNode.nodeId);
for (const tool of toolList) {
const newToolNode = getMCPToolRuntimeNode({ avatar: toolSetNode.avatar, tool, url });
const newToolNode = getMCPToolRuntimeNode({
avatar: toolSetNode.avatar,
tool,
url,
headerSecret
});
nodes.push({ ...newToolNode, name: `${toolSetNode.name} / ${tool.name}` });
......
packages/web/components/common/Icon/icons/close.svg
<svg viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.65613 2.84383C9.85139 3.0391 9.85139 3.35568 9.65613 3.55094L7.20708 5.99999L9.65617 8.44908C9.85143 8.64434 9.85143 8.96093 9.65617 9.15619C9.46091 9.35145 9.14433 9.35145 8.94906 9.15619L6.49997 6.7071L4.05088 9.15619C3.85562 9.35145 3.53904 9.35145 3.34377 9.15619C3.14851 8.96093 3.14851 8.64434 3.34377 8.44908L5.79286 5.99999L3.34382 3.55094C3.14855 3.35568 3.14855 3.0391 3.34382 2.84383C3.53908 2.64857 3.85566 2.64857 4.05092 2.84383L6.49997 5.29288L8.94902 2.84383C9.14428 2.64857 9.46087 2.64857 9.65613 2.84383Z" fill="#92A5C9"/>
</svg>
<svg viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M9.65613 2.84383C9.85139 3.0391 9.85139 3.35568 9.65613 3.55094L7.20708 5.99999L9.65617 8.44908C9.85143 8.64434 9.85143 8.96093 9.65617 9.15619C9.46091 9.35145 9.14433 9.35145 8.94906 9.15619L6.49997 6.7071L4.05088 9.15619C3.85562 9.35145 3.53904 9.35145 3.34377 9.15619C3.14851 8.96093 3.14851 8.64434 3.34377 8.44908L5.79286 5.99999L3.34382 3.55094C3.14855 3.35568 3.14855 3.0391 3.34382 2.84383C3.53908 2.64857 3.85566 2.64857 4.05092 2.84383L6.49997 5.29288L8.94902 2.84383C9.14428 2.64857 9.46087 2.64857 9.65613 2.84383Z"
fill="currentColor" />
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/chat/sendFill.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" class="icon-sm m-1 md:m-0">
<path
d="M.5 1.163A1 1 0 0 1 1.97.28l12.868 6.837a1 1 0 0 1 0 1.766L1.969 15.72A1 1 0 0 1 .5 14.836V10.33a1 1 0 0 1 .816-.983L8.5 8 1.316 6.653A1 1 0 0 1 .5 5.67V1.163Z"
fill="currentColor"></path>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
<path d="M18.2341 9.53355C18.0616 9.19432 17.5241 8.94365 16.4489 8.44231L4.77875 3.00039C3.54356 2.4244 2.92596 2.13641 2.51138 2.23006C2.1515 2.31134 1.85435 2.54718 1.71066 2.86554C1.54513 3.23231 1.75085 3.84719 2.16228 5.07695L3.40682 8.79688L7.33305 9.25598C8.61345 9.4057 9.25367 9.48056 9.38362 9.5746C9.69329 9.7987 9.69329 10.2351 9.38362 10.4592C9.25367 10.5532 8.61347 10.6281 7.33307 10.7778L3.39507 11.2383L2.16228 14.9231C1.75085 16.1528 1.54513 16.7677 1.71066 17.1345C1.85435 17.4528 2.1515 17.6887 2.51138 17.77C2.92596 17.8636 3.54356 17.5756 4.77875 16.9996L16.4489 11.5577C17.5241 11.0564 18.0616 10.8057 18.2341 10.4665C18.3842 10.1713 18.3842 9.82876 18.2341 9.53355Z" />
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/stop.svg
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1682424901088" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3662" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M885.333333 85.333333H138.666667a53.393333 53.393333 0 0 0-53.333334 53.333334v746.666666a53.393333 53.393333 0 0 0 53.333334 53.333334h746.666666a53.393333 53.393333 0 0 0 53.333334-53.333334V138.666667a53.393333 53.393333 0 0 0-53.333334-53.333334z m-160 602.666667a37.373333 37.373333 0 0 1-37.333333 37.333333H336a37.373333 37.373333 0 0 1-37.333333-37.333333V336a37.373333 37.373333 0 0 1 37.333333-37.333333h352a37.373333 37.373333 0 0 1 37.333333 37.333333z" p-id="3663"></path></svg>
\ No newline at end of file
<svg t="1749735945875" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1418" width="64" height="64"><path d="M512 1014.7488005c-276.51184005 0-502.7488005-226.23696045-502.7488005-502.7488005s226.23696045-502.7488005 502.7488005-502.7488005 502.7488005 226.23696045 502.7488005 502.7488005-226.23696045 502.7488005-502.7488005 502.7488005z m0-125.68719975c207.38388041 0 377.06160075-169.67772034 377.06160075-377.06160075s-169.67772034-377.06160075-377.06160075-377.06160075-377.06160075 169.67772034-377.06160075 377.06160075 169.67772034 377.06160075 377.06160075 377.06160075z m-125.68719975-502.7488005h251.3743995v251.3743995h-251.3743995v-251.3743995z" p-id="1419"></path></svg>
\ No newline at end of file
packages/web/i18n/en/account_bill.json
{
"Invoice_document": "Invoice documents",
"all": "all",
"back": "return",
"bank_account": "Account opening account",
"bank_name": "Bank of deposit",
"bill_detail": "Bill details",
"bill_record": "billing records",
"click_to_download": "Click to download",
"company_address": "Company address",
"company_phone": "Company phone number",
"completed": "Completed",
......
packages/web/i18n/en/common.json
......@@ -96,6 +96,10 @@
"all_quotes": "All quotes",
"all_result": "Full Results",
"app_not_version": "This application has not been published, please publish it first",
"auth_config": "Authentication",
"auth_type": "Authentication type",
"auth_type.Custom": "Customize",
"auth_type.None": "None",
"back": "Back",
"base_config": "Basic Configuration",
"bill_already_processed": "Order has been processed",
......@@ -260,7 +264,7 @@
"core.app.have_saved": "Saved",
"core.app.logs.Source And Time": "Source & Time",
"core.app.more": "View More",
"core.app.name": "name",
"name": "name",
"core.app.no_app": "No Apps Yet, Create One Now!",
"core.app.not_saved": "Not Saved",
"core.app.outLink.Can Drag": "Icon Can Be Dragged",
......@@ -728,6 +732,7 @@
"core.workflow.inputType.switch": "Switch",
"core.workflow.inputType.textInput": "Text Input box",
"core.workflow.inputType.textarea": "Multi-line Input Box",
"key": "key",
"core.workflow.publish.OnRevert version": "Click to Revert to This Version",
"core.workflow.publish.OnRevert version confirm": "Confirm to Revert to This Version? The configuration of the editing version will be saved, and a new release version will be created for the reverted version.",
"core.workflow.publish.histories": "Release Records",
......@@ -736,7 +741,7 @@
"core.workflow.template.Search": "Search",
"core.workflow.tool.Handle": "Tool Connector",
"core.workflow.tool.Select Tool": "Select Tool",
"core.workflow.value": "Value",
"value": "Value",
"core.workflow.variable": "Variable",
"create": "Create",
"create_failed": "Create failed",
......@@ -797,6 +802,8 @@
"delete_success": "Deleted Successfully",
"delete_warning": "Deletion Warning",
"embedding_model_not_config": "No index model is detected",
"enable_auth": "Enable authentication",
"error.Create failed": "Create failed",
"error.code_error": "Verification code error",
"error.fileNotFound": "File not found~",
"error.inheritPermissionError": "Inherit permission Error",
......@@ -827,6 +834,7 @@
"get_QR_failed": "Failed to Get QR Code",
"get_app_failed": "Failed to Retrieve App",
"get_laf_failed": "Failed to Retrieve Laf Function List",
"had_auth_value": "Filled in",
"has_verification": "Verified, Click to Unbind",
"have_done": "Completed",
"import_failed": "Import Failed",
......@@ -1001,6 +1009,7 @@
"save_failed": "save_failed",
"save_success": "Saved Successfully",
"scan_code": "Scan the QR code to pay",
"secret_tips": "The value will not return plaintext again after saving",
"select_file_failed": "File Selection Failed",
"select_reference_variable": "Select Reference Variable",
"select_template": "Select Template",
......
packages/web/i18n/zh-CN/account_bill.json
{
"Invoice_document": "发票文件",
"all": "全部",
"back": "返回",
"bank_account": "开户账号",
"bank_name": "开户银行",
"bill_detail": "账单详情",
"bill_record": "账单记录",
"click_to_download": "点击下载",
"company_address": "公司地址",
"company_phone": "公司电话",
"completed": "已完成",
......
packages/web/i18n/zh-CN/common.json
......@@ -96,6 +96,10 @@
"all_quotes": "全部引用",
"all_result": "完整结果",
"app_not_version": " 该应用未发布过，请先发布应用",
"auth_config": "鉴权配置",
"auth_type": "鉴权类型",
"auth_type.Custom": "自定义",
"auth_type.None": "无",
"back": "返回",
"base_config": "基础配置",
"bill_already_processed": "订单已处理",
......@@ -215,7 +219,6 @@
"core.app.Interval timer run": "定时执行",
"core.app.Interval timer tip": "可定时执行应用",
"core.app.Make a brief introduction of your app": "给你的 AI 应用一个介绍",
"core.app.name": "名称",
"core.app.Name and avatar": "头像 & 名称",
"core.app.Publish": "发布",
"core.app.Publish Confirm": "确认发布应用？会立即更新所有发布渠道的应用状态。",
......@@ -261,6 +264,7 @@
"core.app.have_saved": "已保存",
"core.app.logs.Source And Time": "来源 & 时间",
"core.app.more": "查看更多",
"name": "名称",
"core.app.no_app": "还没有应用，快去创建一个吧！",
"core.app.not_saved": "未保存",
"core.app.outLink.Can Drag": "图标可拖拽",
......@@ -728,6 +732,7 @@
"core.workflow.inputType.switch": "开关",
"core.workflow.inputType.textInput": "文本输入框",
"core.workflow.inputType.textarea": "多行输入框",
"key": "键",
"core.workflow.publish.OnRevert version": "点击回退到该版本",
"core.workflow.publish.OnRevert version confirm": "确认回退至该版本？会为您保存编辑中版本的配置，并为回退版本创建一个新的发布版本。",
"core.workflow.publish.histories": "发布记录",
......@@ -736,7 +741,7 @@
"core.workflow.template.Search": "搜索",
"core.workflow.tool.Handle": "工具连接器",
"core.workflow.tool.Select Tool": "选择工具",
"core.workflow.value": "值",
"value": "值",
"core.workflow.variable": "变量",
"create": "去创建",
"create_failed": "创建失败",
......@@ -797,6 +802,8 @@
"delete_success": "删除成功",
"delete_warning": "删除警告",
"embedding_model_not_config": "检测到没有可用的索引模型",
"enable_auth": "启用鉴权",
"error.Create failed": "创建失败",
"error.code_error": "验证码错误",
"error.fileNotFound": "文件找不到了~",
"error.inheritPermissionError": "权限继承错误",
......@@ -827,6 +834,7 @@
"get_QR_failed": "获取二维码失败",
"get_app_failed": "获取应用失败",
"get_laf_failed": "获取Laf函数列表失败",
"had_auth_value": "已填写",
"has_verification": "已验证，点击取消绑定",
"have_done": "已完成",
"import_failed": "导入失败",
......@@ -1001,6 +1009,7 @@
"save_failed": "保存异常",
"save_success": "保存成功",
"scan_code": "扫码支付",
"secret_tips": "值保存后不会再次明文返回",
"select_file_failed": "选择文件异常",
"select_reference_variable": "选择引用变量",
"select_template": "选择模板",
......
packages/web/i18n/zh-Hant/account_bill.json
{
"Invoice_document": "發票文件",
"all": "全部",
"back": "返回",
"bank_account": "開戶帳號",
"bank_name": "開戶銀行",
"bill_detail": "帳單詳細資訊",
"bill_record": "帳單記錄",
"click_to_download": "點擊下載",
"company_address": "公司地址",
"company_phone": "公司電話",
"completed": "已完成",
......
packages/web/i18n/zh-Hant/common.json
......@@ -96,6 +96,10 @@
"all_quotes": "全部引用",
"all_result": "完整結果",
"app_not_version": "該應用未發布過，請先發布應用",
"auth_config": "鑑權配置",
"auth_type": "鑑權類型",
"auth_type.Custom": "自定義",
"auth_type.None": "無",
"back": "返回",
"base_config": "基本設定",
"bill_already_processed": "訂單已處理",
......@@ -260,7 +264,7 @@
"core.app.have_saved": "已儲存",
"core.app.logs.Source And Time": "來源與時間",
"core.app.more": "檢視更多",
"core.app.name": "名稱",
"name": "名稱",
"core.app.no_app": "還沒有應用程式，快來建立一個吧！",
"core.app.not_saved": "未儲存",
"core.app.outLink.Can Drag": "圖示可拖曳",
......@@ -728,6 +732,7 @@
"core.workflow.inputType.switch": "開關",
"core.workflow.inputType.textInput": "文字輸入框",
"core.workflow.inputType.textarea": "多行輸入框",
"key": "鍵",
"core.workflow.publish.OnRevert version": "點選回復至此版本",
"core.workflow.publish.OnRevert version confirm": "確認回復至此版本？將為您儲存編輯中版本的設定，並為回復版本建立一個新的發布版本。",
"core.workflow.publish.histories": "發布記錄",
......@@ -736,7 +741,7 @@
"core.workflow.template.Search": "搜尋",
"core.workflow.tool.Handle": "工具聯結器",
"core.workflow.tool.Select Tool": "選擇工具",
"core.workflow.value": "值",
"value": "值",
"core.workflow.variable": "變數",
"create": "建立",
"create_failed": "建立失敗",
......@@ -797,6 +802,8 @@
"delete_success": "刪除成功",
"delete_warning": "刪除警告",
"embedding_model_not_config": "偵測到沒有可用的索引模型",
"enable_auth": "啟用鑑權",
"error.Create failed": "建立失敗",
"error.code_error": "驗證碼錯誤",
"error.fileNotFound": "找不到檔案",
"error.inheritPermissionError": "繼承權限錯誤",
......@@ -827,6 +834,7 @@
"get_QR_failed": "取得 QR Code 失敗",
"get_app_failed": "取得應用程式失敗",
"get_laf_failed": "取得 LAF 函式清單失敗",
"had_auth_value": "已填寫",
"has_verification": "已驗證，點選解除綁定",
"have_done": "已完成",
"import_failed": "匯入失敗",
......@@ -1001,6 +1009,7 @@
"save_failed": "儲存失敗",
"save_success": "儲存成功",
"scan_code": "掃碼支付",
"secret_tips": "值保存後不會再次明文返回",
"select_file_failed": "選擇檔案失敗",
"select_reference_variable": "選擇引用變數",
"select_template": "選擇範本",
......
packages/web/styles/theme.ts
......@@ -255,7 +255,6 @@ const Button = defineStyleConfig({
grayGhost: {
color: 'myGray.500',
fontWeight: '500',
p: 0,
bg: 'transparent',
transition: 'background 0.1s',
_hover: {
......@@ -816,7 +815,8 @@ export const theme = extendTheme({
md: '0.5rem',
semilg: '0.625rem',
lg: '0.75rem',
xl: '1rem'
xl: '1rem',
xxl: '1.25rem'
},
shadows: {
1: '0px 1px 2px 0px rgba(19, 51, 107, 0.05), 0px 0px 1px 0px rgba(19, 51, 107, 0.08)',
......
projects/app/.env.template
......@@ -5,6 +5,8 @@ DEFAULT_ROOT_PSW=123456
DB_MAX_LINK=5
# 文件阅读时的密钥
FILE_TOKEN_KEY=filetokenkey
# 密钥加密key
AES256_SECRET_KEY=fastgptsecret
# root key, 最高权限
ROOT_KEY=fdafasd
# openai 基本地址，可用作中转。
......
projects/app/data/model.json
......@@ -26,9 +26,7 @@
"usedInExtractFields": true, // 是否用于内容提取（务必保证至少有一个为true）
"usedInToolCall": true, // 是否用于工具调用（务必保证至少有一个为true）
"toolChoice": true, // 是否支持工具选择（分类，内容提取，工具调用会用到。）
"functionCall": false, // 是否支持函数调用（分类，内容提取，工具调用会用到。会优先使用 toolChoice，如果为false，则使用 functionCall，如果仍为 false，则使用提示词模式）
"customCQPrompt": "", // 自定义文本分类提示词（不支持工具和函数调用的模型
"customExtractPrompt": "", // 自定义内容提取提示词
"functionCall": false, // 是否支持函数调用（分类，内容提取，工具调用会用到。会优先使用 toolChoice，如果为false，则使用 functionCall，如果仍为 false，则使用提示词模式） // 自定义文本分类提示词（不支持工具和函数调用的模型 // 自定义内容提取提示词
"defaultSystemChatPrompt": "", // 对话默认携带的系统提示词
"defaultConfig": {}, // 请求API时，挟带一些默认配置（比如 GLM4 的 top_p）
"fieldMap": {} // 字段映射（o1 模型需要把 max_tokens 映射为 max_completion_tokens）
......@@ -50,8 +48,6 @@
"usedInToolCall": true,
"toolChoice": true,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {}
......@@ -73,8 +69,6 @@
"usedInToolCall": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {
"temperature": 1,
......@@ -99,8 +93,6 @@
"usedInToolCall": true,
"toolChoice": false,
"functionCall": false,
"customCQPrompt": "",
"customExtractPrompt": "",
"defaultSystemChatPrompt": "",
"defaultConfig": {
"temperature": 1,
......
projects/app/package.json
{
"name": "app",
"version": "4.9.11",
"version": "4.9.12",
"private": false,
"scripts": {
"dev": "next dev",
......
projects/app/src/components/core/app/WelcomeTextConfig.tsx
......@@ -26,7 +26,7 @@ const WelcomeTextConfig = (props: TextareaProps) => {
rows={6}
fontSize={'sm'}
bg={'myGray.50'}
minW={'384px'}
minW={['auto', '384px']}
placeholder={t('common:core.app.tip.welcomeTextTip')}
autoHeight
minH={100}
......
projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/VoiceInput.tsx
......@@ -6,8 +6,7 @@ import React, {
useCallback,
useState,
forwardRef,
useImperativeHandle,
useMemo
useImperativeHandle
} from 'react';
import { useTranslation } from 'next-i18next';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
......@@ -20,11 +19,14 @@ import { isMobile } from '@fastgpt/web/common/system/utils';
export interface VoiceInputComponentRef {
onSpeak: () => void;
getVoiceInputState: () => { isSpeaking: boolean; isTransCription: boolean };
}
type VoiceInputProps = {
onSendMessage: (params: { text: string; files?: any[]; autoTTSResponse?: boolean }) => void;
resetInputVal: (val: { text: string }) => void;
handleSend: (val: string) => void;
resetInputVal: (val: string) => void;
mobilePreSpeak: boolean;
setMobilePreSpeak: React.Dispatch<React.SetStateAction<boolean>>;
};
// PC voice input
......@@ -40,38 +42,104 @@ const PCVoiceInput = ({
const { t } = useTranslation();
return (
<HStack h={'100%'} px={4}>
<Box fontSize="sm" color="myGray.500" flex={'1 0 0'}>
{t('common:core.chat.Speaking')}
</Box>
<canvas
ref={canvasRef}
style={{
height: '10px',
width: '100px',
background: 'white'
}}
/>
<Box fontSize="sm" color="myGray.500" whiteSpace={'nowrap'}>
{speakingTimeString}
</Box>
<MyTooltip label={t('common:core.chat.Cancel Speak')}>
<MyIconButton
name={'core/chat/cancelSpeak'}
h={'22px'}
w={'22px'}
onClick={() => stopSpeak(true)}
/>
</MyTooltip>
<MyTooltip label={t('common:core.chat.Finish Speak')}>
<MyIconButton
name={'core/chat/finishSpeak'}
h={'22px'}
w={'22px'}
onClick={() => stopSpeak(false)}
<Box
position="absolute"
top={0}
left={0}
right={0}
bottom={0}
bg="rgba(255, 255, 255, 0.3)"
backdropFilter="blur(8px)"
borderRadius="xxl"
zIndex={10}
display="flex"
alignItems="center"
justifyContent="center"
flexDirection="column"
>
{/* Center Waveform Area */}
<Flex
position="absolute"
top="50%"
left="0"
right="0"
transform="translateY(-80%)"
alignItems="center"
justifyContent="center"
direction="column"
gap={1}
w="100%"
>
<Box fontSize="sm" color="myGray.600" fontWeight="500">
{t('common:core.chat.Speaking')}
</Box>
<canvas
ref={canvasRef}
style={{
height: '32px',
width: '90%',
background: 'transparent'
}}
/>
</MyTooltip>
</HStack>
</Flex>
{/* Action Buttons - Bottom */}
<Flex position="absolute" right={4} bottom={3.5} alignItems="center" gap={2} h={9}>
{/* Time Display */}
<Box
fontSize="sm"
color="myGray.600"
mr={2}
bg="rgba(255, 255, 255, 0.9)"
px={2}
py={1}
borderRadius="md"
fontWeight="500"
>
{speakingTimeString}
</Box>
{/* Cancel Button */}
<MyTooltip label={t('common:core.chat.Cancel Speak')}>
<Flex
w={9}
h={9}
alignItems="center"
justifyContent="center"
border="sm"
borderRadius="lg"
cursor="pointer"
bg="rgba(255, 255, 255, 0.95)"
boxShadow="0 2px 8px rgba(0, 0, 0, 0.1)"
_hover={{ bg: 'white', transform: 'scale(1.05)' }}
transition="all 0.2s"
onClick={() => stopSpeak(true)}
>
<MyIcon name={'close'} w={5} h={5} color={'myGray.500'} />
</Flex>
</MyTooltip>
{/* Confirm Button */}
<MyTooltip label={t('common:core.chat.Finish Speak')}>
<Flex
w={9}
h={9}
alignItems="center"
justifyContent="center"
border="sm"
borderRadius="lg"
cursor="pointer"
bg="rgba(255, 255, 255, 0.95)"
boxShadow="0 2px 8px rgba(0, 0, 0, 0.1)"
_hover={{ bg: 'white', transform: 'scale(1.05)' }}
transition="all 0.2s"
onClick={() => stopSpeak(false)}
>
<MyIcon name={'check'} w={5} h={5} color={'myGray.500'} />
</Flex>
</MyTooltip>
</Flex>
</Box>
);
};
......@@ -120,9 +188,9 @@ const MobileVoiceInput = ({
const currentY = touch.pageY;
const deltaY = startYRef.current - currentY;
if (deltaY > 90) {
if (deltaY > 60) {
setIsCancel(true);
} else if (deltaY <= 90) {
} else if (deltaY <= 60) {
setIsCancel(false);
}
},
......@@ -157,8 +225,8 @@ const MobileVoiceInput = ({
transform={'translateY(-50%)'}
zIndex={5}
name={'core/chat/backText'}
h={'22px'}
w={'22px'}
h={6}
w={6}
onClick={onCloseSpeak}
/>
</MyTooltip>
......@@ -166,9 +234,10 @@ const MobileVoiceInput = ({
<Flex
alignItems={'center'}
justifyContent={'center'}
h="100%"
flex="1 0 0"
bg={isSpeaking ? (isCancel ? 'red.500' : 'primary.500') : 'white'}
bg={isSpeaking ? (isCancel ? 'red.500' : 'primary.500') : 'rgba(255, 255, 255, 0.95)'}
backdropFilter={!isSpeaking ? 'blur(4px)' : 'none'}
borderRadius="xxl"
onTouchMove={handleTouchMove}
onTouchEnd={handleTouchEnd}
onTouchStart={handleTouchStart}
......@@ -199,10 +268,10 @@ const MobileVoiceInput = ({
left={0}
right={0}
bottom={maskBottom}
h={'200px'}
h={'48px'}
bg="linear-gradient(to top, white, rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0))"
>
<Box fontSize="sm" color="myGray.500" position="absolute" bottom={'10px'}>
<Box fontSize="sm" color="myGray.500" position="absolute" bottom={2.5}>
{isCancel ? t('chat:release_cancel') : t('chat:release_send')}
</Box>
</Flex>
......@@ -212,7 +281,7 @@ const MobileVoiceInput = ({
};
const VoiceInput = forwardRef<VoiceInputComponentRef, VoiceInputProps>(
({ onSendMessage, resetInputVal }, ref) => {
({ handleSend, resetInputVal, mobilePreSpeak, setMobilePreSpeak }, ref) => {
const { t } = useTranslation();
const isMobileDevice = isMobile();
const { isPc } = useSystem();
......@@ -220,7 +289,6 @@ const VoiceInput = forwardRef<VoiceInputComponentRef, VoiceInputProps>(
const outLinkAuthData = useContextSelector(ChatBoxContext, (v) => v.outLinkAuthData);
const appId = useContextSelector(ChatBoxContext, (v) => v.appId);
const whisperConfig = useContextSelector(ChatBoxContext, (v) => v.whisperConfig);
const autoTTSResponse = useContextSelector(ChatBoxContext, (v) => v.autoTTSResponse);
const canvasRef = useRef<HTMLCanvasElement>(null);
const {
......@@ -234,8 +302,6 @@ const VoiceInput = forwardRef<VoiceInputComponentRef, VoiceInputProps>(
stream
} = useSpeech({ appId, ...outLinkAuthData });
const [mobilePreSpeak, setMobilePreSpeak] = useState(false);
// Canvas render
useEffect(() => {
if (!stream) {
......@@ -290,16 +356,13 @@ const VoiceInput = forwardRef<VoiceInputComponentRef, VoiceInputProps>(
const finishWhisperTranscription = (text: string) => {
if (!text) return;
if (whisperConfig?.autoSend) {
onSendMessage({
text,
autoTTSResponse
});
handleSend(text);
} else {
resetInputVal({ text });
resetInputVal(text);
}
};
startSpeak(finishWhisperTranscription);
}, [autoTTSResponse, onSendMessage, resetInputVal, startSpeak, whisperConfig?.autoSend]);
}, [handleSend, resetInputVal, startSpeak, whisperConfig?.autoSend]);
const onSpeach = useCallback(() => {
if (isMobileDevice) {
......@@ -307,9 +370,10 @@ const VoiceInput = forwardRef<VoiceInputComponentRef, VoiceInputProps>(
} else {
onStartSpeak();
}
}, [isMobileDevice, onStartSpeak]);
}, [isMobileDevice, onStartSpeak, setMobilePreSpeak]);
useImperativeHandle(ref, () => ({
onSpeak: onSpeach
onSpeak: onSpeach,
getVoiceInputState: () => ({ isSpeaking: isSpeaking || mobilePreSpeak, isTransCription })
}));
if (!whisperConfig?.open) return null;
......@@ -324,7 +388,7 @@ const VoiceInput = forwardRef<VoiceInputComponentRef, VoiceInputProps>(
left={0}
right={0}
bottom={0}
bg="white"
bg="transparent"
zIndex={5}
borderRadius={isPc ? 'md' : ''}
onContextMenu={(e) => e.preventDefault()}
......@@ -348,15 +412,17 @@ const VoiceInput = forwardRef<VoiceInputComponentRef, VoiceInputProps>(
{isTransCription && (
<Flex
position={'absolute'}
borderRadius="xxl"
top={0}
bottom={0}
left={0}
right={0}
pl={5}
alignItems={'center'}
bg={'white'}
bg={'rgba(255, 255, 255, 0.95)'}
backdropFilter="blur(4px)"
color={'primary.500'}
zIndex={6}
zIndex={15}
>
<Spinner size={'sm'} mr={4} />
{t('common:core.chat.Converting to text')}
......
projects/app/src/components/core/chat/ChatContainer/ChatBox/index.tsx
......@@ -959,6 +959,7 @@ const ChatBox = ({
pb={3}
>
<Box id="chat-container" maxW={['100%', '92%']} h={'100%'} mx={'auto'}>
{/* chat header */}
{showEmpty && <Empty />}
{!!welcomeText && <WelcomeBox welcomeText={welcomeText} />}
{/* variable input */}
......
projects/app/src/components/core/chat/ChatContainer/components/FilePreview.tsx
......@@ -22,7 +22,7 @@ const RenderFilePreview = ({
<Flex
overflow={'visible'}
wrap={'wrap'}
pt={3}
pt={[2, 3]}
userSelect={'none'}
mb={fileList.length > 0 ? 2 : 0}
gap={'6px'}
......
projects/app/src/pageComponents/account/bill/InvoiceTable.tsx
import { getInvoiceRecords } from '@/web/support/wallet/bill/invoice/api';
import { getInvoiceRecords, readInvoiceFile } from '@/web/support/wallet/bill/invoice/api';
import MyBox from '@fastgpt/web/components/common/MyBox';
import { useTranslation } from 'next-i18next';
import { useState } from 'react';
......@@ -22,6 +22,7 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
import dayjs from 'dayjs';
import { formatStorePrice2Read } from '@fastgpt/global/support/wallet/usage/tools';
import MyModal from '@fastgpt/web/components/common/MyModal';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
const InvoiceTable = () => {
const { t } = useTranslation();
......@@ -135,6 +136,29 @@ function InvoiceDetailModal({
onClose: () => void;
}) {
const { t } = useTranslation();
const { runAsync: handleDownloadInvoice } = useRequest2(async (id: string) => {
const fileInfo = await readInvoiceFile(id);
// Blob
const byteCharacters = atob(fileInfo.data);
const byteNumbers = new Array(byteCharacters.length);
for (let i = 0; i < byteCharacters.length; i++) {
byteNumbers[i] = byteCharacters.charCodeAt(i);
}
const byteArray = new Uint8Array(byteNumbers);
const blob = new Blob([byteArray], { type: fileInfo.mimeType });
const fileUrl = URL.createObjectURL(blob);
// preview
window.open(fileUrl, '_blank');
// clean
setTimeout(() => {
URL.revokeObjectURL(fileUrl);
}, 1000);
});
return (
<MyModal
maxW={['90vw', '700px']}
......@@ -165,6 +189,14 @@ function InvoiceDetailModal({
/>
<LabelItem label={t('account_bill:contact_phone')} value={invoice.contactPhone} />
<LabelItem label={t('account_bill:email_address')} value={invoice.emailAddress} />
{invoice.status === 2 && (
<Flex alignItems={'center'} justify={'space-between'}>
<FormLabel flex={'0 0 120px'}>{t('account_bill:Invoice_document')}</FormLabel>
<Box cursor={'pointer'} onClick={() => handleDownloadInvoice(invoice._id)}>
{t('account_bill:click_to_download')}
</Box>
</Flex>
)}
</Flex>
</ModalBody>
</MyModal>
......
projects/app/src/pageComponents/account/model/AddModelBox.tsx
......@@ -38,7 +38,6 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import MyModal from '@fastgpt/web/components/common/MyModal';
import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
import { getCQPrompt, getExtractJsonPrompt } from '@fastgpt/global/core/ai/prompt/agent';
export const AddModelButton = ({
onCreate,
......@@ -173,6 +172,36 @@ export const ModelEditModal = ({
}
);
const CustomApi = useMemo(
() => (
<>
<Tr>
<Td>
<HStack spacing={1}>
<Box>{t('account:model.request_url')}</Box>
<QuestionTip label={t('account:model.request_url_tip')} />
</HStack>
</Td>
<Td textAlign={'right'}>
<Input {...register('requestUrl')} {...InputStyles} />
</Td>
</Tr>
<Tr>
<Td>
<HStack spacing={1}>
<Box>{t('account:model.request_auth')}</Box>
<QuestionTip label={t('account:model.request_auth_tip')} />
</HStack>
</Td>
<Td textAlign={'right'}>
<Input {...register('requestAuth')} {...InputStyles} />
</Td>
</Tr>
</>
),
[]
);
return (
<MyModal
iconSrc={'modal/edit'}
......@@ -534,28 +563,7 @@ export const ModelEditModal = ({
</Tr>
</>
)}
<Tr>
<Td>
<HStack spacing={1}>
<Box>{t('account:model.request_url')}</Box>
<QuestionTip label={t('account:model.request_url_tip')} />
</HStack>
</Td>
<Td textAlign={'right'}>
<Input {...register('requestUrl')} {...InputStyles} />
</Td>
</Tr>
<Tr>
<Td>
<HStack spacing={1}>
<Box>{t('account:model.request_auth')}</Box>
<QuestionTip label={t('account:model.request_auth_tip')} />
</HStack>
</Td>
<Td textAlign={'right'}>
<Input {...register('requestAuth')} {...InputStyles} />
</Td>
</Tr>
{!isLLMModel && CustomApi}
</Tbody>
</Table>
</TableContainer>
......@@ -669,36 +677,6 @@ export const ModelEditModal = ({
<Tr>
<Td>
<HStack spacing={1}>
<Box>{t('account:model.custom_cq_prompt')}</Box>
<QuestionTip
label={t('account:model.custom_cq_prompt_tip', {
prompt: getCQPrompt()
})}
/>
</HStack>
</Td>
<Td textAlign={'right'}>
<MyTextarea {...register('customCQPrompt')} {...InputStyles} />
</Td>
</Tr>
<Tr>
<Td>
<HStack spacing={1}>
<Box>{t('account:model.custom_extract_prompt')}</Box>
<QuestionTip
label={t('account:model.custom_extract_prompt_tip', {
prompt: getExtractJsonPrompt()
})}
/>
</HStack>
</Td>
<Td textAlign={'right'}>
<MyTextarea {...register('customExtractPrompt')} {...InputStyles} />
</Td>
</Tr>
<Tr>
<Td>
<HStack spacing={1}>
<Box>{t('account:model.default_config')}</Box>
<QuestionTip label={t('account:model.default_config_tip')} />
</HStack>
......@@ -723,6 +701,7 @@ export const ModelEditModal = ({
/>
</Td>
</Tr>
{CustomApi}
</Tbody>
</Table>
</TableContainer>
......
projects/app/src/pageComponents/account/model/ModelDashboard/index.tsx
......@@ -4,7 +4,7 @@ import { Box, Grid, HStack, useTheme } from '@chakra-ui/react';
import MyBox from '@fastgpt/web/components/common/MyBox';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { useTranslation } from 'next-i18next';
import { addDays } from 'date-fns';
import { addDays, addHours } from 'date-fns';
import dayjs from 'dayjs';
import DateRangePicker, {
type DateRangeType
......@@ -47,24 +47,15 @@ const ChartsBoxStyles: BoxProps = {
// Default date range: Past 7 days
const getDefaultDateRange = (): DateRangeType => {
const from = addDays(new Date(), -7);
from.setHours(0, 0, 0, 0);
const from = addHours(new Date(), -24);
from.setMinutes(0, 0, 0); // Set minutes to 0
const to = new Date();
to.setHours(23, 59, 59, 999);
const to = addHours(new Date(), 1);
to.setMinutes(0, 0, 0); // Set minutes to 0
return { from, to };
};
const calculateTimeDiffs = (from: Date, to: Date) => {
const startDate = dayjs(from);
const endDate = dayjs(to);
return {
daysDiff: endDate.diff(startDate, 'day'),
hoursDiff: endDate.diff(startDate, 'hour')
};
};
const ModelDashboard = ({ Tab }: { Tab: React.ReactNode }) => {
const { t } = useTranslation();
const theme = useTheme();
......@@ -89,7 +80,7 @@ const ModelDashboard = ({ Tab }: { Tab: React.ReactNode }) => {
}>({
channelId: undefined,
model: undefined,
timespan: 'day',
timespan: 'hour',
dateRange: getDefaultDateRange()
});
......@@ -159,22 +150,22 @@ const ModelDashboard = ({ Tab }: { Tab: React.ReactNode }) => {
return map;
}, [systemModelList]);
const computeTimespan = (daysDiff: number, hoursDiff: number) => {
const computeTimespan = (hoursDiff: number) => {
const options: { label: string; value: 'minute' | 'hour' | 'day' }[] = [];
if (daysDiff <= 1) {
if (hoursDiff <= 1 * 24) {
options.push({ label: t('account_model:timespan_minute'), value: 'minute' });
}
if (daysDiff < 7) {
if (hoursDiff < 7 * 24) {
options.push({ label: t('account_model:timespan_hour'), value: 'hour' });
}
if (daysDiff >= 1) {
if (hoursDiff >= 1 * 24) {
options.push({ label: t('account_model:timespan_day'), value: 'day' });
}
const defaultTimespan: 'minute' | 'hour' | 'day' = (() => {
if (hoursDiff < 1) {
return 'minute';
} else if (daysDiff < 2) {
} else if (hoursDiff < 2 * 24) {
return 'hour';
} else {
return 'day';
......@@ -183,7 +174,7 @@ const ModelDashboard = ({ Tab }: { Tab: React.ReactNode }) => {
return { options, defaultTimespan };
};
const [timespanOptions, setTimespanOptions] = useState(computeTimespan(30, 60).options);
const [timespanOptions, setTimespanOptions] = useState(computeTimespan(48).options);
// Handle date range change with automatic timespan adjustment
const handleDateRangeChange = (dateRange: DateRangeType) => {
......@@ -191,11 +182,9 @@ const ModelDashboard = ({ Tab }: { Tab: React.ReactNode }) => {
// Computed timespan
if (dateRange.from && dateRange.to) {
const { daysDiff, hoursDiff } = calculateTimeDiffs(dateRange.from, dateRange.to);
const { options: newTimespanOptions, defaultTimespan: newDefaultTimespan } = computeTimespan(
daysDiff,
hoursDiff
);
const hoursDiff = dayjs(dateRange.to).diff(dayjs(dateRange.from), 'hour');
const { options: newTimespanOptions, defaultTimespan: newDefaultTimespan } =
computeTimespan(hoursDiff);
setTimespanOptions(newTimespanOptions);
newFilterProps.timespan = newDefaultTimespan;
......
projects/app/src/pageComponents/account/thirdParty/WorkflowVariableModal.tsx
......@@ -52,7 +52,7 @@ const WorkflowVariableModal = ({
<Box h={'1px'} bg={'myGray.150'} my={4}></Box>
<Flex alignItems={'center'}>
<Box fontSize={'14px'} color={'myGray.900'} fontWeight={'medium'}>
{t('common:core.workflow.value')}
{t('common:value')}
</Box>
<Input
ml={8}
......
projects/app/src/pageComponents/app/detail/MCPTools/ChatTest.tsx
......@@ -16,10 +16,19 @@ import dynamic from 'next/dynamic';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import Markdown from '@/components/Markdown';
import { postRunMCPTool } from '@/web/core/app/api/plugin';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
const JsonEditor = dynamic(() => import('@fastgpt/web/components/common/Textarea/JsonEditor'));
const ChatTest = ({ currentTool, url }: { currentTool: McpToolConfigType | null; url: string }) => {
const ChatTest = ({
currentTool,
url,
headerSecret
}: {
currentTool?: McpToolConfigType;
url: string;
headerSecret: StoreSecretValueType;
}) => {
const { t } = useTranslation();
const [output, setOutput] = useState<string>('');
......@@ -42,6 +51,7 @@ const ChatTest = ({ currentTool, url }: { currentTool: McpToolConfigType | null;
return await postRunMCPTool({
params: data,
url,
headerSecret,
toolName: currentTool.name
});
},
......@@ -135,7 +145,15 @@ const ChatTest = ({ currentTool, url }: { currentTool: McpToolConfigType | null;
);
};
const Render = ({ currentTool, url }: { currentTool: McpToolConfigType | null; url: string }) => {
const Render = ({
currentTool,
url,
headerSecret
}: {
currentTool?: McpToolConfigType;
url: string;
headerSecret: StoreSecretValueType;
}) => {
const { chatId } = useChatStore();
const { appDetail } = useContextSelector(AppContext, (v) => v);
......@@ -157,7 +175,7 @@ const Render = ({ currentTool, url }: { currentTool: McpToolConfigType | null; u
showNodeStatus
>
<ChatRecordContextProvider params={chatRecordProviderParams}>
<ChatTest currentTool={currentTool} url={url} />
<ChatTest currentTool={currentTool} url={url} headerSecret={headerSecret} />
</ChatRecordContextProvider>
</ChatItemContextProvider>
);
......@@ -178,7 +196,7 @@ const RenderToolInput = ({
type: string;
description?: string;
};
toolData: McpToolConfigType | null;
toolData?: McpToolConfigType;
value: any;
onChange: (value: any) => void;
isInvalid: boolean;
......
projects/app/src/pageComponents/app/detail/MCPTools/Edit.tsx
......@@ -8,6 +8,7 @@ import ChatTest from './ChatTest';
import MyBox from '@fastgpt/web/components/common/MyBox';
import EditForm from './EditForm';
import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
const Edit = ({
url,
......@@ -15,14 +16,18 @@ const Edit = ({
toolList,
setToolList,
currentTool,
setCurrentTool
setCurrentTool,
headerSecret,
setHeaderSecret
}: {
url: string;
setUrl: (url: string) => void;
toolList: McpToolConfigType[];
setToolList: (toolList: McpToolConfigType[]) => void;
currentTool: McpToolConfigType | null;
currentTool?: McpToolConfigType;
setCurrentTool: (tool: McpToolConfigType) => void;
headerSecret: StoreSecretValueType;
setHeaderSecret: (headerSecret: StoreSecretValueType) => void;
}) => {
const { isPc } = useSystem();
......@@ -56,12 +61,14 @@ const Edit = ({
setCurrentTool={setCurrentTool}
url={url}
setUrl={setUrl}
headerSecret={headerSecret}
setHeaderSecret={setHeaderSecret}
/>
</Box>
</Flex>
{isPc && (
<Box flex={'2 0 0'} w={0} mb={3}>
<ChatTest currentTool={currentTool} url={url} />
<ChatTest currentTool={currentTool} url={url} headerSecret={headerSecret} />
</Box>
)}
</MyBox>
......
projects/app/src/pageComponents/app/detail/MCPTools/EditForm.tsx
......@@ -13,6 +13,8 @@ import Avatar from '@fastgpt/web/components/common/Avatar';
import MyBox from '@fastgpt/web/components/common/MyBox';
import type { getMCPToolsBody } from '@/pages/api/support/mcp/client/getTools';
import { getMCPTools } from '@/web/core/app/api/plugin';
import HeaderAuthConfig from '@/components/common/secret/HeaderAuthConfig';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
const EditForm = ({
url,
......@@ -20,14 +22,18 @@ const EditForm = ({
toolList,
setToolList,
currentTool,
setCurrentTool
setCurrentTool,
headerSecret,
setHeaderSecret
}: {
url: string;
setUrl: (url: string) => void;
toolList: McpToolConfigType[];
setToolList: (toolList: McpToolConfigType[]) => void;
currentTool: McpToolConfigType | null;
currentTool?: McpToolConfigType;
setCurrentTool: (tool: McpToolConfigType) => void;
headerSecret: StoreSecretValueType;
setHeaderSecret: (headerSecret: StoreSecretValueType) => void;
}) => {
const { t } = useTranslation();
......@@ -52,6 +58,14 @@ const EditForm = ({
<FormLabel ml={2} flex={1}>
{t('app:MCP_tools_url')}
</FormLabel>
<HeaderAuthConfig
storeHeaderSecretConfig={headerSecret}
onUpdate={setHeaderSecret}
buttonProps={{
size: 'sm',
variant: 'grayGhost'
}}
/>
</Flex>
<Flex alignItems={'center'} gap={2} mt={3}>
<Input
......@@ -66,7 +80,7 @@ const EditForm = ({
h={8}
isLoading={isGettingTools}
onClick={() => {
runGetMCPTools({ url });
runGetMCPTools({ url, headerSecret });
}}
>
{t('common:Parse')}
......
projects/app/src/pageComponents/app/detail/MCPTools/Header.tsx
......@@ -10,8 +10,17 @@ import { useRouter } from 'next/router';
import { useSystemStore } from '@/web/common/system/useSystemStore';
import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
import { postUpdateMCPTools } from '@/web/core/app/api/plugin';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
const Header = ({ url, toolList }: { url: string; toolList: McpToolConfigType[] }) => {
const Header = ({
url,
toolList,
headerSecret
}: {
url: string;
toolList: McpToolConfigType[];
headerSecret: StoreSecretValueType;
}) => {
const { t } = useTranslation();
const appId = useContextSelector(AppContext, (v) => v.appId);
const router = useRouter();
......@@ -41,7 +50,7 @@ const Header = ({ url, toolList }: { url: string; toolList: McpToolConfigType[]
const { runAsync: saveMCPTools, loading: isSavingMCPTools } = useRequest2(
async () => {
return await postUpdateMCPTools({ appId, url, toolList });
return await postUpdateMCPTools({ appId, url, toolList, headerSecret });
},
{
successToast: t('common:update_success')
......
projects/app/src/pageComponents/app/detail/MCPTools/index.tsx
......@@ -7,6 +7,7 @@ import { AppContext } from '../context';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
import { type MCPToolSetData } from '@/pageComponents/dashboard/apps/MCPToolsEditModal';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
const MCPTools = () => {
const appDetail = useContextSelector(AppContext, (v) => v.appDetail);
......@@ -19,13 +20,12 @@ const MCPTools = () => {
const [url, setUrl] = useState(toolSetData?.url || '');
const [toolList, setToolList] = useState<McpToolConfigType[]>(toolSetData?.toolList || []);
const [currentTool, setCurrentTool] = useState<McpToolConfigType | null>(
toolSetData?.toolList[0] || null
);
const [headerSecret, setHeaderSecret] = useState<StoreSecretValueType>(toolSetData?.headerSecret);
const [currentTool, setCurrentTool] = useState<McpToolConfigType>(toolSetData?.toolList[0]);
return (
<Flex h={'100%'} flexDirection={'column'} px={[3, 0]} pr={[3, 3]}>
<Header url={url} toolList={toolList} />
<Header url={url} toolList={toolList} headerSecret={headerSecret} />
<Edit
url={url}
setUrl={setUrl}
......@@ -33,6 +33,8 @@ const MCPTools = () => {
setToolList={setToolList}
currentTool={currentTool}
setCurrentTool={setCurrentTool}
headerSecret={headerSecret}
setHeaderSecret={setHeaderSecret}
/>
</Flex>
);
......
projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx
......@@ -8,7 +8,6 @@ import RenderOutput from '../render/RenderOutput';
import {
Box,
Flex,
Input,
Table,
Thead,
Tbody,
......@@ -50,7 +49,9 @@ import { getEditorVariables } from '../../../utils';
import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
import { WorkflowNodeEdgeContext } from '../../../context/workflowInitContext';
import { useSystemStore } from '@/web/common/system/useSystemStore';
const CurlImportModal = dynamic(() => import('./CurlImportModal'));
const HeaderAuthConfig = dynamic(() => import('@/components/common/secret/HeaderAuthConfig'));
const defaultFormBody = {
key: NodeInputKeyEnum.httpFormBody,
......@@ -271,6 +272,7 @@ export function RenderHttpProps({
const edges = useContextSelector(WorkflowNodeEdgeContext, (v) => v.edges);
const nodeList = useContextSelector(WorkflowContext, (v) => v.nodeList);
const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode);
const { appDetail } = useContextSelector(AppContext, (v) => v);
const { feConfigs } = useSystemStore();
......@@ -281,6 +283,7 @@ export function RenderHttpProps({
const jsonBody = inputs.find((item) => item.key === NodeInputKeyEnum.httpJsonBody);
const formBody =
inputs.find((item) => item.key === NodeInputKeyEnum.httpFormBody) || defaultFormBody;
const headerSecret = inputs.find((item) => item.key === NodeInputKeyEnum.headerSecret)!;
const contentType = inputs.find((item) => item.key === NodeInputKeyEnum.httpContentType);
const paramsLength = params?.value?.length || 0;
......@@ -335,6 +338,21 @@ export function RenderHttpProps({
ml={1}
label={t('common:core.module.http.Props tip', { variable: variableText })}
/>
<Flex flex={1} />
<HeaderAuthConfig
storeHeaderSecretConfig={headerSecret?.value}
onUpdate={(data) => {
onChangeNode({
nodeId,
type: 'updateInput',
key: NodeInputKeyEnum.headerSecret,
value: {
...headerSecret,
value: data
}
});
}}
/>
</Flex>
<LightRowTabs<TabEnum>
width={'100%'}
......@@ -403,7 +421,9 @@ export function RenderHttpProps({
contentType,
formBody,
headersLength,
headerSecret,
nodeId,
onChangeNode,
paramsLength,
requestMethods,
selectedTab,
......
projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx
......@@ -182,7 +182,7 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
</Flex>
<Flex mt={2} w={'full'} alignItems={'center'} className="nodrag">
<Flex w={'80px'}>
<Box>{t('common:core.workflow.value')}</Box>
<Box>{t('common:value')}</Box>
<MyTooltip
label={
menuList.current.find((item) => item.renderType === updateItem.renderType)?.label
......
projects/app/src/pageComponents/dashboard/apps/MCPToolsEditModal.tsx
......@@ -26,10 +26,13 @@ import { AppListContext } from './context';
import { useContextSelector } from 'use-context-selector';
import { type McpToolConfigType } from '@fastgpt/global/core/app/type';
import type { getMCPToolsBody } from '@/pages/api/support/mcp/client/getTools';
import HeaderAuthConfig from '@/components/common/secret/HeaderAuthConfig';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
export type MCPToolSetData = {
url: string;
toolList: McpToolConfigType[];
headerSecret: StoreSecretValueType;
};
export type EditMCPToolsProps = {
......@@ -49,6 +52,7 @@ const MCPToolsEditModal = ({ onClose }: { onClose: () => void }) => {
name: '',
mcpData: {
url: '',
headerSecret: {},
toolList: []
}
}
......@@ -63,6 +67,7 @@ const MCPToolsEditModal = ({ onClose }: { onClose: () => void }) => {
avatar: data.avatar,
toolList: data.mcpData.toolList,
url: data.mcpData.url,
headerSecret: data.mcpData.headerSecret,
parentId
});
},
......@@ -131,9 +136,26 @@ const MCPToolsEditModal = ({ onClose }: { onClose: () => void }) => {
/>
</Flex>
<Box color={'myGray.900'} fontSize={'14px'} fontWeight={'medium'} mt={6}>
{t('app:MCP_tools_url')}
</Box>
<Flex
color={'myGray.900'}
fontSize={'14px'}
fontWeight={'medium'}
mt={6}
alignItems={'center'}
>
<Box>{t('app:MCP_tools_url')}</Box>
<Box flex={1} />
<HeaderAuthConfig
storeHeaderSecretConfig={mcpData.headerSecret}
onUpdate={(data) => {
setValue('mcpData.headerSecret', data);
}}
buttonProps={{
size: 'sm',
variant: 'grayGhost'
}}
/>
</Flex>
<Flex alignItems={'center'} gap={2} mt={2}>
<Input
h={8}
......@@ -148,7 +170,10 @@ const MCPToolsEditModal = ({ onClose }: { onClose: () => void }) => {
h={8}
isLoading={isGettingTools}
onClick={() => {
runGetMCPTools({ url: mcpData.url });
runGetMCPTools({
url: mcpData.url,
headerSecret: mcpData.headerSecret
});
}}
>
{t('common:Parse')}
......
projects/app/src/pages/api/common/system/getInitData.ts
......@@ -13,8 +13,6 @@ async function handler(
const activeModelList = global.systemActiveModelList.map((model) => ({
...model,
customCQPrompt: undefined,
customExtractPrompt: undefined,
defaultSystemChatPrompt: undefined,
fieldMap: undefined,
defaultConfig: undefined,
......
projects/app/src/pages/api/core/app/del.ts
......@@ -21,8 +21,8 @@ import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
import { removeImageByPath } from '@fastgpt/service/common/file/image/controller';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
const { appId } = req.query as { appId: string };
......
projects/app/src/pages/api/core/app/mcpTools/create.ts
......@@ -14,6 +14,9 @@ import {
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
import { checkTeamAppLimit } from '@fastgpt/service/support/permission/teamLimit';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
import { encryptSecret } from '@fastgpt/service/common/secret/aes256gcm';
import { storeSecretValue } from '@fastgpt/service/common/secret/utils';
export type createMCPToolsQuery = {};
......@@ -22,6 +25,7 @@ export type createMCPToolsBody = Omit<
'type' | 'modules' | 'edges' | 'chatConfig'
> & {
url: string;
headerSecret?: StoreSecretValueType;
toolList: McpToolConfigType[];
};
......@@ -31,7 +35,7 @@ async function handler(
req: ApiRequestProps<createMCPToolsBody, createMCPToolsQuery>,
res: ApiResponseType<createMCPToolsResponse>
): Promise<createMCPToolsResponse> {
const { name, avatar, toolList, url, parentId } = req.body;
const { name, avatar, toolList, url, headerSecret = {}, parentId } = req.body;
const { teamId, tmbId, userId } = parentId
? await authApp({ req, appId: parentId, per: WritePermissionVal, authToken: true })
......@@ -39,6 +43,8 @@ async function handler(
await checkTeamAppLimit(teamId);
const formatedHeaderAuth = storeSecretValue(headerSecret);
const mcpToolsId = await mongoSessionRun(async (session) => {
const mcpToolsId = await onCreateApp({
name,
......@@ -47,7 +53,15 @@ async function handler(
teamId,
tmbId,
type: AppTypeEnum.toolSet,
modules: [getMCPToolSetRuntimeNode({ url, toolList, name, avatar })],
modules: [
getMCPToolSetRuntimeNode({
url,
toolList,
name,
avatar,
headerSecret: formatedHeaderAuth
})
],
session
});
......@@ -60,7 +74,13 @@ async function handler(
tmbId,
type: AppTypeEnum.tool,
intro: tool.description,
modules: [getMCPToolRuntimeNode({ tool, url })],
modules: [
getMCPToolRuntimeNode({
tool,
url,
headerSecret: formatedHeaderAuth
})
],
session
});
}
......
projects/app/src/pages/api/core/app/mcpTools/update.ts
......@@ -18,12 +18,15 @@ import {
} from '@fastgpt/global/core/app/mcpTools/utils';
import { type MCPToolSetData } from '@/pageComponents/dashboard/apps/MCPToolsEditModal';
import { MongoAppVersion } from '@fastgpt/service/core/app/version/schema';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
import { storeSecretValue } from '@fastgpt/service/common/secret/utils';
export type updateMCPToolsQuery = {};
export type updateMCPToolsBody = {
appId: string;
url: string;
headerSecret: StoreSecretValueType;
toolList: McpToolConfigType[];
};
......@@ -33,12 +36,14 @@ async function handler(
req: ApiRequestProps<updateMCPToolsBody, updateMCPToolsQuery>,
res: ApiResponseType<updateMCPToolsResponse>
): Promise<updateMCPToolsResponse> {
const { appId, url, toolList } = req.body;
const { appId, url, toolList, headerSecret } = req.body;
const { app } = await authApp({ req, authToken: true, appId, per: ManagePermissionVal });
const toolSetNode = app.modules.find((item) => item.flowNodeType === FlowNodeTypeEnum.toolSet);
const toolSetData = toolSetNode?.inputs[0].value as MCPToolSetData;
const formatedHeaderAuth = storeSecretValue(headerSecret);
await mongoSessionRun(async (session) => {
if (
!isEqual(toolSetData, {
......@@ -50,32 +55,43 @@ async function handler(
parentApp: app,
toolSetData: {
url,
toolList
toolList,
headerSecret: formatedHeaderAuth
},
session
});
}
await MongoApp.updateOne(
{ _id: appId },
{
modules: [getMCPToolSetRuntimeNode({ url, toolList, name: app.name, avatar: app.avatar })],
updateTime: new Date()
},
{ session }
);
await MongoAppVersion.updateOne(
{
appId
},
{
$set: {
nodes: [getMCPToolSetRuntimeNode({ url, toolList, name: app.name, avatar: app.avatar })]
}
},
{ session }
);
// create tool set node
const toolSetRuntimeNode = getMCPToolSetRuntimeNode({
url,
toolList,
headerSecret: formatedHeaderAuth,
name: app.name,
avatar: app.avatar
});
// update app and app version
await Promise.all([
MongoApp.updateOne(
{ _id: appId },
{
modules: [toolSetRuntimeNode],
updateTime: new Date()
},
{ session }
),
MongoAppVersion.updateOne(
{ appId },
{
$set: {
nodes: [toolSetRuntimeNode]
}
},
{ session }
)
]);
});
return {};
......@@ -89,7 +105,11 @@ const updateMCPChildrenTool = async ({
session
}: {
parentApp: AppDetailType;
toolSetData: MCPToolSetData;
toolSetData: {
url: string;
toolList: McpToolConfigType[];
headerSecret: StoreSecretValueType;
};
session: ClientSession;
}) => {
const { teamId, tmbId } = parentApp;
......@@ -120,7 +140,13 @@ const updateMCPChildrenTool = async ({
tmbId,
type: AppTypeEnum.tool,
intro: tool.description,
modules: [getMCPToolRuntimeNode({ tool, url: toolSetData.url })],
modules: [
getMCPToolRuntimeNode({
tool,
url: toolSetData.url,
headerSecret: toolSetData.headerSecret
})
],
session
});
}
......@@ -133,7 +159,26 @@ const updateMCPChildrenTool = async ({
await MongoApp.updateOne(
{ _id: dbTool._id },
{
modules: [getMCPToolRuntimeNode({ tool, url: toolSetData.url })]
modules: [
getMCPToolRuntimeNode({
tool,
url: toolSetData.url,
headerSecret: toolSetData.headerSecret
})
]
},
{ session }
);
await MongoAppVersion.updateOne(
{ appId: dbTool._id },
{
nodes: [
getMCPToolRuntimeNode({
tool,
url: toolSetData.url,
headerSecret: toolSetData.headerSecret
})
]
},
{ session }
);
......
projects/app/src/pages/api/core/app/update.ts
......@@ -108,9 +108,8 @@ async function handler(req: ApiRequestProps<AppUpdateBody, AppUpdateQuery>) {
const onUpdate = async (session?: ClientSession) => {
// format nodes data
// 1. dataset search limit, less than model quoteMaxToken
const { nodes: formatNodes } = beforeUpdateAppFormat({
nodes,
isPlugin: app.type === AppTypeEnum.plugin
beforeUpdateAppFormat({
nodes
});
await refreshSourceAvatar(avatar, app.avatar, session);
......@@ -134,8 +133,8 @@ async function handler(req: ApiRequestProps<AppUpdateBody, AppUpdateQuery>) {
...(avatar && { avatar }),
...(intro !== undefined && { intro }),
...(teamTags && { teamTags }),
...(formatNodes && {
modules: formatNodes
...(nodes && {
modules: nodes
}),
...(edges && {
edges
......@@ -235,7 +234,7 @@ const logAppUpdate = ({
const values: string[] = [];
if (name !== undefined) {
names.push(i18nT('common:core.app.name'));
names.push(i18nT('common:name'));
values.push(name);
}
......
projects/app/src/pages/api/core/app/version/publish.ts
......@@ -9,12 +9,11 @@ import { getNextTimeByCronStringAndTimezone } from '@fastgpt/global/common/strin
import { type PostPublishAppProps } from '@/global/core/app/api';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { type ApiRequestProps } from '@fastgpt/service/type/next';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { rewriteAppWorkflowToSimple } from '@fastgpt/service/core/app/utils';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { i18nT } from '@fastgpt/web/i18n/utils';
async function handler(req: ApiRequestProps<PostPublishAppProps>, res: NextApiResponse<any>) {
const { appId } = req.query as { appId: string };
const { nodes = [], edges = [], chatConfig, isPublish, versionName, autoSave } = req.body;
......@@ -26,16 +25,13 @@ async function handler(req: ApiRequestProps<PostPublishAppProps>, res: NextApiRe
authToken: true
});
const { nodes: formatNodes } = beforeUpdateAppFormat({
nodes,
isPlugin: app.type === AppTypeEnum.plugin
beforeUpdateAppFormat({
nodes
});
await rewriteAppWorkflowToSimple(formatNodes);
if (autoSave) {
await MongoApp.findByIdAndUpdate(appId, {
modules: formatNodes,
modules: nodes,
edges,
chatConfig,
updateTime: new Date()
......@@ -62,7 +58,7 @@ async function handler(req: ApiRequestProps<PostPublishAppProps>, res: NextApiRe
[
{
appId,
nodes: formatNodes,
nodes: nodes,
edges,
chatConfig,
isPublish,
......@@ -77,7 +73,7 @@ async function handler(req: ApiRequestProps<PostPublishAppProps>, res: NextApiRe
await MongoApp.findByIdAndUpdate(
appId,
{
modules: formatNodes,
modules: nodes,
edges,
chatConfig,
updateTime: new Date(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment