fix: 修复函数库响应数据在日志中不显示问题

1Panel-dev · Dec 11, 2024 · cbb76a7 · cbb76a7
1 parent daf27a7
commit cbb76a7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/apps/application/flow/step_node/application_node/impl/base_application_node.py b/apps/application/flow/step_node/application_node/impl/base_application_node.py
@@ -52,6 +52,7 @@ def write_context_stream(node_variable: Dict, workflow_variable: Dict, node: INo
         runtime_node_id = response_content.get('runtime_node_id', '')
         chat_record_id = response_content.get('chat_record_id', '')
         child_node = response_content.get('child_node')
+        view_type = response_content.get('view_type')
         node_type = response_content.get('node_type')
         real_node_id = response_content.get('real_node_id')
         node_is_end = response_content.get('node_is_end', False)
@@ -65,7 +66,8 @@ def write_context_stream(node_variable: Dict, workflow_variable: Dict, node: INo
                'runtime_node_id': runtime_node_id, 'chat_record_id': chat_record_id,
                'child_node': child_node,
                'real_node_id': real_node_id,
-               'node_is_end': node_is_end}
+               'node_is_end': node_is_end,
+               'view_type': view_type}
         usage = response_content.get('usage', {})
     node_variable['result'] = {'usage': usage}
     node_variable['is_interrupt_exec'] = is_interrupt_exec

diff --git a/apps/application/flow/step_node/function_lib_node/impl/base_function_lib_node.py b/apps/application/flow/step_node/function_lib_node/impl/base_function_lib_node.py
@@ -29,7 +29,7 @@ def write_context(step_variable: Dict, global_variable: Dict, node, workflow):
         if workflow.is_result(node, NodeResult(step_variable, global_variable)) and 'result' in step_variable:
             result = str(step_variable['result']) + '\n'
             yield result
-            workflow.answer += result
+            node.answer_text = result
     node.context['run_time'] = time.time() - node.context['start_time']
 
 
@@ -94,6 +94,7 @@ class BaseFunctionLibNodeNode(IFunctionLibNode):
     def save_context(self, details, workflow_manage):
         self.context['result'] = details.get('result')
         self.answer_text = details.get('result')
+
     def execute(self, function_lib_id, input_field_list, **kwargs) -> NodeResult:
         function_lib = QuerySet(FunctionLib).filter(id=function_lib_id).first()
         if not function_lib.is_active:

diff --git a/apps/application/flow/step_node/function_node/impl/base_function_node.py b/apps/application/flow/step_node/function_node/impl/base_function_node.py
@@ -27,7 +27,7 @@ def write_context(step_variable: Dict, global_variable: Dict, node, workflow):
         if workflow.is_result(node, NodeResult(step_variable, global_variable)) and 'result' in step_variable:
             result = str(step_variable['result']) + '\n'
             yield result
-            workflow.answer += result
+            node.answer_text = result
     node.context['run_time'] = time.time() - node.context['start_time']
 
 

diff --git a/apps/application/flow/workflow_manage.py b/apps/application/flow/workflow_manage.py
@@ -454,21 +454,23 @@ def hand_event_node_result(self, current_node, node_result_future):
                         content = r
                         child_node = {}
                         node_is_end = False
+                        view_type = current_node.view_type
                         if isinstance(r, dict):
                             content = r.get('content')
                             child_node = {'runtime_node_id': r.get('runtime_node_id'),
                                           'chat_record_id': r.get('chat_record_id')
                                 , 'child_node': r.get('child_node')}
                             real_node_id = r.get('real_node_id')
                             node_is_end = r.get('node_is_end')
+                            view_type = r.get('view_type')
                         chunk = self.base_to_response.to_stream_chunk_response(self.params['chat_id'],
                                                                                self.params['chat_record_id'],
                                                                                current_node.id,
                                                                                current_node.up_node_id_list,
                                                                                content, False, 0, 0,
                                                                                {'node_type': current_node.type,
                                                                                 'runtime_node_id': current_node.runtime_node_id,
-                                                                                'view_type': current_node.view_type,
+                                                                                'view_type': view_type,
                                                                                 'child_node': child_node,
                                                                                 'node_is_end': node_is_end,
                                                                                 'real_node_id': real_node_id})