From 319e3e93bbb4807da58db2ac72bb8f3029738dd7 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 03 十二月 2024 13:48:40 +0800
Subject: [PATCH] dify报告合并
---
app/service/ragflow.py | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index f18f196..ac24e47 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -1,9 +1,11 @@
+from datetime import datetime
+
import httpx
from typing import Union, Dict, List
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
@@ -97,9 +99,11 @@
{
"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"]
]
return result
@@ -145,12 +149,15 @@
}
] if data else []
- async def get_session_history(self, token: str, chat_id: str) -> list:
+ async def get_session_history(self, token: str, chat_id: str, is_all: int=0):
url = f"{self.base_url}/v1/conversation/get?conversation_id={chat_id}"
headers = {"Authorization": token}
async with httpx.AsyncClient() as client:
response = await client.get(url, headers=headers)
data = self._handle_response(response)
+ # print("----------------data----------------------:", data)
+ if is_all:
+ return data
return data.get("message", [])
async def upload_and_parse(self, token: str, chat_id: str, filename: str, file: bytes) -> str:
@@ -171,44 +178,50 @@
data = {"email": email, "user_id": user_id}
async with httpx.AsyncClient(timeout=60) as client:
response = await client.post(url, headers=headers, json=data)
+ print(response)
if response.status_code != 200:
raise Exception(f"Ragflow add user to tenant failed: {response.text}")
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,
- 10)
- 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