Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

zhaoqingang

2024-11-19 35f8639455992d24f5d0b962bd6fa79d7fcb8f31

 app/service/ragflow.py

@@ -1,9 +1,9 @@
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

@@ -40,10 +40,11 @@
            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}")
            return self._handle_response(response)

    async def login(self, username: str, password: str) -> str:
        password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
@@ -66,7 +67,8 @@
            "messages": chat_history
        }

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

        target_url = f"{self.base_url}/v1/conversation/completion"
        async with httpx.AsyncClient(timeout=300.0) as client:
            headers = {
@@ -77,6 +79,7 @@
                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)
@@ -97,8 +100,27 @@
                    "updated_time": item["update_time"]
                }
                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}"
@@ -117,7 +139,11 @@
                    "content": "你好！ 我是你的助理，有什么可以帮到你的吗？",
                    "role": "assistant"
                },
                message,
                {
                    "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) -> list:
@@ -139,3 +165,51 @@
            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)
            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}
        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)
        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, data=data)
            data = self._handle_response(response)
            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())