From c0d11dac469251c71b036c757c788615285c9683 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 十一月 2024 10:57:10 +0800
Subject: [PATCH] 毕昇对话历史只返回了一条修正，按时间正序排列吧，json乱码修正
---
app/service/bisheng.py | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index e263c65..e55dbb7 100644
--- a/app/service/bisheng.py
+++ b/app/service/bisheng.py
@@ -16,7 +16,13 @@
status_code = response_data.get("status_code", 0)
if status_code != 200:
raise Exception(f"Failed to fetch data from Bisheng API: {response.text}")
- return response_data.get("data", {})
+ # 妫�鏌ヨ繑鍥炵殑鏁版嵁绫诲瀷
+ 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()
@@ -27,7 +33,7 @@
json={"user_name": username, "password": password},
headers={'Content-Type': 'application/json'}
)
- self._check_response(response)
+ return self._check_response(response)
async def login(self, username: str, password: str) -> str:
public_key = await self.get_public_key_api()
@@ -67,6 +73,30 @@
]
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"),
+ "role": message.get("category"),
+ "ts": message.get("create_time")
+ }
+ for message in data
+ ]
+
+ # 鎶妔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};"}
@@ -75,13 +105,12 @@
data = self._check_response(response)
return data
- async def upload(self, token: str, file: bytes) -> dict:
+ 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": ("file", file)} # 浣跨敤榛樿鏂囦欢鍚� "file"
-
+ files = {"file": (filename, file)}
async with httpx.AsyncClient() as client:
response = await client.post(url, headers=headers, files=files)
data = self._check_response(response)
@@ -91,3 +120,11 @@
}
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
--
Gitblit v1.8.0