diff --git a/packages/global/core/plugin/httpPlugin/utils.ts b/packages/global/core/plugin/httpPlugin/utils.ts index 487fef592..5eb9ea05a 100644 --- a/packages/global/core/plugin/httpPlugin/utils.ts +++ b/packages/global/core/plugin/httpPlugin/utils.ts @@ -52,13 +52,35 @@ export const str2OpenApiSchema = async (yamlStr = ''): Promise { + const typeMap: { [key: string]: WorkflowIOValueTypeEnum } = { + string: WorkflowIOValueTypeEnum.arrayString, + number: WorkflowIOValueTypeEnum.arrayNumber, + integer: WorkflowIOValueTypeEnum.arrayNumber, + boolean: WorkflowIOValueTypeEnum.arrayBoolean, + object: WorkflowIOValueTypeEnum.arrayObject + }; + + if (schema?.type === 'integer') { + return WorkflowIOValueTypeEnum.number; + } + + if (schema?.type === 'array' && schema?.items) { + const itemType = typeMap[schema.items.type]; + if (itemType) { + return itemType; + } + } + + return schema?.type as WorkflowIOValueTypeEnum; +}; + export const httpApiSchema2Plugins = async ({ parentId, apiSchemaStr = '', @@ -87,7 +109,7 @@ export const httpApiSchema2Plugins = async ({ ...(item.params?.map((param: any) => { return { key: param.name, - valueType: param.schema.type, + valueType: getType(param.schema), label: param.name, renderTypeList: [FlowNodeInputTypeEnum.reference], required: param.required, @@ -109,7 +131,7 @@ export const httpApiSchema2Plugins = async ({ const prop = properties[key]; return { key, - valueType: prop.type, + valueType: getType(prop), label: key, renderTypeList: [FlowNodeInputTypeEnum.reference], required: false, @@ -136,7 +158,7 @@ export const httpApiSchema2Plugins = async ({ return { id, key: param.name, - valueType: param.schema.type, + valueType: getType(param.schema), label: param.name, type: FlowNodeOutputTypeEnum.source }; @@ -147,7 +169,7 @@ export const httpApiSchema2Plugins = async ({ return { id, key, - valueType: properties[key].type, + valueType: getType(properties[key]), label: key, type: FlowNodeOutputTypeEnum.source, edit: true @@ -159,7 +181,7 @@ export const httpApiSchema2Plugins = async ({ ...(item.params?.map((param: any) => { return { key: param.name, - valueType: param.schema.type, + valueType: getType(param.schema), label: param.name, renderTypeList: [FlowNodeInputTypeEnum.reference], canEdit: true, @@ -173,7 +195,7 @@ export const httpApiSchema2Plugins = async ({ ...(propsKeys?.map((key) => { return { key, - valueType: properties[key].type, + valueType: getType(properties[key]), label: key, renderTypeList: [FlowNodeInputTypeEnum.reference], canEdit: true, @@ -197,7 +219,7 @@ export const httpApiSchema2Plugins = async ({ if (param.in === 'header') { httpNodeHeaders.push({ key: param.name, - type: param.schema?.type || WorkflowIOValueTypeEnum.string, + type: getType(param.schema) || WorkflowIOValueTypeEnum.string, value: `{{${param.name}}}` }); } else if (param.in === 'body') { @@ -209,7 +231,7 @@ export const httpApiSchema2Plugins = async ({ } else if (param.in === 'query') { httpNodeParams.push({ key: param.name, - type: param.schema?.type || WorkflowIOValueTypeEnum.string, + type: getType(param.schema) || WorkflowIOValueTypeEnum.string, value: `{{${param.name}}}` }); } diff --git a/projects/app/src/components/core/workflow/Flow/nodes/NodeLaf.tsx b/projects/app/src/components/core/workflow/Flow/nodes/NodeLaf.tsx index 81d1c8d40..514172e6f 100644 --- a/projects/app/src/components/core/workflow/Flow/nodes/NodeLaf.tsx +++ b/projects/app/src/components/core/workflow/Flow/nodes/NodeLaf.tsx @@ -9,7 +9,7 @@ import { useTranslation } from 'next-i18next'; import { getLafAppDetail } from '@/web/support/laf/api'; import MySelect from '@fastgpt/web/components/common/MySelect'; import { getApiSchemaByUrl } from '@/web/core/plugin/api'; -import { str2OpenApiSchema } from '@fastgpt/global/core/plugin/httpPlugin/utils'; +import { getType, str2OpenApiSchema } from '@fastgpt/global/core/plugin/httpPlugin/utils'; import { useUserStore } from '@/web/support/user/useUserStore'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { ChevronRightIcon } from '@chakra-ui/icons'; @@ -155,7 +155,7 @@ const NodeLaf = (props: NodeProps) => { desc: bodyParams[key].description, required: requiredParams?.includes(key) || false, value: `{{${key}}}`, - type: bodyParams[key].type + type: getType(bodyParams[key]) })) ].filter((item) => !inputs.find((input) => input.key === item.name)); @@ -189,7 +189,7 @@ const NodeLaf = (props: NodeProps) => { const allResponseParams = [ ...Object.keys(responseParams).map((key) => ({ - valueType: responseParams[key].type, + valueType: getType(responseParams[key]), name: key, desc: responseParams[key].description, required: requiredResponseParams?.includes(key) || false