ngskcloud
/
gcgj-dify-1.7.0
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

datasource panel

Browse Source
pull/21398/head
zxhlyh 10 months ago
parent 5aaa06c8b0
commit 7d92574e02
7 changed files with 174 additions and 92 deletions
Show Stats Download Patch File Download Diff File

9
web/app/components/workflow/block-selector/hooks.ts
Unescape Escape View File

@ -3,6 +3,8 @@ import {
useState,
} from 'react'
import { useTranslation } from 'react-i18next'
import { useDataSourceList } from '@/service/use-pipeline'
import { useStore } from '../store'
import {
TabsEnum,
ToolTypeEnum,
@ -75,3 +77,10 @@ export const useToolTabs = () => {
},
]
}
export const useDataSources = () => {
const pipelineId = useStore(s => s.pipelineId)
const { data: dataSourceList } = useDataSourceList(!!pipelineId)
return dataSourceList || []
}

6
web/app/components/workflow/block-selector/index.tsx
Unescape Escape View File

@ -5,8 +5,7 @@ import type { NodeSelectorProps } from './main'
import NodeSelector from './main'
import { useHooksStore } from '@/app/components/workflow/hooks-store/store'
import { BlockEnum } from '@/app/components/workflow/types'
import { useStore } from '@/app/components/workflow/store'
import { useDataSourceList } from '@/service/use-pipeline'
import { useDataSources } from './hooks'
const NodeSelectorWrapper = (props: NodeSelectorProps) => {
const availableNodesMetaData = useHooksStore(s => s.availableNodesMetaData)
@ -34,8 +33,7 @@ const NodeSelectorWrapper = (props: NodeSelectorProps) => {
})
}, [availableNodesMetaData?.nodes])
const pipelineId = useStore(s => s.pipelineId)
const { data: dataSourceList } = useDataSourceList(!!pipelineId)
const dataSourceList = useDataSources()
return (
<NodeSelector

91
web/app/components/workflow/hooks/use-nodes-interactions.ts
Unescape Escape View File

@ -711,7 +711,7 @@ export const useNodesInteractions = () => {
const outgoers = getOutgoers(prevNode, nodes, edges).sort((a, b) => a.position.y - b.position.y)
const lastOutgoer = outgoers[outgoers.length - 1]
newNode.data._connectedTargetHandleIds = [targetHandle]
newNode.data._connectedTargetHandleIds = nodeType === BlockEnum.DataSource ? [] : [targetHandle]
newNode.data._connectedSourceHandleIds = []
newNode.position = {
x: lastOutgoer ? lastOutgoer.position.x : prevNode.position.x + prevNode.width! + X_OFFSET,
@ -745,27 +745,31 @@ export const useNodesInteractions = () => {
}
}
const newEdge: Edge = {
id: `${prevNodeId}-${prevNodeSourceHandle}-${newNode.id}-${targetHandle}`,
type: CUSTOM_EDGE,
source: prevNodeId,
sourceHandle: prevNodeSourceHandle,
target: newNode.id,
targetHandle,
data: {
sourceType: prevNode.data.type,
targetType: newNode.data.type,
isInIteration,
isInLoop,
iteration_id: isInIteration ? prevNode.parentId : undefined,
loop_id: isInLoop ? prevNode.parentId : undefined,
_connectedNodeIsSelected: true,
},
zIndex: prevNode.parentId ? (isInIteration ? ITERATION_CHILDREN_Z_INDEX : LOOP_CHILDREN_Z_INDEX) : 0,
let newEdge = null
if (nodeType !== BlockEnum.DataSource) {
newEdge = {
id: `${prevNodeId}-${prevNodeSourceHandle}-${newNode.id}-${targetHandle}`,
type: CUSTOM_EDGE,
source: prevNodeId,
sourceHandle: prevNodeSourceHandle,
target: newNode.id,
targetHandle,
data: {
sourceType: prevNode.data.type,
targetType: newNode.data.type,
isInIteration,
isInLoop,
iteration_id: isInIteration ? prevNode.parentId : undefined,
loop_id: isInLoop ? prevNode.parentId : undefined,
_connectedNodeIsSelected: true,
},
zIndex: prevNode.parentId ? (isInIteration ? ITERATION_CHILDREN_Z_INDEX : LOOP_CHILDREN_Z_INDEX) : 0,
}
}
const nodesConnectedSourceOrTargetHandleIdsMap = getNodesConnectedSourceOrTargetHandleIdsMap(
[
{ type: 'add', edge: newEdge },
...(newEdge ? [{ type: 'add', edge: newEdge }] : []),
],
nodes,
)
@ -816,7 +820,8 @@ export const useNodesInteractions = () => {
_connectedNodeIsSelected: false,
}
})
draft.push(newEdge)
if (newEdge)
draft.push(newEdge)
})
if (checkNestedParallelLimit(newNodes, newEdges, prevNode)) {
@ -959,7 +964,7 @@ export const useNodesInteractions = () => {
const prevNode = nodes.find(node => node.id === prevNodeId)!
const nextNode = nodes.find(node => node.id === nextNodeId)!
newNode.data._connectedTargetHandleIds = [targetHandle]
newNode.data._connectedTargetHandleIds = nodeType === BlockEnum.DataSource ? [] : [targetHandle]
newNode.data._connectedSourceHandleIds = [sourceHandle]
newNode.position = {
x: nextNode.position.x,
@ -986,24 +991,29 @@ export const useNodesInteractions = () => {
}
const currentEdgeIndex = edges.findIndex(edge => edge.source === prevNodeId && edge.target === nextNodeId)
const newPrevEdge = {
id: `${prevNodeId}-${prevNodeSourceHandle}-${newNode.id}-${targetHandle}`,
type: CUSTOM_EDGE,
source: prevNodeId,
sourceHandle: prevNodeSourceHandle,
target: newNode.id,
targetHandle,
data: {
sourceType: prevNode.data.type,
targetType: newNode.data.type,
isInIteration,
isInLoop,
iteration_id: isInIteration ? prevNode.parentId : undefined,
loop_id: isInLoop ? prevNode.parentId : undefined,
_connectedNodeIsSelected: true,
},
zIndex: prevNode.parentId ? (isInIteration ? ITERATION_CHILDREN_Z_INDEX : LOOP_CHILDREN_Z_INDEX) : 0,
let newPrevEdge = null
if (nodeType !== BlockEnum.DataSource) {
newPrevEdge = {
id: `${prevNodeId}-${prevNodeSourceHandle}-${newNode.id}-${targetHandle}`,
type: CUSTOM_EDGE,
source: prevNodeId,
sourceHandle: prevNodeSourceHandle,
target: newNode.id,
targetHandle,
data: {
sourceType: prevNode.data.type,
targetType: newNode.data.type,
isInIteration,
isInLoop,
iteration_id: isInIteration ? prevNode.parentId : undefined,
loop_id: isInLoop ? prevNode.parentId : undefined,
_connectedNodeIsSelected: true,
},
zIndex: prevNode.parentId ? (isInIteration ? ITERATION_CHILDREN_Z_INDEX : LOOP_CHILDREN_Z_INDEX) : 0,
}
}
let newNextEdge: Edge | null = null
const nextNodeParentNode = nodes.find(node => node.id === nextNode.parentId) || null
@ -1033,7 +1043,7 @@ export const useNodesInteractions = () => {
const nodesConnectedSourceOrTargetHandleIdsMap = getNodesConnectedSourceOrTargetHandleIdsMap(
[
{ type: 'remove', edge: edges[currentEdgeIndex] },
{ type: 'add', edge: newPrevEdge },
...(newPrevEdge ? [{ type: 'add', edge: newPrevEdge }] : []),
...(newNextEdge ? [{ type: 'add', edge: newNextEdge }] : []),
],
[...nodes, newNode],
@ -1088,7 +1098,8 @@ export const useNodesInteractions = () => {
_connectedNodeIsSelected: false,
}
})
draft.push(newPrevEdge)
if (newPrevEdge)
draft.push(newPrevEdge)
if (newNextEdge)
draft.push(newNextEdge)

7
web/app/components/workflow/hooks/use-tool-icon.ts
Unescape Escape View File

@ -10,6 +10,7 @@ import {
import {
useStore,
} from '../store'
import { useDataSources } from '../block-selector/hooks'
import { CollectionType } from '@/app/components/tools/types'
import { canFindTool } from '@/utils'
@ -17,6 +18,8 @@ export const useToolIcon = (data: Node['data']) => {
const buildInTools = useStore(s => s.buildInTools)
const customTools = useStore(s => s.customTools)
const workflowTools = useStore(s => s.workflowTools)
const dataSourceList = useDataSources()
// const a = useStore(s => s.data)
const toolIcon = useMemo(() => {
if (data.type === BlockEnum.Tool) {
let targetTools = buildInTools
@ -28,7 +31,9 @@ export const useToolIcon = (data: Node['data']) => {
targetTools = workflowTools
return targetTools.find(toolWithProvider => canFindTool(toolWithProvider.id, data.provider_id))?.icon
}
}, [data, buildInTools, customTools, workflowTools])
if (data.type === BlockEnum.DataSource)
return dataSourceList.find(toolWithProvider => canFindTool(toolWithProvider.id, data.provider_id))?.icon
}, [data, buildInTools, customTools, workflowTools, dataSourceList])
return toolIcon
}

31
web/app/components/workflow/nodes/data-source/hooks/use-config.ts
Unescape Escape View File

@ -1,5 +1,34 @@
import { useCallback } from 'react'
import { useStoreApi } from 'reactflow'
import { useNodeDataUpdate } from '@/app/components/workflow/hooks'
import type { DataSourceNodeType } from '../types'
export const useConfig = (id: string) => {
const store = useStoreApi()
const { handleNodeDataUpdateWithSyncDraft } = useNodeDataUpdate()
const getNodeData = useCallback(() => {
const { getNodes } = store.getState()
const nodes = getNodes()
return nodes.find(node => node.id === id)
}, [store, id])
const handleNodeDataUpdate = useCallback((data: Partial<DataSourceNodeType>) => {
handleNodeDataUpdateWithSyncDraft({
id,
data,
})
}, [id, handleNodeDataUpdateWithSyncDraft])
const handleFileExtensionsChange = useCallback((fileExtensions: string[]) => {
const nodeData = getNodeData()
handleNodeDataUpdate({
...nodeData?.data,
fileExtensions,
})
}, [handleNodeDataUpdate, getNodeData])
return {
id,
handleFileExtensionsChange,
}
}

118
web/app/components/workflow/nodes/data-source/panel.tsx
Unescape Escape View File

@ -5,15 +5,27 @@ import {
import { useTranslation } from 'react-i18next'
import { memo } from 'react'
import type { DataSourceNodeType } from './types'
import { CollectionType } from '@/app/components/tools/types'
import type { NodePanelProps } from '@/app/components/workflow/types'
import { GroupWithBox } from '@/app/components/workflow/nodes/_base/components/layout'
import {
Field,
GroupWithBox,
} from '@/app/components/workflow/nodes/_base/components/layout'
import OutputVars, { VarItem } from '@/app/components/workflow/nodes/_base/components/output-vars'
import StructureOutputItem from '@/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/show'
import TagInput from '@/app/components/base/tag-input'
import { Type } from '../llm/types'
import { useConfig } from './hooks/use-config'
const Panel: FC<NodePanelProps<DataSourceNodeType>> = ({ data }) => {
const Panel: FC<NodePanelProps<DataSourceNodeType>> = ({ id, data }) => {
const { t } = useTranslation()
const { output_schema = {} } = data
const {
output_schema = {},
provider_id,
provider_type,
fileExtensions = [],
} = data
const { handleFileExtensionsChange } = useConfig(id)
const outputSchema = useMemo(() => {
const res: any[] = []
if (!output_schema)
@ -48,52 +60,66 @@ const Panel: FC<NodePanelProps<DataSourceNodeType>> = ({ data }) => {
return (
<div >
<GroupWithBox boxProps={{ withBorderBottom: true }}>
</GroupWithBox>
{
provider_id === 'langgenius/file/file' && provider_type === CollectionType.datasource && (
<GroupWithBox boxProps={{ withBorderBottom: true }}>
<Field
fieldTitleProps={{
title: 'supported file formats',
}}
>
<TagInput
items={fileExtensions}
onChange={handleFileExtensionsChange}
placeholder='File extension, e.g. doc'
/>
</Field>
</GroupWithBox>
)
}
<OutputVars>
<VarItem
name='text'
type='string'
description={t('workflow.nodes.tool.outputVars.text')}
isIndent={hasObjectOutput}
/>
<VarItem
name='files'
type='array[file]'
description={t('workflow.nodes.tool.outputVars.files.title')}
isIndent={hasObjectOutput}
/>
<VarItem
name='json'
type='array[object]'
description={t('workflow.nodes.tool.outputVars.json')}
isIndent={hasObjectOutput}
/>
{outputSchema.map((outputItem: any) => (
<div key={outputItem.name}>
{outputItem.value?.type === 'object' ? (
<StructureOutputItem
rootClassName='code-sm-semibold text-text-secondary'
payload={{
schema: {
type: Type.object,
properties: {
[outputItem.name]: outputItem.value,
},
additionalProperties: false,
name='text'
type='string'
description={t('workflow.nodes.tool.outputVars.text')}
isIndent={hasObjectOutput}
/>
<VarItem
name='files'
type='array[file]'
description={t('workflow.nodes.tool.outputVars.files.title')}
isIndent={hasObjectOutput}
/>
<VarItem
name='json'
type='array[object]'
description={t('workflow.nodes.tool.outputVars.json')}
isIndent={hasObjectOutput}
/>
{outputSchema.map((outputItem: any) => (
<div key={outputItem.name}>
{outputItem.value?.type === 'object' ? (
<StructureOutputItem
rootClassName='code-sm-semibold text-text-secondary'
payload={{
schema: {
type: Type.object,
properties: {
[outputItem.name]: outputItem.value,
},
}} />
) : (
<VarItem
name={outputItem.name}
type={outputItem.type.toLocaleLowerCase()}
description={outputItem.description}
isIndent={hasObjectOutput}
/>
)}
</div>
))}
additionalProperties: false,
},
}} />
) : (
<VarItem
name={outputItem.name}
type={outputItem.type.toLocaleLowerCase()}
description={outputItem.description}
isIndent={hasObjectOutput}
/>
)}
</div>
))}
</OutputVars>
</div>
)

4
web/app/components/workflow/nodes/data-source/types.ts
Unescape Escape View File

@ -1,7 +1,11 @@
import type { CommonNodeType } from '@/app/components/workflow/types'
import type { RAGPipelineVariables } from '@/models/pipeline'
import type { CollectionType } from '@/app/components/tools/types'
export type DataSourceNodeType = CommonNodeType & {
variables: RAGPipelineVariables
output_schema: Record<string, any>
provider_id: string
provider_type: CollectionType
fileExtensions?: string[]
}

Write Preview
Loading…
Cancel
Save