fix

zhangqian

2024-10-18 3cee1dd5768ae10d3834afd3294850af7d626633

 app/service/ragflow.py

@@ -1,4 +1,8 @@
import httpx
from typing import Union, Dict, List

from fastapi import HTTPException
from starlette import status

from app.config.config import settings
from app.utils.rsa_crypto import RagflowCrypto
@@ -8,13 +12,35 @@
    def __init__(self, base_url: str):
        self.base_url = base_url

    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):
        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}")
@@ -24,12 +50,11 @@
        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": 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 +65,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,15 +88,10 @@

    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"],
@@ -81,28 +102,46 @@
            ]
            return result

    async def set_session(self, token: str, dialog_id: str, name: str, chat_id: str, is_new: bool) -> list:
    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) -> list:
        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)
            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