Merge branch 'main' of https://github.com/maxkb-dev/maxkb

apps/application/flow/step_node/application_node/impl/base_application_node.py

@@ -19,8 +19,8 @@ def _is_interrupt_exec(node, node_variable: Dict, workflow_variable: Dict):
 
 def _write_context(node_variable: Dict, workflow_variable: Dict, node: INode, workflow, answer: str):
     result = node_variable.get('result')
-    node.context['child_node'] = node_variable['child_node']
-    node.context['is_interrupt_exec'] = node_variable['is_interrupt_exec']
+    node.context['child_node'] = node_variable.get('child_node')
+    node.context['is_interrupt_exec'] = node_variable.get('is_interrupt_exec')
     node.context['message_tokens'] = result.get('usage', {}).get('prompt_tokens', 0)
     node.context['answer_tokens'] = result.get('usage', {}).get('completion_tokens', 0)
     node.context['answer'] = answer
@@ -81,7 +81,9 @@ def write_context(node_variable: Dict, workflow_variable: Dict, node: INode, wor
     @param node:               节点实例对象
     @param workflow:           工作流管理器
     """
-    response = node_variable.get('result')['choices'][0]['message']
+    response = node_variable.get('result', {}).get('data', {})
+    node_variable['result'] = {'usage': {'completion_tokens': response.get('completion_tokens'),
+                                         'prompt_tokens': response.get('prompt_tokens')}}
     answer = response.get('content', '') or "抱歉，没有查找到相关内容，请重新描述您的问题或提供更多信息。"
     _write_context(node_variable, workflow_variable, node, workflow, answer)
 

apps/application/flow/workflow_manage.py

@@ -328,11 +328,13 @@ class WorkflowManage:
                               'message_tokens' in row and row.get('message_tokens') is not None])
         answer_tokens = sum([row.get('answer_tokens') for row in details.values() if
                              'answer_tokens' in row and row.get('answer_tokens') is not None])
+        answer_text_list = self.get_answer_text_list()
+        answer_text = '\n\n'.join(answer['content'] for answer in answer_text_list)
         self.work_flow_post_handler.handler(self.params['chat_id'], self.params['chat_record_id'],
-                                            self.answer,
+                                            answer_text,
                                             self)
         return self.base_to_response.to_block_response(self.params['chat_id'],
-                                                       self.params['chat_record_id'], self.answer, True
+                                                       self.params['chat_record_id'], answer_text, True
                                                        , message_tokens, answer_tokens,
                                                        _status=status.HTTP_200_OK if self.status == 200 else status.HTTP_500_INTERNAL_SERVER_ERROR)
 

apps/common/handle/impl/response/system_to_response.py

@@ -21,15 +21,19 @@ class SystemToResponse(BaseToResponse):
         if other_params is None:
             other_params = {}
         return result.success({'chat_id': str(chat_id), 'id': str(chat_record_id), 'operate': True,
-                               'content': content, 'is_end': is_end, **other_params}, response_status=_status,
+                               'content': content, 'is_end': is_end, **other_params,
+                               'completion_tokens': completion_tokens, 'prompt_tokens': prompt_tokens},
+                              response_status=_status,
                               code=_status)
 
-    def to_stream_chunk_response(self, chat_id, chat_record_id, node_id, up_node_id_list, content, is_end, completion_tokens,
+    def to_stream_chunk_response(self, chat_id, chat_record_id, node_id, up_node_id_list, content, is_end,
+                                 completion_tokens,
                                  prompt_tokens, other_params: dict = None):
         if other_params is None:
             other_params = {}
         chunk = json.dumps({'chat_id': str(chat_id), 'chat_record_id': str(chat_record_id), 'operate': True,
-                            'content': content, 'node_id': node_id, 'up_node_id_list': up_node_id_list, 'is_end': is_end,
+                            'content': content, 'node_id': node_id, 'up_node_id_list': up_node_id_list,
+                            'is_end': is_end,
                             'usage': {'completion_tokens': completion_tokens,
                                       'prompt_tokens': prompt_tokens,
                                       'total_tokens': completion_tokens + prompt_tokens},

ui/src/components/ai-chat/component/chat-input-operate/index.vue

@@ -75,9 +75,9 @@
 
         <div class="operate flex align-center">
           <span v-if="props.applicationDetails.file_upload_enable" class="flex align-center">
-            <!--            accept="image/jpeg, image/png, image/gif"-->
             <el-upload
               action="#"
+              multiple
               :auto-upload="false"
               :show-file-list="false"
               :accept="getAcceptList()"
@@ -246,23 +246,23 @@ const uploadFile = async (file: any, fileList: any) => {
     fileList.splice(0, fileList.length)
     return
   }
-  const formData = new FormData()
-  for (const file of fileList) {
-    formData.append('file', file.raw, file.name)
-    //
-    const extension = file.name.split('.').pop().toLowerCase() // 获取文件后缀名并转为小写
 
-    if (imageExtensions.includes(extension)) {
-      uploadImageList.value.push(file)
-    } else if (documentExtensions.includes(extension)) {
-      uploadDocumentList.value.push(file)
-    } else if (videoExtensions.includes(extension)) {
-      // videos.push(file)
-    } else if (audioExtensions.includes(extension)) {
-      // audios.push(file)
-    }
+  const formData = new FormData()
+  formData.append('file', file.raw, file.name)
+  //
+  const extension = file.name.split('.').pop().toLowerCase() // 获取文件后缀名并转为小写
+
+  if (imageExtensions.includes(extension)) {
+    uploadImageList.value.push(file)
+  } else if (documentExtensions.includes(extension)) {
+    uploadDocumentList.value.push(file)
+  } else if (videoExtensions.includes(extension)) {
+    // videos.push(file)
+  } else if (audioExtensions.includes(extension)) {
+    // audios.push(file)
   }
 
+
   if (!chatId_context.value) {
     const res = await props.openChatId()
     chatId_context.value = res