opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(trigger-plugin): streamline variable type resolution and output variable construction

This commit is contained in:
zhsama 2025-10-23 15:33:19 +08:00
parent 863b4f8fe9
commit bcdc11396a
1 changed files with 98 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
web/app/components/workflow/nodes/trigger-plugin/default.ts
View File

@ -3,7 +3,6 @@ import type { SchemaTypeDefinition } from '@/service/use-common'
import type { NodeDefault, Var } from '../../types'
import { BlockEnum, VarType } from '../../types'
import { genNodeMetaData } from '../../utils'
import { getMatchedSchemaType } from '../_base/components/variable/use-match-schema-type'
import { VarKindType } from '../_base/types'
import { type Field, type StructuredOutput, Type } from '../llm/types'
import type { PluginTriggerNodeType } from './types'
@ -43,76 +42,72 @@ const pickItemSchema = (schema: any) => {
return Array.isArray(schema.items) ? schema.items[0] : schema.items
}
const resolveVarType = (schema: any, schemaTypeDefinitions?: SchemaTypeDefinition[]): { type: VarType; schemaType: string } => {
const schemaType = getMatchedSchemaType(schema, schemaTypeDefinitions)
const extractSchemaType = (schema: any, _schemaTypeDefinitions?: SchemaTypeDefinition[]): string | undefined => {
if (!schema)
return undefined
const schemaTypeFromSchema = schema.schema_type || schema.schemaType
if (typeof schemaTypeFromSchema === 'string' && schemaTypeFromSchema.trim().length > 0)
return schemaTypeFromSchema
return undefined
}
const NORMALIZED_TYPE_TO_VAR_TYPE: Record<string, VarType> = {
string: VarType.string,
number: VarType.number,
integer: VarType.integer,
boolean: VarType.boolean,
object: VarType.object,
array: VarType.array,
}
const VAR_TYPE_TO_ARRAY_TYPE: Partial<Record<VarType, VarType>> = {
[VarType.string]: VarType.arrayString,
[VarType.number]: VarType.arrayNumber,
[VarType.integer]: VarType.arrayNumber,
[VarType.boolean]: VarType.arrayBoolean,
[VarType.object]: VarType.arrayObject,
[VarType.file]: VarType.arrayFile,
}
const NORMALIZED_TYPE_TO_FIELD_TYPE: Record<string, Type> = {
string: Type.string,
number: Type.number,
integer: Type.number,
boolean: Type.boolean,
object: Type.object,
array: Type.array,
}
const resolveVarType = (
schema: any,
schemaTypeDefinitions?: SchemaTypeDefinition[],
): { type: VarType; schemaType?: string } => {
const schemaType = extractSchemaType(schema, schemaTypeDefinitions)
const normalizedType = normalizeJsonSchemaType(schema)
if (schemaType === 'file') {
if (normalizedType === 'array')
return { type: VarType.arrayFile, schemaType }
return { type: VarType.file, schemaType }
if (normalizedType === 'array') {
const itemSchema = pickItemSchema(schema)
if (!itemSchema)
return { type: VarType.array, schemaType }
const { type: itemType, schemaType: itemSchemaType } = resolveVarType(itemSchema, schemaTypeDefinitions)
const resolvedSchemaType = schemaType || itemSchemaType
const arrayType = VAR_TYPE_TO_ARRAY_TYPE[itemType] ?? VarType.array
return { type: arrayType, schemaType: resolvedSchemaType }
}
switch (normalizedType) {
case 'string':
return { type: VarType.string, schemaType }
case 'number':
return { type: VarType.number, schemaType }
case 'integer':
return { type: VarType.integer, schemaType }
case 'boolean':
return { type: VarType.boolean, schemaType }
case 'object':
return { type: VarType.object, schemaType }
case 'array': {
const itemSchema = pickItemSchema(schema)
if (!itemSchema)
return { type: VarType.array, schemaType }
const { type: itemType, schemaType: itemSchemaType } = resolveVarType(itemSchema, schemaTypeDefinitions)
if (itemSchemaType === 'file')
return { type: VarType.arrayFile, schemaType }
switch (itemType) {
case VarType.string:
return { type: VarType.arrayString, schemaType }
case VarType.number:
case VarType.integer:
return { type: VarType.arrayNumber, schemaType }
case VarType.boolean:
return { type: VarType.arrayBoolean, schemaType }
case VarType.object:
return { type: VarType.arrayObject, schemaType }
case VarType.file:
return { type: VarType.arrayFile, schemaType }
default:
return { type: VarType.array, schemaType }
}
}
default:
return { type: VarType.any, schemaType }
}
const type = normalizedType ? NORMALIZED_TYPE_TO_VAR_TYPE[normalizedType] ?? VarType.any : VarType.any
return { type, schemaType }
}
const toFieldType = (normalizedType: string | undefined, schemaType?: string): Type => {
if (schemaType === 'file')
return normalizedType === 'array' ? Type.array : Type.file
switch (normalizedType) {
case 'number':
case 'integer':
return Type.number
case 'boolean':
return Type.boolean
case 'object':
return Type.object
case 'array':
return Type.array
case 'string':
default:
return Type.string
}
return normalizedType ? NORMALIZED_TYPE_TO_FIELD_TYPE[normalizedType] ?? Type.string : Type.string
}
const toArrayItemType = (type: Type): Exclude<Type, Type.array> => {
@ -122,7 +117,7 @@ const toArrayItemType = (type: Type): Exclude<Type, Type.array> => {
}
const convertJsonSchemaToField = (schema: any, schemaTypeDefinitions?: SchemaTypeDefinition[]): Field => {
const schemaType = getMatchedSchemaType(schema, schemaTypeDefinitions)
const schemaType = extractSchemaType(schema, schemaTypeDefinitions)
const normalizedType = normalizeJsonSchemaType(schema)
const fieldType = toFieldType(normalizedType, schemaType)
@ -166,49 +161,6 @@ const convertJsonSchemaToField = (schema: any, schemaTypeDefinitions?: SchemaTyp
return field
}
const buildOutputVars = (schema: Record<string, any>, schemaTypeDefinitions?: SchemaTypeDefinition[]): Var[] => {
if (!schema || typeof schema !== 'object')
return []
const properties = schema.properties as Record<string, any> | undefined
if (!properties)
return []
return Object.entries(properties).map(([name, propertySchema]) => {
const { type, schemaType } = resolveVarType(propertySchema, schemaTypeDefinitions)
const normalizedType = normalizeJsonSchemaType(propertySchema)
const varItem: Var = {
variable: name,
type,
des: propertySchema?.description,
schemaType,
}
if (normalizedType === 'object') {
const childProperties = propertySchema?.properties
? Object.entries(propertySchema.properties).reduce((acc, [key, value]) => {
acc[key] = convertJsonSchemaToField(value, schemaTypeDefinitions)
return acc
}, {} as Record<string, Field>)
: {}
const required = Array.isArray(propertySchema?.required) ? propertySchema.required.filter(Boolean) : undefined
varItem.children = {
schema: {
type: Type.object,
properties: childProperties,
required: required && required.length > 0 ? required : undefined,
additionalProperties: false,
},
} as StructuredOutput
}
return varItem
})
}
const metaData = genNodeMetaData({
sort: 1,
type: BlockEnum.TriggerPlugin,
@ -277,7 +229,47 @@ const nodeDefault: NodeDefault<PluginTriggerNodeType> = {
},
getOutputVars(payload, _allPluginInfoList, _ragVars, { schemaTypeDefinitions } = { schemaTypeDefinitions: [] }) {
const schema = payload.output_schema || {}
return buildOutputVars(schema, schemaTypeDefinitions)
if (!schema || typeof schema !== 'object')
return []
const properties = schema.properties as Record<string, any> | undefined
if (!properties)
return []
return Object.entries(properties).map(([name, propertySchema]) => {
const { type, schemaType } = resolveVarType(propertySchema, schemaTypeDefinitions)
const normalizedType = normalizeJsonSchemaType(propertySchema)
const varItem: Var = {
variable: name,
type,
des: propertySchema?.description,
...(schemaType && { schemaType }),
}
if (normalizedType === 'object' && propertySchema?.properties) {
const childProperties = Object.entries(propertySchema.properties).reduce((acc, [key, value]) => {
acc[key] = convertJsonSchemaToField(value, schemaTypeDefinitions)
return acc
}, {} as Record<string, Field>)
const required = Array.isArray(propertySchema?.required)
? propertySchema.required.filter(Boolean)
: undefined
varItem.children = {
schema: {
type: Type.object,
properties: childProperties,
required: required && required.length > 0 ? required : undefined,
additionalProperties: false,
},
} as StructuredOutput
}
return varItem
})
},
}