fix: json schema

2025-08-07 15:28:15 +08:00 · 2025-08-07 15:28:15 +08:00 · 9e882122ca
parent e6f1bc165c
commit 9e882122ca
8 changed files with 41 additions and 44 deletions
--- a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx
@ -9,7 +9,7 @@ import type { ValueSelector } from '@/app/components/workflow/types'

 type Props = {
  className?: string
-  root: { nodeId?: string, nodeName?: string, attrName: string }
+  root: { nodeId?: string, nodeName?: string, attrName: string, attrAlias?: string }
  payload: StructuredOutput
  readonly?: boolean
  onSelect?: (valueSelector: ValueSelector) => void
@ -52,8 +52,7 @@ export const PickerPanelMain: FC<Props> = ({
          )}
          <div className='system-sm-medium text-text-secondary'>{root.attrName}</div>
        </div>
-        {/* It must be object */}
-        <div className='system-xs-regular ml-2 shrink-0 text-text-tertiary'>object</div>
+        <div className='system-xs-regular ml-2 truncate text-text-tertiary' title={root.attrAlias || 'object'}>{root.attrAlias || 'object'}</div>
      </div>
      {fieldNames.map(name => (
        <Field
--- a/web/app/components/workflow/nodes/_base/components/variable/utils.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
@ -217,6 +217,7 @@ const findExceptVarInObject = (obj: any, filterVar: (payload: Var, selector: Val
    variable: obj.variable,
    type: isFile ? VarType.file : VarType.object,
    children: childrenResult,
+    alias: obj.alias,
  }

  return res
@ -518,41 +519,8 @@ const formatItem = (

    case BlockEnum.DataSource: {
      const payload = data as DataSourceNodeType
-      const baseVars = DataSourceNodeDefault.getOutputVars?.(payload, ragVars) || []
-      if (payload.output_schema?.properties) {
-        const dynamicOutputSchema: any[] = []
-        Object.keys(payload.output_schema.properties).forEach((outputKey) => {
-          const output = payload.output_schema!.properties[outputKey]
-          const dataType = output?.properties?.dify_builtin_type ? output.properties.dify_builtin_type.enum[0] : output.type
-          dynamicOutputSchema.push({
-            variable: outputKey,
-            type: dataType === 'array'
-              ? `array[${output.items?.type.slice(0, 1).toLocaleLowerCase()}${output.items?.type.slice(1)}]`
-              : `${dataType.slice(0, 1).toLocaleLowerCase()}${dataType.slice(1)}`,
-            description: output.description,
-            children: output.type === 'object' ? {
-              schema: {
-                type: 'object',
-                properties: Object.fromEntries(
-                  Object.entries(output.properties).filter(([key]) => key !== 'dify_builtin_type'),
-                ),
-              },
-            } : undefined,
-          })
-        })
-        res.vars = [
-          ...baseVars,
-          ...dynamicOutputSchema,
-          {
-            variable: 'output',
-            type: VarType.object,
-            children: dynamicOutputSchema,
-          },
-        ]
-      }
-      else {
-        res.vars = baseVars
-      }
+      const dataSourceVars = DataSourceNodeDefault.getOutputVars?.(payload, ragVars) || []
+      res.vars = dataSourceVars
      break
    }

@ -952,7 +920,7 @@ export const getVarType = ({
    const isStructuredOutputVar = !!targetVar.children?.schema?.properties
    if (isStructuredOutputVar) {
      if (valueSelector.length === 2) { // root
-        return VarType.object
+        return targetVar.alias || VarType.object
      }
      let currProperties = targetVar.children.schema;
      (valueSelector as ValueSelector).slice(2).forEach((key, i) => {
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
@ -173,7 +173,7 @@ const Item: FC<ItemProps> = ({
              <div title={itemData.des} className='system-sm-medium ml-1 w-0 grow truncate text-text-secondary'>{itemData.variable.split('.').slice(-1)[0]}</div>
            )}
          </div>
-          <div className='ml-1 shrink-0 text-xs font-normal capitalize text-text-tertiary'>{itemData.type}</div>
+          <div className='ml-1 shrink-0 text-xs font-normal capitalize text-text-tertiary'>{itemData.alias || itemData.type}</div>
          {
            (isObj || isStructureOutput) && (
              <ChevronRight className={cn('ml-0.5 h-3 w-3 text-text-quaternary', isHovering && 'text-text-tertiary')} />
@ -186,7 +186,7 @@ const Item: FC<ItemProps> = ({
      }}>
        {(isStructureOutput || isObj) && (
          <PickerStructurePanel
-            root={{ nodeId, nodeName: title, attrName: itemData.variable }}
+            root={{ nodeId, nodeName: title, attrName: itemData.variable, attrAlias: itemData.alias }}
            payload={structuredOutput!}
            onHovering={setIsChildrenHovering}
            onSelect={(valueSelector) => {
--- a/web/app/components/workflow/nodes/data-source/default.ts
+++ b/web/app/components/workflow/nodes/data-source/default.ts
@ -58,6 +58,29 @@ const nodeDefault: NodeDefault<DataSourceNodeType> = {
      provider_type,
    } = payload
    const isLocalFile = provider_type === DataSourceClassification.localFile
+    const dynamicOutputSchema: any[] = []
+    if (payload.output_schema?.properties) {
+      Object.keys(payload.output_schema.properties).forEach((outputKey) => {
+        const output = payload.output_schema!.properties[outputKey]
+        const dataType = output.type
+        dynamicOutputSchema.push({
+          variable: outputKey,
+          type: dataType === 'array'
+            ? `array[${output.items?.type.slice(0, 1).toLocaleLowerCase()}${output.items?.type.slice(1)}]`
+            : `${dataType.slice(0, 1).toLocaleLowerCase()}${dataType.slice(1)}`,
+          description: output.description,
+          alias: output?.properties.dify_builtin_type?.enum?.[0],
+          children: output.type === 'object' ? {
+            schema: {
+              type: 'object',
+              properties: Object.fromEntries(
+                Object.entries(output.properties).filter(([key]) => key !== 'dify_builtin_type'),
+              ),
+            },
+          } : undefined,
+        })
+      })
+    }
    return [
      ...COMMON_OUTPUT.map(item => ({ variable: item.name, type: item.type })),
      ...(
@ -66,6 +89,7 @@ const nodeDefault: NodeDefault<DataSourceNodeType> = {
          : []
      ),
      ...ragVars,
+      ...dynamicOutputSchema,
    ]
  },
 }
--- a/web/app/components/workflow/nodes/data-source/panel.tsx
+++ b/web/app/components/workflow/nodes/data-source/panel.tsx
@ -50,7 +50,7 @@ const Panel: FC<NodePanelProps<DataSourceNodeType>> = ({ id, data }) => {
  const pipelineId = useStore(s => s.pipelineId)
  const setShowInputFieldPanel = useStore(s => s.setShowInputFieldPanel)
  const wrapStructuredVarItem = (outputItem: any): StructuredOutput => {
-    const dataType = outputItem.value?.properties?.dify_builtin_type ? outputItem.value?.properties?.dify_builtin_type.enum[0] : Type.object
+    const dataType = Type.object
    const properties = Object.fromEntries(
      Object.entries(outputItem.value?.properties || {}).filter(([key]) => key !== 'dify_builtin_type'),
    ) as Record<string, any>
@ -61,6 +61,7 @@ const Panel: FC<NodePanelProps<DataSourceNodeType>> = ({ id, data }) => {
          [outputItem.name]: {
            ...outputItem.value,
            properties,
+            alias: outputItem.value?.properties?.dify_builtin_type?.enum?.[0],
          },
        },
        additionalProperties: false,
--- a/web/app/components/workflow/nodes/llm/types.ts
+++ b/web/app/components/workflow/nodes/llm/types.ts
@ -55,6 +55,7 @@ export type Field = {
  items?: ArrayItems // Array has items. Define the item type
  enum?: SchemaEnumType // Enum values
  additionalProperties?: false // Required in object by api. Just set false
+  alias?: string // Alias of the field
 }

 export type StructuredOutput = {
--- a/web/app/components/workflow/nodes/llm/utils.ts
+++ b/web/app/components/workflow/nodes/llm/utils.ts
@ -10,9 +10,12 @@ export const checkNodeValid = (_payload: LLMNodeType) => {
 }

 export const getFieldType = (field: Field) => {
-  const { type, items } = field
-  if (type !== Type.array || !items)
+  const { type, items, alias } = field
+  if (type !== Type.array || !items) {
+    if (alias)
+      return alias
    return type
+  }

  return ArrayType[items.type]
 }
--- a/web/app/components/workflow/types.ts
+++ b/web/app/components/workflow/types.ts
@ -302,6 +302,7 @@ export type Var = {
  isLoopVariable?: boolean
  nodeId?: string
  isRagVariable?: boolean
+  alias?: string
 }

 export type NodeOutPutVar = {