Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 13b7e0a1 by Archer Committed by GitHub
Options

V4.11.0 features (#5270) 

* feat: workflow catch error (#5220)

* feat: error catch

* feat: workflow catch error

* perf: add catch error to node

* feat: system tool error catch

* catch error

* fix: ts

* update doc

* perf: training queue code (#5232)

* doc

* perf: training queue code

* Feat: 优化错误提示与重试逻辑 (#5192)

* feat: 批量重试异常数据 & 报错信息国际化

  - 新增“全部重试”按钮，支持批量重试所有训练异常数据
  - 报错信息支持国际化，常见错误自动映射为 i18n key
  - 相关文档和 i18n 资源已同步更新

* feat: enhance error message and retry mechanism

* feat: enhance error message and retry mechanism

* feat: add retry_failed i18n key

* feat: enhance error message and retry mechanism

* feat: enhance error message and retry mechanism

* feat: enhance error message and retry mechanism : 5

* feat: enhance error message and retry mechanism : 6

* feat: enhance error message and retry mechanism : 7

* feat: enhance error message and retry mechanism : 8

* perf: catch chat error

* perf: copy hook (#5246)

* perf: copy hook

* doc

* doc

* add app evaluation (#5083)

* add app evaluation

* fix

* usage

* variables

* editing condition

* var ui

* isplus filter

* migrate code

* remove utils

* name

* update type

* build

* fix

* fix

* fix

* delete comment

* fix

* perf: eval code

* eval code

* eval code

* feat: ttfb time in model log

* Refactor chat page (#5253)

* feat: update side bar layout; add login and logout logic at chat page

* refactor: encapsulate login logic and reuse it in `LoginModal` and `Login` page

* chore: improve some logics and comments

* chore: improve some logics

* chore: remove redundant side effect; add translations

---------

Co-authored-by: Archer <545436317@qq.com>

* perf: chat page code

* doc

* perf: provider redirect

* chore: ui improvement (#5266)

* Fix: SSE

* Fix: SSE

* eval pagination (#5264)

* eval scroll pagination

* change eval list to manual pagination

* number

* fix build

* fix

* version doc (#5267)

* version doc

* version doc

* doc

* feat: eval model select

* config eval model

* perf: eval detail modal ui

* doc

* doc

* fix: chat store reload

* doc

---------

Co-authored-by: colnii <1286949794@qq.com>
Co-authored-by: heheer <heheer@sealos.io>
Co-authored-by: 酒川户 <76519998+chuanhu9@users.noreply.github.com>
parent de208d6c
Showing with 1332 additions and 939 deletions
.cursor/design/core/app/workflow/error_catch.mdc 0 → 100644
---
description:
globs:
alwaysApply: false
---
这是一个工作流节点报错捕获的设计文档。
# 背景
现在工作流运行节点若其中有一个报错，则整个工作流中断，无法继续运行，只有红色英文toast，不太友好。对于对工作流可控性要求高的用户，愿意通过编排为报错兜底。现有编排较麻烦。
这类似于代码里的 try catch 机制，用户可以获得 catch 的错误，而不是直接抛错并结束工作流。
# 实现效果
1. 部分节点可以拥有报错捕获选项，也就是 node 里 catchError 不为 undefined 的节点，catchError=true 代表启用报错捕获，catchError=false 代表不启用报错捕获。
2. 支持报错捕获节点，在输出栏右侧会有一个“错误捕获”的开关。
3. node 的 output 属性种，有一个`errorField`的字段，标识该输出是开启报错捕获时候，才会拥有的输出。
4. 开启报错捕获的节点，在运行错误时，不会阻塞后续节点运行，而是输出报错信息，并继续向下执行。
5. 开启报错捕获的节点，会多出一个“错误输出”的分支连线，错误时候会走错误的分支提示。
# 实现方案
1. FlowNodeCommonType 属性上增加一个`catchError`的可选 boolean 值。如果需要报错捕获的节点，则设置 true/false，标识启用报错捕获，并且设置默认是否启用报错捕获。
2. FlowNodeOutputTypeEnume增加一个 error 枚举值，表示该字段是错误时候才展示的输出。
3. IOTitle 组件里接收 catchError 字段，如果为 true，则在右侧展示“错误捕获”的开关。
4. 所有现有的 RenderOutput 的组件，都需要改造。传入的 flowOutputList 都不包含 hidden 和 error类型的。
5. 单独在`FastGPT/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderOutput`下新建一个`CatchError`的组件，用于专门渲染错误类型输出，同时有一个 SourceHandler。
\ No newline at end of file
README.md
...@@ -47,40 +47,41 @@ https://github.com/labring/FastGPT/assets/15308462/7d3a38df-eb0e-4388-9250-2409b ...@@ -47,40 +47,41 @@ https://github.com/labring/FastGPT/assets/15308462/7d3a38df-eb0e-4388-9250-2409b
## 💡 RoadMap ## 💡 RoadMap
`1` 应用编排能力 `1` 应用编排能力
- [x] 对话工作流、插件工作流 - [x] 对话工作流、插件工作流，包含基础的 RPA 节点。
- [x] 工具调用 - [x] Agent 调用
- [x] Code sandbox - [x] 用户交互节点
- [x] 循环调用 - [x] 双向 MCP
- [x] 用户选择 - [ ] 上下文管理
- [x] 表单输入 - [ ] AI 生成工作流
`2` 知识库能力 `2` 应用调试能力
- [x] 知识库单点搜索测试
- [x] 对话时反馈引用并可修改与删除
- [x] 完整调用链路日志
- [ ] 应用评测
- [ ] 高级编排 DeBug 调试模式
- [ ] 应用节点日志
`3` 知识库能力
- [x] 多库复用，混用 - [x] 多库复用，混用
- [x] chunk 记录修改和删除 - [x] chunk 记录修改和删除
- [x] 支持手动输入，直接分段，QA 拆分导入 - [x] 支持手动输入，直接分段，QA 拆分导入
- [x] 支持 txt，md，html，pdf，docx，pptx，csv，xlsx (有需要更多可 PR file loader)，支持 url 读取、CSV 批量导入 - [x] 支持 txt，md，html，pdf，docx，pptx，csv，xlsx (有需要更多可 PR file loader)，支持 url 读取、CSV 批量导入
- [x] 混合检索 & 重排 - [x] 混合检索 & 重排
- [x] API 知识库 - [x] API 知识库
- [ ] 自定义文件读取服务 - [ ] RAG 模块热插拔
- [ ] 自定义分块服务
`3` 应用调试能力
- [x] 知识库单点搜索测试
- [x] 对话时反馈引用并可修改与删除
- [x] 完整上下文呈现
- [x] 完整模块中间值呈现
- [ ] 高级编排 DeBug 模式
`4` OpenAPI 接口 `4` OpenAPI 接口
- [x] completions 接口 (chat 模式对齐 GPT 接口) - [x] completions 接口 (chat 模式对齐 GPT 接口)
- [x] 知识库 CRUD - [x] 知识库 CRUD
- [x] 对话 CRUD - [x] 对话 CRUD
- [ ] 完整 API Documents
`5` 运营能力 `5` 运营能力
- [x] 免登录分享窗口 - [x] 免登录分享窗口
- [x] Iframe 一键嵌入 - [x] Iframe 一键嵌入
- [x] 聊天窗口嵌入支持自定义 Icon，默认打开，拖拽等功能
- [x] 统一查阅对话记录，并对数据进行标注 - [x] 统一查阅对话记录，并对数据进行标注
- [ ] 应用运营日志
`6` 其他 `6` 其他
- [x] 可视化模型配置。 - [x] 可视化模型配置。
......
docSite/content/zh-cn/docs/development/upgrading/4110.md 0 → 100644
---
title: 'V4.11.0(进行中)'
description: 'FastGPT V4.11.0 更新说明'
icon: 'upgrade'
draft: false
toc: true
weight: 783
---
<!-- ## 升级说明
### 1. 修改环境变量
FastGPT 商业版用户，可以增加评估相关环境变量，并在更新后，在管理端点击一次保存。
```
EVAL_CONCURRENCY=3 # 评估单节点并发数
EVAL_LINE_LIMIT=1000 # 评估文件最大行数
```
### 2. 更新镜像：
- 更新 FastGPT 镜像tag: v4.11.0
- 更新 FastGPT 商业版镜像tag: v4.11.0
- 更新 fastgpt-plugin 镜像 tag: v0.1.4
- mcp_server 无需更新
- Sandbox 无需更新
- AIProxy 无需更新 -->
## 项目调整
1. 移除所有**开源功能**的限制，包括：应用数量和知识库数量上限。
2. 调整 RoadMap，增加`上下文管理`,`AI 生成工作流`,`高级编排 DeBug 调试模式`等计划。
## 🚀 新增内容
1. 商业版增加**应用评测(Beta 版)**，可对应用进行有监督评分。
2. 工作流部分节点支持报错捕获分支。
3. 对话页独立 tab 页面UX。
4. 支持 Signoz traces 和 logs 系统追踪。
5. 新增 Gemini2.5, grok4, kimi 模型配置。
6. 模型调用日志增加首字响应时长和请求 IP。
## ⚙️ 优化
1. 优化代码，避免递归造成的内存堆积。
2. 知识库训练：支持全部重试当前集合异常数据。
3. 工作流 valueTypeFormat，避免数据类型不一致。
## 🐛 修复
1. 问题分类和内容提取节点，默认模型无法通过前端校验，导致工作流无法运行和保存发布。
## 🔨 工具更新
1. Markdown 文本转 Docx 和 Xlsx 文件。
\ No newline at end of file
docSite/content/zh-cn/docs/shopping_cart/intro.md
...@@ -20,19 +20,18 @@ FastGPT 商业版是基于 FastGPT 开源版的增强版本，增加了一些独 ...@@ -20,19 +20,18 @@ FastGPT 商业版是基于 FastGPT 开源版的增强版本，增加了一些独
| 文档知识库 | ✅ | ✅ | ✅ | | 文档知识库 | ✅ | ✅ | ✅ |
| 外部使用 | ✅ | ✅ | ✅ | | 外部使用 | ✅ | ✅ | ✅ |
| API 知识库 | ✅ | ✅ | ✅ | | API 知识库 | ✅ | ✅ | ✅ |
| 最大应用数量 | 500 | 无限制 | 由付费套餐决定 |
| 最大知识库数量（单个知识库内容无限制） | 30 | 无限制 | 由付费套餐决定 |
| 自定义版权信息 | ❌ | ✅ | 设计中 | | 自定义版权信息 | ❌ | ✅ | 设计中 |
| 多租户与支付 | ❌ | ✅ | ✅ | | 多租户与支付 | ❌ | ✅ | ✅ |
| 团队空间 & 权限 | ❌ | ✅ | ✅ | | 团队空间 & 权限 | ❌ | ✅ | ✅ |
| 应用发布安全配置 | ❌ | ✅ | ✅ | | 应用发布安全配置 | ❌ | ✅ | ✅ |
| 内容审核 | ❌ | ✅ | ✅ | | 内容审核 | ❌ | ✅ | ✅ |
| 应用评测 | ❌ | ✅ | ✅ |
| web站点同步 | ❌ | ✅ | ✅ | | web站点同步 | ❌ | ✅ | ✅ |
| 增强训练模式 | ❌ | ✅ | ✅ | | 图片知识库 | ❌ | ✅ | ✅ |
| 知识库索引增强 | ❌ | ✅ | ✅ |
| 第三方应用快速接入（飞书、公众号） | ❌ | ✅ | ✅ | | 第三方应用快速接入（飞书、公众号） | ❌ | ✅ | ✅ |
| 管理后台 | ❌ | ✅ | 不需要 | | 管理后台 | ❌ | ✅ | 不需要 |
| SSO 登录（可自定义，也可使用内置：Github、公众号、钉钉、谷歌等） | ❌ | ✅ | 不需要 | | SSO 登录（可自定义，也可使用内置：Github、公众号、钉钉、谷歌等） | ❌ | ✅ | 不需要 |
| 图片知识库 | ❌ | 设计中 | 设计中 |
| 对话日志运营分析 | ❌ | 设计中 | 设计中 | | 对话日志运营分析 | ❌ | 设计中 | 设计中 |
| 完整商业授权 | ❌ | ✅ | ✅ | | 完整商业授权 | ❌ | ✅ | ✅ |
{{< /table >}} {{< /table >}}
......
env.d.ts
declare global { declare global {
namespace NodeJS { namespace NodeJS {
interface ProcessEnv { interface ProcessEnv {
LOG_DEPTH: string;
DEFAULT_ROOT_PSW: string; 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;
AIPROXY_API_ENDPOINT: string;
AIPROXY_API_TOKEN: string;
MULTIPLE_DATA_TO_BASE64: string;
MONGODB_URI: string;
MONGODB_LOG_URI?: string;
PG_URL: string;
OCEANBASE_URL: string;
MILVUS_ADDRESS: string;
MILVUS_TOKEN: string;
SANDBOX_URL: string;
PRO_URL: string; PRO_URL: string;
FE_DOMAIN: string;
FILE_DOMAIN: string;
NEXT_PUBLIC_BASE_URL: string;
LOG_LEVEL?: string;
STORE_LOG_LEVEL?: string;
USE_IP_LIMIT?: string;
WORKFLOW_MAX_RUN_TIMES?: string;
WORKFLOW_MAX_LOOP_TIMES?: string;
CHECK_INTERNAL_IP?: string;
CHAT_LOG_URL?: string;
CHAT_LOG_INTERVAL?: string;
CHAT_LOG_SOURCE_ID_PREFIX?: string;
ALLOWED_ORIGINS?: string;
SHOW_COUPON?: string;
CONFIG_JSON_PATH?: string;
PASSWORD_LOGIN_LOCK_SECONDS?: string;
PASSWORD_EXPIRED_MONTH?: string;
MAX_LOGIN_SESSION?: string;
} }
} }
} }
......
packages/global/common/error/code/user.ts
...@@ -6,7 +6,6 @@ export enum UserErrEnum { ...@@ -6,7 +6,6 @@ export enum UserErrEnum {
userExist = 'userExist', userExist = 'userExist',
unAuthRole = 'unAuthRole', unAuthRole = 'unAuthRole',
account_psw_error = 'account_psw_error', account_psw_error = 'account_psw_error',
balanceNotEnough = 'balanceNotEnough',
unAuthSso = 'unAuthSso' unAuthSso = 'unAuthSso'
} }
const errList = [ const errList = [
...@@ -23,10 +22,6 @@ const errList = [ ...@@ -23,10 +22,6 @@ const errList = [
message: i18nT('common:code_error.account_error') message: i18nT('common:code_error.account_error')
}, },
{ {
statusText: UserErrEnum.balanceNotEnough,
message: i18nT('common:code_error.user_error.balance_not_enough')
},
{
statusText: UserErrEnum.unAuthSso, statusText: UserErrEnum.unAuthSso,
message: i18nT('user:sso_auth_failed') message: i18nT('user:sso_auth_failed')
} }
......
packages/global/common/error/utils.ts
import { replaceSensitiveText } from '../string/tools'; import { replaceSensitiveText } from '../string/tools';
import { ERROR_RESPONSE } from './errorCode';
export const getErrText = (err: any, def = ''): any => { export const getErrText = (err: any, def = ''): any => {
const msg: string = const msg: string =
...@@ -12,6 +13,11 @@ export const getErrText = (err: any, def = ''): any => { ...@@ -12,6 +13,11 @@ export const getErrText = (err: any, def = ''): any => {
err?.msg || err?.msg ||
err?.error || err?.error ||
def; def;
if (ERROR_RESPONSE[msg]) {
return ERROR_RESPONSE[msg].message;
}
// msg && console.log('error =>', msg); // msg && console.log('error =>', msg);
return replaceSensitiveText(msg); return replaceSensitiveText(msg);
}; };
......
packages/global/common/system/types/index.d.ts
...@@ -51,6 +51,7 @@ export type FastGPTFeConfigsType = { ...@@ -51,6 +51,7 @@ export type FastGPTFeConfigsType = {
bind_notification_method?: ['email' | 'phone']; bind_notification_method?: ['email' | 'phone'];
googleClientVerKey?: string; googleClientVerKey?: string;
mcpServerProxyEndpoint?: string; mcpServerProxyEndpoint?: string;
chineseRedirectUrl?: string;
show_emptyChat?: boolean; show_emptyChat?: boolean;
show_appStore?: boolean; show_appStore?: boolean;
...@@ -82,7 +83,6 @@ export type FastGPTFeConfigsType = { ...@@ -82,7 +83,6 @@ export type FastGPTFeConfigsType = {
customSharePageDomain?: string; customSharePageDomain?: string;
systemTitle?: string; systemTitle?: string;
systemDescription?: string;
scripts?: { [key: string]: string }[]; scripts?: { [key: string]: string }[];
favicon?: string; favicon?: string;
...@@ -109,6 +109,7 @@ export type FastGPTFeConfigsType = { ...@@ -109,6 +109,7 @@ export type FastGPTFeConfigsType = {
uploadFileMaxAmount?: number; uploadFileMaxAmount?: number;
uploadFileMaxSize?: number; uploadFileMaxSize?: number;
evalFileMaxLines?: number;
// Compute by systemEnv.customPdfParse // Compute by systemEnv.customPdfParse
showCustomPdfParse?: boolean; showCustomPdfParse?: boolean;
......
packages/global/common/system/utils.ts
...@@ -5,15 +5,17 @@ export const delay = (ms: number) => ...@@ -5,15 +5,17 @@ export const delay = (ms: number) =>
}, ms); }, ms);
}); });
export const retryFn = async <T>(fn: () => Promise<T>, retryTimes = 3): Promise<T> => { export const retryFn = async <T>(fn: () => Promise<T>, attempts = 3): Promise<T> => {
while (true) {
try { try {
return fn(); return fn();
} catch (error) { } catch (error) {
if (retryTimes > 0) { if (attempts <= 0) {
return Promise.reject(error);
}
await delay(500); await delay(500);
return retryFn(fn, retryTimes - 1); attempts--;
} }
return Promise.reject(error);
} }
}; };
......
packages/global/core/ai/model.d.ts
...@@ -47,6 +47,7 @@ export type LLMModelItemType = PriceType & ...@@ -47,6 +47,7 @@ export type LLMModelItemType = PriceType &
usedInClassify?: boolean; // classify usedInClassify?: boolean; // classify
usedInExtractFields?: boolean; // extract fields usedInExtractFields?: boolean; // extract fields
usedInToolCall?: boolean; // tool call usedInToolCall?: boolean; // tool call
useInEvaluation?: boolean; // evaluation
functionCall: boolean; functionCall: boolean;
toolChoice: boolean; toolChoice: boolean;
......
packages/global/core/app/evaluation/api.d.ts 0 → 100644
import type { PaginationProps } from '@fastgpt/web/common/fetch/type';
export type listEvaluationsBody = PaginationProps<{
searchKey?: string;
}>;
export type listEvalItemsBody = PaginationProps<{
evalId: string;
}>;
export type retryEvalItemBody = {
evalItemId: string;
};
export type updateEvalItemBody = {
evalItemId: string;
question: string;
expectedResponse: string;
variables: Record<string, string>;
};
packages/global/core/app/evaluation/constants.ts 0 → 100644
import { i18nT } from '../../../../web/i18n/utils';
export const evaluationFileErrors = i18nT('dashboard_evaluation:eval_file_check_error');
export enum EvaluationStatusEnum {
queuing = 0,
evaluating = 1,
completed = 2
}
export const EvaluationStatusMap = {
[EvaluationStatusEnum.queuing]: {
name: i18nT('dashboard_evaluation:queuing')
},
[EvaluationStatusEnum.evaluating]: {
name: i18nT('dashboard_evaluation:evaluating')
},
[EvaluationStatusEnum.completed]: {
name: i18nT('dashboard_evaluation:completed')
}
};
export const EvaluationStatusValues = Object.keys(EvaluationStatusMap).map(Number);
packages/global/core/app/evaluation/type.d.ts 0 → 100644
import type { EvaluationStatusEnum } from './constants';
export type EvaluationSchemaType = {
_id: string;
teamId: string;
tmbId: string;
evalModel: string;
appId: string;
usageId: string;
name: string;
createTime: Date;
finishTime?: Date;
score?: number;
errorMessage?: string;
};
export type EvalItemSchemaType = {
evalId: string;
question: string;
expectedResponse: string;
globalVariables?: Record<string, any>;
history?: string;
response?: string;
responseTime?: Date;
finishTime?: Date;
status: EvaluationStatusEnum;
retry: number;
errorMessage?: string;
accuracy?: number;
relevance?: number;
semanticAccuracy?: number;
score?: number;
};
export type evaluationType = Pick<
EvaluationSchemaType,
'name' | 'appId' | 'createTime' | 'finishTime' | 'evalModel' | 'errorMessage' | 'score'
> & {
_id: string;
executorAvatar: string;
executorName: string;
appAvatar: string;
appName: string;
completedCount: number;
errorCount: number;
totalCount: number;
};
export type listEvalItemsItem = EvalItemSchemaType & {
evalItemId: string;
};
packages/global/core/app/evaluation/utils.ts 0 → 100644
import type { VariableItemType } from '../type';
export const getEvaluationFileHeader = (appVariables?: VariableItemType[]) => {
if (!appVariables || appVariables.length === 0) return '*q,*a,history';
const variablesStr = appVariables
.map((item) => (item.required ? `*${item.key}` : item.key))
.join(',');
return `${variablesStr},*q,*a,history`;
};
packages/global/core/app/mcpTools/utils.ts
...@@ -32,11 +32,11 @@ export const getMCPToolSetRuntimeNode = ({ ...@@ -32,11 +32,11 @@ export const getMCPToolSetRuntimeNode = ({
nodeId: getNanoid(16), nodeId: getNanoid(16),
flowNodeType: FlowNodeTypeEnum.toolSet, flowNodeType: FlowNodeTypeEnum.toolSet,
avatar, avatar,
intro: 'MCP Tools', intro: '',
inputs: [ inputs: [
{ {
key: NodeInputKeyEnum.toolSetData, key: NodeInputKeyEnum.toolSetData,
label: 'Tool Set Data', label: '',
valueType: WorkflowIOValueTypeEnum.object, valueType: WorkflowIOValueTypeEnum.object,
renderTypeList: [FlowNodeInputTypeEnum.hidden], renderTypeList: [FlowNodeInputTypeEnum.hidden],
value: { value: {
......
packages/global/core/app/plugin/type.d.ts
...@@ -34,6 +34,9 @@ export type SystemPluginTemplateItemType = WorkflowTemplateType & { ...@@ -34,6 +34,9 @@ export type SystemPluginTemplateItemType = WorkflowTemplateType & {
versionList?: { versionList?: {
value: string; value: string;
description?: string; description?: string;
inputs: FlowNodeInputItemType[];
outputs: FlowNodeOutputItemType[];
}[]; }[];
// Admin workflow tool // Admin workflow tool
......
packages/global/core/app/type.d.ts
...@@ -66,6 +66,7 @@ export type AppListItemType = { ...@@ -66,6 +66,7 @@ export type AppListItemType = {
inheritPermission?: boolean; inheritPermission?: boolean;
private?: boolean; private?: boolean;
sourceMember: SourceMemberType; sourceMember: SourceMemberType;
hasInteractiveNode?: boolean;
}; };
export type AppDetailType = AppSchema & { export type AppDetailType = AppSchema & {
......
packages/global/core/workflow/constants.ts
...@@ -269,11 +269,11 @@ export enum NodeOutputKeyEnum { ...@@ -269,11 +269,11 @@ export enum NodeOutputKeyEnum {
reasoningText = 'reasoningText', // node reasoning. the value will be show but not save to history reasoningText = 'reasoningText', // node reasoning. the value will be show but not save to history
success = 'success', success = 'success',
failed = 'failed', failed = 'failed',
error = 'error',
text = 'system_text', text = 'system_text',
addOutputParam = 'system_addOutputParam', addOutputParam = 'system_addOutputParam',
rawResponse = 'system_rawResponse', rawResponse = 'system_rawResponse',
systemError = 'system_error', systemError = 'system_error',
errorText = 'system_error_text',
// start // start
userFiles = 'userFiles', userFiles = 'userFiles',
...@@ -312,7 +312,13 @@ export enum NodeOutputKeyEnum { ...@@ -312,7 +312,13 @@ export enum NodeOutputKeyEnum {
loopStartIndex = 'loopStartIndex', loopStartIndex = 'loopStartIndex',
// form input // form input
formInputResult = 'formInputResult' formInputResult = 'formInputResult',
// File
fileTitle = 'fileTitle',
// @deprecated
error = 'error'
} }
export enum VariableInputEnum { export enum VariableInputEnum {
......
packages/global/core/workflow/node/constant.ts
...@@ -99,6 +99,7 @@ export const FlowNodeInputMap: Record< ...@@ -99,6 +99,7 @@ export const FlowNodeInputMap: Record<
export enum FlowNodeOutputTypeEnum { export enum FlowNodeOutputTypeEnum {
hidden = 'hidden', hidden = 'hidden',
error = 'error',
source = 'source', source = 'source',
static = 'static', static = 'static',
dynamic = 'dynamic' dynamic = 'dynamic'
......
packages/global/core/workflow/runtime/type.d.ts
...@@ -9,7 +9,7 @@ import type { FlowNodeInputItemType, FlowNodeOutputItemType } from '../type/io.d ...@@ -9,7 +9,7 @@ import type { FlowNodeInputItemType, FlowNodeOutputItemType } from '../type/io.d
import type { NodeToolConfigType, StoreNodeItemType } from '../type/node'; import type { NodeToolConfigType, StoreNodeItemType } from '../type/node';
import type { DispatchNodeResponseKeyEnum } from './constants'; import type { DispatchNodeResponseKeyEnum } from './constants';
import type { StoreEdgeItemType } from '../type/edge'; import type { StoreEdgeItemType } from '../type/edge';
import type { NodeInputKeyEnum } from '../constants'; import type { NodeInputKeyEnum, NodeOutputKeyEnum } from '../constants';
import type { ClassifyQuestionAgentItemType } from '../template/system/classifyQuestion/type'; import type { ClassifyQuestionAgentItemType } from '../template/system/classifyQuestion/type';
import type { NextApiResponse } from 'next'; import type { NextApiResponse } from 'next';
import { UserModelSchema } from '../../../support/user/type'; import { UserModelSchema } from '../../../support/user/type';
...@@ -24,7 +24,10 @@ import type { AiChatQuoteRoleType } from '../template/system/aiChat/type'; ...@@ -24,7 +24,10 @@ import type { AiChatQuoteRoleType } from '../template/system/aiChat/type';
import type { OpenaiAccountType } from '../../../support/user/team/type'; import type { OpenaiAccountType } from '../../../support/user/team/type';
import { LafAccountType } from '../../../support/user/team/type'; import { LafAccountType } from '../../../support/user/team/type';
import type { CompletionFinishReason } from '../../ai/type'; import type { CompletionFinishReason } from '../../ai/type';
import type { WorkflowInteractiveResponseType } from '../template/system/interactive/type'; import type {
InteractiveNodeResponseType,
WorkflowInteractiveResponseType
} from '../template/system/interactive/type';
import type { SearchDataResponseItemType } from '../../dataset/type'; import type { SearchDataResponseItemType } from '../../dataset/type';
export type ExternalProviderType = { export type ExternalProviderType = {
openaiAccount?: OpenaiAccountType; openaiAccount?: OpenaiAccountType;
...@@ -104,6 +107,9 @@ export type RuntimeNodeItemType = { ...@@ -104,6 +107,9 @@ export type RuntimeNodeItemType = {
// Tool // Tool
toolConfig?: StoreNodeItemType['toolConfig']; toolConfig?: StoreNodeItemType['toolConfig'];
// catch error
catchError?: boolean;
}; };
export type RuntimeEdgeItemType = StoreEdgeItemType & { export type RuntimeEdgeItemType = StoreEdgeItemType & {
...@@ -116,7 +122,12 @@ export type DispatchNodeResponseType = { ...@@ -116,7 +122,12 @@ export type DispatchNodeResponseType = {
runningTime?: number; runningTime?: number;
query?: string; query?: string;
textOutput?: string; textOutput?: string;
// Client will toast
error?: Record<string, any> | string; error?: Record<string, any> | string;
// Just show
errorText?: string;
customInputs?: Record<string, any>; customInputs?: Record<string, any>;
customOutputs?: Record<string, any>; customOutputs?: Record<string, any>;
nodeInputs?: Record<string, any>; nodeInputs?: Record<string, any>;
...@@ -235,7 +246,7 @@ export type DispatchNodeResponseType = { ...@@ -235,7 +246,7 @@ export type DispatchNodeResponseType = {
extensionTokens?: number; extensionTokens?: number;
}; };
export type DispatchNodeResultType<T = {}> = { export type DispatchNodeResultType<T = {}, ERR = { [NodeOutputKeyEnum.errorText]?: string }> = {
[DispatchNodeResponseKeyEnum.skipHandleId]?: string[]; // skip some edge handle id [DispatchNodeResponseKeyEnum.skipHandleId]?: string[]; // skip some edge handle id
[DispatchNodeResponseKeyEnum.nodeResponse]?: DispatchNodeResponseType; // The node response detail [DispatchNodeResponseKeyEnum.nodeResponse]?: DispatchNodeResponseType; // The node response detail
[DispatchNodeResponseKeyEnum.nodeDispatchUsages]?: ChatNodeUsageType[]; // Node total usage [DispatchNodeResponseKeyEnum.nodeDispatchUsages]?: ChatNodeUsageType[]; // Node total usage
...@@ -246,7 +257,11 @@ export type DispatchNodeResultType<T = {}> = { ...@@ -246,7 +257,11 @@ export type DispatchNodeResultType<T = {}> = {
[DispatchNodeResponseKeyEnum.runTimes]?: number; [DispatchNodeResponseKeyEnum.runTimes]?: number;
[DispatchNodeResponseKeyEnum.newVariables]?: Record<string, any>; [DispatchNodeResponseKeyEnum.newVariables]?: Record<string, any>;
[DispatchNodeResponseKeyEnum.memories]?: Record<string, any>; [DispatchNodeResponseKeyEnum.memories]?: Record<string, any>;
} & T; [DispatchNodeResponseKeyEnum.interactive]?: InteractiveNodeResponseType;
data?: T;
error?: ERR;
};
/* Single node props */ /* Single node props */
export type AIChatNodeProps = { export type AIChatNodeProps = {
......
packages/global/core/workflow/runtime/utils.ts
...@@ -251,7 +251,8 @@ export const storeNodes2RuntimeNodes = ( ...@@ -251,7 +251,8 @@ export const storeNodes2RuntimeNodes = (
outputs: node.outputs, outputs: node.outputs,
pluginId: node.pluginId, pluginId: node.pluginId,
version: node.version, version: node.version,
toolConfig: node.toolConfig toolConfig: node.toolConfig,
catchError: node.catchError
}; };
}) || [] }) || []
); );
......
packages/global/core/workflow/template/output.ts
...@@ -2,6 +2,7 @@ import type { FlowNodeOutputItemType } from '../type/io.d'; ...@@ -2,6 +2,7 @@ import type { FlowNodeOutputItemType } from '../type/io.d';
import { NodeOutputKeyEnum } from '../constants'; import { NodeOutputKeyEnum } from '../constants';
import { FlowNodeOutputTypeEnum } from '../node/constant'; import { FlowNodeOutputTypeEnum } from '../node/constant';
import { WorkflowIOValueTypeEnum } from '../constants'; import { WorkflowIOValueTypeEnum } from '../constants';
import { i18nT } from '../../../../web/i18n/utils';
export const Output_Template_AddOutput: FlowNodeOutputItemType = { export const Output_Template_AddOutput: FlowNodeOutputItemType = {
id: NodeOutputKeyEnum.addOutputParam, id: NodeOutputKeyEnum.addOutputParam,
...@@ -15,3 +16,11 @@ export const Output_Template_AddOutput: FlowNodeOutputItemType = { ...@@ -15,3 +16,11 @@ export const Output_Template_AddOutput: FlowNodeOutputItemType = {
showDefaultValue: false showDefaultValue: false
} }
}; };
export const Output_Template_Error_Message: FlowNodeOutputItemType = {
id: NodeOutputKeyEnum.errorText,
key: NodeOutputKeyEnum.errorText,
type: FlowNodeOutputTypeEnum.error,
valueType: WorkflowIOValueTypeEnum.string,
label: i18nT('workflow:error_text')
};
packages/global/core/workflow/template/system/agent.ts
...@@ -20,6 +20,7 @@ import { chatNodeSystemPromptTip, systemPromptTip } from '../tip'; ...@@ -20,6 +20,7 @@ import { chatNodeSystemPromptTip, systemPromptTip } from '../tip';
import { LLMModelTypeEnum } from '../../../ai/constants'; import { LLMModelTypeEnum } from '../../../ai/constants';
import { i18nT } from '../../../../../web/i18n/utils'; import { i18nT } from '../../../../../web/i18n/utils';
import { Input_Template_File_Link } from '../input'; import { Input_Template_File_Link } from '../input';
import { Output_Template_Error_Message } from '../output';
export const AgentNode: FlowNodeTemplateType = { export const AgentNode: FlowNodeTemplateType = {
id: FlowNodeTypeEnum.agent, id: FlowNodeTypeEnum.agent,
...@@ -31,6 +32,7 @@ export const AgentNode: FlowNodeTemplateType = { ...@@ -31,6 +32,7 @@ export const AgentNode: FlowNodeTemplateType = {
name: i18nT('workflow:template.agent'), name: i18nT('workflow:template.agent'),
intro: i18nT('workflow:template.agent_intro'), intro: i18nT('workflow:template.agent_intro'),
showStatus: true, showStatus: true,
catchError: false,
courseUrl: '/docs/guide/dashboard/workflow/tool/', courseUrl: '/docs/guide/dashboard/workflow/tool/',
version: '4.9.2', version: '4.9.2',
inputs: [ inputs: [
...@@ -107,6 +109,7 @@ export const AgentNode: FlowNodeTemplateType = { ...@@ -107,6 +109,7 @@ export const AgentNode: FlowNodeTemplateType = {
description: i18nT('common:core.module.output.description.Ai response content'), description: i18nT('common:core.module.output.description.Ai response content'),
valueType: WorkflowIOValueTypeEnum.string, valueType: WorkflowIOValueTypeEnum.string,
type: FlowNodeOutputTypeEnum.static type: FlowNodeOutputTypeEnum.static
} },
Output_Template_Error_Message
] ]
}; };
packages/global/core/workflow/template/system/aiChat/index.ts
...@@ -20,6 +20,7 @@ import { ...@@ -20,6 +20,7 @@ import {
Input_Template_File_Link Input_Template_File_Link
} from '../../input'; } from '../../input';
import { i18nT } from '../../../../../../web/i18n/utils'; import { i18nT } from '../../../../../../web/i18n/utils';
import { Output_Template_Error_Message } from '../../output';
export const AiChatQuoteRole = { export const AiChatQuoteRole = {
key: NodeInputKeyEnum.aiChatQuoteRole, key: NodeInputKeyEnum.aiChatQuoteRole,
...@@ -54,6 +55,7 @@ export const AiChatModule: FlowNodeTemplateType = { ...@@ -54,6 +55,7 @@ export const AiChatModule: FlowNodeTemplateType = {
isTool: true, isTool: true,
courseUrl: '/docs/guide/dashboard/workflow/ai_chat/', courseUrl: '/docs/guide/dashboard/workflow/ai_chat/',
version: '4.9.7', version: '4.9.7',
catchError: false,
inputs: [ inputs: [
Input_Template_SettingAiModel, Input_Template_SettingAiModel,
// --- settings modal // --- settings modal
...@@ -158,6 +160,7 @@ export const AiChatModule: FlowNodeTemplateType = { ...@@ -158,6 +160,7 @@ export const AiChatModule: FlowNodeTemplateType = {
const modelItem = llmModelList.find((item) => item.model === model); const modelItem = llmModelList.find((item) => item.model === model);
return modelItem?.reasoning !== true; return modelItem?.reasoning !== true;
} }
} },
Output_Template_Error_Message
] ]
}; };
packages/global/core/workflow/template/system/contextExtract/index.ts
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
import { Input_Template_SelectAIModel, Input_Template_History } from '../../input'; import { Input_Template_SelectAIModel, Input_Template_History } from '../../input';
import { LLMModelTypeEnum } from '../../../../ai/constants'; import { LLMModelTypeEnum } from '../../../../ai/constants';
import { i18nT } from '../../../../../../web/i18n/utils'; import { i18nT } from '../../../../../../web/i18n/utils';
import { Output_Template_Error_Message } from '../../output';
export const ContextExtractModule: FlowNodeTemplateType = { export const ContextExtractModule: FlowNodeTemplateType = {
id: FlowNodeTypeEnum.contentExtract, id: FlowNodeTypeEnum.contentExtract,
...@@ -25,6 +26,7 @@ export const ContextExtractModule: FlowNodeTemplateType = { ...@@ -25,6 +26,7 @@ export const ContextExtractModule: FlowNodeTemplateType = {
intro: i18nT('workflow:intro_text_content_extraction'), intro: i18nT('workflow:intro_text_content_extraction'),
showStatus: true, showStatus: true,
isTool: true, isTool: true,
catchError: false,
courseUrl: '/docs/guide/dashboard/workflow/content_extract/', courseUrl: '/docs/guide/dashboard/workflow/content_extract/',
version: '4.9.2', version: '4.9.2',
inputs: [ inputs: [
...@@ -76,6 +78,7 @@ export const ContextExtractModule: FlowNodeTemplateType = { ...@@ -76,6 +78,7 @@ export const ContextExtractModule: FlowNodeTemplateType = {
description: i18nT('workflow:complete_extraction_result_description'), description: i18nT('workflow:complete_extraction_result_description'),
valueType: WorkflowIOValueTypeEnum.string, valueType: WorkflowIOValueTypeEnum.string,
type: FlowNodeOutputTypeEnum.static type: FlowNodeOutputTypeEnum.static
} },
Output_Template_Error_Message
] ]
}; };
packages/global/core/workflow/template/system/datasetSearch.ts
...@@ -15,6 +15,7 @@ import { ...@@ -15,6 +15,7 @@ import {
import { Input_Template_UserChatInput } from '../input'; import { Input_Template_UserChatInput } from '../input';
import { DatasetSearchModeEnum } from '../../../dataset/constants'; import { DatasetSearchModeEnum } from '../../../dataset/constants';
import { i18nT } from '../../../../../web/i18n/utils'; import { i18nT } from '../../../../../web/i18n/utils';
import { Output_Template_Error_Message } from '../output';
export const Dataset_SEARCH_DESC = i18nT('workflow:template.dataset_search_intro'); export const Dataset_SEARCH_DESC = i18nT('workflow:template.dataset_search_intro');
...@@ -29,6 +30,7 @@ export const DatasetSearchModule: FlowNodeTemplateType = { ...@@ -29,6 +30,7 @@ export const DatasetSearchModule: FlowNodeTemplateType = {
intro: Dataset_SEARCH_DESC, intro: Dataset_SEARCH_DESC,
showStatus: true, showStatus: true,
isTool: true, isTool: true,
catchError: false,
courseUrl: '/docs/guide/dashboard/workflow/dataset_search/', courseUrl: '/docs/guide/dashboard/workflow/dataset_search/',
version: '4.9.2', version: '4.9.2',
inputs: [ inputs: [
...@@ -143,6 +145,7 @@ export const DatasetSearchModule: FlowNodeTemplateType = { ...@@ -143,6 +145,7 @@ export const DatasetSearchModule: FlowNodeTemplateType = {
type: FlowNodeOutputTypeEnum.static, type: FlowNodeOutputTypeEnum.static,
valueType: WorkflowIOValueTypeEnum.datasetQuote, valueType: WorkflowIOValueTypeEnum.datasetQuote,
valueDesc: datasetQuoteValueDesc valueDesc: datasetQuoteValueDesc
} },
Output_Template_Error_Message
] ]
}; };
packages/global/core/workflow/template/system/http468.ts
...@@ -26,6 +26,7 @@ export const HttpNode468: FlowNodeTemplateType = { ...@@ -26,6 +26,7 @@ export const HttpNode468: FlowNodeTemplateType = {
intro: i18nT('workflow:intro_http_request'), intro: i18nT('workflow:intro_http_request'),
showStatus: true, showStatus: true,
isTool: true, isTool: true,
catchError: false,
courseUrl: '/docs/guide/dashboard/workflow/http/', courseUrl: '/docs/guide/dashboard/workflow/http/',
inputs: [ inputs: [
{ {
...@@ -124,14 +125,6 @@ export const HttpNode468: FlowNodeTemplateType = { ...@@ -124,14 +125,6 @@ export const HttpNode468: FlowNodeTemplateType = {
description: i18nT('workflow:http_extract_output_description') description: i18nT('workflow:http_extract_output_description')
}, },
{ {
id: NodeOutputKeyEnum.error,
key: NodeOutputKeyEnum.error,
label: i18nT('workflow:request_error'),
description: i18nT('workflow:http_request_error_info'),
valueType: WorkflowIOValueTypeEnum.object,
type: FlowNodeOutputTypeEnum.static
},
{
id: NodeOutputKeyEnum.httpRawResponse, id: NodeOutputKeyEnum.httpRawResponse,
key: NodeOutputKeyEnum.httpRawResponse, key: NodeOutputKeyEnum.httpRawResponse,
required: true, required: true,
...@@ -139,6 +132,13 @@ export const HttpNode468: FlowNodeTemplateType = { ...@@ -139,6 +132,13 @@ export const HttpNode468: FlowNodeTemplateType = {
description: i18nT('workflow:http_raw_response_description'), description: i18nT('workflow:http_raw_response_description'),
valueType: WorkflowIOValueTypeEnum.any, valueType: WorkflowIOValueTypeEnum.any,
type: FlowNodeOutputTypeEnum.static type: FlowNodeOutputTypeEnum.static
},
{
id: NodeOutputKeyEnum.error,
key: NodeOutputKeyEnum.error,
label: i18nT('workflow:error_text'),
valueType: WorkflowIOValueTypeEnum.string,
type: FlowNodeOutputTypeEnum.error
} }
] ]
}; };
packages/global/core/workflow/template/system/laf.ts
...@@ -11,7 +11,7 @@ import { ...@@ -11,7 +11,7 @@ import {
FlowNodeTemplateTypeEnum FlowNodeTemplateTypeEnum
} from '../../constants'; } from '../../constants';
import { Input_Template_DynamicInput } from '../input'; import { Input_Template_DynamicInput } from '../input';
import { Output_Template_AddOutput } from '../output'; import { Output_Template_AddOutput, Output_Template_Error_Message } from '../output';
import { i18nT } from '../../../../../web/i18n/utils'; import { i18nT } from '../../../../../web/i18n/utils';
export const nodeLafCustomInputConfig = { export const nodeLafCustomInputConfig = {
...@@ -31,6 +31,7 @@ export const LafModule: FlowNodeTemplateType = { ...@@ -31,6 +31,7 @@ export const LafModule: FlowNodeTemplateType = {
intro: i18nT('workflow:intro_laf_function_call'), intro: i18nT('workflow:intro_laf_function_call'),
showStatus: true, showStatus: true,
isTool: true, isTool: true,
catchError: false,
courseUrl: '/docs/guide/dashboard/workflow/laf/', courseUrl: '/docs/guide/dashboard/workflow/laf/',
inputs: [ inputs: [
{ {
...@@ -57,8 +58,7 @@ export const LafModule: FlowNodeTemplateType = { ...@@ -57,8 +58,7 @@ export const LafModule: FlowNodeTemplateType = {
valueType: WorkflowIOValueTypeEnum.any, valueType: WorkflowIOValueTypeEnum.any,
type: FlowNodeOutputTypeEnum.static type: FlowNodeOutputTypeEnum.static
}, },
{ Output_Template_AddOutput,
...Output_Template_AddOutput Output_Template_Error_Message
}
] ]
}; };
packages/global/core/workflow/template/system/readFiles/index.tsx
...@@ -11,6 +11,7 @@ import { ...@@ -11,6 +11,7 @@ import {
FlowNodeTypeEnum FlowNodeTypeEnum
} from '../../../node/constant'; } from '../../../node/constant';
import { type FlowNodeTemplateType } from '../../../type/node'; import { type FlowNodeTemplateType } from '../../../type/node';
import { Output_Template_Error_Message } from '../../output';
export const ReadFilesNode: FlowNodeTemplateType = { export const ReadFilesNode: FlowNodeTemplateType = {
id: FlowNodeTypeEnum.readFiles, id: FlowNodeTypeEnum.readFiles,
...@@ -43,6 +44,7 @@ export const ReadFilesNode: FlowNodeTemplateType = { ...@@ -43,6 +44,7 @@ export const ReadFilesNode: FlowNodeTemplateType = {
description: i18nT('app:workflow.read_files_result_desc'), description: i18nT('app:workflow.read_files_result_desc'),
valueType: WorkflowIOValueTypeEnum.string, valueType: WorkflowIOValueTypeEnum.string,
type: FlowNodeOutputTypeEnum.static type: FlowNodeOutputTypeEnum.static
} },
Output_Template_Error_Message
] ]
}; };
packages/global/core/workflow/template/system/sandbox/index.ts
...@@ -25,6 +25,7 @@ export const CodeNode: FlowNodeTemplateType = { ...@@ -25,6 +25,7 @@ export const CodeNode: FlowNodeTemplateType = {
name: i18nT('workflow:code_execution'), name: i18nT('workflow:code_execution'),
intro: i18nT('workflow:execute_a_simple_script_code_usually_for_complex_data_processing'), intro: i18nT('workflow:execute_a_simple_script_code_usually_for_complex_data_processing'),
showStatus: true, showStatus: true,
catchError: false,
courseUrl: '/docs/guide/dashboard/workflow/sandbox/', courseUrl: '/docs/guide/dashboard/workflow/sandbox/',
inputs: [ inputs: [
{ {
...@@ -90,14 +91,6 @@ export const CodeNode: FlowNodeTemplateType = { ...@@ -90,14 +91,6 @@ export const CodeNode: FlowNodeTemplateType = {
type: FlowNodeOutputTypeEnum.static type: FlowNodeOutputTypeEnum.static
}, },
{ {
id: NodeOutputKeyEnum.error,
key: NodeOutputKeyEnum.error,
label: i18nT('workflow:execution_error'),
description: i18nT('workflow:error_info_returns_empty_on_success'),
valueType: WorkflowIOValueTypeEnum.object,
type: FlowNodeOutputTypeEnum.static
},
{
id: 'qLUQfhG0ILRX', id: 'qLUQfhG0ILRX',
type: FlowNodeOutputTypeEnum.dynamic, type: FlowNodeOutputTypeEnum.dynamic,
key: 'result', key: 'result',
...@@ -110,6 +103,13 @@ export const CodeNode: FlowNodeTemplateType = { ...@@ -110,6 +103,13 @@ export const CodeNode: FlowNodeTemplateType = {
key: 'data2', key: 'data2',
valueType: WorkflowIOValueTypeEnum.string, valueType: WorkflowIOValueTypeEnum.string,
label: 'data2' label: 'data2'
},
{
id: NodeOutputKeyEnum.error,
key: NodeOutputKeyEnum.error,
label: i18nT('workflow:error_text'),
valueType: WorkflowIOValueTypeEnum.string,
type: FlowNodeOutputTypeEnum.error
} }
] ]
}; };
packages/global/core/workflow/type/node.d.ts
...@@ -48,6 +48,7 @@ export type FlowNodeCommonType = { ...@@ -48,6 +48,7 @@ export type FlowNodeCommonType = {
isLatestVersion?: boolean; // Just ui show isLatestVersion?: boolean; // Just ui show
// data // data
catchError?: boolean;
inputs: FlowNodeInputItemType[]; inputs: FlowNodeInputItemType[];
outputs: FlowNodeOutputItemType[]; outputs: FlowNodeOutputItemType[];
......
packages/global/core/workflow/utils.ts
...@@ -52,7 +52,11 @@ import { ChatRoleEnum } from '../../core/chat/constants'; ...@@ -52,7 +52,11 @@ import { ChatRoleEnum } from '../../core/chat/constants';
import { runtimePrompt2ChatsValue } from '../../core/chat/adapt'; import { runtimePrompt2ChatsValue } from '../../core/chat/adapt';
import { getPluginRunContent } from '../../core/app/plugin/utils'; import { getPluginRunContent } from '../../core/app/plugin/utils';
export const getHandleId = (nodeId: string, type: 'source' | 'target', key: string) => { export const getHandleId = (
nodeId: string,
type: 'source' | 'source_catch' | 'target',
key: string
) => {
return `${nodeId}-${type}-${key}`; return `${nodeId}-${type}-${key}`;
}; };
...@@ -219,8 +223,7 @@ export const pluginData2FlowNodeIO = ({ ...@@ -219,8 +223,7 @@ export const pluginData2FlowNodeIO = ({
] ]
: [], : [],
outputs: pluginOutput outputs: pluginOutput
? [ ? pluginOutput.inputs.map((item) => ({
...pluginOutput.inputs.map((item) => ({
id: item.key, id: item.key,
type: FlowNodeOutputTypeEnum.static, type: FlowNodeOutputTypeEnum.static,
key: item.key, key: item.key,
...@@ -228,7 +231,6 @@ export const pluginData2FlowNodeIO = ({ ...@@ -228,7 +231,6 @@ export const pluginData2FlowNodeIO = ({
label: item.label || item.key, label: item.label || item.key,
description: item.description description: item.description
})) }))
]
: [] : []
}; };
}; };
......
packages/global/support/user/audit/constants.ts
...@@ -54,6 +54,9 @@ export enum AuditEventEnum { ...@@ -54,6 +54,9 @@ export enum AuditEventEnum {
UPDATE_APP_PUBLISH_CHANNEL = 'UPDATE_APP_PUBLISH_CHANNEL', UPDATE_APP_PUBLISH_CHANNEL = 'UPDATE_APP_PUBLISH_CHANNEL',
DELETE_APP_PUBLISH_CHANNEL = 'DELETE_APP_PUBLISH_CHANNEL', DELETE_APP_PUBLISH_CHANNEL = 'DELETE_APP_PUBLISH_CHANNEL',
EXPORT_APP_CHAT_LOG = 'EXPORT_APP_CHAT_LOG', EXPORT_APP_CHAT_LOG = 'EXPORT_APP_CHAT_LOG',
CREATE_EVALUATION = 'CREATE_EVALUATION',
EXPORT_EVALUATION = 'EXPORT_EVALUATION',
DELETE_EVALUATION = 'DELETE_EVALUATION',
//Dataset //Dataset
CREATE_DATASET = 'CREATE_DATASET', CREATE_DATASET = 'CREATE_DATASET',
UPDATE_DATASET = 'UPDATE_DATASET', UPDATE_DATASET = 'UPDATE_DATASET',
......
packages/global/support/wallet/usage/constants.ts
...@@ -12,7 +12,8 @@ export enum UsageSourceEnum { ...@@ -12,7 +12,8 @@ export enum UsageSourceEnum {
dingtalk = 'dingtalk', dingtalk = 'dingtalk',
official_account = 'official_account', official_account = 'official_account',
pdfParse = 'pdfParse', pdfParse = 'pdfParse',
mcp = 'mcp' mcp = 'mcp',
evaluation = 'evaluation'
} }
export const UsageSourceMap = { export const UsageSourceMap = {
...@@ -51,5 +52,8 @@ export const UsageSourceMap = { ...@@ -51,5 +52,8 @@ export const UsageSourceMap = {
}, },
[UsageSourceEnum.mcp]: { [UsageSourceEnum.mcp]: {
label: i18nT('account_usage:mcp') label: i18nT('account_usage:mcp')
},
[UsageSourceEnum.evaluation]: {
label: i18nT('account_usage:evaluation')
} }
}; };
packages/global/support/wallet/usage/type.d.ts
...@@ -8,6 +8,7 @@ export type UsageListItemCountType = { ...@@ -8,6 +8,7 @@ export type UsageListItemCountType = {
charsLength?: number; charsLength?: number;
duration?: number; duration?: number;
pages?: number; pages?: number;
count?: number; // Times
// deprecated // deprecated
tokens?: number; tokens?: number;
...@@ -17,6 +18,7 @@ export type UsageListItemType = UsageListItemCountType & { ...@@ -17,6 +18,7 @@ export type UsageListItemType = UsageListItemCountType & {
moduleName: string; moduleName: string;
amount: number; amount: number;
model?: string; model?: string;
count?: number;
}; };
export type UsageSchemaType = CreateUsageProps & { export type UsageSchemaType = CreateUsageProps & {
......
packages/service/common/bullmq/index.ts
...@@ -20,6 +20,7 @@ const defaultWorkerOpts: Omit<ConnectionOptions, 'connection'> = { ...@@ -20,6 +20,7 @@ const defaultWorkerOpts: Omit<ConnectionOptions, 'connection'> = {
export enum QueueNames { export enum QueueNames {
datasetSync = 'datasetSync', datasetSync = 'datasetSync',
evaluation = 'evaluation',
// abondoned // abondoned
websiteSync = 'websiteSync' websiteSync = 'websiteSync'
} }
......
packages/service/common/otel/trace/register.ts
import { registerOTel, OTLPHttpJsonTraceExporter } from '@vercel/otel'; import { registerOTel, OTLPHttpJsonTraceExporter } from '@vercel/otel';
// Add otel logging
// import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
import { SignozBaseURL, SignozServiceName } from '../const'; import { SignozBaseURL, SignozServiceName } from '../const';
import { addLog } from '../../system/log'; import { addLog } from '../../system/log';
// diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
export function connectSignoz() { export function connectSignoz() {
if (!SignozBaseURL) { if (!SignozBaseURL) {
addLog.warn('Signoz is not configured');
return; return;
} }
addLog.info(`Connecting signoz, ${SignozBaseURL}, ${SignozServiceName}`); addLog.info(`Connecting signoz, ${SignozBaseURL}, ${SignozServiceName}`);
......
packages/service/core/ai/config/provider/ChatGLM.json
...@@ -15,11 +15,6 @@ ...@@ -15,11 +15,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -38,11 +33,6 @@ ...@@ -38,11 +33,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -61,11 +51,6 @@ ...@@ -61,11 +51,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -84,11 +69,6 @@ ...@@ -84,11 +69,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -106,11 +86,6 @@ ...@@ -106,11 +86,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -128,11 +103,6 @@ ...@@ -128,11 +103,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
......
packages/service/core/ai/config/provider/Claude.json
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -36,11 +31,6 @@ ...@@ -36,11 +31,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -58,11 +48,6 @@ ...@@ -58,11 +48,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -80,11 +65,6 @@ ...@@ -80,11 +65,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -102,11 +82,6 @@ ...@@ -102,11 +82,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -124,11 +99,6 @@ ...@@ -124,11 +99,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -146,11 +116,6 @@ ...@@ -146,11 +116,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
......
packages/service/core/ai/config/provider/DeepSeek.json
...@@ -15,11 +15,6 @@ ...@@ -15,11 +15,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"type": "llm" "type": "llm"
}, },
{ {
...@@ -34,11 +29,6 @@ ...@@ -34,11 +29,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/Doubao.json
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -36,11 +31,6 @@ ...@@ -36,11 +31,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -58,11 +48,6 @@ ...@@ -58,11 +48,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -80,11 +65,6 @@ ...@@ -80,11 +65,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -102,11 +82,6 @@ ...@@ -102,11 +82,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -124,11 +99,6 @@ ...@@ -124,11 +99,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -146,11 +116,6 @@ ...@@ -146,11 +116,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -168,11 +133,6 @@ ...@@ -168,11 +133,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -190,11 +150,6 @@ ...@@ -190,11 +150,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -210,11 +165,6 @@ ...@@ -210,11 +165,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -232,11 +182,6 @@ ...@@ -232,11 +182,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -254,11 +199,6 @@ ...@@ -254,11 +199,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -276,11 +216,6 @@ ...@@ -276,11 +216,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -298,11 +233,6 @@ ...@@ -298,11 +233,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -320,11 +250,6 @@ ...@@ -320,11 +250,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/Ernie.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -34,11 +29,6 @@ ...@@ -34,11 +29,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -56,11 +46,6 @@ ...@@ -56,11 +46,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -78,11 +63,6 @@ ...@@ -78,11 +63,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/Gemini.json
...@@ -2,6 +2,38 @@ ...@@ -2,6 +2,38 @@
"provider": "Gemini", "provider": "Gemini",
"list": [ "list": [
{ {
"model": "gemini-2.5-pro",
"name": "gemini-2.5-pro",
"maxContext": 1000000,
"maxResponse": 63000,
"quoteMaxToken": 1000000,
"maxTemperature": 1,
"vision": true,
"toolChoice": true,
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {},
"type": "llm",
"showTopP": true,
"showStopSign": true
},
{
"model": "gemini-2.5-flash",
"name": "gemini-2.5-flash",
"maxContext": 1000000,
"maxResponse": 63000,
"quoteMaxToken": 1000000,
"maxTemperature": 1,
"vision": true,
"toolChoice": true,
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {},
"type": "llm",
"showTopP": true,
"showStopSign": true
},
{
"model": "gemini-2.5-pro-exp-03-25", "model": "gemini-2.5-pro-exp-03-25",
"name": "gemini-2.5-pro-exp-03-25", "name": "gemini-2.5-pro-exp-03-25",
"maxContext": 1000000, "maxContext": 1000000,
...@@ -12,11 +44,6 @@ ...@@ -12,11 +44,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -34,11 +61,6 @@ ...@@ -34,11 +61,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -56,11 +78,6 @@ ...@@ -56,11 +78,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -78,11 +95,6 @@ ...@@ -78,11 +95,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -100,11 +112,6 @@ ...@@ -100,11 +112,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -122,11 +129,6 @@ ...@@ -122,11 +129,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -144,11 +146,6 @@ ...@@ -144,11 +146,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -166,11 +163,6 @@ ...@@ -166,11 +163,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -188,11 +180,6 @@ ...@@ -188,11 +180,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -210,11 +197,6 @@ ...@@ -210,11 +197,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/Grok.json
...@@ -2,6 +2,38 @@ ...@@ -2,6 +2,38 @@
"provider": "Grok", "provider": "Grok",
"list": [ "list": [
{ {
"model": "grok-4",
"name": "grok-4",
"maxContext": 256000,
"maxResponse": 8000,
"quoteMaxToken": 128000,
"maxTemperature": 1,
"showTopP": true,
"showStopSign": true,
"vision": true,
"toolChoice": true,
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {},
"type": "llm"
},
{
"model": "grok-4-0709",
"name": "grok-4-0709",
"maxContext": 256000,
"maxResponse": 8000,
"quoteMaxToken": 128000,
"maxTemperature": 1,
"showTopP": true,
"showStopSign": true,
"vision": true,
"toolChoice": true,
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {},
"type": "llm"
},
{
"model": "grok-3-mini", "model": "grok-3-mini",
"name": "grok-3-mini", "name": "grok-3-mini",
"maxContext": 128000, "maxContext": 128000,
...@@ -14,11 +46,6 @@ ...@@ -14,11 +46,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -36,11 +63,6 @@ ...@@ -36,11 +63,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -58,11 +80,6 @@ ...@@ -58,11 +80,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -80,11 +97,6 @@ ...@@ -80,11 +97,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
......
packages/service/core/ai/config/provider/Groq.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"type": "llm", "type": "llm",
"showTopP": true, "showTopP": true,
...@@ -33,11 +28,6 @@ ...@@ -33,11 +28,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"type": "llm", "type": "llm",
"showTopP": true, "showTopP": true,
......
packages/service/core/ai/config/provider/Hunyuan.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -34,11 +29,6 @@ ...@@ -34,11 +29,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -56,11 +46,6 @@ ...@@ -56,11 +46,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -78,11 +63,6 @@ ...@@ -78,11 +63,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -100,11 +80,6 @@ ...@@ -100,11 +80,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -122,11 +97,6 @@ ...@@ -122,11 +97,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -144,11 +114,6 @@ ...@@ -144,11 +114,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/Intern.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -34,11 +29,6 @@ ...@@ -34,11 +29,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/MiniMax.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -34,11 +29,6 @@ ...@@ -34,11 +29,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/MistralAI.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -34,11 +29,6 @@ ...@@ -34,11 +29,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -56,11 +46,6 @@ ...@@ -56,11 +46,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -78,11 +63,6 @@ ...@@ -78,11 +63,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/Moonshot.json
...@@ -2,6 +2,74 @@ ...@@ -2,6 +2,74 @@
"provider": "Moonshot", "provider": "Moonshot",
"list": [ "list": [
{ {
"model": "kimi-k2-0711-preview",
"name": "kimi-k2-0711-preview",
"maxContext": 128000,
"maxResponse": 32000,
"quoteMaxToken": 128000,
"maxTemperature": 1,
"vision": false,
"toolChoice": true,
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {},
"type": "llm",
"showTopP": true,
"showStopSign": true,
"responseFormatList": ["text", "json_object"]
},
{
"model": "kimi-latest-8k",
"name": "kimi-latest-8k",
"maxContext": 8000,
"maxResponse": 4000,
"quoteMaxToken": 6000,
"maxTemperature": 1,
"vision": false,
"toolChoice": true,
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {},
"type": "llm",
"showTopP": true,
"showStopSign": true,
"responseFormatList": ["text", "json_object"]
},
{
"model": "kimi-latest-32k",
"name": "kimi-latest-32k",
"maxContext": 32000,
"maxResponse": 16000,
"quoteMaxToken": 32000,
"maxTemperature": 1,
"vision": false,
"toolChoice": true,
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {},
"type": "llm",
"showTopP": true,
"showStopSign": true,
"responseFormatList": ["text", "json_object"]
},
{
"model": "kimi-latest-128k",
"name": "kimi-latest-128k",
"maxContext": 128000,
"maxResponse": 32000,
"quoteMaxToken": 128000,
"maxTemperature": 1,
"vision": false,
"toolChoice": true,
"defaultSystemChatPrompt": "",
"defaultConfig": {},
"fieldMap": {},
"type": "llm",
"showTopP": true,
"showStopSign": true,
"responseFormatList": ["text", "json_object"]
},
{
"model": "moonshot-v1-8k", "model": "moonshot-v1-8k",
"name": "moonshot-v1-8k", "name": "moonshot-v1-8k",
"maxContext": 8000, "maxContext": 8000,
...@@ -12,11 +80,6 @@ ...@@ -12,11 +80,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -35,11 +98,6 @@ ...@@ -35,11 +98,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -58,11 +116,6 @@ ...@@ -58,11 +116,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -81,11 +134,6 @@ ...@@ -81,11 +134,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -104,11 +152,6 @@ ...@@ -104,11 +152,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -127,11 +170,6 @@ ...@@ -127,11 +170,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/OpenAI.json
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": true, "functionCall": true,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -37,10 +33,6 @@ ...@@ -37,10 +33,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": true, "functionCall": true,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -59,10 +51,6 @@ ...@@ -59,10 +51,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": true, "functionCall": true,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -81,10 +69,6 @@ ...@@ -81,10 +69,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": true, "functionCall": true,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -103,11 +87,6 @@ ...@@ -103,11 +87,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": true, "functionCall": true,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm" "type": "llm"
...@@ -123,11 +102,6 @@ ...@@ -123,11 +102,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": { "fieldMap": {
"max_tokens": "max_completion_tokens" "max_tokens": "max_completion_tokens"
...@@ -147,11 +121,6 @@ ...@@ -147,11 +121,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": { "fieldMap": {
"max_tokens": "max_completion_tokens" "max_tokens": "max_completion_tokens"
...@@ -171,11 +140,6 @@ ...@@ -171,11 +140,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": { "fieldMap": {
"max_tokens": "max_completion_tokens" "max_tokens": "max_completion_tokens"
...@@ -195,11 +159,6 @@ ...@@ -195,11 +159,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": { "fieldMap": {
"max_tokens": "max_completion_tokens" "max_tokens": "max_completion_tokens"
...@@ -219,11 +178,6 @@ ...@@ -219,11 +178,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": { "fieldMap": {
"max_tokens": "max_completion_tokens" "max_tokens": "max_completion_tokens"
...@@ -243,11 +197,6 @@ ...@@ -243,11 +197,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": false "stream": false
}, },
...@@ -271,11 +220,6 @@ ...@@ -271,11 +220,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": true, "functionCall": true,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"type": "llm" "type": "llm"
}, },
{ {
...@@ -291,11 +235,6 @@ ...@@ -291,11 +235,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": true, "functionCall": true,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"type": "llm" "type": "llm"
}, },
{ {
......
packages/service/core/ai/config/provider/Qwen.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -35,11 +30,6 @@ ...@@ -35,11 +30,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -57,11 +47,6 @@ ...@@ -57,11 +47,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -80,11 +65,6 @@ ...@@ -80,11 +65,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"type": "llm", "type": "llm",
"showTopP": true, "showTopP": true,
"showStopSign": true "showStopSign": true
...@@ -100,11 +80,6 @@ ...@@ -100,11 +80,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -124,11 +99,6 @@ ...@@ -124,11 +99,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -150,11 +120,6 @@ ...@@ -150,11 +120,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -176,11 +141,6 @@ ...@@ -176,11 +141,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -202,11 +162,6 @@ ...@@ -202,11 +162,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -228,11 +183,6 @@ ...@@ -228,11 +183,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -254,11 +204,6 @@ ...@@ -254,11 +204,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -280,11 +225,6 @@ ...@@ -280,11 +225,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -306,11 +246,6 @@ ...@@ -306,11 +246,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -336,7 +271,6 @@ ...@@ -336,7 +271,6 @@
"usedInClassify": false, "usedInClassify": false,
"usedInExtractFields": false, "usedInExtractFields": false,
"usedInQueryExtension": false, "usedInQueryExtension": false,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -361,7 +295,6 @@ ...@@ -361,7 +295,6 @@
"usedInClassify": false, "usedInClassify": false,
"usedInExtractFields": false, "usedInExtractFields": false,
"usedInQueryExtension": false, "usedInQueryExtension": false,
"usedInToolCall": true,
"defaultConfig": { "defaultConfig": {
"stream": true "stream": true
}, },
...@@ -381,11 +314,6 @@ ...@@ -381,11 +314,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -403,11 +331,6 @@ ...@@ -403,11 +331,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -426,11 +349,6 @@ ...@@ -426,11 +349,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -449,11 +367,6 @@ ...@@ -449,11 +367,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -472,11 +385,6 @@ ...@@ -472,11 +385,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/Siliconflow.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -55,11 +50,6 @@ ...@@ -55,11 +50,6 @@
"toolChoice": true, "toolChoice": true,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/SparkDesk.json
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
"quoteMaxToken": 32000, "quoteMaxToken": 32000,
"maxTemperature": 1, "maxTemperature": 1,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -29,11 +24,6 @@ ...@@ -29,11 +24,6 @@
"quoteMaxToken": 8000, "quoteMaxToken": 8000,
"maxTemperature": 1, "maxTemperature": 1,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -49,11 +39,6 @@ ...@@ -49,11 +39,6 @@
"quoteMaxToken": 128000, "quoteMaxToken": 128000,
"maxTemperature": 1, "maxTemperature": 1,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -69,11 +54,6 @@ ...@@ -69,11 +54,6 @@
"quoteMaxToken": 8000, "quoteMaxToken": 8000,
"maxTemperature": 1, "maxTemperature": 1,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -92,11 +72,6 @@ ...@@ -92,11 +72,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -114,11 +89,6 @@ ...@@ -114,11 +89,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/provider/StepFun.json
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
"quoteMaxToken": 6000, "quoteMaxToken": 6000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -29,11 +24,6 @@ ...@@ -29,11 +24,6 @@
"quoteMaxToken": 8000, "quoteMaxToken": 8000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -49,11 +39,6 @@ ...@@ -49,11 +39,6 @@
"quoteMaxToken": 32000, "quoteMaxToken": 32000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -69,11 +54,6 @@ ...@@ -69,11 +54,6 @@
"quoteMaxToken": 128000, "quoteMaxToken": 128000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -89,11 +69,6 @@ ...@@ -89,11 +69,6 @@
"quoteMaxToken": 256000, "quoteMaxToken": 256000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -109,11 +84,6 @@ ...@@ -109,11 +84,6 @@
"maxResponse": 8000, "maxResponse": 8000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": true, "vision": true,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -129,11 +99,6 @@ ...@@ -129,11 +99,6 @@
"quoteMaxToken": 8000, "quoteMaxToken": 8000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": true, "vision": true,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -149,11 +114,6 @@ ...@@ -149,11 +114,6 @@
"maxResponse": 8000, "maxResponse": 8000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": true, "vision": true,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -169,11 +129,6 @@ ...@@ -169,11 +129,6 @@
"quoteMaxToken": 6000, "quoteMaxToken": 6000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -189,11 +144,6 @@ ...@@ -189,11 +144,6 @@
"quoteMaxToken": 4000, "quoteMaxToken": 4000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
...@@ -209,11 +159,6 @@ ...@@ -209,11 +159,6 @@
"quoteMaxToken": 4000, "quoteMaxToken": 4000,
"maxTemperature": 2, "maxTemperature": 2,
"vision": false, "vision": false,
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInToolCall": true,
"usedInQueryExtension": true,
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
......
packages/service/core/ai/config/provider/Yi.json
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
...@@ -34,11 +29,6 @@ ...@@ -34,11 +29,6 @@
"toolChoice": false, "toolChoice": false,
"functionCall": false, "functionCall": false,
"defaultSystemChatPrompt": "", "defaultSystemChatPrompt": "",
"datasetProcess": true,
"usedInClassify": true,
"usedInExtractFields": true,
"usedInQueryExtension": true,
"usedInToolCall": true,
"defaultConfig": {}, "defaultConfig": {},
"fieldMap": {}, "fieldMap": {},
"type": "llm", "type": "llm",
......
packages/service/core/ai/config/utils.ts
...@@ -43,6 +43,15 @@ export const loadSystemModels = async (init = false) => { ...@@ -43,6 +43,15 @@ export const loadSystemModels = async (init = false) => {
const pushModel = (model: SystemModelItemType) => { const pushModel = (model: SystemModelItemType) => {
global.systemModelList.push(model); global.systemModelList.push(model);
// Add default value
if (model.type === ModelTypeEnum.llm) {
model.datasetProcess = model.datasetProcess ?? true;
model.usedInClassify = model.usedInClassify ?? true;
model.usedInExtractFields = model.usedInExtractFields ?? true;
model.usedInToolCall = model.usedInToolCall ?? true;
model.useInEvaluation = model.useInEvaluation ?? true;
}
if (model.isActive) { if (model.isActive) {
global.systemActiveModelList.push(model); global.systemActiveModelList.push(model);
......
packages/service/core/ai/model.ts
...@@ -14,15 +14,15 @@ export const getDatasetModel = (model?: string) => { ...@@ -14,15 +14,15 @@ export const getDatasetModel = (model?: string) => {
?.find((item) => item.model === model || item.name === model) ?? getDefaultLLMModel() ?.find((item) => item.model === model || item.name === model) ?? getDefaultLLMModel()
); );
}; };
export const getVlmModel = (model?: string) => {
return Array.from(global.llmModelMap.values())
?.filter((item) => item.vision)
?.find((item) => item.model === model || item.name === model);
};
export const getVlmModelList = () => { export const getVlmModelList = () => {
return Array.from(global.llmModelMap.values())?.filter((item) => item.vision) || []; return Array.from(global.llmModelMap.values())?.filter((item) => item.vision) || [];
}; };
export const getDefaultVLMModel = () => global?.systemDefaultModel.datasetImageLLM;
export const getVlmModel = (model?: string) => {
const list = getVlmModelList();
return list.find((item) => item.model === model || item.name === model) || list[0];
};
export const getDefaultEmbeddingModel = () => global?.systemDefaultModel.embedding!; export const getDefaultEmbeddingModel = () => global?.systemDefaultModel.embedding!;
export const getEmbeddingModel = (model?: string) => { export const getEmbeddingModel = (model?: string) => {
......
packages/service/core/app/evaluation/evalItemSchema.ts 0 → 100644
import { connectionMongo, getMongoModel } from '../../../common/mongo';
import { EvaluationCollectionName } from './evalSchema';
import {
EvaluationStatusEnum,
EvaluationStatusValues
} from '@fastgpt/global/core/app/evaluation/constants';
import type { EvalItemSchemaType } from '@fastgpt/global/core/app/evaluation/type';
const { Schema } = connectionMongo;
export const EvalItemCollectionName = 'eval_items';
const EvalItemSchema = new Schema({
evalId: {
type: Schema.Types.ObjectId,
ref: EvaluationCollectionName,
required: true
},
question: {
type: String,
required: true
},
expectedResponse: {
type: String,
required: true
},
history: String,
globalVariables: Object,
response: String,
responseTime: Date,
status: {
type: Number,
default: EvaluationStatusEnum.queuing,
enum: EvaluationStatusValues
},
retry: {
type: Number,
default: 3
},
finishTime: Date,
accuracy: Number,
relevance: Number,
semanticAccuracy: Number,
score: Number, // average score
errorMessage: String
});
EvalItemSchema.index({ evalId: 1, status: 1 });
export const MongoEvalItem = getMongoModel<EvalItemSchemaType>(
EvalItemCollectionName,
EvalItemSchema
);
packages/service/core/app/evaluation/evalSchema.ts 0 → 100644
import {
TeamCollectionName,
TeamMemberCollectionName
} from '@fastgpt/global/support/user/team/constant';
import { connectionMongo, getMongoModel } from '../../../common/mongo';
import { AppCollectionName } from '../schema';
import type { EvaluationSchemaType } from '@fastgpt/global/core/app/evaluation/type';
import { UsageCollectionName } from '../../../support/wallet/usage/schema';
const { Schema } = connectionMongo;
export const EvaluationCollectionName = 'eval';
const EvaluationSchema = new Schema({
teamId: {
type: Schema.Types.ObjectId,
ref: TeamCollectionName,
required: true
},
tmbId: {
type: Schema.Types.ObjectId,
ref: TeamMemberCollectionName,
required: true
},
appId: {
type: Schema.Types.ObjectId,
ref: AppCollectionName,
required: true
},
usageId: {
type: Schema.Types.ObjectId,
ref: UsageCollectionName,
required: true
},
evalModel: {
type: String,
required: true
},
name: {
type: String,
required: true
},
createTime: {
type: Date,
required: true,
default: () => new Date()
},
finishTime: Date,
score: Number,
errorMessage: String
});
EvaluationSchema.index({ teamId: 1 });
export const MongoEvaluation = getMongoModel<EvaluationSchemaType>(
EvaluationCollectionName,
EvaluationSchema
);
packages/service/core/app/evaluation/mq.ts 0 → 100644
import { getQueue, getWorker, QueueNames } from '../../../common/bullmq';
import { type Processor } from 'bullmq';
import { addLog } from '../../../common/system/log';
export type EvaluationJobData = {
evalId: string;
};
export const evaluationQueue = getQueue<EvaluationJobData>(QueueNames.evaluation, {
defaultJobOptions: {
attempts: 3,
backoff: {
type: 'exponential',
delay: 1000
}
}
});
const concurrency = process.env.EVAL_CONCURRENCY ? Number(process.env.EVAL_CONCURRENCY) : 3;
export const getEvaluationWorker = (processor: Processor<EvaluationJobData>) => {
return getWorker<EvaluationJobData>(QueueNames.evaluation, processor, {
removeOnFail: {
count: 1000 // Keep last 1000 failed jobs
},
concurrency: concurrency
});
};
export const addEvaluationJob = (data: EvaluationJobData) => {
const evalId = String(data.evalId);
return evaluationQueue.add(evalId, data, { deduplication: { id: evalId } });
};
export const checkEvaluationJobActive = async (evalId: string): Promise<boolean> => {
try {
const jobId = await evaluationQueue.getDeduplicationJobId(String(evalId));
if (!jobId) return false;
const job = await evaluationQueue.getJob(jobId);
if (!job) return false;
const jobState = await job.getState();
return ['waiting', 'delayed', 'prioritized', 'active'].includes(jobState);
} catch (error) {
addLog.error('Failed to check evaluation job status', { evalId, error });
return false;
}
};
export const removeEvaluationJob = async (evalId: string): Promise<boolean> => {
const formatEvalId = String(evalId);
try {
const jobId = await evaluationQueue.getDeduplicationJobId(formatEvalId);
if (!jobId) {
addLog.warn('No job found to remove', { evalId });
return false;
}
const job = await evaluationQueue.getJob(jobId);
if (!job) {
addLog.warn('Job not found in queue', { evalId, jobId });
return false;
}
const jobState = await job.getState();
if (['waiting', 'delayed', 'prioritized'].includes(jobState)) {
await job.remove();
addLog.info('Evaluation job removed successfully', { evalId, jobId, jobState });
return true;
} else {
addLog.warn('Cannot remove active or completed job', { evalId, jobId, jobState });
return false;
}
} catch (error) {
addLog.error('Failed to remove evaluation job', { evalId, error });
return false;
}
};
packages/service/core/app/plugin/controller.ts
import { type FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d'; import { type FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import {
FlowNodeOutputTypeEnum,
FlowNodeTypeEnum
} from '@fastgpt/global/core/workflow/node/constant';
import { import {
appData2FlowNodeIO, appData2FlowNodeIO,
pluginData2FlowNodeIO, pluginData2FlowNodeIO,
...@@ -33,6 +36,7 @@ import type { ...@@ -33,6 +36,7 @@ import type {
FlowNodeOutputItemType FlowNodeOutputItemType
} from '@fastgpt/global/core/workflow/type/io'; } from '@fastgpt/global/core/workflow/type/io';
import { isProduction } from '@fastgpt/global/common/system/constants'; import { isProduction } from '@fastgpt/global/common/system/constants';
import { Output_Template_Error_Message } from '@fastgpt/global/core/workflow/template/output';
/** /**
plugin id rule: plugin id rule:
...@@ -122,15 +126,24 @@ export const getSystemPluginByIdAndVersionId = async ( ...@@ -122,15 +126,24 @@ export const getSystemPluginByIdAndVersionId = async (
}; };
} }
// System tool
const versionList = (plugin.versionList as SystemPluginTemplateItemType['versionList']) || [];
if (versionList.length === 0) {
return Promise.reject('Can not find plugin version list');
}
const version = versionId const version = versionId
? plugin.versionList?.find((item) => item.value === versionId) ? versionList.find((item) => item.value === versionId) ?? versionList[0]
: plugin.versionList?.[0]; : versionList[0];
const lastVersion = plugin.versionList?.[0]; const lastVersion = versionList[0];
return { return {
...plugin, ...plugin,
inputs: version.inputs,
outputs: version.outputs,
version: versionId ? version?.value : '', version: versionId ? version?.value : '',
versionLabel: version ? version?.value : '', versionLabel: versionId ? version?.value : '',
isLatestVersion: !version || !lastVersion || version.value === lastVersion?.value isLatestVersion: !version || !lastVersion || version.value === lastVersion?.value
}; };
})(); })();
...@@ -198,8 +211,8 @@ export async function getChildAppPreviewNode({ ...@@ -198,8 +211,8 @@ export async function getChildAppPreviewNode({
return { return {
flowNodeType: FlowNodeTypeEnum.tool, flowNodeType: FlowNodeTypeEnum.tool,
nodeIOConfig: { nodeIOConfig: {
inputs: app.inputs!, inputs: app.inputs || [],
outputs: app.outputs!, outputs: app.outputs || [],
toolConfig: { toolConfig: {
systemTool: { systemTool: {
toolId: app.id toolId: app.id
...@@ -209,6 +222,7 @@ export async function getChildAppPreviewNode({ ...@@ -209,6 +222,7 @@ export async function getChildAppPreviewNode({
}; };
} }
// Plugin workflow
if (!!app.workflow.nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.pluginInput)) { if (!!app.workflow.nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.pluginInput)) {
return { return {
flowNodeType: FlowNodeTypeEnum.pluginModule, flowNodeType: FlowNodeTypeEnum.pluginModule,
...@@ -216,6 +230,7 @@ export async function getChildAppPreviewNode({ ...@@ -216,6 +230,7 @@ export async function getChildAppPreviewNode({
}; };
} }
// Mcp
if ( if (
!!app.workflow.nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.toolSet) && !!app.workflow.nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.toolSet) &&
app.workflow.nodes.length === 1 app.workflow.nodes.length === 1
...@@ -236,6 +251,7 @@ export async function getChildAppPreviewNode({ ...@@ -236,6 +251,7 @@ export async function getChildAppPreviewNode({
}; };
} }
// Chat workflow
return { return {
flowNodeType: FlowNodeTypeEnum.appModule, flowNodeType: FlowNodeTypeEnum.appModule,
nodeIOConfig: appData2FlowNodeIO({ chatConfig: app.workflow.chatConfig }) nodeIOConfig: appData2FlowNodeIO({ chatConfig: app.workflow.chatConfig })
...@@ -254,6 +270,7 @@ export async function getChildAppPreviewNode({ ...@@ -254,6 +270,7 @@ export async function getChildAppPreviewNode({
userGuide: app.userGuide, userGuide: app.userGuide,
showStatus: true, showStatus: true,
isTool: true, isTool: true,
catchError: false,
version: app.version, version: app.version,
versionLabel: app.versionLabel, versionLabel: app.versionLabel,
...@@ -265,7 +282,10 @@ export async function getChildAppPreviewNode({ ...@@ -265,7 +282,10 @@ export async function getChildAppPreviewNode({
hasTokenFee: app.hasTokenFee, hasTokenFee: app.hasTokenFee,
hasSystemSecret: app.hasSystemSecret, hasSystemSecret: app.hasSystemSecret,
...nodeIOConfig ...nodeIOConfig,
outputs: nodeIOConfig.outputs.some((item) => item.type === FlowNodeOutputTypeEnum.error)
? nodeIOConfig.outputs
: [...nodeIOConfig.outputs, Output_Template_Error_Message]
}; };
} }
...@@ -414,8 +434,9 @@ export const getSystemPlugins = async (): Promise<SystemPluginTemplateItemType[] ...@@ -414,8 +434,9 @@ export const getSystemPlugins = async (): Promise<SystemPluginTemplateItemType[]
const formatTools = tools.map<SystemPluginTemplateItemType>((item) => { const formatTools = tools.map<SystemPluginTemplateItemType>((item) => {
const dbPluginConfig = systemPlugins.get(item.id); const dbPluginConfig = systemPlugins.get(item.id);
const inputs = item.versionList[0]?.inputs as FlowNodeInputItemType[];
const outputs = item.versionList[0]?.outputs as FlowNodeOutputItemType[]; const versionList = (item.versionList as SystemPluginTemplateItemType['versionList']) || [];
const inputs = versionList[0]?.inputs;
return { return {
isActive: item.isActive, isActive: item.isActive,
...@@ -439,9 +460,7 @@ export const getSystemPlugins = async (): Promise<SystemPluginTemplateItemType[] ...@@ -439,9 +460,7 @@ export const getSystemPlugins = async (): Promise<SystemPluginTemplateItemType[]
nodes: [], nodes: [],
edges: [] edges: []
}, },
versionList: item.versionList, versionList,
inputs,
outputs,
inputList: inputs?.find((input) => input.key === NodeInputKeyEnum.systemInputConfig) inputList: inputs?.find((input) => input.key === NodeInputKeyEnum.systemInputConfig)
?.inputList as any, ?.inputList as any,
......
packages/service/core/app/plugin/systemPluginSchema.ts
...@@ -25,8 +25,7 @@ const SystemPluginSchema = new Schema({ ...@@ -25,8 +25,7 @@ const SystemPluginSchema = new Schema({
default: false default: false
}, },
pluginOrder: { pluginOrder: {
type: Number, type: Number
default: 0
}, },
customConfig: Object, customConfig: Object,
inputListVal: Object, inputListVal: Object,
......
packages/service/core/app/plugin/type.d.ts
...@@ -9,7 +9,7 @@ export type SystemPluginConfigSchemaType = { ...@@ -9,7 +9,7 @@ export type SystemPluginConfigSchemaType = {
currentCost: number; currentCost: number;
hasTokenFee: boolean; hasTokenFee: boolean;
isActive: boolean; isActive: boolean;
pluginOrder: number; pluginOrder?: number;
customConfig?: { customConfig?: {
name: string; name: string;
......
packages/service/core/app/utils.ts
...@@ -79,6 +79,28 @@ export async function rewriteAppWorkflowToDetail({ ...@@ -79,6 +79,28 @@ export async function rewriteAppWorkflowToDetail({
node.currentCost = preview.currentCost; node.currentCost = preview.currentCost;
node.hasTokenFee = preview.hasTokenFee; node.hasTokenFee = preview.hasTokenFee;
node.hasSystemSecret = preview.hasSystemSecret; node.hasSystemSecret = preview.hasSystemSecret;
// Latest version
if (!node.version) {
const inputsMap = new Map(node.inputs.map((item) => [item.key, item]));
const outputsMap = new Map(node.outputs.map((item) => [item.key, item]));
node.inputs = preview.inputs.map((item) => {
const input = inputsMap.get(item.key);
return {
...item,
value: input?.value,
selectedTypeIndex: input?.selectedTypeIndex
};
});
node.outputs = preview.outputs.map((item) => {
const output = outputsMap.get(item.key);
return {
...item,
value: output?.value
};
});
}
} catch (error) { } catch (error) {
node.pluginData = { node.pluginData = {
error: getErrText(error) error: getErrText(error)
......
packages/service/core/chat/saveChat.ts
...@@ -166,7 +166,7 @@ export async function saveChat({ ...@@ -166,7 +166,7 @@ export async function saveChat({
if (isUpdateUseTime) { if (isUpdateUseTime) {
await MongoApp.findByIdAndUpdate(appId, { await MongoApp.findByIdAndUpdate(appId, {
updateTime: new Date() updateTime: new Date()
}); }).catch();
} }
} catch (error) { } catch (error) {
addLog.error(`update chat history error`, error); addLog.error(`update chat history error`, error);
......
packages/service/core/workflow/dispatch/abandoned/runApp.ts
...@@ -95,6 +95,10 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => { ...@@ -95,6 +95,10 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
const { text } = chatValue2RuntimePrompt(assistantResponses); const { text } = chatValue2RuntimePrompt(assistantResponses);
return { return {
data: {
answerText: text,
history: completeMessages
},
assistantResponses, assistantResponses,
system_memories, system_memories,
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
...@@ -108,8 +112,6 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => { ...@@ -108,8 +112,6 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
moduleName: appData.name, moduleName: appData.name,
totalPoints: flowUsages.reduce((sum, item) => sum + (item.totalPoints || 0), 0) totalPoints: flowUsages.reduce((sum, item) => sum + (item.totalPoints || 0), 0)
} }
], ]
answerText: text,
history: completeMessages
}; };
}; };
packages/service/core/workflow/dispatch/ai/agent/index.ts
...@@ -6,7 +6,7 @@ import type { ...@@ -6,7 +6,7 @@ import type {
RuntimeNodeItemType RuntimeNodeItemType
} from '@fastgpt/global/core/workflow/runtime/type'; } from '@fastgpt/global/core/workflow/runtime/type';
import { getLLMModel } from '../../../../ai/model'; import { getLLMModel } from '../../../../ai/model';
import { filterToolNodeIdByEdges, getHistories } from '../../utils'; import { filterToolNodeIdByEdges, getNodeErrResponse, getHistories } from '../../utils';
import { runToolWithToolChoice } from './toolChoice'; import { runToolWithToolChoice } from './toolChoice';
import { type DispatchToolModuleProps, type ToolNodeItemType } from './type'; import { type DispatchToolModuleProps, type ToolNodeItemType } from './type';
import { type ChatItemType, type UserChatItemValueItemType } from '@fastgpt/global/core/chat/type'; import { type ChatItemType, type UserChatItemValueItemType } from '@fastgpt/global/core/chat/type';
...@@ -25,7 +25,6 @@ import { runToolWithPromptCall } from './promptCall'; ...@@ -25,7 +25,6 @@ import { runToolWithPromptCall } from './promptCall';
import { replaceVariable } from '@fastgpt/global/common/string/tools'; import { replaceVariable } from '@fastgpt/global/common/string/tools';
import { getMultiplePrompt, Prompt_Tool_Call } from './constants'; import { getMultiplePrompt, Prompt_Tool_Call } from './constants';
import { filterToolResponseToPreview } from './utils'; import { filterToolResponseToPreview } from './utils';
import { type InteractiveNodeResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
import { getFileContentFromLinks, getHistoryFileLinks } from '../../tools/readFiles'; import { getFileContentFromLinks, getHistoryFileLinks } from '../../tools/readFiles';
import { parseUrlToFileType } from '@fastgpt/global/common/file/tools'; import { parseUrlToFileType } from '@fastgpt/global/common/file/tools';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
...@@ -38,7 +37,6 @@ import type { JSONSchemaInputType } from '@fastgpt/global/core/app/jsonschema'; ...@@ -38,7 +37,6 @@ import type { JSONSchemaInputType } from '@fastgpt/global/core/app/jsonschema';
type Response = DispatchNodeResultType<{ type Response = DispatchNodeResultType<{
[NodeOutputKeyEnum.answerText]: string; [NodeOutputKeyEnum.answerText]: string;
[DispatchNodeResponseKeyEnum.interactive]?: InteractiveNodeResponseType;
}>; }>;
export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<Response> => { export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<Response> => {
...@@ -64,6 +62,7 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise< ...@@ -64,6 +62,7 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
} }
} = props; } = props;
try {
const toolModel = getLLMModel(model); const toolModel = getLLMModel(model);
const useVision = aiChatVision && toolModel.vision; const useVision = aiChatVision && toolModel.vision;
const chatHistories = getHistories(history, histories); const chatHistories = getHistories(history, histories);
...@@ -74,7 +73,6 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise< ...@@ -74,7 +73,6 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
if (!fileUrlInput || !fileUrlInput.value || fileUrlInput.value.length === 0) { if (!fileUrlInput || !fileUrlInput.value || fileUrlInput.value.length === 0) {
fileLinks = undefined; fileLinks = undefined;
} }
console.log(fileLinks, 22);
const toolNodeIds = filterToolNodeIdByEdges({ nodeId, edges: runtimeEdges }); const toolNodeIds = filterToolNodeIdByEdges({ nodeId, edges: runtimeEdges });
...@@ -265,11 +263,13 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise< ...@@ -265,11 +263,13 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
const previewAssistantResponses = filterToolResponseToPreview(assistantResponses); const previewAssistantResponses = filterToolResponseToPreview(assistantResponses);
return { return {
[DispatchNodeResponseKeyEnum.runTimes]: runTimes, data: {
[NodeOutputKeyEnum.answerText]: previewAssistantResponses [NodeOutputKeyEnum.answerText]: previewAssistantResponses
.filter((item) => item.text?.content) .filter((item) => item.text?.content)
.map((item) => item.text?.content || '') .map((item) => item.text?.content || '')
.join(''), .join('')
},
[DispatchNodeResponseKeyEnum.runTimes]: runTimes,
[DispatchNodeResponseKeyEnum.assistantResponses]: previewAssistantResponses, [DispatchNodeResponseKeyEnum.assistantResponses]: previewAssistantResponses,
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
// 展示的积分消耗 // 展示的积分消耗
...@@ -302,6 +302,9 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise< ...@@ -302,6 +302,9 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
], ],
[DispatchNodeResponseKeyEnum.interactive]: toolWorkflowInteractiveResponse [DispatchNodeResponseKeyEnum.interactive]: toolWorkflowInteractiveResponse
}; };
} catch (error) {
return getNodeErrResponse({ error });
}
}; };
const getMultiInput = async ({ const getMultiInput = async ({
......
packages/service/core/workflow/dispatch/ai/chat.ts
...@@ -17,10 +17,7 @@ import type { ...@@ -17,10 +17,7 @@ import type {
} from '@fastgpt/global/core/ai/type.d'; } from '@fastgpt/global/core/ai/type.d';
import { formatModelChars2Points } from '../../../../support/wallet/usage/utils'; import { formatModelChars2Points } from '../../../../support/wallet/usage/utils';
import type { LLMModelItemType } from '@fastgpt/global/core/ai/model.d'; import type { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
import { import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/global/core/ai/constants';
ChatCompletionRequestMessageRoleEnum,
getLLMDefaultUsage
} from '@fastgpt/global/core/ai/constants';
import type { import type {
ChatDispatchProps, ChatDispatchProps,
DispatchNodeResultType DispatchNodeResultType
...@@ -47,7 +44,7 @@ import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/ty ...@@ -47,7 +44,7 @@ import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/ty
import type { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import type { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants'; import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
import { checkQuoteQAValue, getHistories } from '../utils'; import { checkQuoteQAValue, getNodeErrResponse, getHistories } from '../utils';
import { filterSearchResultsByMaxChars } from '../../utils'; import { filterSearchResultsByMaxChars } from '../../utils';
import { getHistoryPreview } from '@fastgpt/global/core/chat/utils'; import { getHistoryPreview } from '@fastgpt/global/core/chat/utils';
import { computedMaxToken, llmCompletionsBodyFormat } from '../../../ai/utils'; import { computedMaxToken, llmCompletionsBodyFormat } from '../../../ai/utils';
...@@ -59,6 +56,7 @@ import { parseUrlToFileType } from '@fastgpt/global/common/file/tools'; ...@@ -59,6 +56,7 @@ import { parseUrlToFileType } from '@fastgpt/global/common/file/tools';
import { i18nT } from '../../../../../web/i18n/utils'; import { i18nT } from '../../../../../web/i18n/utils';
import { ModelTypeEnum } from '@fastgpt/global/core/ai/model'; import { ModelTypeEnum } from '@fastgpt/global/core/ai/model';
import { postTextCensor } from '../../../chat/postTextCensor'; import { postTextCensor } from '../../../chat/postTextCensor';
import { getErrText } from '@fastgpt/global/common/error/utils';
export type ChatProps = ModuleDispatchProps< export type ChatProps = ModuleDispatchProps<
AIChatNodeProps & { AIChatNodeProps & {
...@@ -67,11 +65,16 @@ export type ChatProps = ModuleDispatchProps< ...@@ -67,11 +65,16 @@ export type ChatProps = ModuleDispatchProps<
[NodeInputKeyEnum.aiChatDatasetQuote]?: SearchDataResponseItemType[]; [NodeInputKeyEnum.aiChatDatasetQuote]?: SearchDataResponseItemType[];
} }
>; >;
export type ChatResponse = DispatchNodeResultType<{ export type ChatResponse = DispatchNodeResultType<
{
[NodeOutputKeyEnum.answerText]: string; [NodeOutputKeyEnum.answerText]: string;
[NodeOutputKeyEnum.reasoningText]?: string; [NodeOutputKeyEnum.reasoningText]?: string;
[NodeOutputKeyEnum.history]: ChatItemType[]; [NodeOutputKeyEnum.history]: ChatItemType[];
}>; },
{
[NodeOutputKeyEnum.errorText]: string;
}
>;
/* request openai chat */ /* request openai chat */
export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResponse> => { export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResponse> => {
...@@ -114,9 +117,12 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp ...@@ -114,9 +117,12 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
const modelConstantsData = getLLMModel(model); const modelConstantsData = getLLMModel(model);
if (!modelConstantsData) { if (!modelConstantsData) {
return Promise.reject(`Mode ${model} is undefined, you need to select a chat model.`); return getNodeErrResponse({
error: `Model ${model} is undefined, you need to select a chat model.`
});
} }
try {
aiChatVision = modelConstantsData.vision && aiChatVision; aiChatVision = modelConstantsData.vision && aiChatVision;
aiChatReasoning = !!aiChatReasoning && !!modelConstantsData.reasoning; aiChatReasoning = !!aiChatReasoning && !!modelConstantsData.reasoning;
// Check fileLinks is reference variable // Check fileLinks is reference variable
...@@ -147,7 +153,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp ...@@ -147,7 +153,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
]); ]);
if (!userChatInput && !documentQuoteText && userFiles.length === 0) { if (!userChatInput && !documentQuoteText && userFiles.length === 0) {
return Promise.reject(i18nT('chat:AI_input_is_empty')); return getNodeErrResponse({ error: i18nT('chat:AI_input_is_empty') });
} }
const max_tokens = computedMaxToken({ const max_tokens = computedMaxToken({
...@@ -215,7 +221,8 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp ...@@ -215,7 +221,8 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
} }
}); });
let { answerText, reasoningText, finish_reason, inputTokens, outputTokens } = await (async () => { let { answerText, reasoningText, finish_reason, inputTokens, outputTokens } =
await (async () => {
if (isStreamResponse) { if (isStreamResponse) {
if (!res || res.closed) { if (!res || res.closed) {
return { return {
...@@ -250,8 +257,9 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp ...@@ -250,8 +257,9 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
const { content, reasoningContent } = (() => { const { content, reasoningContent } = (() => {
const content = response.choices?.[0]?.message?.content || ''; const content = response.choices?.[0]?.message?.content || '';
const reasoningContent: string =
// @ts-ignore // @ts-ignore
const reasoningContent: string = response.choices?.[0]?.message?.reasoning_content || ''; response.choices?.[0]?.message?.reasoning_content || '';
// API already parse reasoning content // API already parse reasoning content
if (reasoningContent || !aiChatReasoning) { if (reasoningContent || !aiChatReasoning) {
...@@ -300,7 +308,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp ...@@ -300,7 +308,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
})(); })();
if (!answerText && !reasoningText) { if (!answerText && !reasoningText) {
return Promise.reject(getEmptyResponseTip()); return getNodeErrResponse({ error: getEmptyResponseTip() });
} }
const AIMessages: ChatCompletionMessageParam[] = [ const AIMessages: ChatCompletionMessageParam[] = [
...@@ -325,8 +333,11 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp ...@@ -325,8 +333,11 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
}); });
return { return {
data: {
answerText: answerText.trim(), answerText: answerText.trim(),
reasoningText, reasoningText,
history: chatCompleteMessages
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: externalProvider.openaiAccount?.key ? 0 : totalPoints, totalPoints: externalProvider.openaiAccount?.key ? 0 : totalPoints,
model: modelName, model: modelName,
...@@ -348,9 +359,11 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp ...@@ -348,9 +359,11 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
outputTokens: outputTokens outputTokens: outputTokens
} }
], ],
[DispatchNodeResponseKeyEnum.toolResponses]: answerText, [DispatchNodeResponseKeyEnum.toolResponses]: answerText
history: chatCompleteMessages
}; };
} catch (error) {
return getNodeErrResponse({ error });
}
}; };
async function filterDatasetQuote({ async function filterDatasetQuote({
......
packages/service/core/workflow/dispatch/ai/classifyQuestion.ts
...@@ -78,7 +78,9 @@ export const dispatchClassifyQuestion = async (props: Props): Promise<CQResponse ...@@ -78,7 +78,9 @@ export const dispatchClassifyQuestion = async (props: Props): Promise<CQResponse
}); });
return { return {
[NodeOutputKeyEnum.cqResult]: result.value, data: {
[NodeOutputKeyEnum.cqResult]: result.value
},
[DispatchNodeResponseKeyEnum.skipHandleId]: agents [DispatchNodeResponseKeyEnum.skipHandleId]: agents
.filter((item) => item.key !== result.key) .filter((item) => item.key !== result.key)
.map((item) => getHandleId(nodeId, 'source', item.key)), .map((item) => getHandleId(nodeId, 'source', item.key)),
......
packages/service/core/workflow/dispatch/ai/extract.ts
...@@ -19,7 +19,7 @@ import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runti ...@@ -19,7 +19,7 @@ import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runti
import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type'; import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type';
import { 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 { type LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
import { getHistories } from '../utils'; import { getNodeErrResponse, getHistories } from '../utils';
import { getLLMModel } from '../../../ai/model'; import { getLLMModel } from '../../../ai/model';
import { formatModelChars2Points } from '../../../../support/wallet/usage/utils'; import { formatModelChars2Points } from '../../../../support/wallet/usage/utils';
import json5 from 'json5'; import json5 from 'json5';
...@@ -46,6 +46,7 @@ type Props = ModuleDispatchProps<{ ...@@ -46,6 +46,7 @@ type Props = ModuleDispatchProps<{
type Response = DispatchNodeResultType<{ type Response = DispatchNodeResultType<{
[NodeOutputKeyEnum.success]: boolean; [NodeOutputKeyEnum.success]: boolean;
[NodeOutputKeyEnum.contextExtractFields]: string; [NodeOutputKeyEnum.contextExtractFields]: string;
[key: string]: any;
}>; }>;
type ActionProps = Props & { extractModel: LLMModelItemType; lastMemory?: Record<string, any> }; type ActionProps = Props & { extractModel: LLMModelItemType; lastMemory?: Record<string, any> };
...@@ -62,7 +63,7 @@ export async function dispatchContentExtract(props: Props): Promise<Response> { ...@@ -62,7 +63,7 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
} = props; } = props;
if (!content) { if (!content) {
return Promise.reject('Input is empty'); return getNodeErrResponse({ error: 'Input is empty' });
} }
const extractModel = getLLMModel(model); const extractModel = getLLMModel(model);
...@@ -75,6 +76,7 @@ export async function dispatchContentExtract(props: Props): Promise<Response> { ...@@ -75,6 +76,7 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
any any
>; >;
try {
const { arg, inputTokens, outputTokens } = await (async () => { const { arg, inputTokens, outputTokens } = await (async () => {
if (extractModel.toolChoice) { if (extractModel.toolChoice) {
return toolChoice({ return toolChoice({
...@@ -131,12 +133,14 @@ export async function dispatchContentExtract(props: Props): Promise<Response> { ...@@ -131,12 +133,14 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
}); });
return { return {
data: {
[NodeOutputKeyEnum.success]: success, [NodeOutputKeyEnum.success]: success,
[NodeOutputKeyEnum.contextExtractFields]: JSON.stringify(arg), [NodeOutputKeyEnum.contextExtractFields]: JSON.stringify(arg),
...arg
},
[DispatchNodeResponseKeyEnum.memories]: { [DispatchNodeResponseKeyEnum.memories]: {
[memoryKey]: arg [memoryKey]: arg
}, },
...arg,
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: externalProvider.openaiAccount?.key ? 0 : totalPoints, totalPoints: externalProvider.openaiAccount?.key ? 0 : totalPoints,
model: modelName, model: modelName,
...@@ -157,6 +161,9 @@ export async function dispatchContentExtract(props: Props): Promise<Response> { ...@@ -157,6 +161,9 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
} }
] ]
}; };
} catch (error) {
return getNodeErrResponse({ error });
}
} }
const getJsonSchema = ({ params: { extractKeys } }: ActionProps) => { const getJsonSchema = ({ params: { extractKeys } }: ActionProps) => {
......
packages/service/core/workflow/dispatch/plugin/runApp.ts → packages/service/core/workflow/dispatch/child/runApp.ts
...@@ -10,16 +10,16 @@ import { ...@@ -10,16 +10,16 @@ import {
storeNodes2RuntimeNodes, storeNodes2RuntimeNodes,
textAdaptGptResponse textAdaptGptResponse
} from '@fastgpt/global/core/workflow/runtime/utils'; } from '@fastgpt/global/core/workflow/runtime/utils';
import type { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants'; 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 { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
import { filterSystemVariables, getHistories } from '../utils'; import { filterSystemVariables, getNodeErrResponse, getHistories } from '../utils';
import { chatValue2RuntimePrompt, runtimePrompt2ChatsValue } from '@fastgpt/global/core/chat/adapt'; import { chatValue2RuntimePrompt, runtimePrompt2ChatsValue } from '@fastgpt/global/core/chat/adapt';
import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type'; import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
import { authAppByTmbId } from '../../../../support/permission/app/auth'; import { authAppByTmbId } from '../../../../support/permission/app/auth';
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant'; import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
import { getAppVersionById } from '../../../app/version/controller'; import { getAppVersionById } from '../../../app/version/controller';
import { parseUrlToFileType } from '@fastgpt/global/common/file/tools'; import { parseUrlToFileType } from '@fastgpt/global/common/file/tools';
import { type ChildrenInteractive } from '@fastgpt/global/core/workflow/template/system/interactive/type';
import { getUserChatInfoAndAuthTeamPoints } from '../../../../support/permission/auth/team'; import { getUserChatInfoAndAuthTeamPoints } from '../../../../support/permission/auth/team';
type Props = ModuleDispatchProps<{ type Props = ModuleDispatchProps<{
...@@ -30,7 +30,6 @@ type Props = ModuleDispatchProps<{ ...@@ -30,7 +30,6 @@ type Props = ModuleDispatchProps<{
[NodeInputKeyEnum.fileUrlList]?: string[]; [NodeInputKeyEnum.fileUrlList]?: string[];
}>; }>;
type Response = DispatchNodeResultType<{ type Response = DispatchNodeResultType<{
[DispatchNodeResponseKeyEnum.interactive]?: ChildrenInteractive;
[NodeOutputKeyEnum.answerText]: string; [NodeOutputKeyEnum.answerText]: string;
[NodeOutputKeyEnum.history]: ChatItemType[]; [NodeOutputKeyEnum.history]: ChatItemType[];
}>; }>;
...@@ -65,12 +64,13 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => { ...@@ -65,12 +64,13 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
})(); })();
if (!userChatInput && !userInputFiles) { if (!userChatInput && !userInputFiles) {
return Promise.reject('Input is empty'); return getNodeErrResponse({ error: 'Input is empty' });
} }
if (!appId) { if (!appId) {
return Promise.reject('pluginId is empty'); return getNodeErrResponse({ error: 'pluginId is empty' });
} }
try {
// Auth the app by tmbId(Not the user, but the workflow user) // Auth the app by tmbId(Not the user, but the workflow user)
const { app: appData } = await authAppByTmbId({ const { app: appData } = await authAppByTmbId({
appId: appId, appId: appId,
...@@ -171,6 +171,10 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => { ...@@ -171,6 +171,10 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
const usagePoints = flowUsages.reduce((sum, item) => sum + (item.totalPoints || 0), 0); const usagePoints = flowUsages.reduce((sum, item) => sum + (item.totalPoints || 0), 0);
return { return {
data: {
[NodeOutputKeyEnum.answerText]: text,
[NodeOutputKeyEnum.history]: completeMessages
},
system_memories, system_memories,
[DispatchNodeResponseKeyEnum.interactive]: workflowInteractiveResponse [DispatchNodeResponseKeyEnum.interactive]: workflowInteractiveResponse
? { ? {
...@@ -196,8 +200,9 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => { ...@@ -196,8 +200,9 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
totalPoints: usagePoints totalPoints: usagePoints
} }
], ],
[DispatchNodeResponseKeyEnum.toolResponses]: text, [DispatchNodeResponseKeyEnum.toolResponses]: text
answerText: text,
history: completeMessages
}; };
} catch (error) {
return getNodeErrResponse({ error });
}
}; };
packages/service/core/workflow/dispatch/plugin/runTool.ts → packages/service/core/workflow/dispatch/child/runTool.ts
...@@ -17,23 +17,25 @@ import type { StoreSecretValueType } from '@fastgpt/global/common/secret/type'; ...@@ -17,23 +17,25 @@ import type { StoreSecretValueType } from '@fastgpt/global/common/secret/type';
import { getSystemPluginById } from '../../../app/plugin/controller'; import { getSystemPluginById } from '../../../app/plugin/controller';
import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils'; import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils';
import { pushTrack } from '../../../../common/middle/tracks/utils'; import { pushTrack } from '../../../../common/middle/tracks/utils';
import { getNodeErrResponse } from '../utils';
type SystemInputConfigType = { type SystemInputConfigType = {
type: SystemToolInputTypeEnum; type: SystemToolInputTypeEnum;
value: StoreSecretValueType; value: StoreSecretValueType;
}; };
type RunToolProps = ModuleDispatchProps< type RunToolProps = ModuleDispatchProps<{
{
[NodeInputKeyEnum.toolData]?: McpToolDataType; [NodeInputKeyEnum.toolData]?: McpToolDataType;
[NodeInputKeyEnum.systemInputConfig]?: SystemInputConfigType; [NodeInputKeyEnum.systemInputConfig]?: SystemInputConfigType;
} & Record<string, any> [key: string]: any;
>; }>;
type RunToolResponse = DispatchNodeResultType< type RunToolResponse = DispatchNodeResultType<
{ {
[NodeOutputKeyEnum.rawResponse]?: any; [NodeOutputKeyEnum.rawResponse]?: any;
} & Record<string, any> [key: string]: any;
},
Record<string, any>
>; >;
export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolResponse> => { export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolResponse> => {
...@@ -43,7 +45,7 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo ...@@ -43,7 +45,7 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
runningAppInfo, runningAppInfo,
variables, variables,
workflowStreamResponse, workflowStreamResponse,
node: { name, avatar, toolConfig, version } node: { name, avatar, toolConfig, version, catchError }
} = props; } = props;
const systemToolId = toolConfig?.systemTool?.toolId; const systemToolId = toolConfig?.systemTool?.toolId;
...@@ -80,7 +82,6 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo ...@@ -80,7 +82,6 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
const formatToolId = tool.id.split('-')[1]; const formatToolId = tool.id.split('-')[1];
const result = await (async () => {
const res = await runSystemTool({ const res = await runSystemTool({
toolId: formatToolId, toolId: formatToolId,
inputs, inputs,
...@@ -111,19 +112,39 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo ...@@ -111,19 +112,39 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
} }
} }
}); });
let result = res.output || {};
if (res.error) { if (res.error) {
return Promise.reject(res.error); // 适配旧版：旧版本没有catchError，部分工具会正常返回 error 字段作为响应。
if (catchError === undefined && typeof res.error === 'object') {
return {
data: res.error,
[DispatchNodeResponseKeyEnum.nodeResponse]: {
toolRes: res.error,
moduleLogo: avatar
},
[DispatchNodeResponseKeyEnum.toolResponses]: res.error
};
} }
if (!res.output) return {};
return res.output; // String error(Common error, not custom)
})(); if (typeof res.error === 'string') {
throw new Error(res.error);
}
// Custom error field
return {
error: res.error,
[DispatchNodeResponseKeyEnum.nodeResponse]: {
error: res.error,
moduleLogo: avatar
},
[DispatchNodeResponseKeyEnum.toolResponses]: res.error
};
}
const usagePoints = (() => { const usagePoints = (() => {
if ( if (params.system_input_config?.type !== SystemToolInputTypeEnum.system) {
params.system_input_config?.type !== SystemToolInputTypeEnum.system ||
result[NodeOutputKeyEnum.systemError]
) {
return 0; return 0;
} }
return tool.currentCost ?? 0; return tool.currentCost ?? 0;
...@@ -140,6 +161,7 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo ...@@ -140,6 +161,7 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
}); });
return { return {
data: result,
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
toolRes: result, toolRes: result,
moduleLogo: avatar, moduleLogo: avatar,
...@@ -151,8 +173,7 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo ...@@ -151,8 +173,7 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
moduleName: name, moduleName: name,
totalPoints: usagePoints totalPoints: usagePoints
} }
], ]
...result
}; };
} else { } else {
// mcp tool // mcp tool
...@@ -168,12 +189,14 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo ...@@ -168,12 +189,14 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
const result = await mcpClient.toolCall(toolName, restParams); const result = await mcpClient.toolCall(toolName, restParams);
return { return {
data: {
[NodeOutputKeyEnum.rawResponse]: result
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
toolRes: result, toolRes: result,
moduleLogo: avatar moduleLogo: avatar
}, },
[DispatchNodeResponseKeyEnum.toolResponses]: result, [DispatchNodeResponseKeyEnum.toolResponses]: result
[NodeOutputKeyEnum.rawResponse]: result
}; };
} }
} catch (error) { } catch (error) {
...@@ -188,12 +211,11 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo ...@@ -188,12 +211,11 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
}); });
} }
return { return getNodeErrResponse({
[DispatchNodeResponseKeyEnum.nodeResponse]: { error,
moduleLogo: avatar, customNodeResponse: {
error: getErrText(error) moduleLogo: avatar
}, }
[DispatchNodeResponseKeyEnum.toolResponses]: getErrText(error) });
};
} }
}; };
packages/service/core/workflow/dispatch/dataset/concat.ts
...@@ -35,10 +35,12 @@ export async function dispatchDatasetConcat( ...@@ -35,10 +35,12 @@ export async function dispatchDatasetConcat(
); );
return { return {
data: {
[NodeOutputKeyEnum.datasetQuoteQA]: await filterSearchResultsByMaxChars( [NodeOutputKeyEnum.datasetQuoteQA]: await filterSearchResultsByMaxChars(
rrfConcatResults, rrfConcatResults,
limit limit
), )
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
concatLength: rrfConcatResults.length concatLength: rrfConcatResults.length
} }
......
packages/service/core/workflow/dispatch/dataset/search.ts
...@@ -17,6 +17,7 @@ import { i18nT } from '../../../../../web/i18n/utils'; ...@@ -17,6 +17,7 @@ import { i18nT } from '../../../../../web/i18n/utils';
import { filterDatasetsByTmbId } from '../../../dataset/utils'; import { filterDatasetsByTmbId } from '../../../dataset/utils';
import { ModelTypeEnum } from '@fastgpt/global/core/ai/model'; import { ModelTypeEnum } from '@fastgpt/global/core/ai/model';
import { getDatasetSearchToolResponsePrompt } from '../../../../../global/core/ai/prompt/dataset'; import { getDatasetSearchToolResponsePrompt } from '../../../../../global/core/ai/prompt/dataset';
import { getNodeErrResponse } from '../utils';
type DatasetSearchProps = ModuleDispatchProps<{ type DatasetSearchProps = ModuleDispatchProps<{
[NodeInputKeyEnum.datasetSelectList]: SelectedDatasetType; [NodeInputKeyEnum.datasetSelectList]: SelectedDatasetType;
...@@ -83,11 +84,13 @@ export async function dispatchDatasetSearch( ...@@ -83,11 +84,13 @@ export async function dispatchDatasetSearch(
} }
if (datasets.length === 0) { if (datasets.length === 0) {
return Promise.reject(i18nT('common:core.chat.error.Select dataset empty')); return getNodeErrResponse({ error: i18nT('common:core.chat.error.Select dataset empty') });
} }
const emptyResult = { const emptyResult: DatasetSearchResponse = {
quoteQA: [], data: {
quoteQA: []
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: 0, totalPoints: 0,
query: '', query: '',
...@@ -102,6 +105,7 @@ export async function dispatchDatasetSearch( ...@@ -102,6 +105,7 @@ export async function dispatchDatasetSearch(
return emptyResult; return emptyResult;
} }
try {
const datasetIds = authTmbId const datasetIds = authTmbId
? await filterDatasetsByTmbId({ ? await filterDatasetsByTmbId({
datasetIds: datasets.map((item) => item.datasetId), datasetIds: datasets.map((item) => item.datasetId),
...@@ -247,7 +251,8 @@ export async function dispatchDatasetSearch( ...@@ -247,7 +251,8 @@ export async function dispatchDatasetSearch(
similarity: usingSimilarityFilter ? similarity : undefined, similarity: usingSimilarityFilter ? similarity : undefined,
limit, limit,
searchMode, searchMode,
embeddingWeight: searchMode === DatasetSearchModeEnum.mixedRecall ? embeddingWeight : undefined, embeddingWeight:
searchMode === DatasetSearchModeEnum.mixedRecall ? embeddingWeight : undefined,
// Rerank // Rerank
...(searchUsingReRank && { ...(searchUsingReRank && {
rerankModel: rerankModelData?.name, rerankModel: rerankModelData?.name,
...@@ -262,7 +267,9 @@ export async function dispatchDatasetSearch( ...@@ -262,7 +267,9 @@ export async function dispatchDatasetSearch(
}; };
return { return {
quoteQA: searchRes, data: {
quoteQA: searchRes
},
[DispatchNodeResponseKeyEnum.nodeResponse]: responseData, [DispatchNodeResponseKeyEnum.nodeResponse]: responseData,
nodeDispatchUsages, nodeDispatchUsages,
[DispatchNodeResponseKeyEnum.toolResponses]: { [DispatchNodeResponseKeyEnum.toolResponses]: {
...@@ -275,4 +282,7 @@ export async function dispatchDatasetSearch( ...@@ -275,4 +282,7 @@ export async function dispatchDatasetSearch(
})) }))
} }
}; };
} catch (error) {
return getNodeErrResponse({ error });
}
} }
packages/service/core/workflow/dispatch/init/workflowStart.tsx
...@@ -34,8 +34,9 @@ export const dispatchWorkflowStart = (props: Record<string, any>): Response => { ...@@ -34,8 +34,9 @@ export const dispatchWorkflowStart = (props: Record<string, any>): Response => {
return { return {
[DispatchNodeResponseKeyEnum.nodeResponse]: {}, [DispatchNodeResponseKeyEnum.nodeResponse]: {},
data: {
[NodeInputKeyEnum.userChatInput]: text || userChatInput, [NodeInputKeyEnum.userChatInput]: text || userChatInput,
[NodeOutputKeyEnum.userFiles]: [...queryFiles, ...variablesFiles] [NodeOutputKeyEnum.userFiles]: [...queryFiles, ...variablesFiles]
// [NodeInputKeyEnum.inputFiles]: files }
}; };
}; };
packages/service/core/workflow/dispatch/interactive/formInput.ts
...@@ -6,10 +6,7 @@ import type { ...@@ -6,10 +6,7 @@ import type {
DispatchNodeResultType, DispatchNodeResultType,
ModuleDispatchProps ModuleDispatchProps
} from '@fastgpt/global/core/workflow/runtime/type'; } from '@fastgpt/global/core/workflow/runtime/type';
import type { import type { UserInputFormItemType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
UserInputFormItemType,
UserInputInteractive
} from '@fastgpt/global/core/workflow/template/system/interactive/type';
import { addLog } from '../../../../common/system/log'; import { addLog } from '../../../../common/system/log';
type Props = ModuleDispatchProps<{ type Props = ModuleDispatchProps<{
...@@ -17,8 +14,8 @@ type Props = ModuleDispatchProps<{ ...@@ -17,8 +14,8 @@ type Props = ModuleDispatchProps<{
[NodeInputKeyEnum.userInputForms]: UserInputFormItemType[]; [NodeInputKeyEnum.userInputForms]: UserInputFormItemType[];
}>; }>;
type FormInputResponse = DispatchNodeResultType<{ type FormInputResponse = DispatchNodeResultType<{
[DispatchNodeResponseKeyEnum.interactive]?: UserInputInteractive;
[NodeOutputKeyEnum.formInputResult]?: Record<string, any>; [NodeOutputKeyEnum.formInputResult]?: Record<string, any>;
[key: string]: any;
}>; }>;
/* /*
...@@ -60,9 +57,11 @@ export const dispatchFormInput = async (props: Props): Promise<FormInputResponse ...@@ -60,9 +57,11 @@ export const dispatchFormInput = async (props: Props): Promise<FormInputResponse
})(); })();
return { return {
[DispatchNodeResponseKeyEnum.rewriteHistories]: histories.slice(0, -2), // Removes the current session record as the history of subsequent nodes data: {
...userInputVal, ...userInputVal,
[NodeOutputKeyEnum.formInputResult]: userInputVal, [NodeOutputKeyEnum.formInputResult]: userInputVal
},
[DispatchNodeResponseKeyEnum.rewriteHistories]: histories.slice(0, -2), // Removes the current session record as the history of subsequent nodes
[DispatchNodeResponseKeyEnum.toolResponses]: userInputVal, [DispatchNodeResponseKeyEnum.toolResponses]: userInputVal,
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
formInputResult: userInputVal formInputResult: userInputVal
......
packages/service/core/workflow/dispatch/interactive/userSelect.ts
...@@ -6,10 +6,7 @@ import type { ...@@ -6,10 +6,7 @@ import type {
import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { getHandleId } from '@fastgpt/global/core/workflow/utils'; import { getHandleId } from '@fastgpt/global/core/workflow/utils';
import type { import type { UserSelectOptionItemType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
UserSelectInteractive,
UserSelectOptionItemType
} from '@fastgpt/global/core/workflow/template/system/interactive/type';
import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt'; import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
type Props = ModuleDispatchProps<{ type Props = ModuleDispatchProps<{
...@@ -17,8 +14,6 @@ type Props = ModuleDispatchProps<{ ...@@ -17,8 +14,6 @@ type Props = ModuleDispatchProps<{
[NodeInputKeyEnum.userSelectOptions]: UserSelectOptionItemType[]; [NodeInputKeyEnum.userSelectOptions]: UserSelectOptionItemType[];
}>; }>;
type UserSelectResponse = DispatchNodeResultType<{ type UserSelectResponse = DispatchNodeResultType<{
[NodeOutputKeyEnum.answerText]?: string;
[DispatchNodeResponseKeyEnum.interactive]?: UserSelectInteractive;
[NodeOutputKeyEnum.selectResult]?: string; [NodeOutputKeyEnum.selectResult]?: string;
}>; }>;
...@@ -59,6 +54,9 @@ export const dispatchUserSelect = async (props: Props): Promise<UserSelectRespon ...@@ -59,6 +54,9 @@ export const dispatchUserSelect = async (props: Props): Promise<UserSelectRespon
} }
return { return {
data: {
[NodeOutputKeyEnum.selectResult]: userSelectedVal
},
[DispatchNodeResponseKeyEnum.rewriteHistories]: histories.slice(0, -2), // Removes the current session record as the history of subsequent nodes [DispatchNodeResponseKeyEnum.rewriteHistories]: histories.slice(0, -2), // Removes the current session record as the history of subsequent nodes
[DispatchNodeResponseKeyEnum.skipHandleId]: userSelectOptions [DispatchNodeResponseKeyEnum.skipHandleId]: userSelectOptions
.filter((item) => item.value !== userSelectedVal) .filter((item) => item.value !== userSelectedVal)
...@@ -66,7 +64,6 @@ export const dispatchUserSelect = async (props: Props): Promise<UserSelectRespon ...@@ -66,7 +64,6 @@ export const dispatchUserSelect = async (props: Props): Promise<UserSelectRespon
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
userSelectResult: userSelectedVal userSelectResult: userSelectedVal
}, },
[DispatchNodeResponseKeyEnum.toolResponses]: userSelectedVal, [DispatchNodeResponseKeyEnum.toolResponses]: userSelectedVal
[NodeOutputKeyEnum.selectResult]: userSelectedVal
}; };
}; };
packages/service/core/workflow/dispatch/loop/runLoop.ts
...@@ -11,10 +11,7 @@ import { ...@@ -11,10 +11,7 @@ import {
type ChatHistoryItemResType type ChatHistoryItemResType
} from '@fastgpt/global/core/chat/type'; } from '@fastgpt/global/core/chat/type';
import { cloneDeep } from 'lodash'; import { cloneDeep } from 'lodash';
import { import { type WorkflowInteractiveResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
type LoopInteractive,
type WorkflowInteractiveResponseType
} from '@fastgpt/global/core/workflow/template/system/interactive/type';
import { storeEdges2RuntimeEdges } from '@fastgpt/global/core/workflow/runtime/utils'; import { storeEdges2RuntimeEdges } from '@fastgpt/global/core/workflow/runtime/utils';
type Props = ModuleDispatchProps<{ type Props = ModuleDispatchProps<{
...@@ -22,7 +19,6 @@ type Props = ModuleDispatchProps<{ ...@@ -22,7 +19,6 @@ type Props = ModuleDispatchProps<{
[NodeInputKeyEnum.childrenNodeIdList]: string[]; [NodeInputKeyEnum.childrenNodeIdList]: string[];
}>; }>;
type Response = DispatchNodeResultType<{ type Response = DispatchNodeResultType<{
[DispatchNodeResponseKeyEnum.interactive]?: LoopInteractive;
[NodeOutputKeyEnum.loopArray]: Array<any>; [NodeOutputKeyEnum.loopArray]: Array<any>;
}>; }>;
...@@ -133,6 +129,9 @@ export const dispatchLoop = async (props: Props): Promise<Response> => { ...@@ -133,6 +129,9 @@ export const dispatchLoop = async (props: Props): Promise<Response> => {
} }
return { return {
data: {
[NodeOutputKeyEnum.loopArray]: outputValueArr
},
[DispatchNodeResponseKeyEnum.interactive]: interactiveResponse [DispatchNodeResponseKeyEnum.interactive]: interactiveResponse
? { ? {
type: 'loopInteractive', type: 'loopInteractive',
...@@ -157,7 +156,6 @@ export const dispatchLoop = async (props: Props): Promise<Response> => { ...@@ -157,7 +156,6 @@ export const dispatchLoop = async (props: Props): Promise<Response> => {
moduleName: name moduleName: name
} }
], ],
[NodeOutputKeyEnum.loopArray]: outputValueArr,
[DispatchNodeResponseKeyEnum.newVariables]: newVariables [DispatchNodeResponseKeyEnum.newVariables]: newVariables
}; };
}; };
packages/service/core/workflow/dispatch/loop/runLoopStart.ts
...@@ -18,10 +18,12 @@ type Response = DispatchNodeResultType<{ ...@@ -18,10 +18,12 @@ type Response = DispatchNodeResultType<{
export const dispatchLoopStart = async (props: Props): Promise<Response> => { export const dispatchLoopStart = async (props: Props): Promise<Response> => {
const { params } = props; const { params } = props;
return { return {
[DispatchNodeResponseKeyEnum.nodeResponse]: { data: {
loopInputValue: params.loopStartInput
},
[NodeOutputKeyEnum.loopStartInput]: params.loopStartInput, [NodeOutputKeyEnum.loopStartInput]: params.loopStartInput,
[NodeOutputKeyEnum.loopStartIndex]: params.loopStartIndex [NodeOutputKeyEnum.loopStartIndex]: params.loopStartIndex
},
[DispatchNodeResponseKeyEnum.nodeResponse]: {
loopInputValue: params.loopStartInput
}
}; };
}; };
packages/service/core/workflow/dispatch/plugin/run.ts
...@@ -13,19 +13,29 @@ import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runti ...@@ -13,19 +13,29 @@ import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runti
import { authPluginByTmbId } from '../../../../support/permission/app/auth'; import { authPluginByTmbId } from '../../../../support/permission/app/auth';
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant'; import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
import { computedPluginUsage } from '../../../app/plugin/utils'; import { computedPluginUsage } from '../../../app/plugin/utils';
import { filterSystemVariables } from '../utils'; import { filterSystemVariables, getNodeErrResponse } from '../utils';
import { getPluginRunUserQuery } from '@fastgpt/global/core/workflow/utils'; import { getPluginRunUserQuery } from '@fastgpt/global/core/workflow/utils';
import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import type { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import type { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { getChildAppRuntimeById, splitCombinePluginId } from '../../../app/plugin/controller'; import { getChildAppRuntimeById, splitCombinePluginId } from '../../../app/plugin/controller';
import { dispatchWorkFlow } from '../index'; import { dispatchWorkFlow } from '../index';
import { getUserChatInfoAndAuthTeamPoints } from '../../../../support/permission/auth/team'; import { getUserChatInfoAndAuthTeamPoints } from '../../../../support/permission/auth/team';
import { dispatchRunTool } from './runTool'; import { dispatchRunTool } from '../child/runTool';
import type { PluginRuntimeType } from '@fastgpt/global/core/app/plugin/type';
type RunPluginProps = ModuleDispatchProps<{ type RunPluginProps = ModuleDispatchProps<{
[NodeInputKeyEnum.forbidStream]?: boolean; [NodeInputKeyEnum.forbidStream]?: boolean;
[key: string]: any; [key: string]: any;
}>; }>;
type RunPluginResponse = DispatchNodeResultType<{}>; type RunPluginResponse = DispatchNodeResultType<
{
[key: string]: any;
},
{
[NodeOutputKeyEnum.errorText]?: string;
}
>;
export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPluginResponse> => { export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPluginResponse> => {
const { const {
node: { pluginId, version }, node: { pluginId, version },
...@@ -34,13 +44,16 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi ...@@ -34,13 +44,16 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
params: { system_forbid_stream = false, ...data } // Plugin input params: { system_forbid_stream = false, ...data } // Plugin input
} = props; } = props;
if (!pluginId) { if (!pluginId) {
return Promise.reject('pluginId can not find'); return getNodeErrResponse({ error: 'pluginId can not find' });
} }
let plugin: PluginRuntimeType | undefined;
try {
// Adapt <= 4.10 system tool // Adapt <= 4.10 system tool
const { source, pluginId: formatPluginId } = splitCombinePluginId(pluginId); const { source, pluginId: formatPluginId } = splitCombinePluginId(pluginId);
if (source === PluginSourceEnum.systemTool) { if (source === PluginSourceEnum.systemTool) {
return dispatchRunTool({ return await dispatchRunTool({
...props, ...props,
node: { node: {
...props.node, ...props.node,
...@@ -66,7 +79,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi ...@@ -66,7 +79,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
per: ReadPermissionVal per: ReadPermissionVal
}); });
const plugin = await getChildAppRuntimeById(pluginId, version); plugin = await getChildAppRuntimeById(pluginId, version);
const outputFilterMap = const outputFilterMap =
plugin.nodes plugin.nodes
...@@ -130,9 +143,6 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi ...@@ -130,9 +143,6 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
runtimeEdges: storeEdges2RuntimeEdges(plugin.edges) runtimeEdges: storeEdges2RuntimeEdges(plugin.edges)
}); });
const output = flowResponses.find((item) => item.moduleType === FlowNodeTypeEnum.pluginOutput); const output = flowResponses.find((item) => item.moduleType === FlowNodeTypeEnum.pluginOutput);
if (output) {
output.moduleLogo = plugin.avatar;
}
const usagePoints = await computedPluginUsage({ const usagePoints = await computedPluginUsage({
plugin, plugin,
...@@ -140,6 +150,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi ...@@ -140,6 +150,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
error: !!output?.pluginOutput?.error error: !!output?.pluginOutput?.error
}); });
return { return {
data: output ? output.pluginOutput : {},
// 嵌套运行时，如果 childApp stream=false，实际上不会有任何内容输出给用户，所以不需要存储 // 嵌套运行时，如果 childApp stream=false，实际上不会有任何内容输出给用户，所以不需要存储
assistantResponses: system_forbid_stream ? [] : assistantResponses, assistantResponses: system_forbid_stream ? [] : assistantResponses,
system_memories, system_memories,
...@@ -169,7 +180,9 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi ...@@ -169,7 +180,9 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
acc[key] = output.pluginOutput![key]; acc[key] = output.pluginOutput![key];
return acc; return acc;
}, {}) }, {})
: null, : null
...(output ? output.pluginOutput : {})
}; };
} catch (error) {
return getNodeErrResponse({ error, customNodeResponse: { moduleLogo: plugin?.avatar } });
}
}; };
packages/service/core/workflow/dispatch/plugin/runInput.ts
...@@ -2,13 +2,22 @@ import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt'; ...@@ -2,13 +2,22 @@ import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
import { ChatFileTypeEnum } from '@fastgpt/global/core/chat/constants'; import { ChatFileTypeEnum } from '@fastgpt/global/core/chat/constants';
import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants'; import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/type'; import type {
DispatchNodeResultType,
ModuleDispatchProps
} from '@fastgpt/global/core/workflow/runtime/type';
export type PluginInputProps = ModuleDispatchProps<{ export type PluginInputProps = ModuleDispatchProps<{
[key: string]: any; [key: string]: any;
}>; }>;
export type PluginInputResponse = DispatchNodeResultType<{
[NodeOutputKeyEnum.userFiles]?: string[];
[key: string]: any;
}>;
export const dispatchPluginInput = (props: PluginInputProps) => { export const dispatchPluginInput = async (
props: PluginInputProps
): Promise<PluginInputResponse> => {
const { params, query } = props; const { params, query } = props;
const { files } = chatValue2RuntimePrompt(query); const { files } = chatValue2RuntimePrompt(query);
...@@ -33,12 +42,14 @@ export const dispatchPluginInput = (props: PluginInputProps) => { ...@@ -33,12 +42,14 @@ export const dispatchPluginInput = (props: PluginInputProps) => {
} }
return { return {
data: {
...params, ...params,
[DispatchNodeResponseKeyEnum.nodeResponse]: {},
[NodeOutputKeyEnum.userFiles]: files [NodeOutputKeyEnum.userFiles]: files
.map((item) => { .map((item) => {
return item?.url ?? ''; return item?.url ?? '';
}) })
.filter(Boolean) .filter(Boolean)
},
[DispatchNodeResponseKeyEnum.nodeResponse]: {}
}; };
}; };
packages/service/core/workflow/dispatch/tools/answer.ts
...@@ -30,7 +30,9 @@ export const dispatchAnswer = (props: Record<string, any>): AnswerResponse => { ...@@ -30,7 +30,9 @@ export const dispatchAnswer = (props: Record<string, any>): AnswerResponse => {
}); });
return { return {
[NodeOutputKeyEnum.answerText]: responseText, data: {
[NodeOutputKeyEnum.answerText]: responseText
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
textOutput: formatText textOutput: formatText
} }
......
packages/service/core/workflow/dispatch/code/run.ts → packages/service/core/workflow/dispatch/tools/codeSandbox.ts
...@@ -2,20 +2,26 @@ import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/ ...@@ -2,20 +2,26 @@ import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/
import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type'; import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
import axios from 'axios'; import axios from 'axios';
import { formatHttpError } from '../utils';
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants'; import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
import { SandboxCodeTypeEnum } from '@fastgpt/global/core/workflow/template/system/sandbox/constants'; import { SandboxCodeTypeEnum } from '@fastgpt/global/core/workflow/template/system/sandbox/constants';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { getNodeErrResponse } from '../utils';
type RunCodeType = ModuleDispatchProps<{ type RunCodeType = ModuleDispatchProps<{
[NodeInputKeyEnum.codeType]: string; [NodeInputKeyEnum.codeType]: string;
[NodeInputKeyEnum.code]: string; [NodeInputKeyEnum.code]: string;
[NodeInputKeyEnum.addInputParam]: Record<string, any>; [NodeInputKeyEnum.addInputParam]: Record<string, any>;
}>; }>;
type RunCodeResponse = DispatchNodeResultType<{ type RunCodeResponse = DispatchNodeResultType<
[NodeOutputKeyEnum.error]?: any; {
[NodeOutputKeyEnum.error]?: any; // @deprecated
[NodeOutputKeyEnum.rawResponse]?: Record<string, any>; [NodeOutputKeyEnum.rawResponse]?: Record<string, any>;
[key: string]: any; [key: string]: any;
}>; },
{
[NodeOutputKeyEnum.error]: string;
}
>;
function getURL(codeType: string): string { function getURL(codeType: string): string {
if (codeType == SandboxCodeTypeEnum.py) { if (codeType == SandboxCodeTypeEnum.py) {
...@@ -25,14 +31,21 @@ function getURL(codeType: string): string { ...@@ -25,14 +31,21 @@ function getURL(codeType: string): string {
} }
} }
export const dispatchRunCode = async (props: RunCodeType): Promise<RunCodeResponse> => { export const dispatchCodeSandbox = async (props: RunCodeType): Promise<RunCodeResponse> => {
const { const {
node: { catchError },
params: { codeType, code, [NodeInputKeyEnum.addInputParam]: customVariables } params: { codeType, code, [NodeInputKeyEnum.addInputParam]: customVariables }
} = props; } = props;
if (!process.env.SANDBOX_URL) { if (!process.env.SANDBOX_URL) {
return { return {
error: {
[NodeOutputKeyEnum.error]: 'Can not find SANDBOX_URL in env' [NodeOutputKeyEnum.error]: 'Can not find SANDBOX_URL in env'
},
[DispatchNodeResponseKeyEnum.nodeResponse]: {
errorText: 'Can not find SANDBOX_URL in env',
customInputs: customVariables
}
}; };
} }
...@@ -51,24 +64,43 @@ export const dispatchRunCode = async (props: RunCodeType): Promise<RunCodeRespon ...@@ -51,24 +64,43 @@ export const dispatchRunCode = async (props: RunCodeType): Promise<RunCodeRespon
if (runResult.success) { if (runResult.success) {
return { return {
data: {
[NodeOutputKeyEnum.rawResponse]: runResult.data.codeReturn, [NodeOutputKeyEnum.rawResponse]: runResult.data.codeReturn,
...runResult.data.codeReturn
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
customInputs: customVariables, customInputs: customVariables,
customOutputs: runResult.data.codeReturn, customOutputs: runResult.data.codeReturn,
codeLog: runResult.data.log codeLog: runResult.data.log
}, },
[DispatchNodeResponseKeyEnum.toolResponses]: runResult.data.codeReturn, [DispatchNodeResponseKeyEnum.toolResponses]: runResult.data.codeReturn
...runResult.data.codeReturn
}; };
} else { } else {
return Promise.reject('Run code failed'); throw new Error('Run code failed');
} }
} catch (error) { } catch (error) {
const text = getErrText(error);
// @adapt
if (catchError === undefined) {
return { return {
[NodeOutputKeyEnum.error]: formatHttpError(error), data: {
[NodeOutputKeyEnum.error]: { message: text }
},
[DispatchNodeResponseKeyEnum.nodeResponse]: {
customInputs: customVariables,
errorText: text
}
};
}
return {
error: {
[NodeOutputKeyEnum.error]: text
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
customInputs: customVariables, customInputs: customVariables,
error: formatHttpError(error) errorText: text
} }
}; };
} }
......
packages/service/core/workflow/dispatch/tools/http468.ts
...@@ -47,10 +47,14 @@ type HttpRequestProps = ModuleDispatchProps<{ ...@@ -47,10 +47,14 @@ type HttpRequestProps = ModuleDispatchProps<{
[NodeInputKeyEnum.httpTimeout]?: number; [NodeInputKeyEnum.httpTimeout]?: number;
[key: string]: any; [key: string]: any;
}>; }>;
type HttpResponse = DispatchNodeResultType<{ type HttpResponse = DispatchNodeResultType<
[NodeOutputKeyEnum.error]?: object; {
[key: string]: any; [key: string]: any;
}>; },
{
[NodeOutputKeyEnum.error]?: string;
}
>;
const UNDEFINED_SIGN = 'UNDEFINED_SIGN'; const UNDEFINED_SIGN = 'UNDEFINED_SIGN';
...@@ -349,7 +353,10 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H ...@@ -349,7 +353,10 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
} }
return { return {
...results, data: {
[NodeOutputKeyEnum.httpRawResponse]: rawResponse,
...results
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: 0, totalPoints: 0,
params: Object.keys(params).length > 0 ? params : undefined, params: Object.keys(params).length > 0 ? params : undefined,
...@@ -358,21 +365,36 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H ...@@ -358,21 +365,36 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
httpResult: rawResponse httpResult: rawResponse
}, },
[DispatchNodeResponseKeyEnum.toolResponses]: [DispatchNodeResponseKeyEnum.toolResponses]:
Object.keys(results).length > 0 ? results : rawResponse, Object.keys(results).length > 0 ? results : rawResponse
[NodeOutputKeyEnum.httpRawResponse]: rawResponse
}; };
} catch (error) { } catch (error) {
addLog.error('Http request error', error); addLog.error('Http request error', error);
// @adapt
if (node.catchError === undefined) {
return { return {
[NodeOutputKeyEnum.error]: formatHttpError(error), data: {
[NodeOutputKeyEnum.error]: getErrText(error)
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
params: Object.keys(params).length > 0 ? params : undefined, params: Object.keys(params).length > 0 ? params : undefined,
body: Object.keys(formattedRequestBody).length > 0 ? formattedRequestBody : undefined, body: Object.keys(formattedRequestBody).length > 0 ? formattedRequestBody : undefined,
headers: Object.keys(publicHeaders).length > 0 ? publicHeaders : undefined, headers: Object.keys(publicHeaders).length > 0 ? publicHeaders : undefined,
httpResult: { error: formatHttpError(error) } httpResult: { error: formatHttpError(error) }
}
};
}
return {
error: {
[NodeOutputKeyEnum.error]: getErrText(error)
}, },
[NodeOutputKeyEnum.httpRawResponse]: getErrText(error) [DispatchNodeResponseKeyEnum.nodeResponse]: {
params: Object.keys(params).length > 0 ? params : undefined,
body: Object.keys(formattedRequestBody).length > 0 ? formattedRequestBody : undefined,
headers: Object.keys(publicHeaders).length > 0 ? publicHeaders : undefined,
httpResult: { error: formatHttpError(error) }
}
}; };
} }
}; };
......
packages/service/core/workflow/dispatch/tools/queryExternsion.ts
...@@ -59,6 +59,9 @@ export const dispatchQueryExtension = async ({ ...@@ -59,6 +59,9 @@ export const dispatchQueryExtension = async ({
}); });
return { return {
data: {
[NodeOutputKeyEnum.text]: JSON.stringify(filterSameQueries)
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints, totalPoints,
model: modelName, model: modelName,
...@@ -75,7 +78,6 @@ export const dispatchQueryExtension = async ({ ...@@ -75,7 +78,6 @@ export const dispatchQueryExtension = async ({
inputTokens, inputTokens,
outputTokens outputTokens
} }
], ]
[NodeOutputKeyEnum.text]: JSON.stringify(filterSameQueries)
}; };
}; };
packages/service/core/workflow/dispatch/tools/readFiles.ts
...@@ -14,6 +14,7 @@ import { parseFileExtensionFromUrl } from '@fastgpt/global/common/string/tools'; ...@@ -14,6 +14,7 @@ import { parseFileExtensionFromUrl } from '@fastgpt/global/common/string/tools';
import { addLog } from '../../../../common/system/log'; import { addLog } from '../../../../common/system/log';
import { addRawTextBuffer, getRawTextBuffer } from '../../../../common/buffer/rawText/controller'; import { addRawTextBuffer, getRawTextBuffer } from '../../../../common/buffer/rawText/controller';
import { addMinutes } from 'date-fns'; import { addMinutes } from 'date-fns';
import { getNodeErrResponse } from '../utils';
type Props = ModuleDispatchProps<{ type Props = ModuleDispatchProps<{
[NodeInputKeyEnum.fileUrlList]: string[]; [NodeInputKeyEnum.fileUrlList]: string[];
...@@ -58,6 +59,7 @@ export const dispatchReadFiles = async (props: Props): Promise<Response> => { ...@@ -58,6 +59,7 @@ export const dispatchReadFiles = async (props: Props): Promise<Response> => {
// Get files from histories // Get files from histories
const filesFromHistories = version !== '489' ? [] : getHistoryFileLinks(histories); const filesFromHistories = version !== '489' ? [] : getHistoryFileLinks(histories);
try {
const { text, readFilesResult } = await getFileContentFromLinks({ const { text, readFilesResult } = await getFileContentFromLinks({
// Concat fileUrlList and filesFromHistories; remove not supported files // Concat fileUrlList and filesFromHistories; remove not supported files
urls: [...fileUrlList, ...filesFromHistories], urls: [...fileUrlList, ...filesFromHistories],
...@@ -69,7 +71,9 @@ export const dispatchReadFiles = async (props: Props): Promise<Response> => { ...@@ -69,7 +71,9 @@ export const dispatchReadFiles = async (props: Props): Promise<Response> => {
}); });
return { return {
[NodeOutputKeyEnum.text]: text, data: {
[NodeOutputKeyEnum.text]: text
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
readFiles: readFilesResult.map((item) => ({ readFiles: readFilesResult.map((item) => ({
name: item?.filename || '', name: item?.filename || '',
...@@ -83,6 +87,9 @@ export const dispatchReadFiles = async (props: Props): Promise<Response> => { ...@@ -83,6 +87,9 @@ export const dispatchReadFiles = async (props: Props): Promise<Response> => {
fileContent: text fileContent: text
} }
}; };
} catch (error) {
return getNodeErrResponse({ error });
}
}; };
export const getHistoryFileLinks = (histories: ChatItemType[]) => { export const getHistoryFileLinks = (histories: ChatItemType[]) => {
......
packages/service/core/workflow/dispatch/tools/runIfElse.ts
...@@ -157,7 +157,9 @@ export const dispatchIfElse = async (props: Props): Promise<Response> => { ...@@ -157,7 +157,9 @@ export const dispatchIfElse = async (props: Props): Promise<Response> => {
}); });
return { return {
[NodeOutputKeyEnum.ifElseResult]: res, data: {
[NodeOutputKeyEnum.ifElseResult]: res
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: 0, totalPoints: 0,
ifElseResult: res ifElseResult: res
......
packages/service/core/workflow/dispatch/tools/runLaf.ts
...@@ -6,16 +6,21 @@ import { valueTypeFormat } from '@fastgpt/global/core/workflow/runtime/utils'; ...@@ -6,16 +6,21 @@ import { valueTypeFormat } from '@fastgpt/global/core/workflow/runtime/utils';
import { SERVICE_LOCAL_HOST } from '../../../../common/system/tools'; import { SERVICE_LOCAL_HOST } from '../../../../common/system/tools';
import { addLog } from '../../../../common/system/log'; import { addLog } from '../../../../common/system/log';
import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type'; import { type DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
import { getErrText } from '@fastgpt/global/common/error/utils';
type LafRequestProps = ModuleDispatchProps<{ type LafRequestProps = ModuleDispatchProps<{
[NodeInputKeyEnum.httpReqUrl]: string; [NodeInputKeyEnum.httpReqUrl]: string;
[NodeInputKeyEnum.addInputParam]: Record<string, any>; [NodeInputKeyEnum.addInputParam]: Record<string, any>;
[key: string]: any; [key: string]: any;
}>; }>;
type LafResponse = DispatchNodeResultType<{ type LafResponse = DispatchNodeResultType<
[NodeOutputKeyEnum.failed]?: boolean; {
[key: string]: any; [key: string]: any;
}>; },
{
[NodeOutputKeyEnum.errorText]?: string;
}
>;
const UNDEFINED_SIGN = 'UNDEFINED_SIGN'; const UNDEFINED_SIGN = 'UNDEFINED_SIGN';
...@@ -78,20 +83,24 @@ export const dispatchLafRequest = async (props: LafRequestProps): Promise<LafRes ...@@ -78,20 +83,24 @@ export const dispatchLafRequest = async (props: LafRequestProps): Promise<LafRes
} }
return { return {
data: {
[NodeOutputKeyEnum.httpRawResponse]: rawResponse,
...results
},
assistantResponses: [], assistantResponses: [],
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: 0, totalPoints: 0,
body: Object.keys(requestBody).length > 0 ? requestBody : undefined, body: Object.keys(requestBody).length > 0 ? requestBody : undefined,
httpResult: rawResponse httpResult: rawResponse
}, },
[DispatchNodeResponseKeyEnum.toolResponses]: rawResponse, [DispatchNodeResponseKeyEnum.toolResponses]: rawResponse
[NodeOutputKeyEnum.httpRawResponse]: rawResponse,
...results
}; };
} catch (error) { } catch (error) {
addLog.error('Http request error', error); addLog.error('Http request error', error);
return { return {
[NodeOutputKeyEnum.failed]: true, error: {
[NodeOutputKeyEnum.errorText]: getErrText(error)
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: 0, totalPoints: 0,
body: Object.keys(requestBody).length > 0 ? requestBody : undefined, body: Object.keys(requestBody).length > 0 ? requestBody : undefined,
......
packages/service/core/workflow/dispatch/tools/textEditor.ts
...@@ -40,7 +40,9 @@ export const dispatchTextEditor = (props: Record<string, any>): Response => { ...@@ -40,7 +40,9 @@ export const dispatchTextEditor = (props: Record<string, any>): Response => {
}); });
return { return {
[NodeOutputKeyEnum.text]: textResult, data: {
[NodeOutputKeyEnum.text]: textResult
},
[DispatchNodeResponseKeyEnum.nodeResponse]: { [DispatchNodeResponseKeyEnum.nodeResponse]: {
textOutput: textResult textOutput: textResult
} }
......
packages/service/core/workflow/dispatch/utils.ts
...@@ -9,7 +9,10 @@ import { ...@@ -9,7 +9,10 @@ import {
} from '@fastgpt/global/core/workflow/runtime/type'; } from '@fastgpt/global/core/workflow/runtime/type';
import { responseWrite } from '../../../common/response'; import { responseWrite } from '../../../common/response';
import { type NextApiResponse } from 'next'; import { type NextApiResponse } from 'next';
import { SseResponseEventEnum } from '@fastgpt/global/core/workflow/runtime/constants'; import {
DispatchNodeResponseKeyEnum,
SseResponseEventEnum
} from '@fastgpt/global/core/workflow/runtime/constants';
import { getNanoid } from '@fastgpt/global/common/string/tools'; import { getNanoid } from '@fastgpt/global/common/string/tools';
import { type SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type'; import { type SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
import { getMCPToolRuntimeNode } from '@fastgpt/global/core/app/mcpTools/utils'; import { getMCPToolRuntimeNode } from '@fastgpt/global/core/app/mcpTools/utils';
...@@ -206,3 +209,30 @@ export const rewriteRuntimeWorkFlow = ( ...@@ -206,3 +209,30 @@ export const rewriteRuntimeWorkFlow = (
} }
} }
}; };
export const getNodeErrResponse = ({
error,
customErr,
customNodeResponse
}: {
error: any;
customErr?: Record<string, any>;
customNodeResponse?: Record<string, any>;
}) => {
const errorText = getErrText(error);
return {
error: {
[NodeOutputKeyEnum.errorText]: errorText,
...(typeof customErr === 'object' ? customErr : {})
},
[DispatchNodeResponseKeyEnum.nodeResponse]: {
errorText,
...(typeof customNodeResponse === 'object' ? customNodeResponse : {})
},
[DispatchNodeResponseKeyEnum.toolResponses]: {
error: errorText,
...(typeof customErr === 'object' ? customErr : {})
}
};
};
packages/service/package.json
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"version": "1.0.0", "version": "1.0.0",
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@fastgpt-sdk/plugin": "^0.1.1", "@fastgpt-sdk/plugin": "^0.1.2",
"@fastgpt/global": "workspace:*", "@fastgpt/global": "workspace:*",
"@modelcontextprotocol/sdk": "^1.12.1", "@modelcontextprotocol/sdk": "^1.12.1",
"@node-rs/jieba": "2.0.1", "@node-rs/jieba": "2.0.1",
......
packages/service/support/permission/evaluation/auth.ts 0 → 100644
import { parseHeaderCert } from '../controller';
import { authAppByTmbId } from '../app/auth';
import {
ManagePermissionVal,
ReadPermissionVal
} from '@fastgpt/global/support/permission/constant';
import type { EvaluationSchemaType } from '@fastgpt/global/core/app/evaluation/type';
import type { AuthModeType } from '../type';
import { MongoEvaluation } from '../../../core/app/evaluation/evalSchema';
export const authEval = async ({
evalId,
per = ReadPermissionVal,
...props
}: AuthModeType & {
evalId: string;
}): Promise<{
evaluation: EvaluationSchemaType;
tmbId: string;
teamId: string;
}> => {
const { teamId, tmbId, isRoot } = await parseHeaderCert(props);
const evaluation = await MongoEvaluation.findById(evalId, 'tmbId').lean();
if (!evaluation) {
return Promise.reject('Evaluation not found');
}
if (String(evaluation.tmbId) === tmbId) {
return {
teamId,
tmbId,
evaluation
};
}
// App read per
if (per === ReadPermissionVal) {
await authAppByTmbId({
tmbId,
appId: evaluation.appId,
per: ReadPermissionVal,
isRoot
});
return {
teamId,
tmbId,
evaluation
};
}
// Write per
await authAppByTmbId({
tmbId,
appId: evaluation.appId,
per: ManagePermissionVal,
isRoot
});
return {
teamId,
tmbId,
evaluation
};
};
packages/service/support/permission/teamLimit.ts
...@@ -113,10 +113,6 @@ export const checkTeamDatasetLimit = async (teamId: string) => { ...@@ -113,10 +113,6 @@ export const checkTeamDatasetLimit = async (teamId: string) => {
return Promise.reject(SystemErrEnum.licenseDatasetAmountLimit); return Promise.reject(SystemErrEnum.licenseDatasetAmountLimit);
} }
} }
// Open source check
if (!global.feConfigs.isPlus && datasetCount >= 30) {
return Promise.reject(SystemErrEnum.communityVersionNumLimit);
}
}; };
export const checkTeamDatasetSyncPermission = async (teamId: string) => { export const checkTeamDatasetSyncPermission = async (teamId: string) => {
......
packages/service/support/wallet/usage/controller.ts
...@@ -235,3 +235,46 @@ export const pushLLMTrainingUsage = async ({ ...@@ -235,3 +235,46 @@ export const pushLLMTrainingUsage = async ({
return { totalPoints }; return { totalPoints };
}; };
export const createEvaluationUsage = async ({
teamId,
tmbId,
appName,
model,
session
}: {
teamId: string;
tmbId: string;
appName: string;
model: string;
session?: ClientSession;
}) => {
const [{ _id: usageId }] = await MongoUsage.create(
[
{
teamId,
tmbId,
appName,
source: UsageSourceEnum.evaluation,
totalPoints: 0,
list: [
{
moduleName: i18nT('account_usage:generate_answer'),
amount: 0,
count: 0
},
{
moduleName: i18nT('account_usage:answer_accuracy'),
amount: 0,
inputTokens: 0,
outputTokens: 0,
model
}
]
}
],
{ session, ordered: true }
);
return { usageId };
};
packages/service/support/wallet/usage/type.d.ts
export type ConcatBillQueueItemType = { export type ConcatBillQueueItemType = {
billId: string; billId: string; // usageId
listIndex?: number; listIndex?: number;
totalPoints: number; totalPoints: number;
inputTokens: number;
outputTokens: number; // Model usage
inputTokens?: number;
outputTokens?: number;
// Times
count?: number;
}; };
declare global { declare global {
......
packages/service/type/env.d.ts 0 → 100644
declare global {
namespace NodeJS {
interface ProcessEnv {
LOG_DEPTH: string;
DB_MAX_LINK: string;
FILE_TOKEN_KEY: string;
AES256_SECRET_KEY: string;
ROOT_KEY: string;
OPENAI_BASE_URL: string;
CHAT_API_KEY: string;
AIPROXY_API_ENDPOINT: string;
AIPROXY_API_TOKEN: string;
MULTIPLE_DATA_TO_BASE64: string;
MONGODB_URI: string;
MONGODB_LOG_URI?: string;
PG_URL: string;
OCEANBASE_URL: string;
MILVUS_ADDRESS: string;
MILVUS_TOKEN: string;
SANDBOX_URL: string;
FE_DOMAIN: string;
FILE_DOMAIN: string;
LOG_LEVEL?: string;
STORE_LOG_LEVEL?: string;
USE_IP_LIMIT?: string;
WORKFLOW_MAX_RUN_TIMES?: string;
WORKFLOW_MAX_LOOP_TIMES?: string;
CHECK_INTERNAL_IP?: string;
ALLOWED_ORIGINS?: string;
SHOW_COUPON?: string;
CONFIG_JSON_PATH?: string;
PASSWORD_LOGIN_LOCK_SECONDS?: string;
PASSWORD_EXPIRED_MONTH?: string;
MAX_LOGIN_SESSION?: string;
// 安全配置
// 密码登录锁定时间
PASSWORD_LOGIN_LOCK_SECONDS?: string;
// Signoz
SIGNOZ_BASE_URL?: string;
SIGNOZ_SERVICE_NAME?: string;
CHAT_LOG_URL?: string;
CHAT_LOG_INTERVAL?: string;
CHAT_LOG_SOURCE_ID_PREFIX?: string;
NEXT_PUBLIC_BASE_URL: string;
}
}
}
export {};
packages/web/components/common/Icon/constants.ts
...@@ -20,11 +20,11 @@ export const iconPaths = { ...@@ -20,11 +20,11 @@ export const iconPaths = {
'common/addLight': () => import('./icons/common/addLight.svg'), 'common/addLight': () => import('./icons/common/addLight.svg'),
'common/addUser': () => import('./icons/common/addUser.svg'), 'common/addUser': () => import('./icons/common/addUser.svg'),
'common/administrator': () => import('./icons/common/administrator.svg'), 'common/administrator': () => import('./icons/common/administrator.svg'),
'common/audit': () => import('./icons/common/audit.svg'),
'common/alipay': () => import('./icons/common/alipay.svg'), 'common/alipay': () => import('./icons/common/alipay.svg'),
'common/app': () => import('./icons/common/app.svg'), 'common/app': () => import('./icons/common/app.svg'),
'common/arrowLeft': () => import('./icons/common/arrowLeft.svg'), 'common/arrowLeft': () => import('./icons/common/arrowLeft.svg'),
'common/arrowRight': () => import('./icons/common/arrowRight.svg'), 'common/arrowRight': () => import('./icons/common/arrowRight.svg'),
'common/audit': () => import('./icons/common/audit.svg'),
'common/backFill': () => import('./icons/common/backFill.svg'), 'common/backFill': () => import('./icons/common/backFill.svg'),
'common/backLight': () => import('./icons/common/backLight.svg'), 'common/backLight': () => import('./icons/common/backLight.svg'),
'common/billing': () => import('./icons/common/billing.svg'), 'common/billing': () => import('./icons/common/billing.svg'),
...@@ -47,6 +47,7 @@ export const iconPaths = { ...@@ -47,6 +47,7 @@ export const iconPaths = {
'common/editor/resizer': () => import('./icons/common/editor/resizer.svg'), 'common/editor/resizer': () => import('./icons/common/editor/resizer.svg'),
'common/ellipsis': () => import('./icons/common/ellipsis.svg'), 'common/ellipsis': () => import('./icons/common/ellipsis.svg'),
'common/enable': () => import('./icons/common/enable.svg'), 'common/enable': () => import('./icons/common/enable.svg'),
'common/error': () => import('./icons/common/error.svg'),
'common/errorFill': () => import('./icons/common/errorFill.svg'), 'common/errorFill': () => import('./icons/common/errorFill.svg'),
'common/file/move': () => import('./icons/common/file/move.svg'), 'common/file/move': () => import('./icons/common/file/move.svg'),
'common/fileNotFound': () => import('./icons/common/fileNotFound.svg'), 'common/fileNotFound': () => import('./icons/common/fileNotFound.svg'),
...@@ -111,9 +112,9 @@ export const iconPaths = { ...@@ -111,9 +112,9 @@ export const iconPaths = {
'common/tickFill': () => import('./icons/common/tickFill.svg'), 'common/tickFill': () => import('./icons/common/tickFill.svg'),
'common/toolkit': () => import('./icons/common/toolkit.svg'), 'common/toolkit': () => import('./icons/common/toolkit.svg'),
'common/trash': () => import('./icons/common/trash.svg'), 'common/trash': () => import('./icons/common/trash.svg'),
'common/upRightArrowLight': () => import('./icons/common/upRightArrowLight.svg'),
'common/uploadFileFill': () => import('./icons/common/uploadFileFill.svg'), 'common/uploadFileFill': () => import('./icons/common/uploadFileFill.svg'),
'common/upperRight': () => import('./icons/common/upperRight.svg'), 'common/upperRight': () => import('./icons/common/upperRight.svg'),
'common/upRightArrowLight': () => import('./icons/common/upRightArrowLight.svg'),
'common/userInfo': () => import('./icons/common/userInfo.svg'), 'common/userInfo': () => import('./icons/common/userInfo.svg'),
'common/variable': () => import('./icons/common/variable.svg'), 'common/variable': () => import('./icons/common/variable.svg'),
'common/viewLight': () => import('./icons/common/viewLight.svg'), 'common/viewLight': () => import('./icons/common/viewLight.svg'),
...@@ -150,8 +151,6 @@ export const iconPaths = { ...@@ -150,8 +151,6 @@ export const iconPaths = {
'core/app/simpleMode/tts': () => import('./icons/core/app/simpleMode/tts.svg'), 'core/app/simpleMode/tts': () => import('./icons/core/app/simpleMode/tts.svg'),
'core/app/simpleMode/variable': () => import('./icons/core/app/simpleMode/variable.svg'), 'core/app/simpleMode/variable': () => import('./icons/core/app/simpleMode/variable.svg'),
'core/app/simpleMode/whisper': () => import('./icons/core/app/simpleMode/whisper.svg'), 'core/app/simpleMode/whisper': () => import('./icons/core/app/simpleMode/whisper.svg'),
'core/app/templates/TranslateRobot': () =>
import('./icons/core/app/templates/TranslateRobot.svg'),
'core/app/templates/animalLife': () => import('./icons/core/app/templates/animalLife.svg'), 'core/app/templates/animalLife': () => import('./icons/core/app/templates/animalLife.svg'),
'core/app/templates/chinese': () => import('./icons/core/app/templates/chinese.svg'), 'core/app/templates/chinese': () => import('./icons/core/app/templates/chinese.svg'),
'core/app/templates/divination': () => import('./icons/core/app/templates/divination.svg'), 'core/app/templates/divination': () => import('./icons/core/app/templates/divination.svg'),
...@@ -161,6 +160,8 @@ export const iconPaths = { ...@@ -161,6 +160,8 @@ export const iconPaths = {
'core/app/templates/plugin-dalle': () => import('./icons/core/app/templates/plugin-dalle.svg'), 'core/app/templates/plugin-dalle': () => import('./icons/core/app/templates/plugin-dalle.svg'),
'core/app/templates/plugin-feishu': () => import('./icons/core/app/templates/plugin-feishu.svg'), 'core/app/templates/plugin-feishu': () => import('./icons/core/app/templates/plugin-feishu.svg'),
'core/app/templates/stock': () => import('./icons/core/app/templates/stock.svg'), 'core/app/templates/stock': () => import('./icons/core/app/templates/stock.svg'),
'core/app/templates/TranslateRobot': () =>
import('./icons/core/app/templates/TranslateRobot.svg'),
'core/app/toolCall': () => import('./icons/core/app/toolCall.svg'), 'core/app/toolCall': () => import('./icons/core/app/toolCall.svg'),
'core/app/ttsFill': () => import('./icons/core/app/ttsFill.svg'), 'core/app/ttsFill': () => import('./icons/core/app/ttsFill.svg'),
'core/app/type/httpPlugin': () => import('./icons/core/app/type/httpPlugin.svg'), 'core/app/type/httpPlugin': () => import('./icons/core/app/type/httpPlugin.svg'),
...@@ -179,7 +180,6 @@ export const iconPaths = { ...@@ -179,7 +180,6 @@ export const iconPaths = {
'core/app/variable/input': () => import('./icons/core/app/variable/input.svg'), 'core/app/variable/input': () => import('./icons/core/app/variable/input.svg'),
'core/app/variable/select': () => import('./icons/core/app/variable/select.svg'), 'core/app/variable/select': () => import('./icons/core/app/variable/select.svg'),
'core/app/variable/textarea': () => import('./icons/core/app/variable/textarea.svg'), 'core/app/variable/textarea': () => import('./icons/core/app/variable/textarea.svg'),
'core/chat/QGFill': () => import('./icons/core/chat/QGFill.svg'),
'core/chat/backText': () => import('./icons/core/chat/backText.svg'), 'core/chat/backText': () => import('./icons/core/chat/backText.svg'),
'core/chat/cancelSpeak': () => import('./icons/core/chat/cancelSpeak.svg'), 'core/chat/cancelSpeak': () => import('./icons/core/chat/cancelSpeak.svg'),
'core/chat/chatFill': () => import('./icons/core/chat/chatFill.svg'), 'core/chat/chatFill': () => import('./icons/core/chat/chatFill.svg'),
...@@ -196,6 +196,7 @@ export const iconPaths = { ...@@ -196,6 +196,7 @@ export const iconPaths = {
'core/chat/fileSelect': () => import('./icons/core/chat/fileSelect.svg'), 'core/chat/fileSelect': () => import('./icons/core/chat/fileSelect.svg'),
'core/chat/finishSpeak': () => import('./icons/core/chat/finishSpeak.svg'), 'core/chat/finishSpeak': () => import('./icons/core/chat/finishSpeak.svg'),
'core/chat/imgSelect': () => import('./icons/core/chat/imgSelect.svg'), 'core/chat/imgSelect': () => import('./icons/core/chat/imgSelect.svg'),
'core/chat/QGFill': () => import('./icons/core/chat/QGFill.svg'),
'core/chat/quoteFill': () => import('./icons/core/chat/quoteFill.svg'), 'core/chat/quoteFill': () => import('./icons/core/chat/quoteFill.svg'),
'core/chat/quoteSign': () => import('./icons/core/chat/quoteSign.svg'), 'core/chat/quoteSign': () => import('./icons/core/chat/quoteSign.svg'),
'core/chat/recordFill': () => import('./icons/core/chat/recordFill.svg'), 'core/chat/recordFill': () => import('./icons/core/chat/recordFill.svg'),
...@@ -203,6 +204,7 @@ export const iconPaths = { ...@@ -203,6 +204,7 @@ export const iconPaths = {
'core/chat/sendLight': () => import('./icons/core/chat/sendLight.svg'), 'core/chat/sendLight': () => import('./icons/core/chat/sendLight.svg'),
'core/chat/setTopLight': () => import('./icons/core/chat/setTopLight.svg'), 'core/chat/setTopLight': () => import('./icons/core/chat/setTopLight.svg'),
'core/chat/sideLine': () => import('./icons/core/chat/sideLine.svg'), 'core/chat/sideLine': () => import('./icons/core/chat/sideLine.svg'),
'core/chat/sidebar/logout': () => import('./icons/core/chat/sidebar/logout.svg'),
'core/chat/speaking': () => import('./icons/core/chat/speaking.svg'), 'core/chat/speaking': () => import('./icons/core/chat/speaking.svg'),
'core/chat/stopSpeech': () => import('./icons/core/chat/stopSpeech.svg'), 'core/chat/stopSpeech': () => import('./icons/core/chat/stopSpeech.svg'),
'core/chat/think': () => import('./icons/core/chat/think.svg'), 'core/chat/think': () => import('./icons/core/chat/think.svg'),
...@@ -283,13 +285,12 @@ export const iconPaths = { ...@@ -283,13 +285,12 @@ export const iconPaths = {
'core/workflow/redo': () => import('./icons/core/workflow/redo.svg'), 'core/workflow/redo': () => import('./icons/core/workflow/redo.svg'),
'core/workflow/revertVersion': () => import('./icons/core/workflow/revertVersion.svg'), 'core/workflow/revertVersion': () => import('./icons/core/workflow/revertVersion.svg'),
'core/workflow/runError': () => import('./icons/core/workflow/runError.svg'), 'core/workflow/runError': () => import('./icons/core/workflow/runError.svg'),
'core/workflow/running': () => import('./icons/core/workflow/running.svg'),
'core/workflow/runSkip': () => import('./icons/core/workflow/runSkip.svg'), 'core/workflow/runSkip': () => import('./icons/core/workflow/runSkip.svg'),
'core/workflow/runSuccess': () => import('./icons/core/workflow/runSuccess.svg'), 'core/workflow/runSuccess': () => import('./icons/core/workflow/runSuccess.svg'),
'core/workflow/running': () => import('./icons/core/workflow/running.svg'),
'core/workflow/template/BI': () => import('./icons/core/workflow/template/BI.svg'),
'core/workflow/template/FileRead': () => import('./icons/core/workflow/template/FileRead.svg'),
'core/workflow/template/aiChat': () => import('./icons/core/workflow/template/aiChat.svg'), 'core/workflow/template/aiChat': () => import('./icons/core/workflow/template/aiChat.svg'),
'core/workflow/template/baseChart': () => import('./icons/core/workflow/template/baseChart.svg'), 'core/workflow/template/baseChart': () => import('./icons/core/workflow/template/baseChart.svg'),
'core/workflow/template/BI': () => import('./icons/core/workflow/template/BI.svg'),
'core/workflow/template/bing': () => import('./icons/core/workflow/template/bing.svg'), 'core/workflow/template/bing': () => import('./icons/core/workflow/template/bing.svg'),
'core/workflow/template/bocha': () => import('./icons/core/workflow/template/bocha.svg'), 'core/workflow/template/bocha': () => import('./icons/core/workflow/template/bocha.svg'),
'core/workflow/template/codeRun': () => import('./icons/core/workflow/template/codeRun.svg'), 'core/workflow/template/codeRun': () => import('./icons/core/workflow/template/codeRun.svg'),
...@@ -306,6 +307,7 @@ export const iconPaths = { ...@@ -306,6 +307,7 @@ export const iconPaths = {
'core/workflow/template/extractJson': () => 'core/workflow/template/extractJson': () =>
import('./icons/core/workflow/template/extractJson.svg'), import('./icons/core/workflow/template/extractJson.svg'),
'core/workflow/template/fetchUrl': () => import('./icons/core/workflow/template/fetchUrl.svg'), 'core/workflow/template/fetchUrl': () => import('./icons/core/workflow/template/fetchUrl.svg'),
'core/workflow/template/FileRead': () => import('./icons/core/workflow/template/FileRead.svg'),
'core/workflow/template/formInput': () => import('./icons/core/workflow/template/formInput.svg'), 'core/workflow/template/formInput': () => import('./icons/core/workflow/template/formInput.svg'),
'core/workflow/template/getTime': () => import('./icons/core/workflow/template/getTime.svg'), 'core/workflow/template/getTime': () => import('./icons/core/workflow/template/getTime.svg'),
'core/workflow/template/google': () => import('./icons/core/workflow/template/google.svg'), 'core/workflow/template/google': () => import('./icons/core/workflow/template/google.svg'),
...@@ -335,12 +337,12 @@ export const iconPaths = { ...@@ -335,12 +337,12 @@ export const iconPaths = {
'core/workflow/template/textConcat': () => 'core/workflow/template/textConcat': () =>
import('./icons/core/workflow/template/textConcat.svg'), import('./icons/core/workflow/template/textConcat.svg'),
'core/workflow/template/toolCall': () => import('./icons/core/workflow/template/toolCall.svg'), 'core/workflow/template/toolCall': () => import('./icons/core/workflow/template/toolCall.svg'),
'core/workflow/template/toolParams': () =>
import('./icons/core/workflow/template/toolParams.svg'),
'core/workflow/template/toolkitActive': () => 'core/workflow/template/toolkitActive': () =>
import('./icons/core/workflow/template/toolkitActive.svg'), import('./icons/core/workflow/template/toolkitActive.svg'),
'core/workflow/template/toolkitInactive': () => 'core/workflow/template/toolkitInactive': () =>
import('./icons/core/workflow/template/toolkitInactive.svg'), import('./icons/core/workflow/template/toolkitInactive.svg'),
'core/workflow/template/toolParams': () =>
import('./icons/core/workflow/template/toolParams.svg'),
'core/workflow/template/userSelect': () => 'core/workflow/template/userSelect': () =>
import('./icons/core/workflow/template/userSelect.svg'), import('./icons/core/workflow/template/userSelect.svg'),
'core/workflow/template/variable': () => import('./icons/core/workflow/template/variable.svg'), 'core/workflow/template/variable': () => import('./icons/core/workflow/template/variable.svg'),
...@@ -389,6 +391,7 @@ export const iconPaths = { ...@@ -389,6 +391,7 @@ export const iconPaths = {
key: () => import('./icons/key.svg'), key: () => import('./icons/key.svg'),
keyPrimary: () => import('./icons/keyPrimary.svg'), keyPrimary: () => import('./icons/keyPrimary.svg'),
loading: () => import('./icons/loading.svg'), loading: () => import('./icons/loading.svg'),
mcp: () => import('./icons/mcp.svg'),
menu: () => import('./icons/menu.svg'), menu: () => import('./icons/menu.svg'),
minus: () => import('./icons/minus.svg'), minus: () => import('./icons/minus.svg'),
'modal/AddClb': () => import('./icons/modal/AddClb.svg'), 'modal/AddClb': () => import('./icons/modal/AddClb.svg'),
...@@ -400,10 +403,10 @@ export const iconPaths = { ...@@ -400,10 +403,10 @@ export const iconPaths = {
'modal/selectSource': () => import('./icons/modal/selectSource.svg'), 'modal/selectSource': () => import('./icons/modal/selectSource.svg'),
'modal/setting': () => import('./icons/modal/setting.svg'), 'modal/setting': () => import('./icons/modal/setting.svg'),
'modal/teamPlans': () => import('./icons/modal/teamPlans.svg'), 'modal/teamPlans': () => import('./icons/modal/teamPlans.svg'),
'model/BAAI': () => import('./icons/model/BAAI.svg'),
'model/alicloud': () => import('./icons/model/alicloud.svg'), 'model/alicloud': () => import('./icons/model/alicloud.svg'),
'model/aws': () => import('./icons/model/aws.svg'), 'model/aws': () => import('./icons/model/aws.svg'),
'model/azure': () => import('./icons/model/azure.svg'), 'model/azure': () => import('./icons/model/azure.svg'),
'model/BAAI': () => import('./icons/model/BAAI.svg'),
'model/baichuan': () => import('./icons/model/baichuan.svg'), 'model/baichuan': () => import('./icons/model/baichuan.svg'),
'model/chatglm': () => import('./icons/model/chatglm.svg'), 'model/chatglm': () => import('./icons/model/chatglm.svg'),
'model/claude': () => import('./icons/model/claude.svg'), 'model/claude': () => import('./icons/model/claude.svg'),
......
packages/web/components/common/Icon/icons/common/error.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" >
<path d="M15.75 9C15.75 5.27208 12.7279 2.25 9 2.25C5.27208 2.25 2.25 5.27208 2.25 9C2.25 12.7279 5.27208 15.75 9 15.75C12.7279 15.75 15.75 12.7279 15.75 9ZM9.00781 11.25L9.08398 11.2539C9.46227 11.2922 9.75781 11.6116 9.75781 12C9.75781 12.3884 9.46227 12.7078 9.08398 12.7461L9.00781 12.75H9C8.58579 12.75 8.25 12.4142 8.25 12C8.25 11.5858 8.58579 11.25 9 11.25H9.00781ZM8.25 9V6C8.25 5.58579 8.58579 5.25 9 5.25C9.41421 5.25 9.75 5.58579 9.75 6V9C9.75 9.41421 9.41421 9.75 9 9.75C8.58579 9.75 8.25 9.41421 8.25 9ZM17.25 9C17.25 13.5563 13.5563 17.25 9 17.25C4.44365 17.25 0.75 13.5563 0.75 9C0.75 4.44365 4.44365 0.75 9 0.75C13.5563 0.75 17.25 4.44365 17.25 9Z" />
</svg>
\ No newline at end of file
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