代码优化

zhangqian

2024-10-29 976f9731921853d3098729e4ba8ef6b2d377e9e7

 app/api/report.py

@@ -4,7 +4,7 @@
import asyncio
import websockets
from sqlalchemy.orm import Session
from app.api import get_current_user_websocket, ResponseList, get_current_user
from app.api import get_current_user_websocket, ResponseList, get_current_user, format_file_url, process_files
from app.config.config import settings
from app.models.agent_model import AgentModel, AgentType
from app.models.base_model import get_db
@@ -35,7 +35,7 @@
        return websocket.send_json(ret)

    token = get_bisheng_token(db, current_user.id)
    service_uri = f"{settings.bisheng_websocket_url}/api/v1/chat/{agent_id}?type=L1&t=&chat_id={chat_id}"
    service_uri = f"{settings.sgb_websocket_url}/api/v1/chat/{agent_id}?type=L1&t=&chat_id={chat_id}"
    headers = {'cookie': f"access_token_cookie={token};"}

    await websocket.accept()
@@ -57,20 +57,26 @@

            # 监听毕昇发来的消息并转发给客户端
            async def forward_to_client():
                last_message = "step"
                while True:
                    message = await service_websocket.recv()
                    print(f"Received from bisheng: {message}")
                    data = json.loads(message)
                    files = data.get("files", [])
                    steps = data.get("intermediate_steps", "")
                    if len(files) != 0 or steps != "" or data["type"] == "close":
                    msg = data.get("message", "")

                    if len(files) != 0 or (steps and last_message == "step") or msg or data["type"] == "close":
                        if data["type"] == "close":
                            t = "close"
                        else:
                            t = "stream"
                        result = {"step_message": steps, "type": t, "files": files}
                        process_files(files, agent_id)
                        result = {"step_message": steps, "message": msg, "type": t, "files": files}
                        await websocket.send_json(result)
                        print(f"Forwarded to client, {chat_id}: {result}")

                    last_message = "step" if steps else "message"

            # 启动两个任务，分别处理客户端和服务端的消息
            tasks = [
@@ -87,8 +93,22 @@
                except asyncio.CancelledError:
                    pass

        except WebSocketDisconnect:
            print(f"Client {chat_id} disconnected")
        except WebSocketDisconnect as e:
            print(f"WebSocket connection closed with code {e.code}: {e.reason}")
            await websocket.close()
            await service_websocket.close()
        except Exception as e:
            print(f"Exception occurred: {e}")
        finally:
            print("Cleaning up resources of bisheng report")
            # 取消所有任务
            for task in tasks:
                if not task.done():
                    task.cancel()
                    try:
                        await task
                    except asyncio.CancelledError:
                        pass


@router.get("/variables/list", response_model=ResponseList)
@@ -96,7 +116,7 @@
    agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
    if not agent:
        return ResponseList(code=404, msg="Agent not found")
    bisheng_service = BishengService(base_url=settings.bisheng_base_url)
    bisheng_service = BishengService(base_url=settings.sgb_base_url)
    try:
        token = get_bisheng_token(db, current_user.id)
        result = await bisheng_service.variable_list(token, agent_id)