From a2c19ee3080048e8b4aca8eeca98c1d8f2b59d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 27 Mar 2026 16:40:49 +0800 Subject: [PATCH 1/4] feat: `Variable assign` supports set to `null` --- .../impl/base_variable_assign_node.py | 19 ++++++++++++------- .../nodes/variable-assign-node/index.vue | 3 ++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py b/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py index f1711009a47..94b49c4d72e 100644 --- a/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py +++ b/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py @@ -60,6 +60,10 @@ def handle(self, variable, evaluation): val = variable['value'] evaluation(variable, val) result['output_value'] = val + elif variable['source'] == 'null': + val = None + evaluation(variable, val) + result['output_value'] = val else: reference = self.get_reference_content(variable['reference']) evaluation(variable, reference) @@ -67,26 +71,27 @@ def handle(self, variable, evaluation): return result def execute(self, variable_list, **kwargs) -> NodeResult: - # result_list = [] - is_chat = False + contains_chat_variable = False for variable in variable_list: if 'fields' not in variable: continue + if 'global' == variable['fields'][0]: result = self.handle(variable, self.global_evaluation) result_list.append(result) - if 'chat' == variable['fields'][0]: + elif 'chat' == variable['fields'][0]: result = self.handle(variable, self.chat_evaluation) result_list.append(result) - is_chat = True - if 'loop' == variable['fields'][0]: + contains_chat_variable = True + elif 'loop' == variable['fields'][0]: result = self.handle(variable, self.loop_evaluation) result_list.append(result) - if 'output' == variable['fields'][0]: + elif 'output' == variable['fields'][0]: result = self.handle(variable, self.out_evaluation) result_list.append(result) - if is_chat: + + if contains_chat_variable: from application.flow.loop_workflow_manage import LoopWorkflowManage if isinstance(self.workflow_manage, LoopWorkflowManage): self.workflow_manage.parentWorkflowManage.get_chat_info().set_chat_variable( diff --git a/ui/src/workflow/nodes/variable-assign-node/index.vue b/ui/src/workflow/nodes/variable-assign-node/index.vue index a455730e0d6..82cf2b584ca 100644 --- a/ui/src/workflow/nodes/variable-assign-node/index.vue +++ b/ui/src/workflow/nodes/variable-assign-node/index.vue @@ -45,6 +45,7 @@ + @@ -142,7 +143,7 @@ - + Date: Fri, 27 Mar 2026 16:46:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=B1=BB=E5=9E=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../variable_assign_node/impl/base_variable_assign_node.py | 5 +++++ ui/src/components/execution-detail-card/index.vue | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py b/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py index 94b49c4d72e..c9e05c99133 100644 --- a/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py +++ b/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py @@ -68,6 +68,11 @@ def handle(self, variable, evaluation): reference = self.get_reference_content(variable['reference']) evaluation(variable, reference) result['output_value'] = reference + + # 获取输入输出值的类型，用于显示在执行详情页面中 + result['input_type'] = type(result.get('input_value')).__name__ if result.get('input_value') is not None else 'null' + result['output_type'] = type(result.get('output_value')).__name__ if result.get('output_value') is not None else 'null' + return result def execute(self, variable_list, **kwargs) -> NodeResult: diff --git a/ui/src/components/execution-detail-card/index.vue b/ui/src/components/execution-detail-card/index.vue index 347ee55ea46..255ec043837 100644 --- a/ui/src/components/execution-detail-card/index.vue +++ b/ui/src/components/execution-detail-card/index.vue @@ -882,7 +882,7 @@
- {{ f.name }}: {{ f.input_value }} + {{ f.name }} ({{ f.input_type }}): {{ f.input_value }}
@@ -892,7 +892,7 @@
- {{ f.name }}: {{ f.output_value }} + {{ f.name }} ({{ f.output_type }}): {{ f.output_value }}
From db662fd01608672ddfa809e8a5c882fea5bf441e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 27 Mar 2026 17:23:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/base_variable_assign_node.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py b/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py index c9e05c99133..86c99578f32 100644 --- a/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py +++ b/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py @@ -60,14 +60,14 @@ def handle(self, variable, evaluation): val = variable['value'] evaluation(variable, val) result['output_value'] = val - elif variable['source'] == 'null': - val = None - evaluation(variable, val) - result['output_value'] = val - else: + elif variable['source'] == 'referencing': reference = self.get_reference_content(variable['reference']) evaluation(variable, reference) result['output_value'] = reference + else: + val = None + evaluation(variable, val) + result['output_value'] = val # 获取输入输出值的类型，用于显示在执行详情页面中 result['input_type'] = type(result.get('input_value')).__name__ if result.get('input_value') is not None else 'null' From 23e0bbb10cf0999d697466a451f04d214387925b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 31 Mar 2026 14:04:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/base_variable_assign_node.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py b/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py index 86c99578f32..9cadb82e5f3 100644 --- a/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py +++ b/apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py @@ -79,20 +79,21 @@ def execute(self, variable_list, **kwargs) -> NodeResult: result_list = [] contains_chat_variable = False for variable in variable_list: - if 'fields' not in variable: + if not variable.get('fields'): continue - if 'global' == variable['fields'][0]: + field0 = variable['fields'][0] + if 'global' == field0: result = self.handle(variable, self.global_evaluation) result_list.append(result) - elif 'chat' == variable['fields'][0]: + elif 'chat' == field0: result = self.handle(variable, self.chat_evaluation) result_list.append(result) contains_chat_variable = True - elif 'loop' == variable['fields'][0]: + elif 'loop' == field0: result = self.handle(variable, self.loop_evaluation) result_list.append(result) - elif 'output' == variable['fields'][0]: + elif 'output' == field0: result = self.handle(variable, self.out_evaluation) result_list.append(result)