+ Dear {{ to }},
diff --git a/api/templates/invite_member_mail_template_zh-CN.html b/api/templates/invite_member_mail_template_zh-CN.html index ccd9cdbaad..b9d6619fa4 100644 --- a/api/templates/invite_member_mail_template_zh-CN.html +++ b/api/templates/invite_member_mail_template_zh-CN.html @@ -54,7 +54,7 @@
- 
+ 
+
尊敬的 {{ to }}，
diff --git a/api/templates/reset_password_mail_template_en-US.html b/api/templates/reset_password_mail_template_en-US.html index d598fd191c..9372bb0c41 100644 --- a/api/templates/reset_password_mail_template_en-US.html +++ b/api/templates/reset_password_mail_template_en-US.html @@ -61,7 +61,7 @@
-
+
+
Set your Dify password
Copy and paste this code, this code will only be valid for the next 5 minutes.
diff --git a/api/templates/reset_password_mail_template_zh-CN.html b/api/templates/reset_password_mail_template_zh-CN.html index 342c9057a7..c08de6cc5d 100644 --- a/api/templates/reset_password_mail_template_zh-CN.html +++ b/api/templates/reset_password_mail_template_zh-CN.html @@ -61,7 +61,7 @@
-
+
+
设置您的 Dify 账户密码
复制并粘贴此验证码，注意验证码仅在接下来的 5 分钟内有效。
diff --git a/docker/.env.example b/docker/.env.example index 37738a5065..f461be5a4a 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -478,7 +478,7 @@ ANALYTICDB_PORT=5432 ANALYTICDB_MIN_CONNECTION=1 ANALYTICDB_MAX_CONNECTION=5 -# TiDB vector configurations, only available when VECTOR_STORE is `tidb` +# TiDB vector configurations, only available when VECTOR_STORE is `tidb_vector` TIDB_VECTOR_HOST=tidb TIDB_VECTOR_PORT=4000 TIDB_VECTOR_USER= diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml index 487d358b24..65fbd007e2 100644 --- a/docker/docker-compose-template.yaml +++ b/docker/docker-compose-template.yaml @@ -2,7 +2,7 @@ x-shared-env: &shared-api-worker-env services: # API service api: - image: langgenius/dify-api:1.3.1 + image: langgenius/dify-api:1.4.0 restart: always environment: # Use the shared environment variables. @@ -31,7 +31,7 @@ services: # worker service # The Celery worker for processing the queue. worker: - image: langgenius/dify-api:1.3.1 + image: langgenius/dify-api:1.4.0 restart: always environment: # Use the shared environment variables. @@ -57,7 +57,7 @@ services: # Frontend web application. web: - image: langgenius/dify-web:1.3.1 + image: langgenius/dify-web:1.4.0 restart: always environment: CONSOLE_API_URL: ${CONSOLE_API_URL:-} @@ -118,7 +118,7 @@ services: # The DifySandbox sandbox: - image: langgenius/dify-sandbox:0.2.11 + image: langgenius/dify-sandbox:0.2.12 restart: always environment: # The DifySandbox configurations @@ -142,7 +142,7 @@ services: # plugin daemon plugin_daemon: - image: langgenius/dify-plugin-daemon:0.0.9-local + image: langgenius/dify-plugin-daemon:0.0.10-local restart: always environment: # Use the shared environment variables. diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml index 498390b708..4f39e801f5 100644 --- a/docker/docker-compose.middleware.yaml +++ b/docker/docker-compose.middleware.yaml @@ -45,7 +45,7 @@ services: # The DifySandbox sandbox: - image: langgenius/dify-sandbox:0.2.11 + image: langgenius/dify-sandbox:0.2.12 restart: always env_file: - ./middleware.env @@ -71,7 +71,7 @@ services: # plugin daemon plugin_daemon: - image: langgenius/dify-plugin-daemon:0.0.9-local + image: langgenius/dify-plugin-daemon:0.0.10-local restart: always env_file: - ./middleware.env diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 1b9ae75c51..bfdfa701e3 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -492,7 +492,7 @@ x-shared-env: &shared-api-worker-env services: # API service api: - image: langgenius/dify-api:1.3.1 + image: langgenius/dify-api:1.4.0 restart: always environment: # Use the shared environment variables. @@ -521,7 +521,7 @@ services: # worker service # The Celery worker for processing the queue. worker: - image: langgenius/dify-api:1.3.1 + image: langgenius/dify-api:1.4.0 restart: always environment: # Use the shared environment variables. @@ -547,7 +547,7 @@ services: # Frontend web application. web: - image: langgenius/dify-web:1.3.1 + image: langgenius/dify-web:1.4.0 restart: always environment: CONSOLE_API_URL: ${CONSOLE_API_URL:-} @@ -608,7 +608,7 @@ services: # The DifySandbox sandbox: - image: langgenius/dify-sandbox:0.2.11 + image: langgenius/dify-sandbox:0.2.12 restart: always environment: # The DifySandbox configurations @@ -632,7 +632,7 @@ services: # plugin daemon plugin_daemon: - image: langgenius/dify-plugin-daemon:0.0.9-local + image: langgenius/dify-plugin-daemon:0.0.10-local restart: always environment: # Use the shared environment variables. diff --git a/images/GitHub_README_cover.png b/images/GitHub_README_cover.png deleted file mode 100644 index 0e21be2177..0000000000 Binary files a/images/GitHub_README_cover.png and /dev/null differ diff --git a/images/GitHub_README_if.png b/images/GitHub_README_if.png new file mode 100644 index 0000000000..6d7bb9e54b Binary files /dev/null and b/images/GitHub_README_if.png differ diff --git a/images/demo.png b/images/demo.png deleted file mode 100644 index ad0cbe0fb5..0000000000 Binary files a/images/demo.png and /dev/null differ diff --git a/images/describe.png b/images/describe.png new file mode 100644 index 0000000000..747739dc2c Binary files /dev/null and b/images/describe.png differ diff --git a/web/app/components/app/configuration/dataset-config/card-item/item.tsx b/web/app/components/app/configuration/dataset-config/card-item/item.tsx index 65ad2ca941..4feba8b01e 100644 --- a/web/app/components/app/configuration/dataset-config/card-item/item.tsx +++ b/web/app/components/app/configuration/dataset-config/card-item/item.tsx @@ -12,6 +12,7 @@ import { DataSourceType } from '@/models/datasets' import FileIcon from '@/app/components/base/file-icon' import { Folder } from '@/app/components/base/icons/src/vender/solid/files' import { Globe06 } from '@/app/components/base/icons/src/vender/solid/mapsAndTravel' +import ActionButton, { ActionButtonState } from '@/app/components/base/action-button' import Drawer from '@/app/components/base/drawer' import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints' import Badge from '@/app/components/base/badge' @@ -47,56 +48,66 @@ const Item: FC
- {
- config.data_source_type === DataSourceType.FILE && (
-
))
diff --git a/web/app/components/workflow/hooks/use-checklist.ts b/web/app/components/workflow/hooks/use-checklist.ts
index 47eeef73b2..9aebd935a5 100644
--- a/web/app/components/workflow/hooks/use-checklist.ts
+++ b/web/app/components/workflow/hooks/use-checklist.ts
@@ -15,7 +15,6 @@ import { useStore } from '../store'
import {
getToolCheckParams,
getValidTreeNodes,
- transformStartNodeVariables,
} from '../utils'
import {
CUSTOM_NODE,
@@ -46,9 +45,6 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
const { data: strategyProviders } = useStrategyProviders()
const datasetsDetail = useDatasetsDetailStore(s => s.datasetsDetail)
- const chatVarList = useStore(s => s.conversationVariables)
- const environmentVariables = useStore(s => s.environmentVariables)
-
const getCheckData = useCallback((data: CommonNodeType<{}>) => {
let checkData = data
if (data.type === BlockEnum.KnowledgeRetrieval) {
@@ -68,10 +64,7 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
const needWarningNodes = useMemo(() => {
const list = []
- const { validNodes } = getValidTreeNodes(nodes.filter(node => node.type === CUSTOM_NODE), edges, true)
-
- const allVariablesMap = transformStartNodeVariables(chatVarList, environmentVariables)
- const errMessageMap = new Map()
+ const { validNodes } = getValidTreeNodes(nodes.filter(node => node.type === CUSTOM_NODE), edges)
for (let i = 0; i < nodes.length; i++) {
const node = nodes[i]
@@ -117,32 +110,8 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
toolIcon,
unConnected: !validNodes.find(n => n.id === node.id),
errorMessage,
- varErrorMessage: [],
})
}
- errMessageMap.set(node.id, list[list.length - 1])
- if (nodesExtraData[node.data.type as BlockEnum].checkVarValid) {
- const { errorMessage: varErrorMessages } = nodesExtraData[node.data.type as BlockEnum].checkVarValid(node.data, { ...allVariablesMap, ...node._parentOutputVarMap }, t)
-
- if (varErrorMessages?.length) {
- const errMessage = errMessageMap.get(node.id)
- if (errMessage) {
- errMessage.varErrorMessage = varErrorMessages
- }
- else {
- list.push({
- id: node.id,
- type: node.data.type,
- title: node.data.title,
- toolIcon,
- unConnected: !validNodes.find(n => n.id === node.id),
- errorMessage: '',
- varErrorMessage: varErrorMessages,
- })
- errMessageMap.set(node.id, list[list.length - 1])
- }
- }
- }
}
}
@@ -164,13 +133,8 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
})
}
- for (let i = 0; i < validNodes.length; i++) {
- const node = validNodes[i]
- delete node._parentOutputVarMap
- }
-
return list
- }, [nodes, edges, isChatMode, buildInTools, customTools, workflowTools, language, nodesExtraData, t, strategyProviders, getCheckData, chatVarList, environmentVariables])
+ }, [nodes, edges, isChatMode, buildInTools, customTools, workflowTools, language, nodesExtraData, t, strategyProviders, getCheckData])
return needWarningNodes
}
@@ -189,9 +153,6 @@ export const useChecklistBeforePublish = () => {
const updateDatasetsDetail = useDatasetsDetailStore(s => s.updateDatasetsDetail)
const updateTime = useRef(0)
- const chatVarList = useStore(s => s.conversationVariables)
- const environmentVariables = useStore(s => s.environmentVariables)
-
const getCheckData = useCallback((data: CommonNodeType<{}>, datasets: DataSet[]) => {
let checkData = data
if (data.type === BlockEnum.KnowledgeRetrieval) {
@@ -222,15 +183,12 @@ export const useChecklistBeforePublish = () => {
const {
validNodes,
maxDepth,
- } = getValidTreeNodes(nodes.filter(node => node.type === CUSTOM_NODE), edges, true)
+ } = getValidTreeNodes(nodes.filter(node => node.type === CUSTOM_NODE), edges)
if (maxDepth > MAX_TREE_DEPTH) {
notify({ type: 'error', message: t('workflow.common.maxTreeDepth', { depth: MAX_TREE_DEPTH }) })
return false
}
-
- const allVariablesMap = transformStartNodeVariables(chatVarList, environmentVariables)
-
// Before publish, we need to fetch datasets detail, in case of the settings of datasets have been changed
const knowledgeRetrievalNodes = nodes.filter(node => node.data.type === BlockEnum.KnowledgeRetrieval)
const allDatasetIds = knowledgeRetrievalNodes.reduce
-
- )
- }
- {
- config.data_source_type === DataSourceType.NOTION && (
-
-
- )
- }
- {
- config.data_source_type === DataSourceType.WEB && (
-
-
- )
- }
-
-
-
-
- {config.name}
- {config.provider === 'external'
- ?
+ setShowSettingsModal(false)} footer={null} mask={isMobile} panelClassName='mt-16 mx-2 sm:mr-2 mb-3 !p-0 !max-w-[640px] rounded-xl'>
{
))}
{/* mask */}
-
+
+
+ {
+ config.indexing_technique &&
{
- editable &&
+ setShowSettingsModal(true)}
- >
-
+ config.data_source_type === DataSourceType.FILE && (
+
+
+ )
}
-
+
+ )
+ }
+ {
+ config.data_source_type === DataSourceType.WEB && (
+
+
+ )
+ }
+ {config.name}
+
+ {
+ editable && {
+ e.stopPropagation()
+ setShowSettingsModal(true)
+ }}
+ >
+
+ }
+ onRemove(config.id)}
- onMouseOver={() => setIsDeleting(true)}
+ state={isDeleting ? ActionButtonState.Destructive : ActionButtonState.Default}
+ onMouseEnter={() => setIsDeleting(true)}
onMouseLeave={() => setIsDeleting(false)}
>
-
+
-
- ))
- }
-
- = {
errorMessage: errorMessages,
}
},
- checkVarValid(payload: KnowledgeRetrievalNodeType, varMap: Record, t: any) {
- const errorMessageArr = []
-
- const query_variable_selector_warnings = getNotExistVariablesByArray([payload.query_variable_selector], varMap)
- if (query_variable_selector_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.knowledgeRetrieval.queryVariable')} ${t('workflow.common.referenceVar')}${query_variable_selector_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- return {
- isValid: true,
- warning_vars: [...query_variable_selector_warnings],
- errorMessage: errorMessageArr,
- }
- },
}
export default nodeDefault
diff --git a/web/app/components/workflow/nodes/list-operator/default.ts b/web/app/components/workflow/nodes/list-operator/default.ts
index 0dc67c14d1..08e664db15 100644
--- a/web/app/components/workflow/nodes/list-operator/default.ts
+++ b/web/app/components/workflow/nodes/list-operator/default.ts
@@ -1,6 +1,5 @@
import { BlockEnum, VarType } from '../../types'
-import type { NodeDefault, Var } from '../../types'
-import { getNotExistVariablesByArray } from '../../utils/workflow'
+import type { NodeDefault } from '../../types'
import { comparisonOperatorNotRequireValue } from '../if-else/utils'
import { type ListFilterNodeType, OrderBy } from './types'
import { genNodeMetaData } from '@/app/components/workflow/utils'
@@ -58,18 +57,6 @@ const nodeDefault: NodeDefault = {
errorMessage: errorMessages,
}
},
- checkVarValid(payload: ListFilterNodeType, varMap: Record, t: any) {
- const errorMessageArr = []
-
- const variable_warnings = getNotExistVariablesByArray([payload.variable], varMap)
- if (variable_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.listFilter.inputVar')} ${t('workflow.common.referenceVar')}${variable_warnings.join('、')}${t('workflow.common.noExist')}`)
- return {
- isValid: true,
- warning_vars: variable_warnings,
- errorMessage: errorMessageArr,
- }
- },
}
export default nodeDefault
diff --git a/web/app/components/workflow/nodes/llm/default.ts b/web/app/components/workflow/nodes/llm/default.ts
index 100d03591e..9b01c3bb68 100644
--- a/web/app/components/workflow/nodes/llm/default.ts
+++ b/web/app/components/workflow/nodes/llm/default.ts
@@ -1,7 +1,5 @@
-import type { Var } from '../../types'
-import { BlockEnum, EditionType, VarType } from '../../types'
+import { BlockEnum, EditionType } from '../../types'
import { type NodeDefault, type PromptItem, PromptRole } from '../../types'
-import { getNotExistVariablesByArray, getNotExistVariablesByText } from '../../utils/workflow'
import type { LLMNodeType } from './types'
import { genNodeMetaData } from '@/app/components/workflow/utils'
@@ -83,37 +81,6 @@ const nodeDefault: NodeDefault = {
errorMessage: errorMessages,
}
},
- checkVarValid(payload: LLMNodeType, varMap: Record, t: any) {
- const errorMessageArr = []
- const prompt_templates_warnings: string[] = []
- if (payload.context?.enabled && payload.context?.variable_selector?.length) {
- const context_variable_selector_warnings = getNotExistVariablesByArray([payload.context.variable_selector], varMap)
- if (context_variable_selector_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.llm.context')} ${t('workflow.common.referenceVar')}${context_variable_selector_warnings.join('、')}${t('workflow.common.noExist')}`)
- }
- const prompt_templates = Array.isArray(payload.prompt_template) ? payload.prompt_template : [payload.prompt_template] as PromptItem[]
- prompt_templates.forEach((v) => {
- prompt_templates_warnings.push(...getNotExistVariablesByText(v.text, { context: { variable: 'context', type: VarType.string }, ...varMap }))
- })
- if (prompt_templates_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.llm.prompt')} ${t('workflow.common.referenceVar')}${prompt_templates_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- const memory_query_prompt_template_warnings = getNotExistVariablesByText(payload.memory?.query_prompt_template || '', varMap)
- if (memory_query_prompt_template_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.common.memories.title')}USER ${t('workflow.common.referenceVar')}${memory_query_prompt_template_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- if (payload.vision?.enabled && payload.vision?.configs?.variable_selector?.length) {
- const vision_variable_selector_warnings = getNotExistVariablesByArray([payload.vision.configs.variable_selector], varMap)
- if (vision_variable_selector_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.llm.vision')} ${t('workflow.common.referenceVar')}${vision_variable_selector_warnings.join('、')}${t('workflow.common.noExist')}`)
- }
-
- return {
- isValid: true,
- warning_vars: [...prompt_templates_warnings, ...memory_query_prompt_template_warnings],
- errorMessage: errorMessageArr,
- }
- },
}
export default nodeDefault
diff --git a/web/app/components/workflow/nodes/parameter-extractor/default.ts b/web/app/components/workflow/nodes/parameter-extractor/default.ts
index 9560fe7b79..a65306249d 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/default.ts
+++ b/web/app/components/workflow/nodes/parameter-extractor/default.ts
@@ -1,5 +1,4 @@
-import type { NodeDefault, Var } from '../../types'
-import { getNotExistVariablesByArray, getNotExistVariablesByText } from '../../utils/workflow'
+import type { NodeDefault } from '../../types'
import { type ParameterExtractorNodeType, ReasoningModeType } from './types'
import { genNodeMetaData } from '@/app/components/workflow/utils'
import { BlockEnum } from '@/app/components/workflow/types'
@@ -62,30 +61,6 @@ const nodeDefault: NodeDefault = {
errorMessage: errorMessages,
}
},
- checkVarValid(payload: ParameterExtractorNodeType, varMap: Record, t: any) {
- const errorMessageArr: string[] = []
-
- const variables_warnings = getNotExistVariablesByArray([payload.query], varMap)
- if (variables_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.parameterExtractor.inputVar')} ${t('workflow.common.referenceVar')}${variables_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- let vision_variable_warnings: string[] = []
- if (payload.vision?.configs?.variable_selector?.length) {
- vision_variable_warnings = getNotExistVariablesByArray([payload.vision.configs.variable_selector], varMap)
- if (vision_variable_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.llm.vision')} ${t('workflow.common.referenceVar')}${vision_variable_warnings.join('、')}${t('workflow.common.noExist')}`)
- }
-
- const instruction_warnings = getNotExistVariablesByText(payload.instruction, varMap)
- if (instruction_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.parameterExtractor.instruction')} ${t('workflow.common.referenceVar')}${instruction_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- return {
- isValid: true,
- warning_vars: [...variables_warnings, ...vision_variable_warnings, ...instruction_warnings],
- errorMessage: errorMessageArr,
- }
- },
}
export default nodeDefault
diff --git a/web/app/components/workflow/nodes/question-classifier/default.ts b/web/app/components/workflow/nodes/question-classifier/default.ts
index b3ed63c73d..d34c854916 100644
--- a/web/app/components/workflow/nodes/question-classifier/default.ts
+++ b/web/app/components/workflow/nodes/question-classifier/default.ts
@@ -1,5 +1,4 @@
-import type { NodeDefault, Var } from '../../types'
-import { getNotExistVariablesByArray, getNotExistVariablesByText } from '../../utils/workflow'
+import type { NodeDefault } from '../../types'
import type { QuestionClassifierNodeType } from './types'
import { genNodeMetaData } from '@/app/components/workflow/utils'
import { BlockEnum } from '@/app/components/workflow/types'
@@ -69,30 +68,6 @@ const nodeDefault: NodeDefault = {
errorMessage: errorMessages,
}
},
- checkVarValid(payload: QuestionClassifierNodeType, varMap: Record, t: any) {
- const errorMessageArr = []
-
- const query_variable_selector_warnings = getNotExistVariablesByArray([payload.query_variable_selector], varMap)
- if (query_variable_selector_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.questionClassifiers.inputVars')} ${t('workflow.common.referenceVar')}${query_variable_selector_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- let vision_variable_selector_warnings: string[] = []
- if (payload.vision?.configs?.variable_selector?.length) {
- vision_variable_selector_warnings = getNotExistVariablesByArray([payload.vision?.configs?.variable_selector], varMap)
- if (vision_variable_selector_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.llm.vision')} ${t('workflow.common.referenceVar')}${vision_variable_selector_warnings.join('、')}${t('workflow.common.noExist')}`)
- }
-
- const instruction_warnings: string[] = getNotExistVariablesByText(payload.instruction, varMap)
- if (instruction_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.questionClassifiers.advancedSetting')}-${t('workflow.nodes.questionClassifiers.instruction')} ${t('workflow.common.referenceVar')}${instruction_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- return {
- isValid: true,
- warning_vars: [...query_variable_selector_warnings, ...vision_variable_selector_warnings, ...instruction_warnings],
- errorMessage: errorMessageArr,
- }
- },
}
export default nodeDefault
diff --git a/web/app/components/workflow/nodes/template-transform/default.ts b/web/app/components/workflow/nodes/template-transform/default.ts
index 1617613432..1a3c092c0b 100644
--- a/web/app/components/workflow/nodes/template-transform/default.ts
+++ b/web/app/components/workflow/nodes/template-transform/default.ts
@@ -1,5 +1,4 @@
-import type { NodeDefault, Var } from '../../types'
-import { getNotExistVariablesByArray } from '../../utils/workflow'
+import type { NodeDefault } from '../../types'
import type { TemplateTransformNodeType } from './types'
import { genNodeMetaData } from '@/app/components/workflow/utils'
import { BlockEnum } from '@/app/components/workflow/types'
@@ -33,19 +32,6 @@ const nodeDefault: NodeDefault = {
errorMessage: errorMessages,
}
},
- checkVarValid(payload: TemplateTransformNodeType, varMap: Record, t: any) {
- const errorMessageArr = []
-
- const variables_selector = payload.variables.map(v => v.value_selector)
- const variables_selector_warnings = getNotExistVariablesByArray(variables_selector, varMap)
- if (variables_selector_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.templateTransform.inputVars')} ${t('workflow.common.referenceVar')}${variables_selector_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- return {
- isValid: true,
- errorMessage: errorMessageArr,
- }
- },
}
export default nodeDefault
diff --git a/web/app/components/workflow/nodes/tool/default.ts b/web/app/components/workflow/nodes/tool/default.ts
index 26669f63c8..0677cc2e09 100644
--- a/web/app/components/workflow/nodes/tool/default.ts
+++ b/web/app/components/workflow/nodes/tool/default.ts
@@ -1,9 +1,8 @@
import { genNodeMetaData } from '@/app/components/workflow/utils'
import { BlockEnum } from '@/app/components/workflow/types'
-import type { NodeDefault, Var } from '../../types'
+import type { NodeDefault } from '../../types'
import type { ToolNodeType } from './types'
import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types'
-import { getNotExistVariablesByArray, getNotExistVariablesByText } from '../../utils/workflow'
const i18nPrefix = 'workflow.errorMsg'
@@ -60,35 +59,6 @@ const nodeDefault: NodeDefault = {
errorMessage: errorMessages,
}
},
- checkVarValid(payload: ToolNodeType, varMap: Record, t: any) {
- const errorMessageArr = []
- const tool_parametersMap = payload.tool_parameters
- const tool_parameters_array = Object.values(tool_parametersMap)
- const tool_parameters_warnings: string[] = []
- tool_parameters_array?.forEach((item) => {
- if (!item.value)
- return
- if (Array.isArray(item.value)) {
- const warnings = getNotExistVariablesByArray([item.value], varMap)
- if (warnings.length)
- tool_parameters_warnings.push(...warnings)
- return
- }
- if (typeof item.value === 'string') {
- const warnings = getNotExistVariablesByText(item.value, varMap)
- if (warnings.length)
- tool_parameters_warnings.push(...warnings)
- }
- })
- if (tool_parameters_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.tool.inputVars')} ${t('workflow.common.referenceVar')}${tool_parameters_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- return {
- isValid: true,
- warning_vars: tool_parameters_warnings,
- errorMessage: errorMessageArr,
- }
- },
}
export default nodeDefault
diff --git a/web/app/components/workflow/nodes/variable-assigner/default.ts b/web/app/components/workflow/nodes/variable-assigner/default.ts
index 9b4c1c2f5d..825bad5b9c 100644
--- a/web/app/components/workflow/nodes/variable-assigner/default.ts
+++ b/web/app/components/workflow/nodes/variable-assigner/default.ts
@@ -1,6 +1,4 @@
-import type { Var } from '../../types'
import { type NodeDefault, VarType } from '../../types'
-import { getNotExistVariablesByArray } from '../../utils/workflow'
import type { VariableAssignerNodeType } from './types'
import { genNodeMetaData } from '@/app/components/workflow/utils'
import { BlockEnum } from '@/app/components/workflow/types'
@@ -53,18 +51,6 @@ const nodeDefault: NodeDefault = {
errorMessage: errorMessages,
}
},
- checkVarValid(payload: VariableAssignerNodeType, varMap: Record, t: any) {
- const errorMessageArr: string[] = []
- const variables_warnings = getNotExistVariablesByArray(payload.variables ?? [], varMap)
- if (variables_warnings.length)
- errorMessageArr.push(`${t('workflow.nodes.variableAssigner.title')} ${t('workflow.common.referenceVar')}${variables_warnings.join('、')}${t('workflow.common.noExist')}`)
-
- return {
- isValid: true,
- warning_vars: variables_warnings,
- errorMessage: errorMessageArr,
- }
- },
}
export default nodeDefault
diff --git a/web/app/components/workflow/types.ts b/web/app/components/workflow/types.ts
index 8a4f0a8266..d100cceafa 100644
--- a/web/app/components/workflow/types.ts
+++ b/web/app/components/workflow/types.ts
@@ -303,7 +303,6 @@ export type NodeDefault = {
}
defaultValue: Partial
checkValid: (payload: T, t: any, moreDataForCheckValid?: any) => { isValid: boolean; errorMessage?: string }
- checkVarValid?: (payload: T, varMap: Record, t: any,) => { isValid: boolean; errorMessage?: string[] }
}
export type OnSelectBlock = (type: BlockEnum, toolDefaultValue?: ToolDefaultValue) => void
diff --git a/web/app/components/workflow/utils/workflow-init.spec.ts b/web/app/components/workflow/utils/workflow-init.spec.ts
index d96e54a76a..8b7bdfaa92 100644
--- a/web/app/components/workflow/utils/workflow-init.spec.ts
+++ b/web/app/components/workflow/utils/workflow-init.spec.ts
@@ -5,18 +5,6 @@ import type {
} from '@/app/components/workflow/types'
import { CUSTOM_ITERATION_START_NODE } from '@/app/components/workflow/nodes/iteration-start/constants'
-jest.mock('ky', () => ({
- __esModule: true,
- default: {
- create: jest.fn(),
- },
-}))
-
-jest.mock('lodash-es/groupBy', () => ({
- __esModule: true,
- default: jest.fn(),
-}))
-
describe('preprocessNodesAndEdges', () => {
it('process nodes without iteration node or loop node should return origin nodes and edges.', () => {
const nodes = [
diff --git a/web/app/components/workflow/utils/workflow.ts b/web/app/components/workflow/utils/workflow.ts
index 739908646a..88c31f09b5 100644
--- a/web/app/components/workflow/utils/workflow.ts
+++ b/web/app/components/workflow/utils/workflow.ts
@@ -10,20 +10,14 @@ import {
uniqBy,
} from 'lodash-es'
import type {
- ConversationVariable,
Edge,
- EnvironmentVariable,
Node,
- Var,
} from '../types'
import {
BlockEnum,
} from '../types'
import type { IterationNodeType } from '../nodes/iteration/types'
import type { LoopNodeType } from '../nodes/loop/types'
-import { VAR_REGEX_TEXT } from '@/config'
-import { formatItem } from '../nodes/_base/components/variable/utils'
-import type { StructuredOutput } from '../nodes/llm/types'
export const canRunBySingle = (nodeType: BlockEnum) => {
return nodeType === BlockEnum.LLM
@@ -92,17 +86,7 @@ export const getNodesConnectedSourceOrTargetHandleIdsMap = (changes: ConnectedSo
return nodesConnectedSourceOrTargetHandleIdsMap
}
-function getParentOutputVarMap(item: Var, path: string, varMap: Record) {
- if (!item.children || (Array.isArray(item.children) && !item.children.length) || ((item.children as StructuredOutput).schema))
- return
- (item.children as Var[]).forEach((child) => {
- const newPath = `${path}.${child.variable}`
- varMap[newPath] = child
- getParentOutputVarMap(child, newPath, varMap)
- })
-}
-
-export const getValidTreeNodes = (nodes: Node[], edges: Edge[], isCollectVar?: boolean) => {
+export const getValidTreeNodes = (nodes: Node[], edges: Edge[]) => {
const startNode = nodes.find(node => node.data.type === BlockEnum.Start)
if (!startNode) {
@@ -125,19 +109,6 @@ export const getValidTreeNodes = (nodes: Node[], edges: Edge[], isCollectVar?: b
outgoers.forEach((outgoer) => {
list.push(outgoer)
- if (isCollectVar) {
- const nodeObj = formatItem(root, false, () => true)
- const varMap = {} as Record
- nodeObj.vars.forEach((item) => {
- if (item.variable.startsWith('sys.'))
- return
- const newPath = `${nodeObj.nodeId}.${item.variable}`
- varMap[newPath] = item
- getParentOutputVarMap(item, newPath, varMap)
- })
- outgoer._parentOutputVarMap = { ...(root._parentOutputVarMap ?? {}), ...varMap }
- }
-
if (outgoer.data.type === BlockEnum.Iteration)
list.push(...nodes.filter(node => node.parentId === outgoer.id))
if (outgoer.data.type === BlockEnum.Loop)
@@ -356,48 +327,3 @@ export const getParallelInfo = (nodes: Node[], edges: Edge[], parentNodeId?: str
export const hasErrorHandleNode = (nodeType?: BlockEnum) => {
return nodeType === BlockEnum.LLM || nodeType === BlockEnum.Tool || nodeType === BlockEnum.HttpRequest || nodeType === BlockEnum.Code
}
-
-export const transformStartNodeVariables = (chatVarList: ConversationVariable[], environmentVariables: EnvironmentVariable[]) => {
- const variablesMap: Record = {}
- chatVarList.forEach((variable) => {
- variablesMap[`conversation.${variable.name}`] = variable
- })
- environmentVariables.forEach((variable) => {
- variablesMap[`env.${variable.name}`] = variable
- })
- return variablesMap
-}
-
-export const getNotExistVariablesByText = (text: string, varMap: Record) => {
- const var_warnings: string[] = []
- text?.replace(VAR_REGEX_TEXT, (str, id_name) => {
- if (id_name.startsWith('sys.'))
- return str
- if (varMap[id_name])
- return str
- const arr = id_name.split('.')
- arr.shift()
- var_warnings.push(arr.join('.'))
- return str
- })
- return var_warnings
-}
-
-export const getNotExistVariablesByArray = (array: string[][], varMap: Record) => {
- if (!array.length)
- return []
- const var_warnings: string[] = []
- array.forEach((item) => {
- if (!item.length)
- return
- if (['sys'].includes(item[0]))
- return
- const var_warning = varMap[item.join('.')]
- if (var_warning)
- return
- const arr = [...item]
- arr.shift()
- var_warnings.push(arr.join('.'))
- })
- return var_warnings
-}
diff --git a/web/config/index.ts b/web/config/index.ts
index 4ddf30c2e4..4d308807c5 100644
--- a/web/config/index.ts
+++ b/web/config/index.ts
@@ -282,8 +282,6 @@ Thought: {{agent_scratchpad}}
export const VAR_REGEX = /\{\{(#[a-zA-Z0-9_-]{1,50}(\.[a-zA-Z_]\w{0,29}){1,10}#)\}\}/gi
-export const VAR_REGEX_TEXT = /\{\{#([a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)*)#\}\}/gi
-
export const resetReg = () => VAR_REGEX.lastIndex = 0
export let textGenerationTimeoutMs = 60000
diff --git a/web/i18n/en-US/workflow.ts b/web/i18n/en-US/workflow.ts
index d8d64967b1..7189f2e08b 100644
--- a/web/i18n/en-US/workflow.ts
+++ b/web/i18n/en-US/workflow.ts
@@ -113,8 +113,6 @@ const translation = {
addFailureBranch: 'Add Fail Branch',
loadMore: 'Load More',
noHistory: 'No History',
- referenceVar: 'Reference Variable',
- noExist: 'No such variable',
},
env: {
envPanelTitle: 'Environment Variables',
@@ -601,7 +599,6 @@ const translation = {
selectVariable: 'Select variable...',
addSubVariable: 'Sub Variable',
select: 'Select',
- condition: 'Condition',
},
variableAssigner: {
title: 'Assign variables',
diff --git a/web/i18n/ja-JP/workflow.ts b/web/i18n/ja-JP/workflow.ts
index 10d76f50a8..066a5581d7 100644
--- a/web/i18n/ja-JP/workflow.ts
+++ b/web/i18n/ja-JP/workflow.ts
@@ -113,8 +113,6 @@ const translation = {
addFailureBranch: '失敗ブランチを追加',
loadMore: 'さらに読み込む',
noHistory: '履歴がありません',
- referenceVar: '参照変数',
- noExist: '存在しません',
},
env: {
envPanelTitle: '環境変数',
@@ -600,7 +598,6 @@ const translation = {
},
select: '選ぶ',
addSubVariable: 'サブ変数',
- condition: '条件',
},
variableAssigner: {
title: '変数を代入する',
diff --git a/web/i18n/zh-Hans/workflow.ts b/web/i18n/zh-Hans/workflow.ts
index 3faac9b6fb..29f58d01a2 100644
--- a/web/i18n/zh-Hans/workflow.ts
+++ b/web/i18n/zh-Hans/workflow.ts
@@ -113,8 +113,6 @@ const translation = {
openInExplore: '在“探索”中打开',
loadMore: '加载更多',
noHistory: '没有历史版本',
- referenceVar: '引用变量',
- noExist: '不存在',
},
env: {
envPanelTitle: '环境变量',
@@ -602,7 +600,6 @@ const translation = {
selectVariable: '选择变量',
addSubVariable: '添加子变量',
select: '选择',
- condition: '条件',
},
variableAssigner: {
title: '变量赋值',
diff --git a/web/package.json b/web/package.json
index 6bf4236ad2..3da5b54921 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
{
"name": "dify-web",
- "version": "1.3.1",
+ "version": "1.4.0",
"private": true,
"engines": {
"node": ">=v22.11.0"