merge

zhaoqingang

2024-11-22 600d2205367bf914dceaf97e6f082383aa54348c

 app/service/bisheng.py

@@ -1,3 +1,4 @@
import json
from datetime import datetime
import httpx

@@ -56,8 +57,8 @@
            data = self._check_response(response)
            return data.get('public_key')

    async def get_chat_sessions(self, token: str) -> list:
        url = f"{self.base_url}/api/v1/chat/list?page=1&limit=40"
    async def get_chat_sessions(self, token: str, page: int = 1, limit: int=100) -> list:
        url = f"{self.base_url}/api/v1/chat/list?page={page}&limit={limit}"
        headers = {'cookie': f"access_token_cookie={token};"}
        async with httpx.AsyncClient() as client:
            response = await client.get(url, headers=headers)
@@ -70,7 +71,34 @@
                    "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
                }
                for item in data
                if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"]
            ]

            def process_name(item):
                message = item.get("latest_message", {}).get("message", "")
                name = message
                try:
                    message_json = json.loads(message)
                    if 'question' in message_json:
                        name = message_json['question']
                    elif 'query' in message_json:
                        name = message_json['query']
                    elif 'report_name' in message_json:
                        name = message_json['report_name']
                except json.JSONDecodeError:
                    pass
                return name

            result = [
                {
                    "id": item["chat_id"],
                    "name": process_name(item),
                    "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
                }
                for item in data
                if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"]
            ]

            return result

    async def get_session_log(self, token: str, agent_id: str, conversation_id: str):
@@ -85,13 +113,13 @@
            response.raise_for_status()
            data = self._check_response(response)
            session_log = [
                    {
                        "message": message.get("message"),
                        "role": message.get("category"),
                        "ts": message.get("create_time")
                    }
                    for message in data
                ]
                {
                    "message": message.get("message"),
                    "role": message.get("category"),
                    "ts": message.get("create_time")
                }
                for message in data
            ]

            # 把session_log 按ts 升序排序
            session_log.sort(key=lambda x: x['ts'])