dify报告合并

zhaoqingang

2024-12-03 319e3e93bbb4807da58db2ac72bb8f3029738dd7

 app/service/bisheng.py

@@ -2,6 +2,7 @@
from datetime import datetime
import httpx

from Log import logger
from app.config.config import settings
from app.utils.rsa_crypto import BishengCrypto

@@ -57,24 +58,28 @@
            data = self._check_response(response)
            return data.get('public_key')

    async def get_chat_sessions(self, token: str, page: int = 1, limit: int=100) -> list:
    async def get_chat_sessions(self, token: str, agent_id,page: int = 1, limit: int=1000) -> 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)
            data = self._check_response(response)

            result = [
                {
                    "id": item["chat_id"],
                    "name": item["latest_message"]["message"],
                    "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"]
            ]
            # print(data)
            # result = [
            #     {
            #         "id": item["chat_id"],
            #         "name": item["latest_message"]["message"],
            #         "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000),
            #         "update_date": item["update_time"]
            #     }
            #     for item in data
            #     if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"]
            # ]

            def process_name(item):
                # logger.error("-----------------------process_name-------------------------------------")
                # logger.error(item)

                message = item.get("latest_message", {}).get("message", "")
                name = message
                try:
@@ -87,16 +92,19 @@
                        name = message_json['report_name']
                except json.JSONDecodeError:
                    pass
                return name
                if not name:
                    name =  item.get("flow_name")
                return name[:50]

            result = [
                {
                    "id": item["chat_id"],
                    "name": process_name(item),
                    "update_date": item["update_time"].replace("T", " "),
                    "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"]
                if item.get("flow_id") == agent_id #if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"] and
            ]

            return result
@@ -114,11 +122,12 @@
            data = self._check_response(response)
            session_log = [
                {
                    "message": message.get("message"),
                    "role": message.get("category"),
                    "message":message.get("message", "") if message.get("message", "") else message.get("intermediate_steps", ""),
                    "files": message.get("files", ""),
                    "role": "question" if message.get("category") == "question" and message.get("message", "") else "answer",
                    "ts": message.get("create_time")
                }
                for message in data
                for message in data if message.get("category") != "system"
            ]

            # 把session_log 按ts 升序排序