From cfb8a353c72f96494cd46a78bd917f6ed8aaef1d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 20 十一月 2024 17:01:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/ragflow.py | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index 769631d..34e8307 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -3,7 +3,7 @@
from fastapi import HTTPException
from starlette import status
-from Log import logger
+# from Log import logger
from app.config.config import settings
from app.utils.rsa_crypto import RagflowCrypto
@@ -182,38 +182,42 @@
async def get_knowledge_list(self, token: str, page_index: int, page_size: int) -> str:
url = f"{self.base_url}/v1/kb/list"
headers = {"Authorization": token}
- params = {"page": page_index, "page_size": page_size}
+ # params = {"page": page_index, "page_size": page_size}
+ params = {}
async with httpx.AsyncClient(timeout=60) as client:
response = await client.get(url, headers=headers, params=params)
res = self._handle_response(response)
- print(res)
return res
async def set_user_password(self, token: str, password: str, new_password: str) -> str:
# print("password:", password)
# print("new_password:", new_password)
+ headers = {
+ 'Content-Type': 'application/json',
+ 'Authorization': token
+ }
password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
new_password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(new_password)
url = f"{self.base_url}/v1/user/setting"
- headers = {"Authorization": token}
+ # headers = {"Authorization": token}
data = {"password": password, "new_password":new_password}
async with httpx.AsyncClient(timeout=60) as client:
- response = await client.post(url, headers=headers, data=data)
+ response = await client.post(url, headers=headers, json=data)
data = self._handle_response(response)
- logger.info("set_user_password:{}".format(data))
+ # logger.info("set_user_password:{}".format(data))
return data
if __name__ == "__main__":
async def a():
a = RagflowService("http://192.168.20.119:11080")
- b = await a.get_knowledge_list("625e1f24a26811ef8f940242ac130006", 1,
+ b = await a.get_knowledge_list("ImY3ZTZlZWQwYTY2NTExZWY5ZmFiMDI0MmFjMTMwMDA2Ig.Zzxwmw.uI_HAWzOkipQuga1aeQtoeIc3IM", 1,
10)
print(b)
import asyncio
- # 鍦ㄥ悓姝ヤ唬鐮佷腑鍚姩寮傛涓诲嚱鏁�
+
asyncio.run(a())
--
Gitblit v1.8.0