From 77d51a55f7241e1eae25d89b4c76865c51565319 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 06 十二月 2024 16:04:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/ragflow.py | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index 03e92ea..ac24e47 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
import httpx
from typing import Union, Dict, List
from fastapi import HTTPException
@@ -97,7 +99,8 @@
{
"id": item["id"],
"name": item["name"],
- "updated_time": item["update_time"]
+ "updated_time": item["update_time"],
+ "update_date": datetime.fromtimestamp(item["update_time"] / 1000.0).strftime('%Y-%m-%d %H:%M:%S')
}
for item in data
if "id" in item and "name" in item and item["name"]
@@ -182,11 +185,11 @@
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
@@ -204,22 +207,21 @@
data = {"password": password, "new_password":new_password}
async with httpx.AsyncClient(timeout=60) as client:
- response = await client.post(url, headers=headers, data=data)
- print(response.text)
+ response = await client.post(url, headers=headers, json=data)
data = self._handle_response(response)
- print(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.set_user_password("IjYwYjg1MTFjYTY1NTExZWY4ODZlMDI0MmFjMTMwMDA2Ig.ZzxUxQ.8rIH2HifXNWtkNsnODv6XFHjGVU", "123456",
- "000000")
- print(b)
-
- import asyncio
-
- asyncio.run(a())
-
+ # async def a():
+ # a = RagflowService("http://192.168.20.119:11080")
+ # b = await a.get_knowledge_list("ImY3ZTZlZWQwYTY2NTExZWY5ZmFiMDI0MmFjMTMwMDA2Ig.Zzxwmw.uI_HAWzOkipQuga1aeQtoeIc3IM", 1,
+ # 10)
+ # print(b)
+ #
+ # import asyncio
+ #
+ # asyncio.run(a())
+ password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt("123456")
+ print(password)
--
Gitblit v1.8.0