merge

zhaoqingang

2024-11-22 600d2205367bf914dceaf97e6f082383aa54348c

 app/api/chat.py

@@ -5,6 +5,8 @@
import asyncio
import websockets
from sqlalchemy.orm import Session

from Log import logger
from app.api import get_current_user_websocket
from app.config.config import settings
from app.models.agent_model import AgentModel, AgentType
@@ -14,6 +16,7 @@
from app.service.basic import BasicService
from app.service.ragflow import RagflowService
from app.service.service_token import get_bisheng_token, get_ragflow_token
from app.service.session import SessionService

router = APIRouter()

@@ -199,40 +202,89 @@
                            pass
    elif agent_type == AgentType.BASIC:
        try:
            service = BasicService(base_url=settings.basic_base_url)
            while True:
                # 接收前端消息
                message = await websocket.receive_json()
                question = message.get("message")
                try:
                    SessionService(db).create_session(
                        chat_id,
                        question,
                        agent_id,
                        AgentType.BASIC,
                        current_user.id
                    )
                except Exception as e:
                    logger.error(e)
                if not question:
                    await websocket.send_json({"message": "Invalid request", "type": "error"})
                    continue
                logger.error(agent.type)
                if agent.type == "questionTalk":

                service = BasicService(base_url=settings.basic_base_url)
                complete_response = ""
                async for result in service.excel_talk(question, chat_id):
                    try:
                        if result[:5] == "data:":
                            # 如果是，则截取掉前5个字符，并去除首尾空白符
                            text = result[5:].strip()
                        else:
                            # 否则，保持原样
                            text = result
                        complete_response += text
                        data = await service.questions_talk(question, chat_id)
                        output = data.get("output", "")
                        file_name = data.get("filename", "")

                        excel_url = None
                        if file_name:
                            excel_url = f"/api/files/download/?agent_id=basic_question_talk&file_id={file_name}&file_type=word"
                        result = {"message": output, "type": "message", "file_url": excel_url}
                        try:
                            json_data = json.loads(complete_response)
                            output = json_data.get("output", "")
                            result = {"message": output, "type": "message"}
                            await websocket.send_json(result | json_data)
                            complete_response = ""
                        except json.JSONDecodeError as e:
                            print(f"Error decoding JSON: {e}")
                            print(f"Response text: {text}")
                            SessionService(db).update_session(chat_id,
                                                              message={"role": "assistant", "content": result})
                        except Exception as e:
                            logger.error(e)
                        logger.error("-----------------返回数据--------------------")
                        await websocket.send_json(result | data)
                    except Exception as e2:

                        result = {"message": f"内部错误： {e2}", "type": "close"}
                        logger.error(str(e2))
                        logger.error(f"Error process message of basic chuti agent: {e2}")
                        await websocket.send_json(result)
                        print(f"Error process message of basic agent: {e2}")

                else:
                    async for result in service.excel_talk(question, chat_id):
                        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}")
        except Exception as e:
            await websocket.send_json({"message": str(e), "type": "error"})
            logger.error("----------------------------------------------fffffff")
            logger.error(e)
            print(e)
            await websocket.send_json({"message": "出现错误！", "type": "error"})
        finally:
            await websocket.close()
            print(f"Client {agent_id} disconnected")