Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 007ca097 by Archer Committed by GitHub
Options

perf: workflow runtime (#6562) 

* perf: workflow runtime

* perf: lable input and dispatch workflow

* fix: workflow dispatch

* fix: workflow dispatch

* fix: workflow dispatch

* fix: workflow dispatch

* perf: workflow runtime

* perf: workflow runtime
parent 6ea65f64
Showing with 148 additions and 87 deletions
packages/global/core/app/jsonschema.ts
...@@ -19,7 +19,7 @@ export const JsonSchemaPropertiesItemSchema = z.object({ ...@@ -19,7 +19,7 @@ export const JsonSchemaPropertiesItemSchema = z.object({
not: z.any().optional(), // 不匹配 not: z.any().optional(), // 不匹配
// 枚举和常量 // 枚举和常量
enum: z.array(z.string()).optional(), // 枚举值 enum: z.array(z.any()).optional(), // 枚举值
const: z.any().optional(), // 常量值 const: z.any().optional(), // 常量值
// 字符串约束 // 字符串约束
......
packages/service/common/logger/sinks.ts
...@@ -67,7 +67,9 @@ export async function createSinks(options: CreateSinksOptions): Promise<CreateSi ...@@ -67,7 +67,9 @@ export async function createSinks(options: CreateSinksOptions): Promise<CreateSi
timestampStyle: 'reset', timestampStyle: 'reset',
categorySeparator: ':', categorySeparator: ':',
timestamp: () => dayjs().format('YYYY-MM-DD HH:mm:ss') timestamp: () => dayjs().format('YYYY-MM-DD HH:mm:ss'),
// Full depth for nested objects (e.g. Zod errors) in console output
inspectOptions: { depth: 5 }
}) })
}), }),
(record) => levelFilter(record, consoleLevel) (record) => levelFilter(record, consoleLevel)
......
packages/web/i18n/en/app.json
...@@ -334,6 +334,7 @@ ...@@ -334,6 +334,7 @@
"publish_channel.wecom.empty": "Publish to WeCom bot. Please <a>bind a custom domain</a> and complete domain verification first.", "publish_channel.wecom.empty": "Publish to WeCom bot. Please <a>bind a custom domain</a> and complete domain verification first.",
"publish_success": "Publish Successful", "publish_success": "Publish Successful",
"question_guide_tip": "After the conversation, 3 guiding questions will be generated for you.", "question_guide_tip": "After the conversation, 3 guiding questions will be generated for you.",
"raw_params": "original parameters",
"reasoning_response": "Output thinking", "reasoning_response": "Output thinking",
"recharge": "Go to recharge", "recharge": "Go to recharge",
"reference_variable": "Reference variables", "reference_variable": "Reference variables",
......
packages/web/i18n/zh-CN/app.json
...@@ -334,6 +334,7 @@ ...@@ -334,6 +334,7 @@
"publish_channel.wecom.empty": "发布到企业微信机器人，请先 <a>绑定自定义域名</a>，并且通过域名校验。", "publish_channel.wecom.empty": "发布到企业微信机器人，请先 <a>绑定自定义域名</a>，并且通过域名校验。",
"publish_success": "发布成功", "publish_success": "发布成功",
"question_guide_tip": "对话结束后，会为你生成 3 个引导性问题。", "question_guide_tip": "对话结束后，会为你生成 3 个引导性问题。",
"raw_params": "原始参数",
"reasoning_response": "输出思考", "reasoning_response": "输出思考",
"recharge": "去充值", "recharge": "去充值",
"reference_variable": "引用变量", "reference_variable": "引用变量",
......
packages/web/i18n/zh-Hant/app.json
...@@ -319,6 +319,7 @@ ...@@ -319,6 +319,7 @@
"publish_channel": "發布通道", "publish_channel": "發布通道",
"publish_success": "發布成功", "publish_success": "發布成功",
"question_guide_tip": "對話結束後，會為你產生 3 個引導性問題。", "question_guide_tip": "對話結束後，會為你產生 3 個引導性問題。",
"raw_params": "原始參數",
"reasoning_response": "輸出思考", "reasoning_response": "輸出思考",
"recharge": "去充值", "recharge": "去充值",
"reference_variable": "引用變量", "reference_variable": "引用變量",
......
projects/app/package.json
{ {
"name": "app", "name": "app",
"version": "4.14.8.1", "version": "4.14.8.4",
"private": false, "private": false,
"scripts": { "scripts": {
"dev": "npm run build:workers && next dev", "dev": "npm run build:workers && next dev",
......
projects/app/src/components/core/app/formRender/LabelAndForm.tsx
...@@ -32,6 +32,7 @@ const getFlattenedErrorKeys = (errors: any, prefix = ''): string[] => { ...@@ -32,6 +32,7 @@ const getFlattenedErrorKeys = (errors: any, prefix = ''): string[] => {
const LabelAndFormRender = ({ const LabelAndFormRender = ({
label, label,
required, required,
description,
placeholder, placeholder,
inputType, inputType,
showValueType, showValueType,
...@@ -40,6 +41,7 @@ const LabelAndFormRender = ({ ...@@ -40,6 +41,7 @@ const LabelAndFormRender = ({
}: { }: {
label: string | React.ReactNode; label: string | React.ReactNode;
required?: boolean; required?: boolean;
description?: string;
placeholder?: string; placeholder?: string;
showValueType?: boolean; showValueType?: boolean;
form: UseFormReturn<any>; form: UseFormReturn<any>;
...@@ -57,7 +59,7 @@ const LabelAndFormRender = ({ ...@@ -57,7 +59,7 @@ const LabelAndFormRender = ({
<Box _notLast={{ mb: 4 }}> <Box _notLast={{ mb: 4 }}>
<Flex alignItems={'center'} mb={1}> <Flex alignItems={'center'} mb={1}>
{typeof label === 'string' ? <FormLabel required={required}>{t(label)}</FormLabel> : label} {typeof label === 'string' ? <FormLabel required={required}>{t(label)}</FormLabel> : label}
{placeholder && <QuestionTip ml={1} label={placeholder} />} {description && <QuestionTip ml={1} label={description} />}
</Flex> </Flex>
<Controller <Controller
......
projects/app/src/components/core/chat/ChatContainer/ChatBox/components/VariableInputForm.tsx
...@@ -107,7 +107,7 @@ const VariableInputForm = ({ ...@@ -107,7 +107,7 @@ const VariableInputForm = ({
{...item} {...item}
isUnChange={isUnChange} isUnChange={isUnChange}
key={item.key} key={item.key}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type, item.valueType)} inputType={variableInputTypeToInputType(item.type, item.valueType)}
form={variablesForm} form={variablesForm}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
...@@ -150,7 +150,7 @@ const VariableInputForm = ({ ...@@ -150,7 +150,7 @@ const VariableInputForm = ({
{...item} {...item}
isUnChange={isUnChange} isUnChange={isUnChange}
key={item.key} key={item.key}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type, item.valueType)} inputType={variableInputTypeToInputType(item.type, item.valueType)}
form={variablesForm} form={variablesForm}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
...@@ -192,7 +192,7 @@ const VariableInputForm = ({ ...@@ -192,7 +192,7 @@ const VariableInputForm = ({
{...item} {...item}
isUnChange={isUnChange} isUnChange={isUnChange}
key={item.key} key={item.key}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type)} inputType={variableInputTypeToInputType(item.type)}
bg={'myGray.50'} bg={'myGray.50'}
form={variablesForm} form={variablesForm}
......
projects/app/src/components/core/chat/ChatContainer/ChatBox/components/home/ChatHomeVariablesForm.tsx
...@@ -47,7 +47,7 @@ const ChatHomeVariablesForm = ({ chatForm }: Props) => { ...@@ -47,7 +47,7 @@ const ChatHomeVariablesForm = ({ chatForm }: Props) => {
{...item} {...item}
key={item.key} key={item.key}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type, item.valueType)} inputType={variableInputTypeToInputType(item.type, item.valueType)}
form={variablesForm} form={variablesForm}
bg={'myGray.50'} bg={'myGray.50'}
...@@ -63,7 +63,7 @@ const ChatHomeVariablesForm = ({ chatForm }: Props) => { ...@@ -63,7 +63,7 @@ const ChatHomeVariablesForm = ({ chatForm }: Props) => {
{...item} {...item}
key={item.key} key={item.key}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type)} inputType={variableInputTypeToInputType(item.type)}
form={variablesForm} form={variablesForm}
bg={'myGray.50'} bg={'myGray.50'}
......
projects/app/src/components/core/chat/ChatContainer/components/VariablePopover.tsx
...@@ -104,7 +104,7 @@ const VariablePopover = ({ chatType }: { chatType: ChatTypeEnum }) => { ...@@ -104,7 +104,7 @@ const VariablePopover = ({ chatType }: { chatType: ChatTypeEnum }) => {
<LabelAndFormRender <LabelAndFormRender
{...item} {...item}
key={item.key} key={item.key}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type)} inputType={variableInputTypeToInputType(item.type)}
form={variablesForm} form={variablesForm}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
...@@ -137,7 +137,7 @@ const VariablePopover = ({ chatType }: { chatType: ChatTypeEnum }) => { ...@@ -137,7 +137,7 @@ const VariablePopover = ({ chatType }: { chatType: ChatTypeEnum }) => {
<LabelAndFormRender <LabelAndFormRender
{...item} {...item}
key={item.key} key={item.key}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type)} inputType={variableInputTypeToInputType(item.type)}
form={variablesForm} form={variablesForm}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
...@@ -156,7 +156,7 @@ const VariablePopover = ({ chatType }: { chatType: ChatTypeEnum }) => { ...@@ -156,7 +156,7 @@ const VariablePopover = ({ chatType }: { chatType: ChatTypeEnum }) => {
<LabelAndFormRender <LabelAndFormRender
{...item} {...item}
key={item.key} key={item.key}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type)} inputType={variableInputTypeToInputType(item.type)}
form={variablesForm} form={variablesForm}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
......
projects/app/src/pageComponents/app/detail/Edit/HTTPTools/ChatTest.tsx
...@@ -147,7 +147,7 @@ const ChatTest = ({ ...@@ -147,7 +147,7 @@ const ChatTest = ({
inputType={inputType} inputType={inputType}
fieldName={paramName} fieldName={paramName}
form={form} form={form}
placeholder={paramName} description={paramName}
/> />
); );
} }
......
projects/app/src/pageComponents/app/detail/Edit/MCPTools/ChatTest.tsx
...@@ -130,7 +130,8 @@ const ChatTest = ({ ...@@ -130,7 +130,8 @@ const ChatTest = ({
inputType={inputType} inputType={inputType}
form={form} form={form}
fieldName={paramName} fieldName={paramName}
placeholder={paramInfo.description} bg={'myGray.50'}
description={paramInfo.description}
/> />
); );
} }
......
projects/app/src/pageComponents/app/detail/Edit/MCPTools/EditForm.tsx
...@@ -15,6 +15,7 @@ import type { GetMcpToolsBodyType } from '@fastgpt/global/openapi/core/app/mcpTo ...@@ -15,6 +15,7 @@ import type { GetMcpToolsBodyType } from '@fastgpt/global/openapi/core/app/mcpTo
import { getMCPTools } from '@/web/core/app/api/tool'; import { getMCPTools } from '@/web/core/app/api/tool';
import HeaderAuthConfig from '@/components/common/secret/HeaderAuthConfig'; import HeaderAuthConfig from '@/components/common/secret/HeaderAuthConfig';
import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type'; import { type StoreSecretValueType } from '@fastgpt/global/common/secret/type';
import type { JsonSchemaPropertiesItemType } from '@fastgpt/global/core/app/jsonschema';
const EditForm = ({ const EditForm = ({
url, url,
...@@ -208,25 +209,30 @@ const ToolDetailModal = ({ tool, onClose }: { tool: McpToolConfigType; onClose: ...@@ -208,25 +209,30 @@ const ToolDetailModal = ({ tool, onClose }: { tool: McpToolConfigType; onClose:
w={'530px'} w={'530px'}
> >
<ModalBody> <ModalBody>
<Flex pb={6} borderBottom={'1px solid'} borderColor={'myGray.200'}> <Flex
pb={6}
borderBottom={'1px solid'}
borderColor={'myGray.200'}
alignItems={'flex-start'}
>
<Avatar src={appDetail.avatar} borderRadius={'md'} w={'40px'} /> <Avatar src={appDetail.avatar} borderRadius={'md'} w={'40px'} />
<Box ml={'14px'}> <Box ml={'14px'}>
<Box fontSize={'16px'} color={'myGray.900'}> <Box fontSize={'16px'} color={'myGray.900'}>
{tool.name} {tool.name}
</Box> </Box>
<Box fontSize={'12px'} color={'myGray.500'}> <Box fontSize={'12px'} color={'myGray.500'} maxH={'100px'} overflow={'auto'}>
{tool.description} {tool.description}
</Box> </Box>
</Box> </Box>
</Flex> </Flex>
<Box mt={6} color={'myGray.900'} fontWeight={'medium'}> <Box mt={6} color={'myGray.900'} fontWeight={'medium'}>
{t('common:Params')} {t('app:raw_params')}
</Box> </Box>
<Box mt={3}> <Box mt={3}>
{Object.entries(tool.inputSchema.properties || {}).map( {Object.entries(tool.inputSchema.properties || {}).map(
([paramName, paramInfo]: [string, any]) => ( ([paramName, paramInfo]: [string, JsonSchemaPropertiesItemType]) => (
<Box key={paramName} py={2} borderBottom={'1px solid'} borderColor={'myGray.150'}> <Box key={paramName} py={2} borderBottom={'1px solid'} borderColor={'myGray.150'}>
<Flex alignItems="center"> <Flex alignItems="center">
{tool.inputSchema.required?.includes(paramName) && ( {tool.inputSchema.required?.includes(paramName) && (
...@@ -248,7 +254,11 @@ const ToolDetailModal = ({ tool, onClose }: { tool: McpToolConfigType; onClose: ...@@ -248,7 +254,11 @@ const ToolDetailModal = ({ tool, onClose }: { tool: McpToolConfigType; onClose:
border={'1px solid'} border={'1px solid'}
borderColor={'myGray.200'} borderColor={'myGray.200'}
> >
{paramInfo.type} {paramInfo.type ||
paramInfo.anyOf?.map((item) => item.type).join(',') ||
paramInfo.oneOf?.map((item) => item.type).join(',') ||
paramInfo.allOf?.map((item) => item.type).join(',') ||
'any'}
</Box> </Box>
</Flex> </Flex>
......
projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/hooks/useDebug.tsx
...@@ -269,7 +269,7 @@ export const useDebug = () => { ...@@ -269,7 +269,7 @@ export const useDebug = () => {
key={item.key} key={item.key}
label={item.label} label={item.label}
required={item.required} required={item.required}
placeholder={t(item.placeholder || item.description)} description={t(item.placeholder || item.description)}
inputType={nodeInputTypeToInputType(item.renderTypeList)} inputType={nodeInputTypeToInputType(item.renderTypeList)}
form={variablesForm} form={variablesForm}
fieldName={`nodeVariables.${item.key}`} fieldName={`nodeVariables.${item.key}`}
...@@ -284,7 +284,7 @@ export const useDebug = () => { ...@@ -284,7 +284,7 @@ export const useDebug = () => {
key={item.key} key={item.key}
label={item.label} label={item.label}
required={item.required} required={item.required}
placeholder={t(item.description)} description={t(item.description)}
inputType={variableInputTypeToInputType(item.type)} inputType={variableInputTypeToInputType(item.type)}
form={variablesForm} form={variablesForm}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
...@@ -297,7 +297,7 @@ export const useDebug = () => { ...@@ -297,7 +297,7 @@ export const useDebug = () => {
key={item.key} key={item.key}
label={item.label} label={item.label}
required={item.required} required={item.required}
placeholder={t(item.description)} description={t(item.description)}
inputType={variableInputTypeToInputType(item.type)} inputType={variableInputTypeToInputType(item.type)}
form={variablesForm} form={variablesForm}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
...@@ -310,7 +310,7 @@ export const useDebug = () => { ...@@ -310,7 +310,7 @@ export const useDebug = () => {
key={item.key} key={item.key}
label={item.label} label={item.label}
required={item.required} required={item.required}
placeholder={item.description} description={item.description}
inputType={variableInputTypeToInputType(item.type)} inputType={variableInputTypeToInputType(item.type)}
form={variablesForm} form={variablesForm}
fieldName={`variables.${item.key}`} fieldName={`variables.${item.key}`}
......
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