Skip to content

Commit 334c374

Browse files
committed
fix: Knowledge base workflow variable assignment node
1 parent 3cb4a47 commit 334c374

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

apps/application/flow/step_node/variable_assign_node/i_variable_assign_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ def get_node_params_serializer_class(self) -> Type[serializers.Serializer]:
2525
def _run(self):
2626
return self.execute(**self.node_params_serializer.data, **self.flow_params_serializer.data)
2727

28-
def execute(self, variable_list, stream, **kwargs) -> NodeResult:
28+
def execute(self, variable_list, **kwargs) -> NodeResult:
2929
pass

apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def handle(self, variable, evaluation):
5858
result['output_value'] = reference
5959
return result
6060

61-
def execute(self, variable_list, stream, **kwargs) -> NodeResult:
61+
def execute(self, variable_list, **kwargs) -> NodeResult:
6262
#
6363
result_list = []
6464
is_chat = False

ui/src/workflow/common/NodeCascader.vue

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ const get_up_node_field_list = (contain_self: boolean, use_cache: boolean) => {
9393
return result.filter((v: any) => v.children && v.children.length > 0)
9494
}
9595
const getOptionsValue = () => {
96-
if (workflowMode == WorkflowMode.ApplicationLoop) {
96+
if ([WorkflowMode.ApplicationLoop, WorkflowMode.KnowledgeLoop].includes(workflowMode)) {
9797
return props.global
9898
? get_up_node_field_list(false, true).filter(
9999
(v: any) =>
@@ -110,13 +110,6 @@ const getOptionsValue = () => {
110110
: props.nodeModel
111111
.get_up_node_field_list(false, true)
112112
.filter((v: any) => v.children && v.children.length > 0)
113-
if (workflowMode == WorkflowMode.Knowledge || workflowMode == WorkflowMode.KnowledgeLoop) {
114-
const edgeModel = props.nodeModel.graphModel.getElement('knowledge-base-node')
115-
const baseNode = edgeModel
116-
.get_node_field_list()
117-
.filter((v: any) => v.children && v.children.length > 0)
118-
return [...baseNode, ...result]
119-
}
120113
return result
121114
}
122115
}

ui/src/workflow/common/app-node.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class AppNode extends HtmlResize.view {
8181
let globalFields = []
8282
if (this.props.model.properties.user_input_field_list) {
8383
globalFields = this.props.model.properties.user_input_field_list.map((item: any) => ({
84-
label: item.label.label,
84+
label: typeof item.label == 'string' ? item.label : item.label.label,
8585
value: item.field,
8686
}))
8787
}
@@ -129,6 +129,12 @@ class AppNode extends HtmlResize.view {
129129
this.props.graphModel.getNodeModelById('start-node') ||
130130
this.props.graphModel.getNodeModelById('loop-start-node')
131131
)?.get_node_field_list() || []
132+
const kbn = this.props.graphModel.getNodeModelById('knowledge-base-node')
133+
if (kbn) {
134+
const knowledgeBaseFieldList = kbn.get_node_field_list()
135+
return [...knowledgeBaseFieldList, ...start_node_field_list, ...result]
136+
}
137+
132138
return [...start_node_field_list, ...result]
133139
}
134140

0 commit comments

Comments
 (0)