zhaoqingang
2025-01-07 b134897836ca6f26cba71ef22f2474447cf39d15
app/service/ragflow.py
@@ -1,8 +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 app.config.config import settings
from app.utils.rsa_crypto import RagflowCrypto
@@ -33,13 +36,13 @@
        else:
            return {}
    async def register(self, username: str, password: str):
    async def register(self, username: str, password: str, token:str=""):
        password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
        async with httpx.AsyncClient() as client:
            response = await client.post(
                f"{self.base_url}/v1/user/register",
                headers={'Content-Type': 'application/json'},
                json={"nickname": username, "email": f"{username}@example.com", "password": password}
                json={"nickname": username, "email":  f"{username}@example.com", "password": password}
            )
            if response.status_code != 200:
                raise Exception(f"Ragflow registration failed: {response.text}")
@@ -96,11 +99,31 @@
                {
                    "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
    async def get_session_log(self, token: str, conversation_id: str) -> dict:
        url = f"{self.base_url}/v1/conversation/get?conversation_id={conversation_id}"
        headers = {"Authorization": token}
        async with httpx.AsyncClient() as client:
            response = await client.get(url, headers=headers)
            data = self._handle_response(response)
            session_log = {
                "session_log": [
                    {
                        "message": message.get("content"),
                        "role": message.get("role"),
                    }
                    for message in data.get("message", [])
                ],
                "reference": data.get("reference"),
            }
        return session_log
    async def set_session(self, token: str, dialog_id: str, message: dict, chat_id: str, is_new: bool) -> list:
        url = f"{self.base_url}/v1/conversation/set?dialog_id={dialog_id}"
@@ -126,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:
@@ -152,5 +178,60 @@
        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.text)
            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 = {}
        async with httpx.AsyncClient(timeout=60) as client:
            response = await client.get(url, headers=headers, params=params)
            res = self._handle_response(response)
            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}
        data = {"password": password, "new_password":new_password}
        async with httpx.AsyncClient(timeout=60) as client:
            response = await client.post(url, headers=headers, json=data)
            data = self._handle_response(response)
            # logger.info("set_user_password:{}".format(data))
            return data
    async def agree_tenant_role(self, token: str, tenant_id: str) -> str:
        url = f"{self.base_url}/v1/tenant/agree/{tenant_id}"
        headers = {"Authorization": token}
        data = {}
        async with httpx.AsyncClient(timeout=60) as client:
            response = await client.put(url, headers=headers, json=data)
            print(response.text)
            if response.status_code != 200:
                raise Exception(f"Ragflow add user to tenant failed: {response.text}")
if __name__ == "__main__":
    async def a():
        a = RagflowService("http://192.168.20.119:11080")
        b = await a.agree_tenant_role("ImQ3MGY1NGFhYzFkZjExZWY5MDFmMDI0MmFjMTMwMDA2Ig.Z2qJfA.hJX4rPnnmlkUzpjIl0YGcM-yp1M", "fe24dd2c9be611ef92880242ac160006")
        print(b)
        print(b)
    import asyncio
    asyncio.run(a())
    # password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt("123456")
    # print(password)