zhaoqingang
2025-03-18 282a631b9ceee9a634ee1d93751a5254ed37ccef
app/service/bisheng.py
@@ -26,7 +26,7 @@
        else:
            return {}
    async def register(self, username: str, password: str):
    async def register(self, username: str, password: str, token:str=""):
        public_key = await self.get_public_key_api()
        password = BishengCrypto(public_key, settings.PRIVATE_KEY).encrypt(password)
        async with httpx.AsyncClient() as client:
@@ -35,7 +35,10 @@
                json={"user_name": username, "password": password},
                headers={'Content-Type': 'application/json'}
            )
            return self._check_response(response)
            res = self._check_response(response)
            if isinstance(res, dict):
                res["id"] = res.get("user_id")
            return res
    async def login(self, username: str, password: str) -> str:
        public_key = await self.get_public_key_api()
@@ -90,18 +93,11 @@
                        name = message_json['query']
                    elif 'report_name' in message_json:
                        name = message_json['report_name']
                except json.JSONDecodeError:
                except Exception as e:
                    pass
                if not name:
                    name =  item.get("flow_name")
                return name
            def process_name_report(item):
                # logger.error("-----------------------process_name-------------------------------------")
                # logger.error(item)
                name = item.get("flow_name", "报告生成")
                return name
                    name = item.get("flow_name")
                return name[:50]
            result = [
                {
@@ -126,16 +122,15 @@
        async with httpx.AsyncClient() as client:
            response = await client.get(url, headers=headers)
            response.raise_for_status()
            # print(response.text)
            data = self._check_response(response)
            session_log = [
                {
                    "message": message.get("intermediate_steps", ""),
                    "intermediate_steps": 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 升序排序