Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit cd554f57 by Archer Committed by GitHub
Options

4.8.8 test fix (#2149) 

* perf: code comment

* feat: system plugin input guide

* perf: variable avatar

* feat: feishu webhook

* perf: select tool config tip

* perf: rename variable

* fix: per inherit error

* perf: docker-compose oneapi version and i18n

* perf: ui tip bug

* fix: ts

* perf: pg log

* perf: editor color

* perf: update init
parent 2d016b74
Showing with 395 additions and 156 deletions
.github/workflows/preview-image.yml
......@@ -7,7 +7,7 @@ on:
workflow_dispatch:
jobs:
build-fastgpt-images:
preview-fastgpt-images:
runs-on: ubuntu-20.04
steps:
- name: Checkout
......
docSite/content/zh-cn/docs/development/upgrading/488.md
......@@ -16,19 +16,35 @@ weight: 816
- fastgpt 镜像 tag 修改成 v4.8.8-alpha
- 商业版镜像 tag 修改成 v4.8.8-alpha
### 3. 执行初始化
从任意终端，发起 1 个 HTTP 请求。其中 {{rootkey}} 替换成环境变量里的 `rootkey`；{{host}} 替换成**FastGPT 域名**。
```bash
curl --location --request POST 'https://{{host}}/api/admin/initv48 8' \
--header 'rootkey: {{rootkey}}' \
--header 'Content-Type: application/json'
```
会初始化知识库的继承权限
-------
## V4.8.8 更新说明
1. 新增 - 重构系统插件的结构。允许向开源社区 PR 系统插件，具体可见: [如何向 FastGPT 社区提交系统插件](https://fael3z0zfze.feishu.cn/wiki/ERZnw9R26iRRG0kXZRec6WL9nwh)。
2. 新增 - DuckDuckGo 系统插件。
3. 新增 - 修改变量填写方式。提示词输入框以以及工作流中所有 Textarea 输入框，支持输入 / 唤起变量选择，可直接选择所有上游输出值，无需动态引入。
4. 优化 - 移动端快速切换应用交互。
5. 优化 - 节点图标。
6. 优化 - 对话框引用增加额外复制案件，便于复制。增加引用内容折叠。
7. 优化 - 对话框底部增加复制，简便复制交互，无需滚动到消息开头。
8. 优化 - OpenAI sdk 升级，并自定义了 whisper 模型接口（未仔细查看 sdk 实现，但 sdk 中 whisper 接口，似乎无法适配一般 fastapi 接口）
9. 修复 - Permission 表声明问题。
10. 修复 - 并行执行节点，运行时间未正确记录。
11. 修复 - 简易模式，首次进入，无法正确获取知识库配置。
12. 修复 - Log debug level 配置无效。
3. 新增 - 飞书 webhook 系统插件。
4. 新增 - 修改变量填写方式。提示词输入框以以及工作流中所有 Textarea 输入框，支持输入 / 唤起变量选择，可直接选择所有上游输出值，无需动态引入。
5. 商业版新增 - 知识库权限继承。
6. 优化 - 移动端快速切换应用交互。
7. 优化 - 节点图标。
8. 优化 - 对话框引用增加额外复制案件，便于复制。增加引用内容折叠。
9. 优化 - 对话框底部增加复制，简便复制交互，无需滚动到消息开头。
10. 优化 - OpenAI sdk 升级，并自定义了 whisper 模型接口（未仔细查看 sdk 实现，但 sdk 中 whisper 接口，似乎无法适配一般 fastapi 接口）
11. 修复 - Permission 表声明问题。
12. 修复 - 并行执行节点，运行时间未正确记录。
13. 修复 - 运行详情未正确展示嵌套节点信息。
14. 修复 - 简易模式，首次进入，无法正确获取知识库配置。
15. 修复 - Log debug level 配置无效。
16. 修复 - 插件独立运行时，会将插件输入的值进行变量替换，可能导致后续节点变量异常。
\ No newline at end of file
files/docker/docker-compose-milvus.yml
......@@ -179,7 +179,7 @@ services:
- ./mysql:/var/lib/mysql
oneapi:
container_name: oneapi
image: ghcr.io/songquanpeng/one-api:latest
image: ghcr.io/songquanpeng/one-api:0.6.7
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/one-api:v0.6.6 # 阿里云
ports:
- 3001:3000
......
files/docker/docker-compose-pgvector.yml
......@@ -136,7 +136,7 @@ services:
- ./mysql:/var/lib/mysql
oneapi:
container_name: oneapi
image: ghcr.io/songquanpeng/one-api:latest
image: ghcr.io/songquanpeng/one-api:0.6.7
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/one-api:v0.6.6 # 阿里云
ports:
- 3001:3000
......
files/docker/docker-compose-zilliz.yml
......@@ -117,7 +117,7 @@ services:
- ./mysql:/var/lib/mysql
oneapi:
container_name: oneapi
image: ghcr.io/songquanpeng/one-api:latest
image: ghcr.io/songquanpeng/one-api:0.6.7
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/one-api:v0.6.6 # 阿里云
ports:
- 3001:3000
......
packages/global/core/app/utils.ts
......@@ -6,27 +6,29 @@ import { getAppChatConfig } from '../workflow/utils';
import { StoreNodeItemType } from '../workflow/type/node';
import { DatasetSearchModeEnum } from '../dataset/constants';
export const getDefaultAppForm = (): AppSimpleEditFormType => ({
aiSettings: {
model: 'gpt-4o-mini',
systemPrompt: '',
temperature: 0,
isResponseAnswerText: true,
maxHistories: 6,
maxToken: 4000
},
dataset: {
datasets: [],
similarity: 0.4,
limit: 1500,
searchMode: DatasetSearchModeEnum.embedding,
usingReRank: false,
datasetSearchUsingExtensionQuery: false,
datasetSearchExtensionBg: ''
},
selectedTools: [],
chatConfig: {}
});
export const getDefaultAppForm = (): AppSimpleEditFormType => {
return {
aiSettings: {
model: 'gpt-4o-mini',
systemPrompt: '',
temperature: 0,
isResponseAnswerText: true,
maxHistories: 6,
maxToken: 4000
},
dataset: {
datasets: [],
similarity: 0.4,
limit: 1500,
searchMode: DatasetSearchModeEnum.embedding,
usingReRank: false,
datasetSearchUsingExtensionQuery: true,
datasetSearchExtensionBg: ''
},
selectedTools: [],
chatConfig: {}
};
};
/* format app nodes to edit form */
export const appWorkflow2Form = ({
......
packages/global/core/workflow/constants.ts
......@@ -6,6 +6,7 @@ export enum FlowNodeTemplateTypeEnum {
search = 'search',
multimodal = 'multimodal',
communication = 'communication',
other = 'other',
teamApp = 'teamApp'
......
packages/global/core/workflow/type/index.d.ts
......@@ -35,6 +35,7 @@ export type WorkflowTemplateType = {
avatar: string;
intro?: string;
author?: string;
inputExplanationUrl?: string;
version: string;
showStatus?: boolean;
......
packages/global/core/workflow/type/node.d.ts
......@@ -31,6 +31,7 @@ export type FlowNodeCommonType = {
avatar?: string;
name: string;
intro?: string; // template list intro
inputExplanationUrl?: string;
showStatus?: boolean; // chatting response step status
version: string;
......
packages/global/core/workflow/utils.ts
......@@ -229,7 +229,7 @@ export const updatePluginInputByVariables = (
);
};
export const filterPluginInputVariables = (
export const removePluginInputVariables = (
variables: Record<string, any>,
nodes: RuntimeNodeItemType[]
) => {
......@@ -268,6 +268,7 @@ export function replaceVariableLabel({
};
});
// Upstream node outputs
const nodeVariables = nodes
.map((node) => {
return node.outputs.map((output) => {
......@@ -280,6 +281,7 @@ export function replaceVariableLabel({
})
.flat();
// Get runningNode inputs(Will be replaced with reference)
const customInputs = runningNode.inputs.flatMap((item) => {
if (Array.isArray(item.value)) {
return [
......@@ -299,6 +301,7 @@ export function replaceVariableLabel({
const allVariables = [...globalVariables, ...nodeVariables, ...customInputs];
// Replace {{$xxx.xxx$}} to value
for (const key in allVariables) {
const val = allVariables[key];
const regex = new RegExp(`\\{\\{\\$(${val.nodeId}\\.${val.id})\\$\\}\\}`, 'g');
......
packages/plugins/register.ts
......@@ -7,7 +7,14 @@ import { cloneDeep } from 'lodash';
import { WorkerNameEnum, runWorker } from '@fastgpt/service/worker/utils';
// Run in main thread
const staticPluginList = ['getTime', 'fetchUrl', 'Doc2X', 'Doc2X/URLPDF2text', 'Doc2X/URLImg2text'];
const staticPluginList = [
'getTime',
'fetchUrl',
'Doc2X',
'Doc2X/URLPDF2text',
'Doc2X/URLImg2text',
'feishu'
];
// Run in worker thread (Have npm packages)
const packagePluginList = [
'mathExprVal',
......
packages/plugins/src/Doc2X/URLImg2text/template.json
{
"author": "",
"author": "Menghuan1918",
"version": "488",
"name": "Doc2X 图像(URL)识别",
"avatar": "plugins/doc2x",
"intro": "将传入的图片(URL)发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
"inputExplanationUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
"showStatus": true,
"weight": 10,
......
packages/plugins/src/Doc2X/URLPDF2text/template.json
{
"author": "",
"author": "Menghuan1918",
"version": "488",
"name": "Doc2X PDF文件(URL)识别",
"avatar": "plugins/doc2x",
"intro": "将传入的PDF文件(URL)发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
"inputExplanationUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
"showStatus": true,
"weight": 10,
......
packages/plugins/src/Doc2X/template.json
{
"author": "",
"author": "Menghuan1918",
"version": "488",
"name": "Doc2X服务",
"avatar": "plugins/doc2x",
......
packages/plugins/src/duckduckgo/template.json
......@@ -5,7 +5,7 @@
"avatar": "core/workflow/template/duckduckgo",
"intro": "DuckDuckGo 服务，包含网络搜索、图片搜索、新闻搜索等。",
"showStatus": false,
"weight": 10,
"weight": 100,
"isTool": true,
"templateType": "tools",
......
packages/service/common/mongo/index.ts
......@@ -47,8 +47,6 @@ const addCommonMiddleware = (schema: mongoose.Schema) => {
if (duration > 1000) {
addLog.warn(`Slow operation ${duration}ms`, warnLogData);
} else if (duration > 3000) {
addLog.error(`Slow operation ${duration}ms`, warnLogData);
}
}
next();
......
packages/service/common/mongo/init.ts
import { delay } from '@fastgpt/global/common/system/utils';
import { addLog } from '../system/log';
import { connectionMongo } from './index';
import type { Mongoose } from 'mongoose';
......@@ -17,9 +18,11 @@ export async function connectMongo(): Promise<Mongoose> {
try {
connectionMongo.set('strictQuery', true);
connectionMongo.connection.on('error', (error) => {
connectionMongo.connection.on('error', async (error) => {
console.log('mongo error', error);
connectionMongo.disconnect();
await connectionMongo.disconnect();
await delay(1000);
connectMongo();
});
connectionMongo.connection.on('disconnected', () => {
console.log('mongo disconnected');
......@@ -44,8 +47,10 @@ export async function connectMongo(): Promise<Mongoose> {
console.log('mongo connected');
} catch (error) {
connectionMongo.disconnect();
addLog.error('mongo connect error', error);
await connectionMongo.disconnect();
await delay(1000);
connectMongo();
}
return connectionMongo;
......
packages/service/common/vectorStore/pg/class.ts
......@@ -10,6 +10,7 @@ import {
InsertVectorControllerProps
} from '../controller.d';
import dayjs from 'dayjs';
import { addLog } from '../../system/log';
export class PgVectorCtrl {
constructor() {}
......@@ -38,9 +39,9 @@ export class PgVectorCtrl {
`CREATE INDEX CONCURRENTLY IF NOT EXISTS create_time_index ON ${DatasetVectorTableName} USING btree(createtime);`
);
console.log('init pg successful');
addLog.info('init pg successful');
} catch (error) {
console.log('init pg error', error);
addLog.error('init pg error', error);
}
};
insert = async (props: InsertVectorControllerProps): Promise<{ insertId: string }> => {
......
packages/service/core/app/plugin/controller.ts
......@@ -82,6 +82,7 @@ export async function getPluginPreviewNode({ id }: { id: string }): Promise<Flow
avatar: plugin.avatar,
name: plugin.name,
intro: plugin.intro,
inputExplanationUrl: plugin.inputExplanationUrl,
showStatus: plugin.showStatus,
isTool: plugin.isTool,
version: plugin.version,
......
packages/service/core/workflow/dispatch/index.ts
......@@ -262,13 +262,14 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
/* Inject data into module input */
function getNodeRunParams(node: RuntimeNodeItemType) {
if (node.flowNodeType === FlowNodeTypeEnum.pluginInput) {
// Format plugin input to object
return node.inputs.reduce<Record<string, any>>((acc, item) => {
acc[item.key] = valueTypeFormat(item.value, item.valueType);
return acc;
}, {});
}
// common nodes
// Dynamic input need to store a key.
const dynamicInput = node.inputs.find(
(item) => item.renderTypeList[0] === FlowNodeInputTypeEnum.addInputParam
);
......@@ -281,14 +282,14 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
node.inputs.forEach((input) => {
if (input.key === dynamicInput?.key) return;
// replace {{}} variables
// replace {{xx}} variables
let value = replaceVariable(input.value, variables);
// replace {{$$}} variables
// replace {{$xx.xx$}} variables
value = replaceVariableLabel({
text: value,
nodes: runtimeNodes,
variables: variables,
variables,
runningNode: node
});
......@@ -299,12 +300,11 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
variables
});
// concat dynamic inputs
// Dynamic input is stored in the dynamic key
if (input.canEdit && dynamicInput && params[dynamicInput.key]) {
params[dynamicInput.key][input.key] = valueTypeFormat(value, input.valueType);
}
// Not dynamic input
params[input.key] = valueTypeFormat(value, input.valueType);
});
......
packages/service/core/workflow/dispatch/tools/http468.ts
......@@ -106,6 +106,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
acc[key] = valueTypeFormat(value, WorkflowIOValueTypeEnum.string);
return acc;
}, {});
const requestBody = await (() => {
if (!httpJsonBody) return {};
try {
......
packages/web/components/common/Textarea/PromptEditor/Editor.tsx
......@@ -89,7 +89,13 @@ export default function Editor({
}, [value, variables, variableLabels]);
return (
<Box position={'relative'} width={'full'} h={`${height}px`} cursor={'text'}>
<Box
position={'relative'}
width={'full'}
h={`${height}px`}
cursor={'text'}
color={'myGray.700'}
>
<LexicalComposer initialConfig={initialConfig} key={key}>
<PlainTextPlugin
contentEditable={
......
packages/web/core/workflow/constants.ts
import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants';
import { NodeTemplateListType } from '@fastgpt/global/core/workflow/type/node';
import { TFunction } from 'next-i18next';
import { i18nT } from '../../i18n/utils';
export const workflowNodeTemplateList = (t: TFunction): NodeTemplateListType => [
export const workflowNodeTemplateList = [
{
type: FlowNodeTemplateTypeEnum.systemInput,
label: t('common:core.module.template.System input module'),
label: i18nT('common:core.module.template.System input module'),
list: []
},
{
type: FlowNodeTemplateTypeEnum.ai,
label: t('common:core.module.template.AI function'),
label: i18nT('common:core.module.template.AI function'),
list: []
},
{
type: FlowNodeTemplateTypeEnum.tools,
label: t('common:core.module.template.Tool module'),
type: FlowNodeTemplateTypeEnum.search,
label: i18nT('common:core.workflow.template.Search'),
list: []
},
{
type: FlowNodeTemplateTypeEnum.search,
label: t('core.workflow.template.Search'),
type: FlowNodeTemplateTypeEnum.multimodal,
label: i18nT('common:core.workflow.template.Multimodal'),
list: []
},
{
type: FlowNodeTemplateTypeEnum.multimodal,
label: t('core.workflow.template.Multimodal'),
type: FlowNodeTemplateTypeEnum.tools,
label: i18nT('common:core.module.template.Tool module'),
list: []
},
{
type: FlowNodeTemplateTypeEnum.communication,
label: i18nT('app:workflow.template.communication'),
list: []
},
{
type: FlowNodeTemplateTypeEnum.other,
label: t('common:common.Other'),
label: i18nT('common:common.Other'),
list: []
},
{
......
packages/web/i18n/en/app.json
{
"Run": "Run",
"ai_settings": "AI Settings",
"all_apps": "All Apps",
"app": {
"modules": {
"click to update": "click to update",
......@@ -52,6 +53,7 @@
"template": {
"simple_robot": "Simple Robot"
},
"tool_input_param_tip": "Configure related information before the plugin runs properly",
"transition_to_workflow": "Transition to workflow",
"transition_to_workflow_create_new_placeholder": "Create a new application instead of modifying the current one",
"transition_to_workflow_create_new_tip": "After converting to workflow, it will not be able to convert back to simple mode, please confirm!",
......@@ -71,5 +73,11 @@
},
"version": {
"Revert success": "Revert success"
},
"workflow": {
"Input guide": "Input guide",
"template": {
"communication": "Communication"
}
}
}
packages/web/i18n/en/common.json
{
"App": "App",
"all_apps": "All Apps",
"click_to_resume": "Resume",
"code_editor": "Code edit",
"Export": "Export",
......
packages/web/i18n/zh/app.json
{
"Run": "运行",
"ai_settings": "AI 配置",
"all_apps": "全部应用",
"app": {
"modules": {
"click to update": "点击更新",
......@@ -52,6 +53,7 @@
"template": {
"simple_robot": "简易机器人"
},
"tool_input_param_tip": "该插件正常运行需要配置相关信息",
"transition_to_workflow": "转成工作流",
"transition_to_workflow_create_new_placeholder": "创建一个新的应用，而不是修改当前应用",
"transition_to_workflow_create_new_tip": "转化成工作流后，将无法转化回简易模式，请确认！",
......@@ -71,5 +73,11 @@
},
"version": {
"Revert success": "回滚成功"
},
"workflow": {
"Input guide": "填写说明",
"template": {
"communication": "通信"
}
}
}
packages/web/i18n/zh/common.json
{
"App": "应用",
"all_apps": "全部应用",
"click_to_resume": "点击恢复",
"code_editor": "代码编辑",
"Export": "导出",
......
projects/app/package.json
......@@ -52,13 +52,14 @@
"react-dom": "18.3.1",
"react-hook-form": "7.43.1",
"react-i18next": "14.1.2",
"react-markdown": "^8.0.7",
"react-markdown": "^9.0.1",
"react-syntax-highlighter": "^15.5.0",
"reactflow": "^11.7.4",
"rehype-katex": "^6.0.2",
"remark-breaks": "^3.0.3",
"remark-gfm": "^3.0.1",
"remark-math": "^5.1.1",
"rehype-external-links": "^3.0.0",
"rehype-katex": "^7.0.0",
"remark-breaks": "^4.0.0",
"remark-gfm": "^4.0.0",
"remark-math": "^6.0.0",
"request-ip": "^3.3.0",
"sass": "^1.58.3",
"use-context-selector": "^1.4.4",
......
projects/app/src/components/Markdown/img/Image.tsx
......@@ -36,4 +36,4 @@ const MdImage = ({ src }: { src?: string }) => {
);
};
export default React.memo(MdImage);
export default MdImage;
projects/app/src/components/Markdown/index.tsx
import React, { useMemo } from 'react';
import ReactMarkdown from 'react-markdown';
import 'katex/dist/katex.min.css';
import RemarkMath from 'remark-math';
import RemarkBreaks from 'remark-breaks';
import RehypeKatex from 'rehype-katex';
import RemarkGfm from 'remark-gfm';
import RemarkMath from 'remark-math'; // Math syntax
import RemarkBreaks from 'remark-breaks'; // Line break
import RehypeKatex from 'rehype-katex'; // Math render
import RemarkGfm from 'remark-gfm'; // Special markdown syntax
import RehypeExternalLinks from 'rehype-external-links';
import styles from './index.module.scss';
import dynamic from 'next/dynamic';
......@@ -15,6 +16,7 @@ import { useTranslation } from 'next-i18next';
import { EventNameEnum, eventBus } from '@/web/common/utils/eventbus';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { MARKDOWN_QUOTE_SIGN } from '@fastgpt/global/core/chat/constants';
import { CodeClassNameEnum } from './utils';
const CodeLight = dynamic(() => import('./CodeLight'), { ssr: false });
const MermaidCodeBlock = dynamic(() => import('./img/MermaidCodeBlock'), { ssr: false });
......@@ -24,15 +26,6 @@ const EChartsCodeBlock = dynamic(() => import('./img/EChartsCodeBlock'), { ssr:
const ChatGuide = dynamic(() => import('./chat/Guide'), { ssr: false });
const QuestionGuide = dynamic(() => import('./chat/QuestionGuide'), { ssr: false });
export enum CodeClassName {
guide = 'guide',
questionGuide = 'questionGuide',
mermaid = 'mermaid',
echarts = 'echarts',
quote = 'quote',
files = 'files'
}
const Markdown = ({
source = '',
showAnimation = false
......@@ -51,10 +44,13 @@ const Markdown = ({
[]
);
const formatSource = source
// .replace(/\\n/g, '\n')
.replace(/(http[s]?:\/\/[^\s，。]+)([。，])/g, '$1 $2')
.replace(/\n*(\[QUOTE SIGN\]\(.*\))/g, '$1');
const formatSource = useMemo(() => {
const formatSource = source
.replace(/(http[s]?:\/\/[^\s，。]+)([。，])/g, '$1 $2') // Follow the link with a space
.replace(/\n*(\[QUOTE SIGN\]\(.*\))/g, '$1');
return formatSource;
}, [source]);
return (
<ReactMarkdown
......@@ -62,9 +58,8 @@ const Markdown = ({
${showAnimation ? `${formatSource ? styles.waitingAnimation : styles.animation}` : ''}
`}
remarkPlugins={[RemarkMath, [RemarkGfm, { singleTilde: false }], RemarkBreaks]}
rehypePlugins={[RehypeKatex]}
rehypePlugins={[RehypeKatex, [RehypeExternalLinks, { target: '_blank' }]]}
components={components}
linkTarget={'_blank'}
>
{formatSource}
</ReactMarkdown>
......@@ -73,6 +68,7 @@ const Markdown = ({
export default React.memo(Markdown);
/* Custom dom */
const Code = React.memo(function Code(e: any) {
const { inline, className, children } = e;
......@@ -82,17 +78,16 @@ const Code = React.memo(function Code(e: any) {
const strChildren = String(children);
const Component = useMemo(() => {
if (codeType === CodeClassName.mermaid) {
if (codeType === CodeClassNameEnum.mermaid) {
return <MermaidCodeBlock code={strChildren} />;
}
if (codeType === CodeClassName.guide) {
if (codeType === CodeClassNameEnum.guide) {
return <ChatGuide text={strChildren} />;
}
if (codeType === CodeClassName.questionGuide) {
if (codeType === CodeClassNameEnum.questionGuide) {
return <QuestionGuide text={strChildren} />;
}
if (codeType === CodeClassName.echarts) {
if (codeType === CodeClassNameEnum.echarts) {
return <EChartsCodeBlock code={strChildren} />;
}
......@@ -105,7 +100,6 @@ const Code = React.memo(function Code(e: any) {
return Component;
});
const Image = React.memo(function Image({ src }: { src?: string }) {
return <MdImage src={src} />;
});
......
projects/app/src/components/Markdown/utils.ts 0 → 100644
export enum CodeClassNameEnum {
guide = 'guide',
questionGuide = 'questionGuide',
mermaid = 'mermaid',
echarts = 'echarts',
quote = 'quote',
files = 'files',
latex = 'latex'
}
function htmlTableToLatex(html: string) {
const parser = new DOMParser();
const doc = parser.parseFromString(html, 'text/html');
const table = doc.querySelector('table');
if (!table) return '';
let latex = '\\begin{tabular}{';
// 获取列数
const columns = table.querySelectorAll('tr:first-child th, tr:first-child td').length;
latex += '|' + 'c|'.repeat(columns) + '}\n\\hline\n';
// 创建一个二维数组来跟踪单元格合并情况
const cellTracker = Array.from({ length: table.rows.length }, () => Array(columns).fill(false));
// 遍历行
table.querySelectorAll('tr').forEach((row, rowIndex) => {
const cells = row.querySelectorAll('th, td');
let cellTexts: string[] = [];
let colIndex = 0;
cells.forEach((cell) => {
// 跳过已经被合并的单元格
while (cellTracker[rowIndex][colIndex]) {
colIndex++;
}
// @ts-ignore
const rowspan = parseInt(cell.getAttribute('rowspan') || 1, 10);
// @ts-ignore
const colspan = parseInt(cell.getAttribute('colspan') || 1, 10);
// 添加单元格内容
let cellText = cell.textContent?.trim() || '';
if (colspan > 1) {
cellText = `\\multicolumn{${colspan}}{|c|}{${cellText}}`;
}
if (rowspan > 1) {
cellText = `\\multirow{${rowspan}}{*}{${cellText}}`;
}
cellTexts.push(cellText);
// 标记合并的单元格
for (let i = 0; i < rowspan; i++) {
for (let j = 0; j < colspan; j++) {
cellTracker[rowIndex + i][colIndex + j] = true;
}
}
colIndex += colspan;
});
latex += cellTexts.join(' & ') + ' \\\\\n\\hline\n';
});
latex += '\\end{tabular}';
return `\`\`\`${CodeClassNameEnum.latex}
${latex}
\`\`\``;
}
export function convertHtmlTablesToLatex(input: string) {
const tableRegex = /<table[\s\S]*?<\/table>/gi;
return input.replace(tableRegex, (match) => htmlTableToLatex(match));
}
projects/app/src/components/common/Textarea/MyTextarea/index.tsx
......@@ -16,6 +16,7 @@ import MyModal from '@fastgpt/web/components/common/MyModal';
type Props = TextareaProps & {
title?: string;
iconSrc?: string;
// variables: string[];
};
......@@ -24,7 +25,11 @@ const MyTextarea = React.forwardRef<HTMLTextAreaElement, Props>(function MyTexta
const TextareaRef = useRef<HTMLTextAreaElement>(null);
const { t } = useTranslation();
const { title = t('common:core.app.edit.Prompt Editor'), ...childProps } = props;
const {
title = t('common:core.app.edit.Prompt Editor'),
iconSrc = 'modal/edit',
...childProps
} = props;
const { isOpen, onOpen, onClose } = useDisclosure();
......@@ -32,7 +37,7 @@ const MyTextarea = React.forwardRef<HTMLTextAreaElement, Props>(function MyTexta
<>
<Editor textareaRef={TextareaRef} {...childProps} onOpenModal={onOpen} />
{isOpen && (
<MyModal iconSrc="/imgs/modal/edit.svg" title={title} isOpen onClose={onClose}>
<MyModal iconSrc={iconSrc} title={title} isOpen onClose={onClose}>
<ModalBody>
<Editor
textareaRef={ModalTextareaRef}
......
projects/app/src/components/core/app/VariableEdit.tsx
......@@ -96,9 +96,7 @@ const VariableEdit = ({
<Box>
<Flex alignItems={'center'}>
<MyIcon name={'core/app/simpleMode/variable'} w={'20px'} />
<FormLabel ml={2} fontWeight={'medium'}>
{t('common:core.module.Variable')}
</FormLabel>
<FormLabel ml={2}>{t('common:core.module.Variable')}</FormLabel>
<ChatFunctionTip type={'variable'} />
<Box flex={1} />
<Button
......
projects/app/src/components/core/app/WelcomeTextConfig.tsx
......@@ -17,6 +17,8 @@ const WelcomeTextConfig = (props: TextareaProps) => {
<ChatFunctionTip type={'welcome'} />
</Flex>
<MyTextarea
iconSrc={'core/app/simpleMode/chat'}
title={t('common:core.app.Welcome Text')}
mt={2}
rows={6}
fontSize={'sm'}
......
projects/app/src/components/core/chat/components/AIResponseBox.tsx
import Markdown, { CodeClassName } from '@/components/Markdown';
import Markdown from '@/components/Markdown';
import { CodeClassNameEnum } from '@/components/Markdown/utils';
import {
Accordion,
AccordionButton,
......@@ -41,7 +42,7 @@ const AIResponseBox = ({ value, index, chat, isLastChild, isChatting, questionGu
index === chat.value.length - 1
) {
source = `${source}
\`\`\`${CodeClassName.questionGuide}
\`\`\`${CodeClassNameEnum.questionGuide}
${JSON.stringify(questionGuides)}`;
}
......
projects/app/src/components/core/dataset/SearchParamsTip.tsx
......@@ -14,6 +14,7 @@ const SearchParamsTip = ({
limit = 1500,
responseEmptyText,
usingReRank = false,
datasetSearchUsingExtensionQuery,
queryExtensionModel
}: {
searchMode: `${DatasetSearchModeEnum}`;
......@@ -21,6 +22,7 @@ const SearchParamsTip = ({
limit?: number;
responseEmptyText?: string;
usingReRank?: boolean;
datasetSearchUsingExtensionQuery?: boolean;
queryExtensionModel?: string;
}) => {
const { t } = useTranslation();
......@@ -32,11 +34,11 @@ const SearchParamsTip = ({
const extensionModelName = useMemo(
() =>
queryExtensionModel
datasetSearchUsingExtensionQuery
? llmModelList.find((item) => item.model === queryExtensionModel)?.name ??
llmModelList[0]?.name
: undefined,
[llmModelList, queryExtensionModel]
[datasetSearchUsingExtensionQuery, llmModelList, queryExtensionModel]
);
return (
......
projects/app/src/components/support/permission/ConfigPerModal/index.tsx
......@@ -52,7 +52,7 @@ const ConfigPerModal = ({
>
<ModalBody>
<HStack>
<Avatar src={avatar} w={'1.75rem'} />
<Avatar src={avatar} w={'1.75rem'} borderRadius={'md'} />
<Box>{name}</Box>
</HStack>
{!isInheritPermission && (
......
projects/app/src/pages/api/admin/initv488.ts 0 → 100644
import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@fastgpt/service/common/response';
import { connectToDatabase } from '@/service/mongo';
import { authCert } from '@fastgpt/service/support/permission/auth/common';
import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
import { DatasetDefaultPermissionVal } from '@fastgpt/global/support/permission/dataset/constant';
/* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
await connectToDatabase();
await authCert({ req, authRoot: true });
await MongoDataset.updateMany(
{
inheritPermission: { $exists: false }
},
{
$set: {
inheritPermission: true
}
}
);
await MongoDataset.updateMany(
{
defaultPermission: { $exists: false }
},
{
$set: {
defaultPermission: DatasetDefaultPermissionVal
}
}
);
jsonRes(res, {
message: 'success'
});
} catch (error) {
console.log(error);
jsonRes(res, {
code: 500,
error
});
}
}
projects/app/src/pages/api/core/app/update.ts
......@@ -89,7 +89,7 @@ async function handler(req: ApiRequestProps<AppUpdateParams, { appId: string }>)
defaultPermission: updatedDefaultPermission
}),
// Not root, update default permission
...(isDefaultPermissionChanged && { inheritPermission: false }),
...(app.parentId && isDefaultPermissionChanged && { inheritPermission: false }),
...(teamTags && { teamTags }),
...(formatNodes && {
modules: formatNodes
......
projects/app/src/pages/api/core/chat/chatTest.ts
......@@ -15,7 +15,7 @@ import { removeEmptyUserInput } from '@fastgpt/global/core/chat/utils';
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import {
filterPluginInputVariables,
removePluginInputVariables,
updatePluginInputByVariables
} from '@fastgpt/global/core/workflow/utils';
import { NextAPI } from '@/service/middleware/entry';
......@@ -66,7 +66,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
// Plugin need to replace inputs
if (isPlugin) {
nodes = updatePluginInputByVariables(nodes, variables);
variables = filterPluginInputVariables(variables, nodes);
variables = removePluginInputVariables(variables, nodes);
} else {
if (!userInput) {
throw new Error('Params Error');
......
projects/app/src/pages/api/core/dataset/searchTest.ts
......@@ -24,7 +24,7 @@ async function handler(req: NextApiRequest) {
searchMode,
usingReRank,
datasetSearchUsingExtensionQuery = false,
datasetSearchUsingExtensionQuery = true,
datasetSearchExtensionModel,
datasetSearchExtensionBg = ''
} = req.body as SearchTestProps;
......
projects/app/src/pages/api/core/dataset/update.ts
......@@ -78,7 +78,7 @@ async function handler(
defaultPermission: updatedDefaultPermission
}),
// update the defaultPermission
...(isDefaultPermissionChanged && { inheritPermission: false })
...(dataset.parentId && isDefaultPermissionChanged && { inheritPermission: false })
},
{ session }
);
......
projects/app/src/pages/api/v1/chat/completions.ts
......@@ -55,7 +55,7 @@ import { getAppLatestVersion } from '@fastgpt/service/core/app/controller';
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import {
filterPluginInputVariables,
removePluginInputVariables,
updatePluginInputByVariables
} from '@fastgpt/global/core/workflow/utils';
import { getNanoid } from '@fastgpt/global/common/string/tools';
......@@ -238,7 +238,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
)
: storeNodes2RuntimeNodes(nodes, getDefaultEntryNodeIds(nodes));
const runtimeVariables = filterPluginInputVariables(
const runtimeVariables = removePluginInputVariables(
variables,
storeNodes2RuntimeNodes(nodes, getDefaultEntryNodeIds(nodes))
);
......
projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx
......@@ -113,8 +113,8 @@ const EditForm = ({
...item,
parent: {
id: 'VARIABLE_NODE_ID',
label: '全局变量',
avatar: '/imgs/workflow/variable.png'
label: t('common:core.module.Variable'),
avatar: 'core/workflow/template/variable'
}
})),
[appForm.chatConfig.variables, t]
......@@ -230,6 +230,7 @@ const EditForm = ({
similarity={appForm.dataset.similarity}
limit={appForm.dataset.limit}
usingReRank={appForm.dataset.usingReRank}
datasetSearchUsingExtensionQuery={appForm.dataset.datasetSearchUsingExtensionQuery}
queryExtensionModel={appForm.dataset.datasetSearchExtensionModel}
/>
</Box>
......
projects/app/src/pages/app/detail/components/SimpleApp/Header.tsx
......@@ -92,7 +92,12 @@ const Header = ({
)}
<Flex pt={[2, 3]} alignItems={'flex-start'} position={'relative'}>
<Box flex={'1'}>
<FolderPath paths={paths} hoverStyle={{ color: 'primary.600' }} onClick={onclickRoute} />
<FolderPath
rootName={t('app:all_apps')}
paths={paths}
hoverStyle={{ color: 'primary.600' }}
onClick={onclickRoute}
/>
</Box>
{isPc && (
<Box position={'absolute'} left={'50%'} transform={'translateX(-50%)'}>
......
projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx
......@@ -6,6 +6,7 @@ import {
Box,
Button,
Flex,
HStack,
Input,
InputGroup,
InputLeftElement,
......@@ -287,6 +288,8 @@ const RenderList = React.memo(function RenderList({
</MyTooltip>
);
})}
{/* Plugin input config */}
{!!configTool && (
<MyModal
isOpen
......@@ -295,6 +298,19 @@ const RenderList = React.memo(function RenderList({
overflow={'auto'}
>
<ModalBody>
<HStack mb={4} spacing={1} fontSize={'sm'}>
<MyIcon name={'common/info'} w={'1.25rem'} />
<Box flex={1}>{t('app:tool_input_param_tip')}</Box>
{configTool.inputExplanationUrl && (
<Box
cursor={'pointer'}
color={'primary.500'}
onClick={() => window.open(configTool.inputExplanationUrl, '_blank')}
>
{t('app:workflow.Input guide')}
</Box>
)}
</HStack>
{configTool.inputs
.filter((item) => !item.toolDescription)
.map((input) => {
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx
......@@ -334,7 +334,7 @@ const RenderList = React.memo(function RenderList({
const { computedNewNodeName } = useWorkflowUtils();
const formatTemplates = useMemo<NodeTemplateListType>(() => {
const copy: NodeTemplateListType = cloneDeep(workflowNodeTemplateList(t));
const copy: NodeTemplateListType = cloneDeep(workflowNodeTemplateList);
templates.forEach((item) => {
const index = copy.findIndex((template) => template.type === item.templateType);
if (index === -1) return;
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/components/IOTitle.tsx
import React from 'react';
import { Box, Flex, FlexProps } from '@chakra-ui/react';
import { Box, StackProps, HStack } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
const IOTitle = ({
text,
inputExplanationUrl,
...props
}: { text?: 'Input' | 'Output' | string; inputExplanationUrl?: string } & StackProps) => {
const { t } = useTranslation();
const IOTitle = ({ text, ...props }: { text?: 'Input' | 'Output' | string } & FlexProps) => {
return (
<Flex fontSize={'md'} alignItems={'center'} fontWeight={'medium'} mb={3} {...props}>
<Box w={'3px'} h={'14px'} borderRadius={'13px'} bg={'primary.600'} mr={1.5} />
{text}
</Flex>
<HStack fontSize={'md'} alignItems={'center'} fontWeight={'medium'} mb={3} {...props}>
<Box w={'3px'} h={'14px'} borderRadius={'13px'} bg={'primary.600'} />
<Box>{text}</Box>
<Box flex={1} />
{inputExplanationUrl && (
<Box
cursor={'pointer'}
color={'primary.500'}
onClick={() => window.open(inputExplanationUrl, '_blank')}
>
{t('app:workflow.Input guide')}
</Box>
)}
</HStack>
);
};
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeSimple.tsx
......@@ -37,7 +37,10 @@ const NodeSimple = ({
{filterHiddenInputs.length > 0 && (
<>
<Container>
<IOTitle text={t('common:common.Input')} />
<IOTitle
text={t('common:common.Input')}
inputExplanationUrl={data.inputExplanationUrl}
/>
<RenderInput nodeId={nodeId} flowInputList={commonInputs} />
</Container>
</>
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx
......@@ -80,27 +80,36 @@ const NodeCard = (props: Props) => {
const node = nodeList.find((node) => node.nodeId === nodeId);
const { openConfirm: onOpenConfirmSync, ConfirmModal: ConfirmSyncModal } = useConfirm({
content: appT('module.Confirm Sync')
content: t('app:module.Confirm Sync')
});
const { data: newNodeVersion, runAsync: getNodeVersion } = useRequest2(
const { data: nodeTemplate, runAsync: getNodeLatestTemplate } = useRequest2(
async () => {
if (node?.flowNodeType === FlowNodeTypeEnum.pluginModule) {
if (!node?.pluginId) return;
const template = await getPreviewPluginNode({ appId: node.pluginId });
return template.version;
// Focus update plugin latest inputExplanationUrl
onChangeNode({
nodeId,
type: 'attr',
key: 'inputExplanationUrl',
value: template.inputExplanationUrl
});
return template;
} else {
const template = moduleTemplatesFlat.find(
(item) => item.flowNodeType === node?.flowNodeType
);
return template?.version;
return template;
}
},
{
manual: false
}
);
const hasNewVersion = newNodeVersion && newNodeVersion !== node?.version;
const hasNewVersion = nodeTemplate && nodeTemplate.version !== node?.version;
const { runAsync: onClickSyncVersion } = useRequest2(
async () => {
......@@ -119,10 +128,10 @@ const NodeCard = (props: Props) => {
node: getLatestNodeTemplate(node, template)
});
}
await getNodeVersion();
await getNodeLatestTemplate();
},
{
refreshDeps: [node, nodeId, onResetNode, getNodeVersion]
refreshDeps: [node, nodeId, onResetNode, getNodeLatestTemplate]
}
);
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDatasetParams.tsx
import React, { useEffect, useMemo, useState } from 'react';
import type { RenderInputProps } from '../type';
import { Box, Button, Flex, useDisclosure } from '@chakra-ui/react';
import { Flex, useDisclosure } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
......@@ -54,7 +54,8 @@ const SelectDatasetParam = ({ inputs = [], nodeId }: RenderInputProps) => {
if (data[input.key] !== undefined) {
setData((state) => ({
...state,
[input.key]: input.value
// @ts-ignore
[input.key]: input.value || state[input.key]
}));
}
});
......@@ -82,6 +83,7 @@ const SelectDatasetParam = ({ inputs = [], nodeId }: RenderInputProps) => {
similarity={data.similarity}
limit={data.limit}
usingReRank={data.usingReRank}
datasetSearchUsingExtensionQuery={data.datasetSearchUsingExtensionQuery}
queryExtensionModel={data.datasetSearchExtensionModel}
/>
</>
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/TextInput.tsx
......@@ -10,7 +10,7 @@ const TextInput = ({ item, nodeId }: RenderInputProps) => {
const Render = useMemo(() => {
return (
<Input
placeholder={item.placeholder}
placeholder={item.placeholder ?? item.description}
defaultValue={item.value}
bg={'white'}
px={3}
......
projects/app/src/pages/app/list/components/context.tsx
......@@ -14,7 +14,6 @@ import { AppUpdateParams } from '@/global/core/app/api';
import dynamic from 'next/dynamic';
import { useI18n } from '@/web/context/I18n';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { useThrottleEffect } from 'ahooks';
const MoveModal = dynamic(() => import('@/components/common/folder/MoveModal'));
type AppListContextType = {
......
projects/app/src/pages/chat/components/ChatHeader.tsx
......@@ -131,10 +131,10 @@ const MobileDrawer = ({
}}
list={[
...(isTeamChat
? [{ label: t('common:all_apps'), value: TabEnum.recently }]
? [{ label: t('app:all_apps'), value: TabEnum.recently }]
: [
{ label: t('common:core.chat.Recent use'), value: TabEnum.recently },
{ label: t('common:all_apps'), value: TabEnum.app }
{ label: t('app:all_apps'), value: TabEnum.app }
])
]}
value={currentTab}
......
projects/app/src/pages/dataset/detail/components/Test.tsx
......@@ -71,7 +71,7 @@ const Test = ({ datasetId }: { datasetId: string }) => {
usingReRank: false,
limit: 5000,
similarity: 0,
datasetSearchUsingExtensionQuery: false,
datasetSearchUsingExtensionQuery: true,
datasetSearchExtensionModel: llmModelList[0].model,
datasetSearchExtensionBg: ''
}
......@@ -432,6 +432,7 @@ const TestResults = React.memo(function TestResults({
similarity={datasetTestItem.similarity}
limit={datasetTestItem.limit}
usingReRank={datasetTestItem.usingReRank}
datasetSearchUsingExtensionQuery={!!datasetTestItem.queryExtensionModel}
queryExtensionModel={datasetTestItem.queryExtensionModel}
/>
</Box>
......
projects/app/src/pages/dataset/list/context.tsx
......@@ -68,7 +68,11 @@ function DatasetContextProvider({ children }: { children: React.ReactNode }) {
const { parentId = null } = router.query as { parentId?: string | null };
const { data: myDatasets = [], runAsync: loadMyDatasets } = useRequest2(
const {
data: myDatasets = [],
runAsync: loadMyDatasets,
loading: isFetchingDatasets
} = useRequest2(
() =>
getDatasets({
parentId
......@@ -83,7 +87,7 @@ function DatasetContextProvider({ children }: { children: React.ReactNode }) {
() => (parentId ? getDatasetById(parentId) : Promise.resolve(undefined)),
{
manual: false,
refreshDeps: [parentId, myDatasets]
refreshDeps: [parentId]
}
);
......@@ -95,16 +99,8 @@ function DatasetContextProvider({ children }: { children: React.ReactNode }) {
}
);
const { runAsync: refetchDatasets, loading: isFetchingDatasets } = useRequest2(
() => loadMyDatasets(),
{
manual: false,
refreshDeps: [parentId]
}
);
const { runAsync: onUpdateDataset } = useRequest2(putDatasetById, {
onSuccess: () => Promise.all([refetchDatasets(), refetchPaths(), loadMyDatasets()])
onSuccess: () => Promise.all([refetchFolderDetail(), refetchPaths(), loadMyDatasets()])
});
const onMoveDataset = useCallback(
......@@ -138,7 +134,6 @@ function DatasetContextProvider({ children }: { children: React.ReactNode }) {
});
const contextValue = {
refetchDatasets,
isFetchingDatasets,
setMoveDatasetId,
paths,
......
projects/app/src/web/core/workflow/adapt.ts
......@@ -40,8 +40,8 @@ export const getGlobalVariableNode = ({
flowNodeType: FlowNodeTypeEnum.emptyNode,
sourceHandle: getHandleConfig(false, false, false, false),
targetHandle: getHandleConfig(false, false, false, false),
avatar: '/imgs/workflow/variable.png',
name: '全局变量',
avatar: 'core/workflow/template/variable',
name: t('common:core.module.Variable'),
intro: '',
unique: true,
forbidDelete: true,
......
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