zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Having the same suffix for function node names can result in incorrect value retrieval (#2513)

Browse Source
This commit is contained in:
shaohuzhang1 2025-03-07 13:48:52 +08:00 committed by GitHub
parent 8b9998a53d
commit 82b566d580
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/application/flow/workflow_manage.py
View File

@ -269,11 +269,36 @@ class WorkflowManage:
self.child_node = child_node self.child_node = child_node
self.future_list = [] self.future_list = []
self.lock = threading.Lock() self.lock = threading.Lock()
self.field_list = []
self.global_field_list = []
self.init_fields()
if start_node_id is not None: if start_node_id is not None:
self.load_node(chat_record, start_node_id, start_node_data) self.load_node(chat_record, start_node_id, start_node_data)
else: else:
self.node_context = [] self.node_context = []
def init_fields(self):
field_list = []
global_field_list = []
for node in self.flow.nodes:
properties = node.properties
node_name = properties.get('stepName')
node_id = node.id
node_config = properties.get('config')
if node_config is not None:
fields = node_config.get('fields')
if fields is not None:
for field in fields:
field_list.append({**field, 'node_id': node_id, 'node_name': node_name})
global_fields = node_config.get('globalFields')
if global_fields is not None:
for global_field in global_fields:
global_field_list.append({**global_field, 'node_id': node_id, 'node_name': node_name})
field_list.sort(key=lambda f: len(f.get('node_name')), reverse=True)
global_field_list.sort(key=lambda f: len(f.get('node_name')), reverse=True)
self.field_list = field_list
self.global_field_list = global_field_list
def append_answer(self, content): def append_answer(self, content):
self.answer += content self.answer += content
self.answer_list[-1] += content self.answer_list[-1] += content
@ -739,19 +764,11 @@ class WorkflowManage:
def reset_prompt(self, prompt: str): def reset_prompt(self, prompt: str):
placeholder = "{}" placeholder = "{}"
for node in self.flow.nodes: for field in self.field_list:
properties = node.properties globeLabel = f"{field.get('node_name')}.{field.get('value')}"
node_config = properties.get('config') globeValue = f"context.get('{field.get('node_id')}',{placeholder}).get('{field.get('value', '')}','')"
if node_config is not None:
fields = node_config.get('fields')
if fields is not None:
for field in fields:
globeLabel = f"{properties.get('stepName')}.{field.get('value')}"
globeValue = f"context.get('{node.id}',{placeholder}).get('{field.get('value', '')}','')"
prompt = prompt.replace(globeLabel, globeValue) prompt = prompt.replace(globeLabel, globeValue)
global_fields = node_config.get('globalFields') for field in self.global_field_list:
if global_fields is not None:
for field in global_fields:
globeLabel = f"全局变量.{field.get('value')}" globeLabel = f"全局变量.{field.get('value')}"
globeLabelNew = f"global.{field.get('value')}" globeLabelNew = f"global.{field.get('value')}"
globeValue = f"context.get('global').get('{field.get('value', '')}','')" globeValue = f"context.get('global').get('{field.get('value', '')}','')"