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

Merge remote-tracking branch 'origin/feat/support-agent-sandbox' into pre-align-hitl-frontend

This commit is contained in:
yyh 2026-02-08 13:27:24 +08:00
parent 8dbecce34a 7d2e630fc8
commit a0b9354e78
No known key found for this signature in database
14 changed files with 127 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/app/components/workflow-app/hooks/use-available-nodes-meta-data.ts
View File

@ -3,6 +3,8 @@ import type { CommonNodeType, NodeDefault, NodeDefaultBase } from '@/app/compone
import type { DocPathWithoutLang } from '@/types/doc-paths'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { useStore as useAppStore } from '@/app/components/app/store'
import { useFeatures } from '@/app/components/base/features/hooks'
import { WORKFLOW_COMMON_NODES } from '@/app/components/workflow/constants/node'
import AnswerDefault from '@/app/components/workflow/nodes/answer/default'
import EndDefault from '@/app/components/workflow/nodes/end/default'
@ -17,6 +19,9 @@ import { useIsChatMode } from './use-is-chat-mode'
export const useAvailableNodesMetaData = () => {
const { t } = useTranslation()
const isChatMode = useIsChatMode()
const isSandboxFeatureEnabled = useFeatures(s => s.features.sandbox?.enabled) ?? false
const isSandboxRuntime = useAppStore(s => s.appDetail?.runtime_type === 'sandboxed')
const isSandboxed = isSandboxFeatureEnabled || isSandboxRuntime
const docLink = useDocLink()
const startNodeMetaData = useMemo(() => ({
@ -28,7 +33,9 @@ export const useAvailableNodesMetaData = () => {
}), [isChatMode])
const mergedNodesMetaData = useMemo(() => [
...WORKFLOW_COMMON_NODES,
...(isSandboxed
? WORKFLOW_COMMON_NODES.filter(node => node.metaData.type !== BlockEnum.Agent)
: WORKFLOW_COMMON_NODES),
startNodeMetaData,
...(
isChatMode
@ -40,7 +47,7 @@ export const useAvailableNodesMetaData = () => {
TriggerPluginDefault,
]
),
] as AvailableNodesMetaData['nodes'], [isChatMode, startNodeMetaData])
] as AvailableNodesMetaData['nodes'], [isChatMode, isSandboxed, startNodeMetaData])
const availableNodesMetaData = useMemo<NodeDefaultBase[]>(() => {
const toNodeDefaultBase = (
@ -69,11 +76,17 @@ export const useAvailableNodesMetaData = () => {
// normalize per-node defaults into a shared metadata shape.
const typedNode = node as NodeDefault<CommonNodeType>
const { metaData } = typedNode
const title = t(`blocks.${metaData.type}`, { ns: 'workflow' })
const title = isSandboxed && metaData.type === BlockEnum.LLM
? t('blocks.agent', { ns: 'workflow' })
: t(`blocks.${metaData.type}` as const, { ns: 'workflow' })
const iconTypeOverride = isSandboxed && metaData.type === BlockEnum.LLM
? BlockEnum.Agent
: undefined
const description = t(`blocksAbout.${metaData.type}`, { ns: 'workflow' })
const helpLinkPath = `/use-dify/nodes/${metaData.helpLinkUri}` as DocPathWithoutLang
return toNodeDefaultBase(typedNode, {
...metaData,
iconType: iconTypeOverride,
title,
description,
helpLinkUri: docLink(helpLinkPath),
@ -81,9 +94,10 @@ export const useAvailableNodesMetaData = () => {
...typedNode.defaultValue,
type: metaData.type,
title,
_iconTypeOverride: iconTypeOverride,
})
})
}, [mergedNodesMetaData, t, docLink])
}, [mergedNodesMetaData, t, docLink, isSandboxed])
const availableNodesMetaDataMap = useMemo(() => availableNodesMetaData.reduce((acc, node) => {
acc![node.metaData.type] = node

17
web/app/components/workflow-app/hooks/use-workflow-template.ts
View File

@ -1,5 +1,6 @@
import type { StartNodeType } from '@/app/components/workflow/nodes/start/types'
import { useTranslation } from 'react-i18next'
import { useStore as useAppStore } from '@/app/components/app/store'
import {
NODE_WIDTH_X_OFFSET,
START_INITIAL_POSITION,
@ -7,11 +8,20 @@ import {
import answerDefault from '@/app/components/workflow/nodes/answer/default'
import llmDefault from '@/app/components/workflow/nodes/llm/default'
import startDefault from '@/app/components/workflow/nodes/start/default'
import { BlockEnum } from '@/app/components/workflow/types'
import { generateNewNode } from '@/app/components/workflow/utils'
import { STORAGE_KEYS } from '@/config/storage-keys'
import { storage } from '@/utils/storage'
import { useIsChatMode } from './use-is-chat-mode'
export const useWorkflowTemplate = () => {
const isChatMode = useIsChatMode()
const appDetail = useAppStore(s => s.appDetail)
const isSandboxedByType = appDetail?.runtime_type === 'sandboxed'
const isSandboxedBySelection = appDetail?.id
? storage.getBoolean(`${STORAGE_KEYS.LOCAL.WORKFLOW.SANDBOX_RUNTIME_PREFIX}${appDetail.id}`) === true
: false
const isSandboxed = isSandboxedByType || isSandboxedBySelection
const { t } = useTranslation()
const { newNode: startNode } = generateNewNode({
@ -24,6 +34,10 @@ export const useWorkflowTemplate = () => {
})
if (isChatMode) {
const llmTitle = isSandboxed
? t('blocks.agent', { ns: 'workflow' })
: t(`blocks.${llmDefault.metaData.type}` as const, { ns: 'workflow' })
const { newNode: llmNode } = generateNewNode({
id: 'llm',
data: {
@ -33,8 +47,9 @@ export const useWorkflowTemplate = () => {
query_prompt_template: '{{#sys.query#}}\n\n{{#sys.files#}}',
},
selected: true,
_iconTypeOverride: isSandboxed ? BlockEnum.Agent : undefined,
type: llmDefault.metaData.type,
title: t(`blocks.${llmDefault.metaData.type}`, { ns: 'workflow' }),
title: llmTitle,
},
position: {
x: START_INITIAL_POSITION.x + NODE_WIDTH_X_OFFSET,

27
web/app/components/workflow-app/index.tsx
View File

@ -28,6 +28,7 @@ import OnlineUsers from '@/app/components/workflow/header/online-users'
import { useStore, useWorkflowStore } from '@/app/components/workflow/store'
import { useTriggerStatusStore } from '@/app/components/workflow/store/trigger-status'
import {
BlockEnum,
SupportUploadFileTypes,
ViewType,
} from '@/app/components/workflow/types'
@ -221,14 +222,32 @@ const WorkflowAppWithAdditionalContext = () => {
}
}, [workflowStore])
const isSandboxRuntime = appDetail?.runtime_type === 'sandboxed'
const isSandboxFeatureEnabled = data?.features?.sandbox?.enabled === true
const isSandboxed = isSandboxRuntime || isSandboxFeatureEnabled
const nodesData = useMemo(() => {
if (data) {
const processedNodes = initialNodes(data.graph.nodes, data.graph.edges)
collaborationManager.setNodes([], processedNodes)
return processedNodes
const resolvedNodes = isSandboxed
? processedNodes.map((node) => {
if (node.data.type !== BlockEnum.LLM)
return node
return {
...node,
data: {
...node.data,
_iconTypeOverride: BlockEnum.Agent,
},
}
})
: processedNodes
collaborationManager.setNodes([], resolvedNodes)
return resolvedNodes
}
return []
}, [data])
}, [data, isSandboxed])
const edgesData = useMemo(() => {
if (data) {
@ -304,7 +323,7 @@ const WorkflowAppWithAdditionalContext = () => {
}, [replayRunId, workflowStore, getWorkflowRunAndTraceUrl])
const isDataReady = !(!data || isLoading || isLoadingCurrentWorkspace || !currentWorkspace.id)
const sandboxEnabled = data?.features?.sandbox?.enabled === true
const sandboxEnabled = isSandboxFeatureEnabled
useEffect(() => {
if (!isDataReady || !appId)

53
web/app/components/workflow/block-icon.tsx
View File

@ -1,6 +1,13 @@
import type { FC } from 'react'
import { memo } from 'react'
import {
memo,
useCallback,
useMemo,
useSyncExternalStore,
} from 'react'
import { useStore as useAppStore } from '@/app/components/app/store'
import AppIcon from '@/app/components/base/app-icon'
import { useFeaturesStore } from '@/app/components/base/features/hooks'
import { Folder as FolderLine } from '@/app/components/base/icons/src/vender/line/files'
import {
Agent,
@ -29,7 +36,9 @@ import {
WebhookLine,
WindowCursor,
} from '@/app/components/base/icons/src/vender/workflow'
import { STORAGE_KEYS } from '@/config/storage-keys'
import { cn } from '@/utils/classnames'
import { storage } from '@/utils/storage'
import { BlockEnum } from './types'
type BlockIconProps = {
@ -117,13 +126,45 @@ const ICON_CONTAINER_BG_COLOR_MAP: Record<string, string> = {
[BlockEnum.TriggerWebhook]: 'bg-util-colors-blue-blue-500',
[BlockEnum.TriggerPlugin]: 'bg-util-colors-blue-blue-500',
}
const useDisplayBlockType = (type: BlockEnum) => {
const appDetail = useAppStore(s => s.appDetail)
const featuresStore = useFeaturesStore()
const subscribe = useCallback((listener: () => void) => {
if (!featuresStore)
return () => {}
return featuresStore.subscribe(listener)
}, [featuresStore])
const getSnapshot = useCallback(() => {
if (!featuresStore)
return false
return featuresStore.getState().features.sandbox?.enabled ?? false
}, [featuresStore])
const isSandboxFeatureEnabled = useSyncExternalStore(subscribe, getSnapshot, () => false)
const isSandboxRuntime = appDetail?.runtime_type === 'sandboxed'
const isSandboxSelection = useMemo(() => {
if (!appDetail?.id)
return false
return storage.getBoolean(`${STORAGE_KEYS.LOCAL.WORKFLOW.SANDBOX_RUNTIME_PREFIX}${appDetail.id}`) === true
}, [appDetail?.id])
const isSandboxed = isSandboxRuntime || isSandboxFeatureEnabled || isSandboxSelection
return isSandboxed && type === BlockEnum.LLM
? BlockEnum.Agent
: type
}
const BlockIcon: FC<BlockIconProps> = ({
type,
size = 'sm',
className,
toolIcon,
}) => {
const isToolOrDataSourceOrTriggerPlugin = type === BlockEnum.Tool || type === BlockEnum.DataSource || type === BlockEnum.TriggerPlugin
const displayType = useDisplayBlockType(type)
const isToolOrDataSourceOrTriggerPlugin = displayType === BlockEnum.Tool || displayType === BlockEnum.DataSource || displayType === BlockEnum.TriggerPlugin
const showDefaultIcon = !isToolOrDataSourceOrTriggerPlugin || !toolIcon
return (
@ -131,7 +172,7 @@ const BlockIcon: FC<BlockIconProps> = ({
cn(
'flex items-center justify-center border-[0.5px] border-white/2 text-white',
ICON_CONTAINER_CLASSNAME_SIZE_MAP[size],
showDefaultIcon && ICON_CONTAINER_BG_COLOR_MAP[type],
showDefaultIcon && ICON_CONTAINER_BG_COLOR_MAP[displayType],
toolIcon && '!shadow-none',
className,
)
@ -139,7 +180,7 @@ const BlockIcon: FC<BlockIconProps> = ({
>
{
showDefaultIcon && (
getIcon(type, (type === BlockEnum.TriggerSchedule || type === BlockEnum.TriggerWebhook)
getIcon(displayType, (displayType === BlockEnum.TriggerSchedule || displayType === BlockEnum.TriggerWebhook)
? (size === 'xs' ? 'w-4 h-4' : 'w-4.5 h-4.5')
: (size === 'xs' ? 'w-3 h-3' : 'w-3.5 h-3.5'))
)
@ -178,9 +219,11 @@ export const VarBlockIcon: FC<BlockIconProps> = ({
type,
className,
}) => {
const displayType = useDisplayBlockType(type)
return (
<>
{getIcon(type, `w-3 h-3 ${className}`)}
{getIcon(displayType, `w-3 h-3 ${className}`)}
</>
)
}

4
web/app/components/workflow/block-selector/blocks.tsx
View File

@ -103,7 +103,7 @@ const Blocks = ({
<BlockIcon
size="md"
className="mb-2"
type={block.metaData.type}
type={block.metaData.iconType || block.metaData.type}
/>
<div className="system-md-medium mb-1 text-text-primary">{block.metaData.title}</div>
<div className="system-xs-regular text-text-tertiary">{block.metaData.description}</div>
@ -117,7 +117,7 @@ const Blocks = ({
>
<BlockIcon
className="mr-2 shrink-0"
type={block.metaData.type}
type={block.metaData.iconType || block.metaData.type}
/>
<div className="grow text-sm text-text-secondary">{block.metaData.title}</div>
{

2
web/app/components/workflow/nodes/_base/components/next-step/index.tsx
View File

@ -100,7 +100,7 @@ const NextStep = ({
<div className="flex py-1">
<div className="relative flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border-[0.5px] border-divider-regular bg-background-default shadow-xs">
<BlockIcon
type={selectedNode!.data.type}
type={selectedNode!.data._iconTypeOverride ?? selectedNode!.data.type}
toolIcon={toolIcon}
/>
</div>

2
web/app/components/workflow/nodes/_base/components/next-step/item.tsx
View File

@ -42,7 +42,7 @@ const Item = ({
className="group relative flex h-9 cursor-pointer items-center rounded-lg border-[0.5px] border-divider-regular bg-background-default px-2 text-xs text-text-secondary shadow-xs last-of-type:mb-0 hover:bg-background-default-hover"
>
<BlockIcon
type={data.type}
type={data._iconTypeOverride ?? data.type}
toolIcon={toolIcon}
className="mr-1.5 shrink-0"
/>

2
web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
View File

@ -528,7 +528,7 @@ const BasePanel: FC<BasePanelProps> = ({
<div className="flex items-center px-4 pb-1 pt-4">
<BlockIcon
className="mr-1 shrink-0"
type={data.type}
type={data._iconTypeOverride ?? data.type}
toolIcon={toolIcon}
size="md"
/>

7
web/app/components/workflow/nodes/_base/node.tsx
View File

@ -70,11 +70,8 @@ const BaseNode: FC<BaseNodeProps> = ({
const { t } = useTranslation()
const nodeRef = useRef<HTMLDivElement>(null)
const { nodesReadOnly } = useNodesReadOnly()
const { _subGraphEntry, _iconTypeOverride } = data as {
_subGraphEntry?: boolean
_iconTypeOverride?: BlockEnum
}
const iconType = _iconTypeOverride ?? data.type
const { _subGraphEntry } = data
const iconType = data._iconTypeOverride ?? data.type
const { handleNodeIterationChildSizeChange } = useNodeIterationInteractions()
const { handleNodeLoopChildSizeChange } = useNodeLoopInteractions()

3
web/app/components/workflow/types.ts
View File

@ -98,6 +98,8 @@ export type CommonNodeType<T = {}> = {
_retryIndex?: number
_dataSourceStartToAdd?: boolean
_isTempNode?: boolean
_subGraphEntry?: boolean
_iconTypeOverride?: BlockEnum
isInIteration?: boolean
iteration_id?: string
selected?: boolean
@ -376,6 +378,7 @@ export type NodeDefaultBase = {
classification: BlockClassificationEnum
sort: number
type: BlockEnum
iconType?: BlockEnum
title: string
author: string
description?: string

6
web/i18n/en-US/workflow.json
View File

@ -776,11 +776,11 @@
"nodes.llm.addContext": "Add Context",
"nodes.llm.addMessage": "Add Message",
"nodes.llm.advancedSettings": "Advanced Settings",
"nodes.llm.computerUse.disabledByStructuredOutput": "Computer Use is disabled when Structured Output is enabled.",
"nodes.llm.computerUse.disabledByStructuredOutput": "Agent mode is disabled when Structured Output is enabled.",
"nodes.llm.computerUse.referenceTools": "Reference Tools",
"nodes.llm.computerUse.referenceToolsEmpty": "Tools referenced in the prompt will appear here",
"nodes.llm.computerUse.title": "Computer Use",
"nodes.llm.computerUse.tooltip": "Manage the runtime filesystem and tool access for your agent.",
"nodes.llm.computerUse.title": "Agent mode",
"nodes.llm.computerUse.tooltip": "Manage the runtime filesystem and tool access in Agent mode.",
"nodes.llm.context": "context",
"nodes.llm.contextBlock": "Context Block",
"nodes.llm.contextMissing": "Missing context from node {{nodeName}}. Please select a context variable.",

4
web/i18n/ja-JP/workflow.json
View File

@ -751,7 +751,9 @@
"nodes.listFilter.selectVariableKeyPlaceholder": "サブ変数キーを選択する",
"nodes.llm.addContext": "コンテキスト追加",
"nodes.llm.addMessage": "メッセージ追加",
"nodes.llm.computerUse.disabledByStructuredOutput": "構造化出力を有効にすると、コンピュータ使用は無効になります。",
"nodes.llm.computerUse.disabledByStructuredOutput": "構造化出力を有効にすると、Agent mode は無効になります。",
"nodes.llm.computerUse.title": "Agent mode",
"nodes.llm.computerUse.tooltip": "Agent mode で実行時ファイルシステムとツールアクセスを管理します。",
"nodes.llm.context": "コンテキスト",
"nodes.llm.contextBlock": "コンテキストブロック",
"nodes.llm.contextMissing": "ノード「{{nodeName}}」のコンテキストがありません。コンテキスト変数を選択してください。",

6
web/i18n/zh-Hans/workflow.json
View File

@ -769,11 +769,11 @@
"nodes.listFilter.selectVariableKeyPlaceholder": "选择子变量的 Key",
"nodes.llm.addContext": "添加上下文",
"nodes.llm.addMessage": "添加消息",
"nodes.llm.computerUse.disabledByStructuredOutput": "启用结构化输出时，将禁用计算机使用。",
"nodes.llm.computerUse.disabledByStructuredOutput": "启用结构化输出时，将禁用 Agent 模式。",
"nodes.llm.computerUse.referenceTools": "引用工具",
"nodes.llm.computerUse.referenceToolsEmpty": "提示词中引用的工具会显示在这里",
"nodes.llm.computerUse.title": "计算机使用",
"nodes.llm.computerUse.tooltip": "管理代理的运行时文件系统与工具访问权限。",
"nodes.llm.computerUse.title": "Agent 模式",
"nodes.llm.computerUse.tooltip": "管理 Agent 模式下的运行时文件系统与工具访问权限。",
"nodes.llm.context": "上下文",
"nodes.llm.contextBlock": "上下文块",
"nodes.llm.contextMissing": "缺少前序节点「{{nodeName}}」的上下文，请先选择上下文变量。",

4
web/i18n/zh-Hant/workflow.json
View File

@ -751,8 +751,10 @@
"nodes.listFilter.selectVariableKeyPlaceholder": "Select sub variable key（選擇子變數鍵）",
"nodes.llm.addContext": "新增上下文",
"nodes.llm.addMessage": "新增消息",
"nodes.llm.computerUse.disabledByStructuredOutput": "啟用結構化輸出時，將停用電腦使用。",
"nodes.llm.computerUse.disabledByStructuredOutput": "啟用結構化輸出時，將停用 Agent 模式。",
"nodes.llm.computerUse.referenceToolsEmpty": "提示詞中引用的工具會顯示在這裡",
"nodes.llm.computerUse.title": "Agent 模式",
"nodes.llm.computerUse.tooltip": "管理 Agent 模式下的執行階段檔案系統與工具存取權限。",
"nodes.llm.context": "上下文",
"nodes.llm.contextBlock": "上下文區塊",
"nodes.llm.contextMissing": "缺少前序節點「{{nodeName}}」的上下文，請先選擇上下文變數。",