merge master

zhaoqingang

2025-02-14 74d286ea8e5be898d142f9ebed0d0c72dbdc5900

 app/service/ragflow.py

@@ -1,5 +1,11 @@
import httpx
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

@@ -8,28 +14,50 @@
    def __init__(self, base_url: str):
        self.base_url = base_url

    async def register(self, username: str, password: str):
    def _handle_response(self, response: httpx.Response) -> Union[Dict, List]:
        if response.status_code != 200:
            return {}

        data = response.json()
        ret_code = data.get("retcode")
        if ret_code == 401:
            raise HTTPException(
                status_code=status.HTTP_401_UNAUTHORIZED,
                detail="登录过期",
            )
        if ret_code != 0:
            return {}

        # 检查返回的数据类型
        if isinstance(data.get("data"), dict):
            return data.get("data", {})
        elif isinstance(data.get("data"), list):
            return data.get("data", [])
        else:
            return {}

    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",
                json={"nickname": username, "email": f"{username}@example.com", "password": password},
                headers={'Content-Type': 'application/json'}
                headers={'Content-Type': 'application/json'},
                json={"nickname": username, "email":  f"{username}@example.com", "password": password}
            )
            if response.status_code != 200:
                raise Exception(f"Ragflow registration failed: {response.text}")
            return self._handle_response(response)

    async def login(self, username: str, password: str) -> str:
    async def login(self, username: str, password: str, email="") -> 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/login",
                json={"email": f"{username}@example.com", "password": password},
                headers={'Content-Type': 'application/json'}
                headers={'Content-Type': 'application/json'},
                json={"email": username if "@" in username else f"{username}@example.com", "password": password}
            )
            if response.status_code != 200:
                raise Exception(f"Ragflow login failed: {response.text}")
                # 从响应头中提取 Authorization 字段
            authorization = response.headers.get('Authorization')
            if not authorization:
                raise Exception("Authorization header not found in response")
@@ -40,19 +68,20 @@
            "conversation_id": chat_id,
            "messages": chat_history
        }

        print(f"send to ragflow chat: {data}")

        target_url = f"{self.base_url}/v1/conversation/completion"
        async with httpx.AsyncClient() as client:
        async with httpx.AsyncClient(timeout=300.0) as client:
            headers = {
                'Content-Type': 'application/json',
                'Authorization': token
            }
            # 创建流式请求
            async with client.stream("POST", target_url, json=data, headers=headers) as response:
                # 检查响应状态码
                if response.status_code == 200:
                    # 流式读取响应
                    try:
                        async for answer in response.aiter_text():
                            print(f"response of ragflow chat: {answer}")
                            yield answer
                    except GeneratorExit as e:
                        print(e)
@@ -62,47 +91,147 @@

    async def get_chat_sessions(self, token: str, dialog_id: str) -> list:
        url = f"{self.base_url}/v1/conversation/list?dialog_id={dialog_id}"
        headers = {
            "Authorization": token
        }
        headers = {"Authorization": token}
        async with httpx.AsyncClient() as client:
            response = await client.get(url, headers=headers)
            if response.status_code != 200:
                raise Exception(f"Failed to fetch data from Ragflow API: {response.text}")

            data = response.json().get("data", [])
            data = self._handle_response(response)
            result = [
                {
                    "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 set_session(self, token: str, dialog_id: str, name: str, chat_id: str, is_new: bool) -> list:
    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}"
        headers = {
            "Authorization": token
        headers = {"Authorization": token}
        data = {
            "dialog_id": dialog_id,
            "name": message["message"],
            "is_new": is_new,
            "conversation_id": chat_id,
        }

        data = {"dialog_id": dialog_id,
                "name": name,
                "is_new": is_new,
                "conversation_id": chat_id,
                }

        async with httpx.AsyncClient() as client:
            response = await client.post(url, headers=headers, json=data)
            if response.status_code != 200:
                return []
            return [{
                "content": "你好！ 我是你的助理，有什么可以帮到你的吗？",
                "role": "assistant"
            },
            data = self._handle_response(response)
            return [
                {
                    "content": name,
                    "doc_ids": [],
                    "content": "你好！ 我是你的助理，有什么可以帮到你的吗？",
                    "role": "assistant"
                },
                {
                    "content": message["message"],
                    "doc_ids":message.get("doc_ids", []),
                    "role": "user"
                }]
                }
            ] if data else []

    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:
        url = f"{self.base_url}/v1/document/upload_and_parse"
        headers = {"Authorization": token}
        data = {"conversation_id": chat_id}

        # 创建表单数据，包含文件
        files = {"file": (filename, file)}
        async with httpx.AsyncClient(timeout=60) as client:
            response = await client.post(url, headers=headers, files=files, data=data)
            data = self._handle_response(response)
            return data

    async def add_user_tenant(self, token: str, tenant_id: str, email: str, user_id: str) -> str:
        url = f"{self.base_url}/v1/tenant/{tenant_id}/user"
        headers = {"Authorization": token}
        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)