接收excel_talk返回的消息和缓冲区的数据拼接，然后解析JSON。如果解析失败，存入缓存区继续累积，如何解析成功，给前端返回并清空缓冲区。 &&...

zhangqian

2024-11-22 66f5df3ec8004e91ec2f440d69755caa52ac33bd

 app/api/chat.py

@@ -247,43 +247,30 @@
                        await websocket.send_json(result)

                else:
                    async for result in service.excel_talk(question, chat_id):
                    async for data in service.excel_talk(question, chat_id):
                        output = data.get("output", "")
                        excel_name = data.get("excel_name", "")
                        image_name = data.get("image_name", "")

                        def build_file_url(name, file_type):
                            if not name:
                                return None
                            return (f"/api/files/download/?agent_id={agent_id}&file_id={name}"
                                    f"&file_type={file_type}")
                        excel_url = build_file_url(excel_name, 'excel')
                        image_url = build_file_url(image_name, 'image')
                        try:
                            if result[:5] == "data:":
                                # 如果是，则截取掉前5个字符，并去除首尾空白符
                                text = result[5:].strip()
                            else:
                                # 否则，保持原样
                                text = result
                            try:
                                data = json.loads(text)
                                output = data.get("output", "")
                                excel_name = data.get("excel_name", "")
                                image_name = data.get("image_name", "")
                                excel_url = None
                                image_url = None
                                if excel_name:
                                    excel_url = f"/api/files/download/?agent_id=basic_excel_talk&file_id={excel_name}&file_type=excel"
                                if image_name:
                                    image_url = f"/api/files/download/?agent_id=basic_excel_talk&file_id={image_name}&file_type=image"
                                result = {"message": output, "type": "message", "excel_url": excel_url, "image_url": image_url}
                                try:
                                    SessionService(db).update_session(chat_id,
                                                                      message={"role": "assistant", "content": result})
                                except Exception as e:
                                    logger.error(e)
                                await websocket.send_json(result | data)
                            except json.JSONDecodeError as e:
                                print(f"Error decoding JSON: {e}")
                                # print(f"Response text: {text}")
                        except Exception as e2:
                            result = {"message": f"内部错误： {e2}", "type": "close"}
                            await websocket.send_json(result)
                            print(f"Error process message of basic agent: {e2}")
                            SessionService(db).update_session(chat_id, message={"content": output, "role": "assistant"})
                        except Exception as e:
                            logger.error(f"Unexpected error when update_session: {e}")
                        # 发送结果给客户端
                        data["type"] = "message"
                        data["message"] = output
                        data["excel_url"] = excel_url
                        data["image_url"] = image_url
                        await websocket.send_json(data)
        except Exception as e:
            logger.error("----------------------------------------------fffffff")
            logger.error(e)
            print(e)
            await websocket.send_json({"message": "出现错误！", "type": "error"})
        finally:
            await websocket.close()