Skip to content

赵月辉 / fastgpt-migrated

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

perf: http body;perf: create by json;perf: create by curl (#3570) 

* perf: http body

* feat: create app by json (#3557)

* feat: create app by json

* fix build

* perf: create by json;perf: create by curl

* fix: ts

---------

Co-authored-by: heheer <heheer@sealos.io>
parent f1f0ae28
Showing with 1065 additions and 345 deletions
docSite/content/zh-cn/docs/agreement/open-source.md
...@@ -7,7 +7,7 @@ toc: true ...@@ -7,7 +7,7 @@ toc: true
weight: 1210 weight: 1210
--- ---
FastGPT 项目在 Apache License 2.0 许可下开源，同时包含以下附加条件： FastGPT 项目在 Apache License 2.0 许可下开源，但包含以下附加条件：
+ FastGPT 允许被用于商业化，例如作为其他应用的“后端即服务”使用，或者作为应用开发平台提供给企业。然而，当满足以下条件时，必须联系作者获得商业许可： + FastGPT 允许被用于商业化，例如作为其他应用的“后端即服务”使用，或者作为应用开发平台提供给企业。然而，当满足以下条件时，必须联系作者获得商业许可：
......
docSite/content/zh-cn/docs/development/upgrading/4818.md
...@@ -24,14 +24,17 @@ curl --location --request POST 'https://{{host}}/api/admin/initv4818' \ ...@@ -24,14 +24,17 @@ curl --location --request POST 'https://{{host}}/api/admin/initv4818' \
## 完整更新内容 ## 完整更新内容
1. 新增 - 支持部门架构权限模式。 1. 新增 - 支持通过 JSON 配置直接创建应用。
2. 新增 - 支持配置自定跨域安全策略，默认全开。 2. 新增 - 支持通过 CURL 脚本快速创建 HTTP 插件。
3. 优化 - 分享链接随机生成用户头像。 3. 新增 - 商业版支持部门架构权限模式。
4. 优化 - 图片上传安全校验。并增加头像图片唯一存储，确保不会累计存储。 4. 新增 - 支持配置自定跨域安全策略，默认全开。
5. 优化 - Mongo 全文索引表分离。 5. 优化 - HTTP Body 增加特殊处理，解决字符串变量带换行时无法解析问题。
6. 优化 - 知识库检索查询语句合并，同时减少查库数量。 6. 优化 - 分享链接随机生成用户头像。
7. 优化 - 文件编码检测，减少 CSV 文件乱码概率。 7. 优化 - 图片上传安全校验。并增加头像图片唯一存储，确保不会累计存储。
8. 优化 - 异步读取文件内容，减少进程阻塞。 8. 优化 - Mongo 全文索引表分离。
9. 优化 - 文件阅读，HTML 直接下载，不允许在线阅读。 9. 优化 - 知识库检索查询语句合并，同时减少查库数量。
10. 修复 - HTML 文件上传，base64 图片无法自动转图片链接。 10. 优化 - 文件编码检测，减少 CSV 文件乱码概率。
11. 修复 - 插件计费错误。 11. 优化 - 异步读取文件内容，减少进程阻塞。
12. 优化 - 文件阅读，HTML 直接下载，不允许在线阅读。
13. 修复 - HTML 文件上传，base64 图片无法自动转图片链接。
14. 修复 - 插件计费错误。
docSite/content/zh-cn/docs/intro.md
...@@ -54,7 +54,7 @@ FastGPT 对外的 API 接口对齐了 OpenAI 官方接口，可以直接接入 ...@@ -54,7 +54,7 @@ FastGPT 对外的 API 接口对齐了 OpenAI 官方接口，可以直接接入
1. **项目开源** 1. **项目开源**
FastGPT 遵循附加条件 Apache License 2.0 开源协议，你可以 [Fork](https://github.com/labring/FastGPT/fork) 之后进行二次开发和发布。FastGPT 社区版将保留核心功能，商业版仅在社区版基础上使用 API 的形式进行扩展，不影响学习使用。 FastGPT 遵循**附加条件 Apache License 2.0 开源协议**，你可以 [Fork](https://github.com/labring/FastGPT/fork) 之后进行二次开发和发布。FastGPT 社区版将保留核心功能，商业版仅在社区版基础上使用 API 的形式进行扩展，不影响学习使用。
2. **独特的 QA 结构** 2. **独特的 QA 结构**
......
packages/global/common/error/utils.ts
...@@ -5,6 +5,6 @@ export const getErrText = (err: any, def = ''): any => { ...@@ -5,6 +5,6 @@ export const getErrText = (err: any, def = ''): any => {
typeof err === 'string' typeof err === 'string'
? err ? err
: err?.response?.data?.message || err?.response?.message || err?.message || def; : err?.response?.data?.message || err?.response?.message || err?.message || def;
msg && console.log('error =>', msg); // msg && console.log('error =>', msg);
return replaceSensitiveText(msg); return replaceSensitiveText(msg);
}; };
packages/global/common/string/http.ts 0 → 100644
import parse from '@bany/curl-to-json';
type RequestMethod = 'get' | 'post' | 'put' | 'delete' | 'patch';
const methodMap: { [K in RequestMethod]: string } = {
get: 'GET',
post: 'POST',
put: 'PUT',
delete: 'DELETE',
patch: 'PATCH'
};
export const parseCurl = (curlContent: string) => {
const parsed = parse(curlContent);
if (!parsed.url) {
throw new Error('url not found');
}
const newParams = Object.keys(parsed.params || {}).map((key) => ({
key,
value: parsed.params?.[key],
type: 'string'
}));
const newHeaders = Object.keys(parsed.header || {}).map((key) => ({
key,
value: parsed.header?.[key],
type: 'string'
}));
const newBody = JSON.stringify(parsed.data, null, 2);
return {
url: parsed.url,
method: methodMap[parsed.method?.toLowerCase() as RequestMethod] || 'GET',
params: newParams,
headers: newHeaders,
body: newBody
};
};
packages/global/core/app/utils.ts
...@@ -5,6 +5,8 @@ import type { FlowNodeInputItemType } from '../workflow/type/io.d'; ...@@ -5,6 +5,8 @@ import type { FlowNodeInputItemType } from '../workflow/type/io.d';
import { getAppChatConfig } from '../workflow/utils'; import { getAppChatConfig } from '../workflow/utils';
import { StoreNodeItemType } from '../workflow/type/node'; import { StoreNodeItemType } from '../workflow/type/node';
import { DatasetSearchModeEnum } from '../dataset/constants'; import { DatasetSearchModeEnum } from '../dataset/constants';
import { WorkflowTemplateBasicType } from '../workflow/type';
import { AppTypeEnum } from './constants';
export const getDefaultAppForm = (): AppSimpleEditFormType => { export const getDefaultAppForm = (): AppSimpleEditFormType => {
return { return {
...@@ -127,3 +129,20 @@ export const appWorkflow2Form = ({ ...@@ -127,3 +129,20 @@ export const appWorkflow2Form = ({
return defaultAppForm; return defaultAppForm;
}; };
export const getAppType = (config?: WorkflowTemplateBasicType | AppSimpleEditFormType) => {
if (!config) return '';
if ('aiSettings' in config) {
return AppTypeEnum.simple;
}
if (!('nodes' in config)) return '';
if (config.nodes.some((node) => node.flowNodeType === 'workflowStart')) {
return AppTypeEnum.workflow;
}
if (config.nodes.some((node) => node.flowNodeType === 'pluginInput')) {
return AppTypeEnum.plugin;
}
return '';
};
packages/global/package.json
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
"openai": "4.61.0", "openai": "4.61.0",
"openapi-types": "^12.1.3", "openapi-types": "^12.1.3",
"json5": "^2.2.3", "json5": "^2.2.3",
"timezones-list": "^3.0.2" "timezones-list": "^3.0.2",
"@bany/curl-to-json": "^1.2.8"
}, },
"devDependencies": { "devDependencies": {
"@types/js-yaml": "^4.0.9", "@types/js-yaml": "^4.0.9",
......
packages/service/core/workflow/dispatch/index.ts
...@@ -487,16 +487,16 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons ...@@ -487,16 +487,16 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
if (input.key === dynamicInput?.key) return; if (input.key === dynamicInput?.key) return;
// Skip some special key // Skip some special key
if (input.key === NodeInputKeyEnum.childrenNodeIdList) { if (
[NodeInputKeyEnum.childrenNodeIdList, NodeInputKeyEnum.httpJsonBody].includes(
input.key as any
)
) {
params[input.key] = input.value; params[input.key] = input.value;
return; return;
} }
// replace {{xx}} variables // replace {{$xx.xx$}} and {{xx}} variables
// let value = replaceVariable(input.value, variables);
// replace {{$xx.xx$}} variables
let value = replaceEditorVariable({ let value = replaceEditorVariable({
text: input.value, text: input.value,
nodes: runtimeNodes, nodes: runtimeNodes,
...@@ -606,6 +606,11 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons ...@@ -606,6 +606,11 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
}; };
} }
// Error
if (dispatchRes?.responseData?.error) {
addLog.warn('workflow error', dispatchRes.responseData.error);
}
return { return {
node, node,
runStatus: 'run', runStatus: 'run',
......
packages/service/core/workflow/dispatch/tools/http468.ts
...@@ -2,6 +2,7 @@ import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/ ...@@ -2,6 +2,7 @@ import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/runtime/
import { import {
NodeInputKeyEnum, NodeInputKeyEnum,
NodeOutputKeyEnum, NodeOutputKeyEnum,
VARIABLE_NODE_ID,
WorkflowIOValueTypeEnum WorkflowIOValueTypeEnum
} from '@fastgpt/global/core/workflow/constants'; } from '@fastgpt/global/core/workflow/constants';
import { import {
...@@ -16,7 +17,9 @@ import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/ty ...@@ -16,7 +17,9 @@ import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/ty
import { getErrText } from '@fastgpt/global/common/error/utils'; import { getErrText } from '@fastgpt/global/common/error/utils';
import { import {
textAdaptGptResponse, textAdaptGptResponse,
replaceEditorVariable replaceEditorVariable,
formatVariableValByType,
getReferenceVariableValue
} from '@fastgpt/global/core/workflow/runtime/utils'; } from '@fastgpt/global/core/workflow/runtime/utils';
import { ContentTypes } from '@fastgpt/global/core/workflow/constants'; import { ContentTypes } from '@fastgpt/global/core/workflow/constants';
import { uploadFileFromBase64Img } from '../../../../common/file/gridfs/controller'; import { uploadFileFromBase64Img } from '../../../../common/file/gridfs/controller';
...@@ -104,15 +107,73 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H ...@@ -104,15 +107,73 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
[NodeInputKeyEnum.addInputParam]: concatVariables, [NodeInputKeyEnum.addInputParam]: concatVariables,
...concatVariables ...concatVariables
}; };
// General data for variable substitution（Exclude: json body)
const replaceStringVariables = (text: string) => { const replaceStringVariables = (text: string) => {
return replaceVariable( return replaceEditorVariable({
replaceEditorVariable({ text,
text, nodes: runtimeNodes,
nodes: runtimeNodes, variables: allVariables
variables: allVariables });
}), };
allVariables /* 特殊处理 JSON 的字符串，减少解码错误
); 1. 找不到的值，替换成 null
2. 有换行字符串
*/
const replaceJsonBodyString = (text: string) => {
const valToStr = (val: any) => {
if (val === undefined) return 'null';
if (val === null) return 'null';
if (typeof val === 'object') return JSON.stringify(val);
if (typeof val === 'string') {
const str = JSON.stringify(val);
return str.startsWith('"') && str.endsWith('"') ? str.slice(1, -1) : str;
}
return String(val);
};
// 1. Replace {{key}} variables
const regex1 = /{{([^}]+)}}/g;
const matches1 = text.match(regex1) || [];
const uniqueKeys1 = [...new Set(matches1.map((match) => match.slice(2, -2)))];
for (const key of uniqueKeys1) {
text = text.replace(new RegExp(`{{(${key})}}`, 'g'), () => valToStr(variables[key]));
}
// 2. Replace {{key.key}} variables
const regex2 = /\{\{\$([^.]+)\.([^$]+)\$\}\}/g;
const matches2 = [...text.matchAll(regex2)];
if (matches2.length === 0) return text;
matches2.forEach((match) => {
const nodeId = match[1];
const id = match[2];
const variableVal = (() => {
if (nodeId === VARIABLE_NODE_ID) {
return variables[id];
}
// Find upstream node input/output
const node = runtimeNodes.find((node) => node.nodeId === nodeId);
if (!node) return;
const output = node.outputs.find((output) => output.id === id);
if (output) return formatVariableValByType(output.value, output.valueType);
const input = node.inputs.find((input) => input.key === id);
if (input)
return getReferenceVariableValue({ value: input.value, nodes: runtimeNodes, variables });
})();
const formatVal = valToStr(variableVal);
const regex = new RegExp(`\\{\\{\\$(${nodeId}\\.${id})\\$\\}\\}`, 'g');
text = text.replace(regex, () => formatVal);
});
return text.replace(/(".*?")\s*:\s*undefined\b/g, '$1: null');
}; };
httpReqUrl = replaceStringVariables(httpReqUrl); httpReqUrl = replaceStringVariables(httpReqUrl);
...@@ -176,15 +237,10 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H ...@@ -176,15 +237,10 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
} }
if (!httpJsonBody) return {}; if (!httpJsonBody) return {};
if (httpContentType === ContentTypes.json) { if (httpContentType === ContentTypes.json) {
httpJsonBody = replaceStringVariables(httpJsonBody); return json5.parse(replaceJsonBodyString(httpJsonBody));
const replaceJsonBody = httpJsonBody.replace(/(".*?")\s*:\s*undefined\b/g, '$1: null');
// Json body, parse and return
const jsonParse = json5.parse(replaceJsonBody);
const removeSignJson = removeUndefinedSign(jsonParse);
return removeSignJson;
} }
// Raw text, xml
httpJsonBody = replaceStringVariables(httpJsonBody); httpJsonBody = replaceStringVariables(httpJsonBody);
return httpJsonBody.replaceAll(UNDEFINED_SIGN, 'null'); return httpJsonBody.replaceAll(UNDEFINED_SIGN, 'null');
} catch (error) { } catch (error) {
...@@ -335,40 +391,40 @@ async function fetchData({ ...@@ -335,40 +391,40 @@ async function fetchData({
}; };
} }
function replaceVariable(text: string, obj: Record<string, any>) { // function replaceVariable(text: string, obj: Record<string, any>) {
for (const [key, value] of Object.entries(obj)) { // for (const [key, value] of Object.entries(obj)) {
if (value === undefined) { // if (value === undefined) {
text = text.replace(new RegExp(`{{(${key})}}`, 'g'), UNDEFINED_SIGN); // text = text.replace(new RegExp(`{{(${key})}}`, 'g'), UNDEFINED_SIGN);
} else { // } else {
const replacement = JSON.stringify(value); // const replacement = JSON.stringify(value);
const unquotedReplacement = // const unquotedReplacement =
replacement.startsWith('"') && replacement.endsWith('"') // replacement.startsWith('"') && replacement.endsWith('"')
? replacement.slice(1, -1) // ? replacement.slice(1, -1)
: replacement; // : replacement;
text = text.replace(new RegExp(`{{(${key})}}`, 'g'), () => unquotedReplacement); // text = text.replace(new RegExp(`{{(${key})}}`, 'g'), () => unquotedReplacement);
} // }
} // }
return text || ''; // return text || '';
} // }
function removeUndefinedSign(obj: Record<string, any>) { // function removeUndefinedSign(obj: Record<string, any>) {
for (const key in obj) { // for (const key in obj) {
if (obj[key] === UNDEFINED_SIGN) { // if (obj[key] === UNDEFINED_SIGN) {
obj[key] = undefined; // obj[key] = undefined;
} else if (Array.isArray(obj[key])) { // } else if (Array.isArray(obj[key])) {
obj[key] = obj[key].map((item: any) => { // obj[key] = obj[key].map((item: any) => {
if (item === UNDEFINED_SIGN) { // if (item === UNDEFINED_SIGN) {
return undefined; // return undefined;
} else if (typeof item === 'object') { // } else if (typeof item === 'object') {
removeUndefinedSign(item); // removeUndefinedSign(item);
} // }
return item; // return item;
}); // });
} else if (typeof obj[key] === 'object') { // } else if (typeof obj[key] === 'object') {
removeUndefinedSign(obj[key]); // removeUndefinedSign(obj[key]);
} // }
} // }
return obj; // return obj;
} // }
// Replace some special response from system plugin // Replace some special response from system plugin
async function replaceSystemPluginResponse({ async function replaceSystemPluginResponse({
......
packages/web/components/common/Icon/constants.ts
...@@ -142,6 +142,7 @@ export const iconPaths = { ...@@ -142,6 +142,7 @@ export const iconPaths = {
'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'),
'core/app/type/httpPluginFill': () => import('./icons/core/app/type/httpPluginFill.svg'), 'core/app/type/httpPluginFill': () => import('./icons/core/app/type/httpPluginFill.svg'),
'core/app/type/jsonImport': () => import('./icons/core/app/type/jsonImport.svg'),
'core/app/type/plugin': () => import('./icons/core/app/type/plugin.svg'), 'core/app/type/plugin': () => import('./icons/core/app/type/plugin.svg'),
'core/app/type/pluginFill': () => import('./icons/core/app/type/pluginFill.svg'), 'core/app/type/pluginFill': () => import('./icons/core/app/type/pluginFill.svg'),
'core/app/type/pluginLight': () => import('./icons/core/app/type/pluginLight.svg'), 'core/app/type/pluginLight': () => import('./icons/core/app/type/pluginLight.svg'),
......
packages/web/components/common/Icon/icons/core/app/type/jsonImport.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
<g clip-path="url(#clip0_16784_2993)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.5271 4.37083L25.4043 8.01175C26.3626 8.91164 26.8417 9.36158 27.1828 9.89648C27.4727 10.3511 27.6882 10.849 27.8211 11.3715C27.9775 11.9863 27.9775 12.6436 27.9775 13.9582V19.4935C27.0071 19.026 25.919 18.764 24.7697 18.764C20.6828 18.764 17.3698 22.077 17.3698 26.1639C17.3698 27.502 17.7249 28.7571 18.3461 29.8401H12.1799C9.29446 29.8401 7.85176 29.8401 6.75362 29.2697C5.82822 28.789 5.07369 28.0344 4.59299 27.1091C4.02255 26.0109 4.02255 24.5682 4.02255 21.6828V10.3173C4.02255 7.43186 4.02255 5.98915 4.59299 4.89101C5.07369 3.96561 5.82822 3.21108 6.75362 2.73038C7.85176 2.15994 9.29447 2.15994 12.1799 2.15994H15.943C17.1489 2.15994 17.7519 2.15994 18.3216 2.29333C18.806 2.40673 19.2711 2.59087 19.7019 2.83981C20.2085 3.1326 20.6481 3.54535 21.5271 4.37083ZM19.1105 6.20351C18.3195 5.4451 17.924 5.0659 17.5846 5.05216C17.315 5.04124 17.0548 5.15224 16.8761 5.3544C16.6511 5.60893 16.6511 6.15685 16.6511 7.25268V8.50383C16.6511 10.1068 16.6511 10.9083 16.963 11.5205C17.2374 12.0591 17.6753 12.4969 18.2138 12.7713C18.8261 13.0833 19.6276 13.0833 21.2305 13.0833H22.6697C23.8233 13.0833 24.4001 13.0833 24.6566 12.8505C24.8602 12.6658 24.9678 12.3979 24.9487 12.1238C24.9247 11.7782 24.5084 11.379 23.6757 10.5806L19.1105 6.20351Z" fill="url(#paint0_linear_16784_2993)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5057 21.6108C23.8901 20.1169 26.0117 20.1169 26.3961 21.6108C26.6044 22.4202 27.4368 22.9007 28.2419 22.6764C29.7278 22.2624 30.7886 24.0997 29.6871 25.1796C29.0903 25.7646 29.0903 26.7258 29.6871 27.3108C30.7886 28.3907 29.7278 30.228 28.2419 29.814C27.4368 29.5897 26.6044 30.0703 26.3961 30.8796C26.0117 32.3735 23.8901 32.3735 23.5057 30.8796C23.2974 30.0703 22.4651 29.5897 21.66 29.814C20.174 30.228 19.1133 28.3907 20.2148 27.3108C20.8116 26.7258 20.8116 25.7646 20.2148 25.1796C19.1133 24.0997 20.174 22.2624 21.66 22.6764C22.4651 22.9007 23.2974 22.4202 23.5057 21.6108ZM26.8127 26.2452C26.8127 27.2734 25.9791 28.107 24.9509 28.107C23.9227 28.107 23.0891 27.2734 23.0891 26.2452C23.0891 25.217 23.9227 24.3834 24.9509 24.3834C25.9791 24.3834 26.8127 25.217 26.8127 26.2452Z" fill="url(#paint1_linear_16784_2993)"/>
</g>
<defs>
<linearGradient id="paint0_linear_16784_2993" x1="17.0824" y1="2.15994" x2="17.0824" y2="32" gradientUnits="userSpaceOnUse">
<stop stop-color="#BAC6D8"/>
<stop offset="1" stop-color="#9FA9C2"/>
</linearGradient>
<linearGradient id="paint1_linear_16784_2993" x1="17.0824" y1="2.15994" x2="17.0824" y2="32" gradientUnits="userSpaceOnUse">
<stop stop-color="#BAC6D8"/>
<stop offset="1" stop-color="#9FA9C2"/>
</linearGradient>
<clipPath id="clip0_16784_2993">
<rect width="32" height="32" fill="white"/>
</clipPath>
</defs>
</svg>
\ No newline at end of file
packages/web/components/common/MyModal/index.tsx
...@@ -75,6 +75,7 @@ const MyModal = ({ ...@@ -75,6 +75,7 @@ const MyModal = ({
py={'10px'} py={'10px'}
fontSize={'md'} fontSize={'md'}
fontWeight={'bold'} fontWeight={'bold'}
minH={['46px', '53px']}
> >
{iconSrc && ( {iconSrc && (
<> <>
......
packages/web/i18n/en/app.json
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
"copy_one_app": "Create Duplicate", "copy_one_app": "Create Duplicate",
"core.app.QG.Switch": "Enable guess what you want to ask", "core.app.QG.Switch": "Enable guess what you want to ask",
"core.dataset.import.Custom prompt": "Custom Prompt", "core.dataset.import.Custom prompt": "Custom Prompt",
"create_by_curl": "By CURL",
"create_by_template": "By template",
"create_copy_success": "Duplicate Created Successfully", "create_copy_success": "Duplicate Created Successfully",
"create_empty_app": "Create Default App", "create_empty_app": "Create Default App",
"create_empty_plugin": "Create Default Plugin", "create_empty_plugin": "Create Default Plugin",
...@@ -69,6 +71,7 @@ ...@@ -69,6 +71,7 @@
"interval.6_hours": "Every 6 Hours", "interval.6_hours": "Every 6 Hours",
"interval.per_hour": "Every Hour", "interval.per_hour": "Every Hour",
"intro": "A comprehensive model application orchestration system that offers out-of-the-box data processing and model invocation capabilities. It allows for rapid Dataset construction and workflow orchestration through Flow visualization, enabling complex Dataset scenarios!", "intro": "A comprehensive model application orchestration system that offers out-of-the-box data processing and model invocation capabilities. It allows for rapid Dataset construction and workflow orchestration through Flow visualization, enabling complex Dataset scenarios!",
"invalid_json_format": "JSON format error",
"llm_not_support_vision": "This model does not support image recognition", "llm_not_support_vision": "This model does not support image recognition",
"llm_use_vision": "Vision", "llm_use_vision": "Vision",
"llm_use_vision_tip": "After clicking on the model selection, you can see whether the model supports image recognition and the ability to control whether to start image recognition. \nAfter starting image recognition, the model will read the image content in the file link, and if the user question is less than 500 words, it will automatically parse the image in the user question.", "llm_use_vision_tip": "After clicking on the model selection, you can see whether the model supports image recognition and the ability to control whether to start image recognition. \nAfter starting image recognition, the model will read the image content in the file link, and if the user question is less than 500 words, it will automatically parse the image in the user question.",
...@@ -90,10 +93,11 @@ ...@@ -90,10 +93,11 @@
"move_app": "Move Application", "move_app": "Move Application",
"node_not_intro": "This node is not introduced", "node_not_intro": "This node is not introduced",
"not_json_file": "Please select a JSON file", "not_json_file": "Please select a JSON file",
"oaste_curl_string": "Enter CURL code",
"open_auto_execute": "Enable automatic execution", "open_auto_execute": "Enable automatic execution",
"open_vision_function_tip": "Models with icon switches have image recognition capabilities. \nAfter being turned on, the model will parse the pictures in the file link and automatically parse the pictures in the user's question (user question ≤ 500 words).", "open_vision_function_tip": "Models with icon switches have image recognition capabilities. \nAfter being turned on, the model will parse the pictures in the file link and automatically parse the pictures in the user's question (user question ≤ 500 words).",
"or_drag_JSON": "or drag in JSON file", "or_drag_JSON": "or drag in JSON file",
"paste_config": "Paste Configuration", "paste_config_or_drag": "Paste config or drag JSON file here",
"permission.des.manage": "Based on write permissions, you can configure publishing channels, view conversation logs, and assign permissions to the application.", "permission.des.manage": "Based on write permissions, you can configure publishing channels, view conversation logs, and assign permissions to the application.",
"permission.des.read": "Use the app to have conversations", "permission.des.read": "Use the app to have conversations",
"permission.des.write": "Can view and edit apps", "permission.des.write": "Can view and edit apps",
...@@ -150,9 +154,12 @@ ...@@ -150,9 +154,12 @@
"type.Create workflow bot": "Create Workflow", "type.Create workflow bot": "Create Workflow",
"type.Create workflow tip": "Build complex multi-turn dialogue AI applications through low-code methods, recommended for advanced users.", "type.Create workflow tip": "Build complex multi-turn dialogue AI applications through low-code methods, recommended for advanced users.",
"type.Http plugin": "HTTP Plugin", "type.Http plugin": "HTTP Plugin",
"type.Import from json": "Import JSON",
"type.Import from json tip": "Create applications directly through JSON configuration files",
"type.Plugin": "Plugin", "type.Plugin": "Plugin",
"type.Simple bot": "Simple App", "type.Simple bot": "Simple App",
"type.Workflow bot": "Workflow", "type.Workflow bot": "Workflow",
"type_not_recognized": "App type not recognized",
"upload_file_max_amount": "Maximum File Quantity", "upload_file_max_amount": "Maximum File Quantity",
"upload_file_max_amount_tip": "Maximum number of files uploaded in a single round of conversation", "upload_file_max_amount_tip": "Maximum number of files uploaded in a single round of conversation",
"variable.select type_desc": "You can define a global variable that does not need to be filled in by the user.\n\nThe value of this variable can come from the API interface, the Query of the shared link, or assigned through the [Variable Update] module.", "variable.select type_desc": "You can define a global variable that does not need to be filled in by the user.\n\nThe value of this variable can come from the API interface, the Query of the shared link, or assigned through the [Variable Update] module.",
......
packages/web/i18n/en/common.json
...@@ -305,7 +305,6 @@ ...@@ -305,7 +305,6 @@
"core.app.Random": "Divergent", "core.app.Random": "Divergent",
"core.app.Search team tags": "Search Tags", "core.app.Search team tags": "Search Tags",
"core.app.Select TTS": "Select Voice Playback Mode", "core.app.Select TTS": "Select Voice Playback Mode",
"core.app.Select app from template": "Template",
"core.app.Select quote template": "Select Quote Prompt Template", "core.app.Select quote template": "Select Quote Prompt Template",
"core.app.Set a name for your app": "Set a Name for Your App", "core.app.Set a name for your app": "Set a Name for Your App",
"core.app.Setting ai property": "Click to Configure AI Model Properties", "core.app.Setting ai property": "Click to Configure AI Model Properties",
......
packages/web/i18n/zh-CN/app.json
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
"copy_one_app": "创建副本", "copy_one_app": "创建副本",
"core.app.QG.Switch": "启用猜你想问", "core.app.QG.Switch": "启用猜你想问",
"core.dataset.import.Custom prompt": "自定义提示词", "core.dataset.import.Custom prompt": "自定义提示词",
"create_by_curl": "从 CURL 创建",
"create_by_template": "从模板创建",
"create_copy_success": "创建副本成功", "create_copy_success": "创建副本成功",
"create_empty_app": "创建空白应用", "create_empty_app": "创建空白应用",
"create_empty_plugin": "创建空白插件", "create_empty_plugin": "创建空白插件",
...@@ -69,6 +71,7 @@ ...@@ -69,6 +71,7 @@
"interval.6_hours": "每6小时", "interval.6_hours": "每6小时",
"interval.per_hour": "每小时", "interval.per_hour": "每小时",
"intro": "是一个大模型应用编排系统，提供开箱即用的数据处理、模型调用等能力，可以快速的构建知识库并通过 Flow 可视化进行工作流编排，实现复杂的知识库场景！", "intro": "是一个大模型应用编排系统，提供开箱即用的数据处理、模型调用等能力，可以快速的构建知识库并通过 Flow 可视化进行工作流编排，实现复杂的知识库场景！",
"invalid_json_format": "JSON 格式错误",
"llm_not_support_vision": "该模型不支持图片识别", "llm_not_support_vision": "该模型不支持图片识别",
"llm_use_vision": "图片识别", "llm_use_vision": "图片识别",
"llm_use_vision_tip": "点击模型选择后，可以看到模型是否支持图片识别以及控制是否启动图片识别的能力。启动图片识别后，模型会读取文件链接里图片内容，并且如果用户问题少于 500 字，会自动解析用户问题中的图片。", "llm_use_vision_tip": "点击模型选择后，可以看到模型是否支持图片识别以及控制是否启动图片识别的能力。启动图片识别后，模型会读取文件链接里图片内容，并且如果用户问题少于 500 字，会自动解析用户问题中的图片。",
...@@ -90,10 +93,11 @@ ...@@ -90,10 +93,11 @@
"move_app": "移动应用", "move_app": "移动应用",
"node_not_intro": "这个节点没有介绍", "node_not_intro": "这个节点没有介绍",
"not_json_file": "请选择JSON文件", "not_json_file": "请选择JSON文件",
"oaste_curl_string": "输入 CURL 代码",
"open_auto_execute": "启用自动执行", "open_auto_execute": "启用自动执行",
"open_vision_function_tip": "有图示开关的模型即拥有图片识别能力。若开启，模型会解析文件链接里的图片，并自动解析用户问题中的图片（用户问题≤500字时生效）。", "open_vision_function_tip": "有图示开关的模型即拥有图片识别能力。若开启，模型会解析文件链接里的图片，并自动解析用户问题中的图片（用户问题≤500字时生效）。",
"or_drag_JSON": "或拖入JSON文件", "or_drag_JSON": "或拖入JSON文件",
"paste_config": "粘贴配置", "paste_config_or_drag": "粘贴配置或拖入 JSON 文件",
"permission.des.manage": "写权限基础上，可配置发布渠道、查看对话日志、分配该应用权限", "permission.des.manage": "写权限基础上，可配置发布渠道、查看对话日志、分配该应用权限",
"permission.des.read": "可使用该应用进行对话", "permission.des.read": "可使用该应用进行对话",
"permission.des.write": "可查看和编辑应用", "permission.des.write": "可查看和编辑应用",
...@@ -150,9 +154,12 @@ ...@@ -150,9 +154,12 @@
"type.Create workflow bot": "创建工作流", "type.Create workflow bot": "创建工作流",
"type.Create workflow tip": "通过低代码的方式，构建逻辑复杂的多轮对话 AI 应用，推荐高级玩家使用", "type.Create workflow tip": "通过低代码的方式，构建逻辑复杂的多轮对话 AI 应用，推荐高级玩家使用",
"type.Http plugin": "HTTP 插件", "type.Http plugin": "HTTP 插件",
"type.Import from json": "导入 JSON 配置",
"type.Import from json tip": "通过 JSON 配置文件，直接创建应用",
"type.Plugin": "插件", "type.Plugin": "插件",
"type.Simple bot": "简易应用", "type.Simple bot": "简易应用",
"type.Workflow bot": "工作流", "type.Workflow bot": "工作流",
"type_not_recognized": "未识别到应用类型",
"upload_file_max_amount": "最大文件数量", "upload_file_max_amount": "最大文件数量",
"upload_file_max_amount_tip": "单轮对话中最大上传文件数量", "upload_file_max_amount_tip": "单轮对话中最大上传文件数量",
"variable.select type_desc": "可以为工作流定义全局变量，常用临时缓存。赋值的方式包括：\n1. 从对话页面的 query 参数获取。\n2. 通过 API 的 variables 对象传递。\n3. 通过【变量更新】节点进行赋值。", "variable.select type_desc": "可以为工作流定义全局变量，常用临时缓存。赋值的方式包括：\n1. 从对话页面的 query 参数获取。\n2. 通过 API 的 variables 对象传递。\n3. 通过【变量更新】节点进行赋值。",
......
packages/web/i18n/zh-CN/common.json
...@@ -308,7 +308,6 @@ ...@@ -308,7 +308,6 @@
"core.app.Random": "发散", "core.app.Random": "发散",
"core.app.Search team tags": "搜索标签", "core.app.Search team tags": "搜索标签",
"core.app.Select TTS": "选择语音播放模式", "core.app.Select TTS": "选择语音播放模式",
"core.app.Select app from template": "从模板中选择",
"core.app.Select quote template": "选择引用提示模板", "core.app.Select quote template": "选择引用提示模板",
"core.app.Set a name for your app": "给应用设置一个名称", "core.app.Set a name for your app": "给应用设置一个名称",
"core.app.Setting ai property": "点击配置 AI 模型相关属性", "core.app.Setting ai property": "点击配置 AI 模型相关属性",
......
packages/web/i18n/zh-Hant/app.json
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
"copy_one_app": "建立副本", "copy_one_app": "建立副本",
"core.app.QG.Switch": "啟用猜你想問", "core.app.QG.Switch": "啟用猜你想問",
"core.dataset.import.Custom prompt": "自訂提示詞", "core.dataset.import.Custom prompt": "自訂提示詞",
"create_by_curl": "從 CURL 創建",
"create_by_template": "從模板創建",
"create_copy_success": "建立副本成功", "create_copy_success": "建立副本成功",
"create_empty_app": "建立空白應用程式", "create_empty_app": "建立空白應用程式",
"create_empty_plugin": "建立空白外掛", "create_empty_plugin": "建立空白外掛",
...@@ -69,6 +71,7 @@ ...@@ -69,6 +71,7 @@
"interval.6_hours": "每 6 小時", "interval.6_hours": "每 6 小時",
"interval.per_hour": "每小時", "interval.per_hour": "每小時",
"intro": "FastGPT 是一個基於大型語言模型的知識庫平臺，提供開箱即用的資料處理、向量檢索和視覺化 AI 工作流程編排等功能，讓您可以輕鬆開發和部署複雜的問答系統，而無需繁瑣的設定或配置。", "intro": "FastGPT 是一個基於大型語言模型的知識庫平臺，提供開箱即用的資料處理、向量檢索和視覺化 AI 工作流程編排等功能，讓您可以輕鬆開發和部署複雜的問答系統，而無需繁瑣的設定或配置。",
"invalid_json_format": "JSON 格式錯誤",
"llm_not_support_vision": "這個模型不支援圖片辨識", "llm_not_support_vision": "這個模型不支援圖片辨識",
"llm_use_vision": "圖片辨識", "llm_use_vision": "圖片辨識",
"llm_use_vision_tip": "點選模型選擇後，可以看到模型是否支援圖片辨識以及控制是否啟用圖片辨識的功能。啟用圖片辨識後，模型會讀取檔案連結中的圖片內容，並且如果使用者問題少於 500 字，會自動解析使用者問題中的圖片。", "llm_use_vision_tip": "點選模型選擇後，可以看到模型是否支援圖片辨識以及控制是否啟用圖片辨識的功能。啟用圖片辨識後，模型會讀取檔案連結中的圖片內容，並且如果使用者問題少於 500 字，會自動解析使用者問題中的圖片。",
...@@ -90,10 +93,11 @@ ...@@ -90,10 +93,11 @@
"move_app": "移動應用程式", "move_app": "移動應用程式",
"node_not_intro": "這個節點沒有介紹", "node_not_intro": "這個節點沒有介紹",
"not_json_file": "請選擇 JSON 檔案", "not_json_file": "請選擇 JSON 檔案",
"oaste_curl_string": "輸入 CURL 代碼",
"open_auto_execute": "啟用自動執行", "open_auto_execute": "啟用自動執行",
"open_vision_function_tip": "有圖示開關的模型即擁有圖片辨識功能。若開啟，模型會解析檔案連結中的圖片，並自動解析使用者問題中的圖片（使用者問題 ≤ 500 字時生效）。", "open_vision_function_tip": "有圖示開關的模型即擁有圖片辨識功能。若開啟，模型會解析檔案連結中的圖片，並自動解析使用者問題中的圖片（使用者問題 ≤ 500 字時生效）。",
"or_drag_JSON": "或拖曳 JSON 檔案", "or_drag_JSON": "或拖曳 JSON 檔案",
"paste_config": "貼上設定", "paste_config_or_drag": "貼上配置或拖入 JSON 文件",
"permission.des.manage": "在寫入權限基礎上，可以設定發布通道、檢視對話紀錄、分配這個應用程式的權限", "permission.des.manage": "在寫入權限基礎上，可以設定發布通道、檢視對話紀錄、分配這個應用程式的權限",
"permission.des.read": "可以使用這個應用程式進行對話", "permission.des.read": "可以使用這個應用程式進行對話",
"permission.des.write": "可以檢視和編輯應用程式", "permission.des.write": "可以檢視和編輯應用程式",
...@@ -150,9 +154,12 @@ ...@@ -150,9 +154,12 @@
"type.Create workflow bot": "建立工作流程", "type.Create workflow bot": "建立工作流程",
"type.Create workflow tip": "透過低程式碼的方式，建立邏輯複雜的多輪對話 AI 應用程式，建議進階使用者使用", "type.Create workflow tip": "透過低程式碼的方式，建立邏輯複雜的多輪對話 AI 應用程式，建議進階使用者使用",
"type.Http plugin": "HTTP 外掛", "type.Http plugin": "HTTP 外掛",
"type.Import from json": "導入 JSON 配置",
"type.Import from json tip": "透過 JSON 設定文件，直接建立應用",
"type.Plugin": "外掛", "type.Plugin": "外掛",
"type.Simple bot": "簡易應用程式", "type.Simple bot": "簡易應用程式",
"type.Workflow bot": "工作流程", "type.Workflow bot": "工作流程",
"type_not_recognized": "未識別到應用程式類型",
"upload_file_max_amount": "最大檔案數量", "upload_file_max_amount": "最大檔案數量",
"upload_file_max_amount_tip": "單輪對話中最大上傳檔案數量", "upload_file_max_amount_tip": "單輪對話中最大上傳檔案數量",
"variable.select type_desc": "可以為工作流程定義全域變數，常用於暫存。賦值的方式包括：\n1. 從對話頁面的 query 參數取得。\n2. 透過 API 的 variables 物件傳遞。\n3. 透過【變數更新】節點進行賦值。", "variable.select type_desc": "可以為工作流程定義全域變數，常用於暫存。賦值的方式包括：\n1. 從對話頁面的 query 參數取得。\n2. 透過 API 的 variables 物件傳遞。\n3. 透過【變數更新】節點進行賦值。",
......
packages/web/i18n/zh-Hant/common.json
...@@ -305,7 +305,6 @@ ...@@ -305,7 +305,6 @@
"core.app.Random": "發散", "core.app.Random": "發散",
"core.app.Search team tags": "搜尋標籤", "core.app.Search team tags": "搜尋標籤",
"core.app.Select TTS": "選擇語音播放模式", "core.app.Select TTS": "選擇語音播放模式",
"core.app.Select app from template": "從範本中選擇",
"core.app.Select quote template": "選擇引用提示範本", "core.app.Select quote template": "選擇引用提示範本",
"core.app.Set a name for your app": "為您的應用程式命名", "core.app.Set a name for your app": "為您的應用程式命名",
"core.app.Setting ai property": "點選設定 AI 模型相關屬性", "core.app.Setting ai property": "點選設定 AI 模型相關屬性",
......
projects/app/package.json
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
"test": "jest" "test": "jest"
}, },
"dependencies": { "dependencies": {
"@bany/curl-to-json": "^1.2.8",
"@chakra-ui/anatomy": "2.2.1", "@chakra-ui/anatomy": "2.2.1",
"@chakra-ui/icons": "2.1.1", "@chakra-ui/icons": "2.1.1",
"@chakra-ui/next-js": "2.1.5", "@chakra-ui/next-js": "2.1.5",
......
projects/app/src/pageComponents/app/ImportAppConfigEditor.tsx 0 → 100644
import React, { DragEvent, useCallback, useState } from 'react';
import { Box, Button, Flex, Textarea } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
import { useToast } from '@fastgpt/web/hooks/useToast';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
type Props = {
value: string;
onChange: (value: string) => void;
rows?: number;
};
const ImportAppConfigEditor = ({ value, onChange, rows = 16 }: Props) => {
const { t } = useTranslation();
const { toast } = useToast();
const [isDragging, setIsDragging] = useState(false);
const { File, onOpen } = useSelectFile({
fileType: 'json',
multiple: false
});
const handleDragEnter = useCallback((e: DragEvent<HTMLDivElement>) => {
e.preventDefault();
setIsDragging(true);
}, []);
const handleDragLeave = useCallback((e: DragEvent<HTMLDivElement>) => {
e.preventDefault();
setIsDragging(false);
}, []);
const readJSONFile = useCallback(
(file: File) => {
const reader = new FileReader();
reader.onload = (e) => {
if (!file.name.endsWith('.json')) {
toast({
title: t('app:not_json_file'),
status: 'error'
});
return;
}
if (e.target) {
const res = JSON.parse(e.target.result as string);
onChange(JSON.stringify(res, null, 2));
}
};
reader.readAsText(file);
},
[onChange, t, toast]
);
const onSelectFile = useCallback(
async (e: File[]) => {
const file = e[0];
readJSONFile(file);
},
[readJSONFile]
);
const handleDrop = useCallback(
async (e: DragEvent<HTMLDivElement>) => {
e.preventDefault();
const file = e.dataTransfer.files[0];
console.log(file);
readJSONFile(file);
setIsDragging(false);
},
[readJSONFile]
);
return (
<>
<Box w={['100%', '31rem']}>
{isDragging ? (
<Flex
align={'center'}
justify={'center'}
w={'full'}
h={'17.5rem'}
borderRadius={'md'}
border={'1px dashed'}
borderColor={'myGray.400'}
onDragEnter={handleDragEnter}
onDragOver={(e) => e.preventDefault()}
onDrop={handleDrop}
onDragLeave={handleDragLeave}
>
<Flex align={'center'} justify={'center'} flexDir={'column'} gap={'0.62rem'}>
<MyIcon name={'configmap'} w={'2rem'} color={'primary.500'} />
<Box color={'primary.600'} fontSize={'sm'}>
{t('app:file_recover')}
</Box>
</Flex>
</Flex>
) : (
<Box>
<Flex justify={'space-between'} align={'center'} pb={3}>
<Box fontSize={'sm'} color={'myGray.900'} fontWeight={'500'}>
{t('common:common.json_config')}
</Box>
<Button onClick={onOpen} variant={'whiteBase'} p={0}>
<Flex px={'0.88rem'} py={'0.44rem'} color={'myGray.600'} fontSize={'mini'}>
<MyIcon name={'file/uploadFile'} w={'1rem'} mr={'0.38rem'} />
{t('common:common.upload_file')}
</Flex>
</Button>
</Flex>
<Box
onDragEnter={handleDragEnter}
onDragOver={(e) => e.preventDefault()}
onDrop={handleDrop}
onDragLeave={handleDragLeave}
>
<Textarea
bg={'myGray.50'}
border={'1px solid'}
borderRadius={'md'}
borderColor={'myGray.200'}
value={value}
placeholder={t('app:or_drag_JSON')}
rows={rows}
onChange={(e) => onChange(e.target.value)}
/>
</Box>
</Box>
)}
</Box>
{File && <File onSelect={onSelectFile} />}
</>
);
};
export default React.memo(ImportAppConfigEditor);
projects/app/src/pageComponents/app/constants.ts 0 → 100644
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { i18nT } from '@fastgpt/web/i18n/utils';
export const appTypeMap = {
[AppTypeEnum.simple]: {
icon: 'core/app/simpleBot',
title: i18nT('app:type.Create simple bot'),
avatar: 'core/app/type/simpleFill',
emptyCreateText: i18nT('app:create_empty_app')
},
[AppTypeEnum.workflow]: {
icon: 'core/app/type/workflowFill',
avatar: 'core/app/type/workflowFill',
title: i18nT('app:type.Create workflow bot'),
emptyCreateText: i18nT('app:create_empty_workflow')
},
[AppTypeEnum.plugin]: {
icon: 'core/app/type/pluginFill',
avatar: 'core/app/type/pluginFill',
title: i18nT('app:type.Create plugin bot'),
emptyCreateText: i18nT('app:create_empty_plugin')
}
};
projects/app/src/pageComponents/app/detail/ExportConfigPopover.tsx 0 → 100644
import React, { useCallback } from 'react';
import { Box, Flex } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { filterSensitiveNodesData } from '@/web/core/workflow/utils';
import { useCopyData } from '@/web/common/hooks/useCopyData';
import MyPopover from '@fastgpt/web/components/common/MyPopover';
import { fileDownload } from '@/web/common/file/utils';
import { AppChatConfigType, AppSimpleEditFormType } from '@fastgpt/global/core/app/type';
import MyBox from '@fastgpt/web/components/common/MyBox';
import { filterSensitiveFormData } from '@/web/core/app/utils';
import { RequireOnlyOne } from '@fastgpt/global/common/type/utils';
import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
import { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
const ExportConfigPopover = ({
appForm,
getWorkflowData,
chatConfig,
appName
}: {
appName: string;
chatConfig?: AppChatConfigType;
} & RequireOnlyOne<{
getWorkflowData: () =>
| {
nodes: StoreNodeItemType[];
edges: StoreEdgeItemType[];
}
| undefined;
appForm: AppSimpleEditFormType;
}>) => {
const { t } = useTranslation();
const { copyData } = useCopyData();
const onExportWorkflow = useCallback(
async (mode: 'copy' | 'json') => {
let config = '';
if (appForm) {
config = JSON.stringify(filterSensitiveFormData(appForm), null, 2);
} else if (getWorkflowData) {
const workflowData = getWorkflowData();
if (!workflowData) return;
config = JSON.stringify(
{
nodes: filterSensitiveNodesData(workflowData.nodes),
edges: workflowData.edges,
chatConfig
},
null,
2
);
}
if (!config) {
return;
}
if (mode === 'copy') {
copyData(config, t('app:export_config_successful'));
} else if (mode === 'json') {
fileDownload({
text: config,
type: 'application/json;charset=utf-8',
filename: `${appName}.json`
});
}
},
[appForm, appName, chatConfig, copyData, getWorkflowData, t]
);
return (
<MyPopover
placement={'right-start'}
offset={[0, 20]}
hasArrow
trigger={'hover'}
w={'8.6rem'}
Trigger={
<MyBox display={'flex'} cursor={'pointer'}>
<MyIcon name={'export'} w={'16px'} mr={2} />
<Box fontSize={'sm'}>{t('app:export_configs')}</Box>
</MyBox>
}
>
{({ onClose }) => (
<Box p={1}>
<Flex
py={'0.38rem'}
px={1}
color={'myGray.600'}
_hover={{
bg: 'myGray.05',
color: 'primary.600',
cursor: 'pointer'
}}
borderRadius={'xs'}
onClick={() => onExportWorkflow('copy')}
>
<MyIcon name={'copy'} w={'1rem'} mr={2} />
<Box fontSize={'mini'}>{t('common:common.copy_to_clipboard')}</Box>
</Flex>
<Flex
py={'0.38rem'}
px={1}
color={'myGray.600'}
_hover={{
bg: 'myGray.05',
color: 'primary.600',
cursor: 'pointer'
}}
borderRadius={'xs'}
onClick={() => onExportWorkflow('json')}
>
<MyIcon name={'configmap'} w={'1rem'} mr={2} />
<Box fontSize={'mini'}>{t('common:common.export_to_json')}</Box>
</Flex>
</Box>
)}
</MyPopover>
);
};
export default React.memo(ExportConfigPopover);
projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx
...@@ -24,6 +24,7 @@ import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; ...@@ -24,6 +24,7 @@ import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { postTransition2Workflow } from '@/web/core/app/api/app'; import { postTransition2Workflow } from '@/web/core/app/api/app';
import { form2AppWorkflow } from '@/web/core/app/utils'; import { form2AppWorkflow } from '@/web/core/app/utils';
import { SimpleAppSnapshotType } from './useSnapshots'; import { SimpleAppSnapshotType } from './useSnapshots';
import ExportConfigPopover from '@/pageComponents/app/detail/ExportConfigPopover';
const AppCard = ({ const AppCard = ({
appForm, appForm,
...@@ -118,6 +119,7 @@ const AppCard = ({ ...@@ -118,6 +119,7 @@ const AppCard = ({
)} )}
{appDetail.permission.isOwner && ( {appDetail.permission.isOwner && (
<MyMenu <MyMenu
size={'xs'}
Button={ Button={
<IconButton <IconButton
variant={'whitePrimary'} variant={'whitePrimary'}
...@@ -130,6 +132,17 @@ const AppCard = ({ ...@@ -130,6 +132,17 @@ const AppCard = ({
{ {
children: [ children: [
{ {
label: (
<Flex>
<ExportConfigPopover
appName={appDetail.name}
appForm={appForm}
chatConfig={appDetail.chatConfig}
/>
</Flex>
)
},
{
icon: 'core/app/type/workflow', icon: 'core/app/type/workflow',
label: t('app:transition_to_workflow'), label: t('app:transition_to_workflow'),
onClick: () => setTransitionCreateNew(true) onClick: () => setTransitionCreateNew(true)
......
projects/app/src/pages/app/detail/components/WorkflowComponents/AppCard.tsx
...@@ -6,27 +6,27 @@ import { useTranslation } from 'next-i18next'; ...@@ -6,27 +6,27 @@ import { useTranslation } from 'next-i18next';
import Avatar from '@fastgpt/web/components/common/Avatar'; import Avatar from '@fastgpt/web/components/common/Avatar';
import MyIcon from '@fastgpt/web/components/common/Icon'; import MyIcon from '@fastgpt/web/components/common/Icon';
import { WorkflowContext } from './context'; import { WorkflowContext } from './context';
import { filterSensitiveNodesData } from '@/web/core/workflow/utils';
import dynamic from 'next/dynamic'; import dynamic from 'next/dynamic';
import { useCopyData } from '@/web/common/hooks/useCopyData';
import MyTag from '@fastgpt/web/components/common/Tag/index'; import MyTag from '@fastgpt/web/components/common/Tag/index';
import { publishStatusStyle } from '../constants'; import { publishStatusStyle } from '../constants';
import MyPopover from '@fastgpt/web/components/common/MyPopover'; import MyPopover from '@fastgpt/web/components/common/MyPopover';
import { fileDownload } from '@/web/common/file/utils';
import { AppChatConfigType } from '@fastgpt/global/core/app/type';
import MyBox from '@fastgpt/web/components/common/MyBox'; import MyBox from '@fastgpt/web/components/common/MyBox';
import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useSystemStore } from '@/web/common/system/useSystemStore';
const ImportSettings = dynamic(() => import('./Flow/ImportSettings')); const ImportSettings = dynamic(() => import('./Flow/ImportSettings'));
const ExportConfigPopover = dynamic(
() => import('@/pageComponents/app/detail/ExportConfigPopover')
);
const AppCard = ({ showSaveStatus, isSaved }: { showSaveStatus: boolean; isSaved: boolean }) => { const AppCard = ({ showSaveStatus, isSaved }: { showSaveStatus: boolean; isSaved: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const { feConfigs } = useSystemStore(); const { feConfigs } = useSystemStore();
const { appDetail, onOpenInfoEdit, onOpenTeamTagModal, onDelApp } = useContextSelector( const appDetail = useContextSelector(AppContext, (v) => v.appDetail);
AppContext, const onOpenInfoEdit = useContextSelector(AppContext, (v) => v.onOpenInfoEdit);
(v) => v const onOpenTeamTagModal = useContextSelector(AppContext, (v) => v.onOpenTeamTagModal);
); const onDelApp = useContextSelector(AppContext, (v) => v.onDelApp);
const flowData2StoreData = useContextSelector(WorkflowContext, (v) => v.flowData2StoreData);
const { isOpen: isOpenImport, onOpen: onOpenImport, onClose: onCloseImport } = useDisclosure(); const { isOpen: isOpenImport, onOpen: onOpenImport, onClose: onCloseImport } = useDisclosure();
...@@ -92,10 +92,11 @@ const AppCard = ({ showSaveStatus, isSaved }: { showSaveStatus: boolean; isSaved ...@@ -92,10 +92,11 @@ const AppCard = ({ showSaveStatus, isSaved }: { showSaveStatus: boolean; isSaved
_hover={{ color: 'primary.600', bg: 'rgba(17, 24, 36, 0.05)' }} _hover={{ color: 'primary.600', bg: 'rgba(17, 24, 36, 0.05)' }}
cursor={'pointer'} cursor={'pointer'}
> >
{ExportPopover({ <ExportConfigPopover
chatConfig: appDetail.chatConfig, chatConfig={appDetail.chatConfig}
appName: appDetail.name appName={appDetail.name}
})} getWorkflowData={flowData2StoreData}
/>
</MyBox> </MyBox>
{appDetail.permission.hasWritePer && feConfigs?.show_team_chat && ( {appDetail.permission.hasWritePer && feConfigs?.show_team_chat && (
<> <>
...@@ -148,6 +149,7 @@ const AppCard = ({ showSaveStatus, isSaved }: { showSaveStatus: boolean; isSaved ...@@ -148,6 +149,7 @@ const AppCard = ({ showSaveStatus, isSaved }: { showSaveStatus: boolean; isSaved
appDetail.permission.hasWritePer, appDetail.permission.hasWritePer,
appDetail.permission.isOwner, appDetail.permission.isOwner,
feConfigs?.show_team_chat, feConfigs?.show_team_chat,
flowData2StoreData,
onDelApp, onDelApp,
onOpenImport, onOpenImport,
onOpenInfoEdit, onOpenInfoEdit,
...@@ -210,104 +212,4 @@ const AppCard = ({ showSaveStatus, isSaved }: { showSaveStatus: boolean; isSaved ...@@ -210,104 +212,4 @@ const AppCard = ({ showSaveStatus, isSaved }: { showSaveStatus: boolean; isSaved
return Render; return Render;
}; };
function ExportPopover({
chatConfig,
appName
}: {
chatConfig: AppChatConfigType;
appName: string;
}) {
const { t } = useTranslation();
const { copyData } = useCopyData();
const flowData2StoreData = useContextSelector(WorkflowContext, (v) => v.flowData2StoreData);
const onExportWorkflow = useCallback(
async (mode: 'copy' | 'json') => {
const data = flowData2StoreData();
if (data) {
if (mode === 'copy') {
copyData(
JSON.stringify(
{
nodes: filterSensitiveNodesData(data.nodes),
edges: data.edges,
chatConfig
},
null,
2
),
t('app:export_config_successful')
);
} else if (mode === 'json') {
fileDownload({
text: JSON.stringify(
{
nodes: filterSensitiveNodesData(data.nodes),
edges: data.edges,
chatConfig
},
null,
2
),
type: 'application/json;charset=utf-8',
filename: `${appName}.json`
});
}
}
},
[appName, chatConfig, copyData, flowData2StoreData, t]
);
return (
<MyPopover
placement={'right-start'}
offset={[0, 20]}
hasArrow
trigger={'hover'}
w={'8.6rem'}
Trigger={
<MyBox display={'flex'} size={'md'} rounded={'4px'} cursor={'pointer'}>
<MyIcon name={'export'} w={'16px'} mr={2} />
<Box fontSize={'sm'}>{t('app:export_configs')}</Box>
</MyBox>
}
>
{({ onClose }) => (
<Box p={1}>
<Flex
py={'0.38rem'}
px={1}
color={'myGray.600'}
_hover={{
bg: 'myGray.05',
color: 'primary.600',
cursor: 'pointer'
}}
borderRadius={'xs'}
onClick={() => onExportWorkflow('copy')}
>
<MyIcon name={'copy'} w={'1rem'} mr={2} />
<Box fontSize={'mini'}>{t('common:common.copy_to_clipboard')}</Box>
</Flex>
<Flex
py={'0.38rem'}
px={1}
color={'myGray.600'}
_hover={{
bg: 'myGray.05',
color: 'primary.600',
cursor: 'pointer'
}}
borderRadius={'xs'}
onClick={() => onExportWorkflow('json')}
>
<MyIcon name={'configmap'} w={'1rem'} mr={2} />
<Box fontSize={'mini'}>{t('common:common.export_to_json')}</Box>
</Flex>
</Box>
)}
</MyPopover>
);
}
export default AppCard; export default AppCard;
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/ImportSettings.tsx
import React, { DragEvent, useCallback, useMemo, useState } from 'react'; import React, { useState } from 'react';
import { Textarea, Button, ModalBody, ModalFooter, Flex, Box } from '@chakra-ui/react'; import { Button, ModalBody, ModalFooter } from '@chakra-ui/react';
import MyModal from '@fastgpt/web/components/common/MyModal'; import MyModal from '@fastgpt/web/components/common/MyModal';
import { useToast } from '@fastgpt/web/hooks/useToast'; import { useToast } from '@fastgpt/web/hooks/useToast';
import { useContextSelector } from 'use-context-selector'; import { useContextSelector } from 'use-context-selector';
import { WorkflowContext } from '../context'; import { WorkflowContext } from '../context';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
import MyIcon from '@fastgpt/web/components/common/Icon'; import dynamic from 'next/dynamic';
import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
import { useSystem } from '@fastgpt/web/hooks/useSystem'; const ImportAppConfigEditor = dynamic(() => import('@/pageComponents/app/ImportAppConfigEditor'), {
ssr: false
});
type Props = { type Props = {
onClose: () => void; onClose: () => void;
...@@ -15,63 +17,10 @@ type Props = { ...@@ -15,63 +17,10 @@ type Props = {
const ImportSettings = ({ onClose }: Props) => { const ImportSettings = ({ onClose }: Props) => {
const { toast } = useToast(); const { toast } = useToast();
const { File, onOpen } = useSelectFile({
fileType: 'json',
multiple: false
});
const { isPc } = useSystem();
const initData = useContextSelector(WorkflowContext, (v) => v.initData); const initData = useContextSelector(WorkflowContext, (v) => v.initData);
const [isDragging, setIsDragging] = useState(false);
const [value, setValue] = useState('');
const { t } = useTranslation(); const { t } = useTranslation();
const [value, setValue] = useState('');
const readJSONFile = useCallback(
(file: File) => {
const reader = new FileReader();
reader.onload = (e) => {
if (!file.name.endsWith('.json')) {
toast({
title: t('app:not_json_file'),
status: 'error'
});
return;
}
if (e.target) {
const res = JSON.parse(e.target.result as string);
setValue(JSON.stringify(res, null, 2));
}
};
reader.readAsText(file);
},
[t, toast]
);
const handleDragEnter = useCallback((e: DragEvent<HTMLDivElement>) => {
e.preventDefault();
setIsDragging(true);
}, []);
const handleDragLeave = useCallback((e: DragEvent<HTMLDivElement>) => {
e.preventDefault();
setIsDragging(false);
}, []);
const handleDrop = useCallback(
async (e: DragEvent<HTMLDivElement>) => {
e.preventDefault();
const file = e.dataTransfer.files[0];
readJSONFile(file);
setIsDragging(false);
},
[readJSONFile]
);
const onSelectFile = useCallback(
async (e: File[]) => {
const file = e[0];
readJSONFile(file);
},
[readJSONFile]
);
return ( return (
<MyModal <MyModal
...@@ -80,67 +29,10 @@ const ImportSettings = ({ onClose }: Props) => { ...@@ -80,67 +29,10 @@ const ImportSettings = ({ onClose }: Props) => {
iconSrc="common/importLight" iconSrc="common/importLight"
iconColor="primary.600" iconColor="primary.600"
title={t('app:import_configs')} title={t('app:import_configs')}
size={isPc ? 'lg' : 'md'} size={'md'}
> >
<ModalBody> <ModalBody>
<File onSelect={onSelectFile} /> <ImportAppConfigEditor value={value} onChange={setValue} rows={16} />
{isDragging ? (
<Flex
align={'center'}
justify={'center'}
w={'31rem'}
h={'17.5rem'}
borderRadius={'md'}
border={'1px dashed'}
borderColor={'myGray.400'}
onDragEnter={handleDragEnter}
onDragOver={(e) => e.preventDefault()}
onDrop={handleDrop}
onDragLeave={handleDragLeave}
>
<Flex align={'center'} justify={'center'} flexDir={'column'} gap={'0.62rem'}>
<MyIcon name={'configmap'} w={'1.5rem'} color={'myGray.500'} />
<Box color={'myGray.600'} fontSize={'mini'}>
{t('app:file_recover')}
</Box>
</Flex>
</Flex>
) : (
<Box w={['100%', '31rem']}>
<Flex justify={'space-between'} align={'center'} pb={2}>
<Box fontSize={'sm'} color={'myGray.900'} fontWeight={'500'}>
{t('common:common.json_config')}
</Box>
<Button onClick={onOpen} variant={'whiteBase'} p={0}>
<Flex px={'0.88rem'} py={'0.44rem'} color={'myGray.600'} fontSize={'mini'}>
<MyIcon name={'file/uploadFile'} w={'1rem'} mr={'0.38rem'} />
{t('common:common.upload_file')}
</Flex>
</Button>
</Flex>
<Box
onDragEnter={handleDragEnter}
onDragOver={(e) => e.preventDefault()}
onDrop={handleDrop}
onDragLeave={handleDragLeave}
>
<Textarea
bg={'myGray.50'}
border={'1px solid'}
borderRadius={'md'}
borderColor={'myGray.200'}
value={value}
placeholder={
isPc
? t('app:paste_config') + '\n' + t('app:or_drag_JSON')
: t('app:paste_config')
}
rows={16}
onChange={(e) => setValue(e.target.value)}
/>
</Box>
</Box>
)}
</ModalBody> </ModalBody>
<ModalFooter justifyItems={'flex-end'}> <ModalFooter justifyItems={'flex-end'}>
<Button <Button
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeHttp/CurlImportModal.tsx
import React from 'react'; import React from 'react';
import MyModal from '@fastgpt/web/components/common/MyModal'; import MyModal from '@fastgpt/web/components/common/MyModal';
import { ModalBody, Button, ModalFooter, useDisclosure, Textarea, Box } from '@chakra-ui/react'; import { ModalBody, Button, ModalFooter, Textarea } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants'; import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io.d'; import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io.d';
import { useToast } from '@fastgpt/web/hooks/useToast'; import { useToast } from '@fastgpt/web/hooks/useToast';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import parse from '@bany/curl-to-json';
import { useContextSelector } from 'use-context-selector'; import { useContextSelector } from 'use-context-selector';
import { WorkflowContext } from '../../../context'; import { WorkflowContext } from '../../../context';
import { parseCurl } from '@fastgpt/global/common/string/http';
type RequestMethod = 'get' | 'post' | 'put' | 'delete' | 'patch';
const methodMap: { [K in RequestMethod]: string } = {
get: 'GET',
post: 'POST',
put: 'PUT',
delete: 'DELETE',
patch: 'PATCH'
};
const CurlImportModal = ({ const CurlImportModal = ({
nodeId, nodeId,
...@@ -49,22 +40,7 @@ const CurlImportModal = ({ ...@@ -49,22 +40,7 @@ const CurlImportModal = ({
if (!requestUrl || !requestMethod || !params || !headers || !jsonBody) return; if (!requestUrl || !requestMethod || !params || !headers || !jsonBody) return;
const parsed = parse(content); const parsed = parseCurl(content);
if (!parsed.url) {
throw new Error('url not found');
}
const newParams = Object.keys(parsed.params || {}).map((key) => ({
key,
value: parsed.params?.[key],
type: 'string'
}));
const newHeaders = Object.keys(parsed.header || {}).map((key) => ({
key,
value: parsed.header?.[key],
type: 'string'
}));
const newBody = JSON.stringify(parsed.data, null, 2);
onChangeNode({ onChangeNode({
nodeId, nodeId,
...@@ -82,7 +58,7 @@ const CurlImportModal = ({ ...@@ -82,7 +58,7 @@ const CurlImportModal = ({
key: NodeInputKeyEnum.httpMethod, key: NodeInputKeyEnum.httpMethod,
value: { value: {
...requestMethod, ...requestMethod,
value: methodMap[parsed.method?.toLowerCase() as RequestMethod] || 'GET' value: parsed.method
} }
}); });
...@@ -92,7 +68,7 @@ const CurlImportModal = ({ ...@@ -92,7 +68,7 @@ const CurlImportModal = ({
key: NodeInputKeyEnum.httpParams, key: NodeInputKeyEnum.httpParams,
value: { value: {
...params, ...params,
value: newParams value: parsed.params
} }
}); });
...@@ -102,7 +78,7 @@ const CurlImportModal = ({ ...@@ -102,7 +78,7 @@ const CurlImportModal = ({
key: NodeInputKeyEnum.httpHeaders, key: NodeInputKeyEnum.httpHeaders,
value: { value: {
...headers, ...headers,
value: newHeaders value: parsed.headers
} }
}); });
...@@ -112,7 +88,7 @@ const CurlImportModal = ({ ...@@ -112,7 +88,7 @@ const CurlImportModal = ({
key: NodeInputKeyEnum.httpJsonBody, key: NodeInputKeyEnum.httpJsonBody,
value: { value: {
...jsonBody, ...jsonBody,
value: newBody value: parsed.body
} }
}); });
......
projects/app/src/pages/app/list/components/JsonImportModal.tsx 0 → 100644
import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
import { Box, Button, Flex, Input, ModalBody, ModalFooter } from '@chakra-ui/react';
import Avatar from '@fastgpt/web/components/common/Avatar';
import MyModal from '@fastgpt/web/components/common/MyModal';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import { useTranslation } from 'next-i18next';
import { useForm } from 'react-hook-form';
import { appTypeMap } from '@/pageComponents/app/constants';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { useMemo } from 'react';
import { getAppType } from '@fastgpt/global/core/app/utils';
import { useContextSelector } from 'use-context-selector';
import { AppListContext } from './context';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { postCreateApp } from '@/web/core/app/api';
import { useRouter } from 'next/router';
import { form2AppWorkflow } from '@/web/core/app/utils';
import ImportAppConfigEditor from '@/pageComponents/app/ImportAppConfigEditor';
type FormType = {
avatar: string;
name: string;
workflowStr: string;
};
const JsonImportModal = ({ onClose }: { onClose: () => void }) => {
const { t } = useTranslation();
const { parentId, loadMyApps } = useContextSelector(AppListContext, (v) => v);
const router = useRouter();
const { register, setValue, watch, handleSubmit } = useForm<FormType>({
defaultValues: {
avatar: '',
name: '',
workflowStr: ''
}
});
const workflowStr = watch('workflowStr');
const avatar = watch('avatar');
const {
File,
onOpen: onOpenSelectFile,
onSelectImage
} = useSelectFile({
fileType: '.jpg,.png',
multiple: false
});
// If the user does not select an avatar, it will follow the type to change
const selectedAvatar = useMemo(() => {
if (avatar) return avatar;
const defaultVal = appTypeMap[AppTypeEnum.simple].avatar;
if (!workflowStr) return defaultVal;
try {
const workflow = JSON.parse(workflowStr);
const type = getAppType(workflow);
if (type) return appTypeMap[type].avatar;
return defaultVal;
} catch (err) {
return defaultVal;
}
}, [avatar, workflowStr]);
const { runAsync: onSubmit, loading: isCreating } = useRequest2(
async ({ name, workflowStr }: FormType) => {
const { workflow, appType } = await (async () => {
try {
const workflow = JSON.parse(workflowStr);
const appType = getAppType(workflow);
if (!appType) {
return Promise.reject(t('app:type_not_recognized'));
}
if (appType === AppTypeEnum.simple) {
return {
workflow: form2AppWorkflow(workflow, t),
appType
};
}
return {
workflow,
appType
};
} catch (err) {
return Promise.reject(t('app:invalid_json_format'));
}
})();
return postCreateApp({
parentId,
avatar: selectedAvatar,
name,
type: appType,
modules: workflow.nodes,
edges: workflow.edges,
chatConfig: workflow.chatConfig
});
},
{
refreshDeps: [selectedAvatar],
onSuccess(id: string) {
router.push(`/app/detail?appId=${id}`);
loadMyApps();
onClose();
},
successToast: t('common:common.Create Success')
}
);
return (
<>
<MyModal
isOpen
onClose={onClose}
isLoading={isCreating}
title={t('app:type.Import from json')}
iconSrc="common/importLight"
iconColor={'primary.600'}
>
<ModalBody>
<Box color={'myGray.800'} fontWeight={'bold'}>
{t('common:common.Set Name')}
</Box>
<Flex mt={2} alignItems={'center'}>
<MyTooltip label={t('common:common.Set Avatar')}>
<Avatar
flexShrink={0}
src={selectedAvatar}
w={['1.75rem', '2.25rem']}
h={['1.75rem', '2.25rem']}
cursor={'pointer'}
borderRadius={'md'}
onClick={onOpenSelectFile}
/>
</MyTooltip>
<Input
flex={1}
ml={3}
autoFocus
bg={'myWhite.600'}
{...register('name', {
required: t('common:core.app.error.App name can not be empty')
})}
/>
</Flex>
<Box mt={5}>
<ImportAppConfigEditor
value={workflowStr}
onChange={(e) => setValue('workflowStr', e)}
rows={10}
/>
</Box>
</ModalBody>
<ModalFooter gap={4}>
<Button variant={'whiteBase'} onClick={onClose}>
{t('common:common.Cancel')}
</Button>
<Button onClick={handleSubmit(onSubmit)}>{t('common:common.Confirm')}</Button>
</ModalFooter>
</MyModal>
<File
onSelect={(e) =>
onSelectImage(e, {
maxH: 300,
maxW: 300,
callback: (e) => setValue('avatar', e)
})
}
/>
</>
);
};
export default JsonImportModal;
projects/app/src/pages/app/list/components/TemplateMarketModal.tsx
...@@ -37,6 +37,7 @@ import { webPushTrack } from '@/web/common/middle/tracks/utils'; ...@@ -37,6 +37,7 @@ import { webPushTrack } from '@/web/common/middle/tracks/utils';
import { AppTemplateSchemaType, TemplateTypeSchemaType } from '@fastgpt/global/core/app/type'; import { AppTemplateSchemaType, TemplateTypeSchemaType } from '@fastgpt/global/core/app/type';
import { i18nT } from '@fastgpt/web/i18n/utils'; import { i18nT } from '@fastgpt/web/i18n/utils';
import UseGuideModal from '@/components/common/Modal/UseGuideModal'; import UseGuideModal from '@/components/common/Modal/UseGuideModal';
import { form2AppWorkflow } from '@/web/core/app/utils';
type TemplateAppType = AppTypeEnum | 'all'; type TemplateAppType = AppTypeEnum | 'all';
...@@ -94,14 +95,18 @@ const TemplateMarketModal = ({ ...@@ -94,14 +95,18 @@ const TemplateMarketModal = ({
const { runAsync: onUseTemplate, loading: isCreating } = useRequest2( const { runAsync: onUseTemplate, loading: isCreating } = useRequest2(
async (template: AppTemplateSchemaType) => { async (template: AppTemplateSchemaType) => {
const templateDetail = await getTemplateMarketItemDetail(template.templateId); const templateDetail = await getTemplateMarketItemDetail(template.templateId);
let workflow = templateDetail.workflow;
if (templateDetail.type === AppTypeEnum.simple) {
workflow = form2AppWorkflow(workflow, t);
}
return postCreateApp({ return postCreateApp({
parentId, parentId,
avatar: template.avatar, avatar: template.avatar,
name: template.name, name: template.name,
type: template.type as AppTypeEnum, type: template.type as AppTypeEnum,
modules: templateDetail.workflow.nodes || [], modules: workflow.nodes || [],
edges: templateDetail.workflow.edges || [], edges: workflow.edges || [],
chatConfig: templateDetail.workflow.chatConfig chatConfig: workflow.chatConfig
}).then((res) => { }).then((res) => {
webPushTrack.useAppTemplate({ webPushTrack.useAppTemplate({
id: res, id: res,
......
projects/app/src/pages/app/list/index.tsx
...@@ -30,6 +30,7 @@ import { useSystem } from '@fastgpt/web/hooks/useSystem'; ...@@ -30,6 +30,7 @@ import { useSystem } from '@fastgpt/web/hooks/useSystem';
import MyIcon from '@fastgpt/web/components/common/Icon'; import MyIcon from '@fastgpt/web/components/common/Icon';
import TemplateMarketModal from './components/TemplateMarketModal'; import TemplateMarketModal from './components/TemplateMarketModal';
import MyImage from '@fastgpt/web/components/common/Image/MyImage'; import MyImage from '@fastgpt/web/components/common/Image/MyImage';
import JsonImportModal from './components/JsonImportModal';
const CreateModal = dynamic(() => import('./components/CreateModal')); const CreateModal = dynamic(() => import('./components/CreateModal'));
const EditFolderModal = dynamic( const EditFolderModal = dynamic(
...@@ -64,6 +65,11 @@ const MyApps = () => { ...@@ -64,6 +65,11 @@ const MyApps = () => {
onOpen: onOpenCreateHttpPlugin, onOpen: onOpenCreateHttpPlugin,
onClose: onCloseCreateHttpPlugin onClose: onCloseCreateHttpPlugin
} = useDisclosure(); } = useDisclosure();
const {
isOpen: isOpenJsonImportModal,
onOpen: onOpenJsonImportModal,
onClose: onCloseJsonImportModal
} = useDisclosure();
const [editFolder, setEditFolder] = useState<EditFolderFormType>(); const [editFolder, setEditFolder] = useState<EditFolderFormType>();
const [templateModalType, setTemplateModalType] = useState<AppTypeEnum | 'all'>(); const [templateModalType, setTemplateModalType] = useState<AppTypeEnum | 'all'>();
...@@ -244,6 +250,16 @@ const MyApps = () => { ...@@ -244,6 +250,16 @@ const MyApps = () => {
} }
] ]
}, },
{
children: [
{
icon: 'core/app/type/jsonImport',
label: t('app:type.Import from json'),
description: t('app:type.Import from json tip'),
onClick: onOpenJsonImportModal
}
]
},
...(isPc ...(isPc
? [] ? []
: [ : [
...@@ -375,6 +391,7 @@ const MyApps = () => { ...@@ -375,6 +391,7 @@ const MyApps = () => {
defaultType={templateModalType} defaultType={templateModalType}
/> />
)} )}
{isOpenJsonImportModal && <JsonImportModal onClose={onCloseJsonImportModal} />}
</Flex> </Flex>
); );
}; };
......
projects/app/src/web/common/file/hooks/useSelectFile.tsx
...@@ -74,7 +74,6 @@ export const useSelectFile = (props?: { ...@@ -74,7 +74,6 @@ export const useSelectFile = (props?: {
maxW, maxW,
maxH maxH
}); });
console.log(src, '--');
callback?.(src); callback?.(src);
return src; return src;
} catch (err: any) { } catch (err: any) {
......
projects/app/src/web/core/app/templates.ts
// @ts-nocheck // @ts-nocheck
import { AppItemType } from '@/types/app'; import { AppItemType } from '@/types/app';
import { parseCurl } from '@fastgpt/global/common/string/http';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants'; import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { AppSchema } from '@fastgpt/global/core/app/type'; import { AppSchema } from '@fastgpt/global/core/app/type';
import { import {
...@@ -408,3 +409,286 @@ export const emptyTemplates: Record< ...@@ -408,3 +409,286 @@ export const emptyTemplates: Record<
edges: [] edges: []
} }
}; };
export const parsePluginFromCurlString = (
curl: string
): {
nodes: AppSchema['modules'];
edges: AppSchema['edges'];
chatConfig: AppSchema['chatConfig'];
} => {
const { url, method, headers, body } = parseCurl(curl);
return {
nodes: [
{
nodeId: 'pluginInput',
name: 'workflow:template.plugin_start',
intro: 'workflow:intro_plugin_input',
avatar: 'core/workflow/template/workflowStart',
flowNodeType: 'pluginInput',
showStatus: false,
position: {
x: 630.1191328382079,
y: -125.05298493910118
},
version: '481',
inputs: [],
outputs: []
},
{
nodeId: 'pluginOutput',
name: 'common:core.module.template.self_output',
intro: 'workflow:intro_custom_plugin_output',
avatar: 'core/workflow/template/pluginOutput',
flowNodeType: 'pluginOutput',
showStatus: false,
position: {
x: 1776.334576378706,
y: -179.2671413906911
},
version: '481',
inputs: [
{
renderTypeList: ['reference'],
valueType: 'any',
canEdit: true,
key: 'result',
label: 'result',
isToolOutput: false,
description: '',
required: true,
value: ['vumlECDQTjeC', 'httpRawResponse']
},
{
renderTypeList: ['reference'],
valueType: 'object',
canEdit: true,
key: 'error',
label: 'error',
isToolOutput: false,
description: '',
required: true,
value: ['vumlECDQTjeC', 'error']
}
],
outputs: []
},
{
nodeId: 'vumlECDQTjeC',
name: 'HTTP 请求',
intro: '可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）',
avatar: 'core/workflow/template/httpRequest',
flowNodeType: 'httpRequest468',
showStatus: true,
position: {
x: 1068.6226695001628,
y: -435.2671413906911
},
version: '481',
inputs: [
{
key: 'system_addInputParam',
renderTypeList: ['addInputParam'],
valueType: 'dynamic',
label: '',
required: false,
description: '接收前方节点的输出值作为变量，这些变量可以被 HTTP 请求参数使用。',
customInputConfig: {
selectValueTypeList: [
'string',
'number',
'boolean',
'object',
'arrayString',
'arrayNumber',
'arrayBoolean',
'arrayObject',
'arrayAny',
'any',
'chatHistory',
'datasetQuote',
'dynamic',
'selectApp',
'selectDataset'
],
showDescription: false,
showDefaultValue: true
},
valueDesc: '',
debugLabel: '',
toolDescription: ''
},
{
key: 'system_httpMethod',
renderTypeList: ['custom'],
valueType: 'string',
label: '',
value: method,
required: true,
valueDesc: '',
description: '',
debugLabel: '',
toolDescription: ''
},
{
key: 'system_httpTimeout',
renderTypeList: ['custom'],
valueType: 'number',
label: '',
value: 30,
min: 5,
max: 600,
required: true,
valueDesc: '',
description: '',
debugLabel: '',
toolDescription: ''
},
{
key: 'system_httpReqUrl',
renderTypeList: ['hidden'],
valueType: 'string',
label: '',
description:
'新的 HTTP 请求地址。如果出现两个"请求地址"，可以删除该模块重新加入，会拉取最新的模块配置。',
placeholder: 'https://api.ai.com/getInventory',
required: false,
value: url,
valueDesc: '',
debugLabel: '',
toolDescription: ''
},
{
key: 'system_httpHeader',
renderTypeList: ['custom'],
valueType: 'any',
value: headers,
label: '',
description:
'自定义请求头，请严格填入 JSON 字符串。\n1. 确保最后一个属性没有逗号\n2. 确保 key 包含双引号\n例如：{"Authorization":"Bearer xxx"}',
placeholder: 'common:core.module.input.description.Http Request Header',
required: false,
valueDesc: '',
debugLabel: '',
toolDescription: ''
},
{
key: 'system_httpParams',
renderTypeList: ['hidden'],
valueType: 'any',
description:
'新的 HTTP 请求地址。如果出现两个“请求地址”，可以删除该模块重新加入，会拉取最新的模块配置。',
label: '',
required: false,
valueDesc: '',
description: '',
debugLabel: '',
toolDescription: ''
},
{
key: 'system_httpJsonBody',
renderTypeList: ['hidden'],
valueType: 'any',
value: body,
label: '',
required: false,
valueDesc: '',
description: '',
debugLabel: '',
toolDescription: ''
},
{
key: 'system_httpFormBody',
renderTypeList: ['hidden'],
valueType: 'any',
value: [],
label: '',
required: false,
valueDesc: '',
description: '',
debugLabel: '',
toolDescription: ''
},
{
key: 'system_httpContentType',
renderTypeList: ['hidden'],
valueType: 'string',
value: 'json',
label: '',
required: false,
valueDesc: '',
description: '',
debugLabel: '',
toolDescription: ''
}
],
outputs: [
{
id: 'system_addOutputParam',
key: 'system_addOutputParam',
type: 'dynamic',
valueType: 'dynamic',
label: '输出字段提取',
customFieldConfig: {
selectValueTypeList: [
'string',
'number',
'boolean',
'object',
'arrayString',
'arrayNumber',
'arrayBoolean',
'arrayObject',
'arrayAny',
'any',
'chatHistory',
'datasetQuote',
'dynamic',
'selectApp',
'selectDataset'
],
showDescription: false,
showDefaultValue: false
},
description: '可以通过 JSONPath 语法来提取响应值中的指定字段',
valueDesc: ''
},
{
id: 'error',
key: 'error',
label: '请求错误',
description: 'HTTP请求错误信息，成功时返回空',
valueType: 'object',
type: 'static',
valueDesc: ''
},
{
id: 'httpRawResponse',
key: 'httpRawResponse',
required: true,
label: '原始响应',
description: 'HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。',
valueType: 'any',
type: 'static',
valueDesc: ''
}
]
}
],
edges: [
{
source: 'pluginInput',
target: 'vumlECDQTjeC',
sourceHandle: 'pluginInput-source-right',
targetHandle: 'vumlECDQTjeC-target-left'
},
{
source: 'vumlECDQTjeC',
target: 'pluginOutput',
sourceHandle: 'vumlECDQTjeC-source-right',
targetHandle: 'pluginOutput-target-left'
}
]
};
};
projects/app/src/web/core/app/utils.ts
...@@ -40,6 +40,7 @@ import { ...@@ -40,6 +40,7 @@ import {
Input_Template_UserChatInput Input_Template_UserChatInput
} from '@fastgpt/global/core/workflow/template/input'; } from '@fastgpt/global/core/workflow/template/input';
import { workflowStartNodeId } from './constants'; import { workflowStartNodeId } from './constants';
import { getDefaultAppForm } from '@fastgpt/global/core/app/utils';
type WorkflowType = { type WorkflowType = {
nodes: StoreNodeItemType[]; nodes: StoreNodeItemType[];
...@@ -515,6 +516,13 @@ export function form2AppWorkflow( ...@@ -515,6 +516,13 @@ export function form2AppWorkflow(
chatConfig: data.chatConfig chatConfig: data.chatConfig
}; };
} }
export function filterSensitiveFormData(appForm: AppSimpleEditFormType) {
const defaultAppForm = getDefaultAppForm();
return {
...appForm,
dataset: defaultAppForm.dataset
};
}
export const workflowSystemVariables: EditorVariablePickerType[] = [ export const workflowSystemVariables: EditorVariablePickerType[] = [
{ {
......
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