fix: openapi integer & array type (#1439)

This commit is contained in:
heheer
2024-05-10 18:40:01 +08:00
committed by GitHub
parent d70efe1d6f
commit f351d4ea68
2 changed files with 34 additions and 12 deletions

View File

@@ -52,13 +52,35 @@ export const str2OpenApiSchema = async (yamlStr = ''): Promise<OpenApiJsonSchema
}) })
.flat() .flat()
.filter(Boolean) as OpenApiJsonSchema['pathData']; .filter(Boolean) as OpenApiJsonSchema['pathData'];
return { pathData, serverPath }; return { pathData, serverPath };
} catch (err) { } catch (err) {
throw new Error('Invalid Schema'); throw new Error('Invalid Schema');
} }
}; };
export const getType = (schema: { type: string; items?: { type: string } }) => {
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 ({ export const httpApiSchema2Plugins = async ({
parentId, parentId,
apiSchemaStr = '', apiSchemaStr = '',
@@ -87,7 +109,7 @@ export const httpApiSchema2Plugins = async ({
...(item.params?.map((param: any) => { ...(item.params?.map((param: any) => {
return { return {
key: param.name, key: param.name,
valueType: param.schema.type, valueType: getType(param.schema),
label: param.name, label: param.name,
renderTypeList: [FlowNodeInputTypeEnum.reference], renderTypeList: [FlowNodeInputTypeEnum.reference],
required: param.required, required: param.required,
@@ -109,7 +131,7 @@ export const httpApiSchema2Plugins = async ({
const prop = properties[key]; const prop = properties[key];
return { return {
key, key,
valueType: prop.type, valueType: getType(prop),
label: key, label: key,
renderTypeList: [FlowNodeInputTypeEnum.reference], renderTypeList: [FlowNodeInputTypeEnum.reference],
required: false, required: false,
@@ -136,7 +158,7 @@ export const httpApiSchema2Plugins = async ({
return { return {
id, id,
key: param.name, key: param.name,
valueType: param.schema.type, valueType: getType(param.schema),
label: param.name, label: param.name,
type: FlowNodeOutputTypeEnum.source type: FlowNodeOutputTypeEnum.source
}; };
@@ -147,7 +169,7 @@ export const httpApiSchema2Plugins = async ({
return { return {
id, id,
key, key,
valueType: properties[key].type, valueType: getType(properties[key]),
label: key, label: key,
type: FlowNodeOutputTypeEnum.source, type: FlowNodeOutputTypeEnum.source,
edit: true edit: true
@@ -159,7 +181,7 @@ export const httpApiSchema2Plugins = async ({
...(item.params?.map((param: any) => { ...(item.params?.map((param: any) => {
return { return {
key: param.name, key: param.name,
valueType: param.schema.type, valueType: getType(param.schema),
label: param.name, label: param.name,
renderTypeList: [FlowNodeInputTypeEnum.reference], renderTypeList: [FlowNodeInputTypeEnum.reference],
canEdit: true, canEdit: true,
@@ -173,7 +195,7 @@ export const httpApiSchema2Plugins = async ({
...(propsKeys?.map((key) => { ...(propsKeys?.map((key) => {
return { return {
key, key,
valueType: properties[key].type, valueType: getType(properties[key]),
label: key, label: key,
renderTypeList: [FlowNodeInputTypeEnum.reference], renderTypeList: [FlowNodeInputTypeEnum.reference],
canEdit: true, canEdit: true,
@@ -197,7 +219,7 @@ export const httpApiSchema2Plugins = async ({
if (param.in === 'header') { if (param.in === 'header') {
httpNodeHeaders.push({ httpNodeHeaders.push({
key: param.name, key: param.name,
type: param.schema?.type || WorkflowIOValueTypeEnum.string, type: getType(param.schema) || WorkflowIOValueTypeEnum.string,
value: `{{${param.name}}}` value: `{{${param.name}}}`
}); });
} else if (param.in === 'body') { } else if (param.in === 'body') {
@@ -209,7 +231,7 @@ export const httpApiSchema2Plugins = async ({
} else if (param.in === 'query') { } else if (param.in === 'query') {
httpNodeParams.push({ httpNodeParams.push({
key: param.name, key: param.name,
type: param.schema?.type || WorkflowIOValueTypeEnum.string, type: getType(param.schema) || WorkflowIOValueTypeEnum.string,
value: `{{${param.name}}}` value: `{{${param.name}}}`
}); });
} }

View File

@@ -9,7 +9,7 @@ import { useTranslation } from 'next-i18next';
import { getLafAppDetail } from '@/web/support/laf/api'; import { getLafAppDetail } from '@/web/support/laf/api';
import MySelect from '@fastgpt/web/components/common/MySelect'; import MySelect from '@fastgpt/web/components/common/MySelect';
import { getApiSchemaByUrl } from '@/web/core/plugin/api'; 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 { useUserStore } from '@/web/support/user/useUserStore';
import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useSystemStore } from '@/web/common/system/useSystemStore';
import { ChevronRightIcon } from '@chakra-ui/icons'; import { ChevronRightIcon } from '@chakra-ui/icons';
@@ -155,7 +155,7 @@ const NodeLaf = (props: NodeProps<FlowNodeItemType>) => {
desc: bodyParams[key].description, desc: bodyParams[key].description,
required: requiredParams?.includes(key) || false, required: requiredParams?.includes(key) || false,
value: `{{${key}}}`, value: `{{${key}}}`,
type: bodyParams[key].type type: getType(bodyParams[key])
})) }))
].filter((item) => !inputs.find((input) => input.key === item.name)); ].filter((item) => !inputs.find((input) => input.key === item.name));
@@ -189,7 +189,7 @@ const NodeLaf = (props: NodeProps<FlowNodeItemType>) => {
const allResponseParams = [ const allResponseParams = [
...Object.keys(responseParams).map((key) => ({ ...Object.keys(responseParams).map((key) => ({
valueType: responseParams[key].type, valueType: getType(responseParams[key]),
name: key, name: key,
desc: responseParams[key].description, desc: responseParams[key].description,
required: requiredResponseParams?.includes(key) || false required: requiredResponseParams?.includes(key) || false