毕昇报告生成放出message,并去掉重复的step_message

zhangqian

2024-10-29 e428743956c262c03c293f7b8e2ad2971591f8a8

 app/service/ragflow.py

@@ -1,5 +1,9 @@
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,12 +12,17 @@
    def __init__(self, base_url: str):
        self.base_url = base_url

    async def _handle_response(self, response: httpx.Response) -> Union[Dict, List]:
    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 {}

@@ -57,9 +66,10 @@
            "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=10.0) as client:
        async with httpx.AsyncClient(timeout=300.0) as client:
            headers = {
                'Content-Type': 'application/json',
                'Authorization': token
@@ -68,6 +78,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)
@@ -80,7 +91,7 @@
        headers = {"Authorization": token}
        async with httpx.AsyncClient() as client:
            response = await client.get(url, headers=headers)
            data = await self._handle_response(response)
            data = self._handle_response(response)
            result = [
                {
                    "id": item["id"],
@@ -91,26 +102,26 @@
            ]
            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}
        data = {
            "dialog_id": dialog_id,
            "name": name,
            "name": message["message"],
            "is_new": is_new,
            "conversation_id": chat_id,
        }
        async with httpx.AsyncClient() as client:
            response = await client.post(url, headers=headers, json=data)
            data = await self._handle_response(response)
            data = self._handle_response(response)
            return [
                {
                    "content": "你好！ 我是你的助理，有什么可以帮到你的吗？",
                    "role": "assistant"
                },
                {
                    "content": name,
                    "doc_ids": [],
                    "content": message["message"],
                    "doc_ids":message.get("doc_ids", []),
                    "role": "user"
                }
            ] if data else []
@@ -120,5 +131,17 @@
        headers = {"Authorization": token}
        async with httpx.AsyncClient() as client:
            response = await client.get(url, headers=headers)
            data = await self._handle_response(response)
            return data.get("message", [])
            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