From 08c8e8c9a4d65677de6a493446a605d70efee631 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期二, 10 十二月 2024 16:32:07 +0800 Subject: [PATCH] 12.10 16 --- app/service/bisheng.py | 156 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 148 insertions(+), 8 deletions(-) diff --git a/app/service/bisheng.py b/app/service/bisheng.py index b71a932..ff1accc 100644 --- a/app/service/bisheng.py +++ b/app/service/bisheng.py @@ -1,5 +1,8 @@ +import json +from datetime import datetime import httpx +from Log import logger from app.config.config import settings from app.utils.rsa_crypto import BishengCrypto @@ -7,6 +10,21 @@ class BishengService: def __init__(self, base_url: str): self.base_url = base_url + + def _check_response(self, response: httpx.Response): + if response.status_code not in [200, 201]: + raise Exception(f"Failed to fetch data from Bisheng API: {response.text}") + response_data = response.json() + status_code = response_data.get("status_code", 0) + if status_code != 200: + raise Exception(f"Failed to fetch data from Bisheng API: {response.text}") + # 妫�鏌ヨ繑鍥炵殑鏁版嵁绫诲瀷 + if isinstance(response_data.get("data"), dict): + return response_data.get("data", {}) + elif isinstance(response_data.get("data"), list): + return response_data.get("data", []) + else: + return {} async def register(self, username: str, password: str): public_key = await self.get_public_key_api() @@ -17,8 +35,10 @@ json={"user_name": username, "password": password}, headers={'Content-Type': 'application/json'} ) - if response.status_code != 200 and response.status_code != 201: - raise Exception(f"Bisheng registration failed: {response.text}") + 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() @@ -29,9 +49,8 @@ json={"user_name": username, "password": password}, headers={'Content-Type': 'application/json'} ) - if response.status_code != 200 and response.status_code != 201: - raise Exception(f"Bisheng login failed: {response.text}") - return response.json().get('data', {}).get('access_token') + data = self._check_response(response) + return data.get('access_token') async def get_public_key_api(self) -> dict: async with httpx.AsyncClient() as client: @@ -39,6 +58,127 @@ f"{self.base_url}/api/v1/user/public_key", headers={'Content-Type': 'application/json'} ) - if response.status_code != 200: - raise Exception(f"Failed to get public key: {response.text}") - return response.json().get('data', {}).get('public_key') + data = self._check_response(response) + return data.get('public_key') + + 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) + # 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: + 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 Exception as e: + pass + 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 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 + + async def get_session_log(self, token: str, agent_id: str, conversation_id: str): + url = ( + f"{self.base_url}/api/v1/chat/history?" + f"flow_id={agent_id}&" + f"chat_id={conversation_id}&page_size=30&id=" + ) + headers = {'cookie': f"access_token_cookie={token};"} + async with httpx.AsyncClient() as client: + response = await client.get(url, headers=headers) + response.raise_for_status() + data = self._check_response(response) + session_log = [ + { + "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 if message.get("category") != "system" + ] + + # 鎶妔ession_log 鎸塼s 鍗囧簭鎺掑簭 + session_log.sort(key=lambda x: x['ts']) + return session_log + + async def variable_list(self, token: str, agent_id: str) -> list: + url = f"{self.base_url}/api/v1/variable/list?flow_id={agent_id}" + 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) + return data + + async def upload(self, token: str, filename: str, file: bytes) -> dict: + url = f"{self.base_url}/api/v1/knowledge/upload" + headers = {'cookie': f"access_token_cookie={token};"} + + # 鍒涘缓琛ㄥ崟鏁版嵁锛屽寘鍚枃浠� + files = {"file": (filename, file)} + async with httpx.AsyncClient() as client: + response = await client.post(url, headers=headers, files=files) + data = self._check_response(response) + file_path = data.get("file_path", "") + result = { + "file_path": file_path + } + + return result + + async def user_list(self, token: str) -> list: + url = f"{self.base_url}/api/v1/user/list" + 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) + return data + + + async def change_password_public(self, token: str, username: str, password: str, new_password:str) -> dict: + url = f"{self.base_url}/api/v1/user/change_password_public" + headers = {'cookie': f"access_token_cookie={token};"} + public_key = await self.get_public_key_api() + password = BishengCrypto(public_key, settings.PRIVATE_KEY).encrypt(password) + new_password = BishengCrypto(public_key, settings.PRIVATE_KEY).encrypt(new_password) + json = {"username": username, "password": password, "new_password": new_password} + async with httpx.AsyncClient() as client: + response = await client.post(url, headers=headers, json=json) + data = self._check_response(response) + + return data -- Gitblit v1.8.0