请求basic_agent换成requests库，保存消息是不再保存中间结果

zhangqian

2024-11-22 0ad20a631808fcc255a8739d0ea27bfe044f4ea0

 app/service/basic.py

@@ -1,4 +1,7 @@
import json

import httpx
import requests

from Log import logger

@@ -42,12 +45,9 @@
        url = f"{self.base_url}/exceltalk/download/excel"
        return await self.download_from_url(url, params={'excel_name': file_id})

    async def excel_talk_upload(self, chat_id: str, filename: str, file_content: bytes):
    async def excel_talk_upload(self, chat_id: str, files):
        url = f"{self.base_url}/exceltalk/upload/files"
        params = {'chat_id': chat_id, 'is_col': '0'}

        # 创建 FormData 对象
        files = [('files', (filename, file_content, 'application/octet-stream'))]

        async with httpx.AsyncClient() as client:
            response = await client.post(
@@ -62,20 +62,27 @@
        params = {'chat_id': chat_id}
        data = {"query": question}
        headers = {'Content-Type': 'application/json'}
        async with httpx.AsyncClient(timeout=300.0) as client:
            async with client.stream("POST", url, params=params, json=data, headers=headers) as response:
                if response.status_code == 200:
        with requests.post(url, headers=headers, json=data, params=params, timeout=60,
                           stream=True) as response:
            for line in response.iter_lines():
                if line:
                    decoded_line = line.decode("utf-8")
                    try:
                        async for answer in response.aiter_text():
                            print(f"response of excel_talk chat: {answer}")
                            yield answer
                        if decoded_line.startswith("data:"):
                            decoded_line = decoded_line[5:]
                        answer = json.loads(decoded_line)
                        yield answer
                    except GeneratorExit as e:
                        print(e)
                        return
                        yield {"message": "内部错误", "type": "close"}
                    finally:
                        # 在所有数据接收完毕后返回close
                        yield {"message": "", "type": "close"}

                else:
                    yield f"Error: {response.status_code}"

    async def questions_talk(self,question, chat_id: str):
    async def questions_talk(self, question, chat_id: str):
        logger.error("---------------questions_talk--------------------------")
        url = f"{self.base_url}/questions/talk"
        params = {'chat_id': chat_id}
@@ -91,4 +98,4 @@

    async def questions_talk_word_download(self, file_id: str):
        url = f"{self.base_url}/questions/download/word"
        return await self.download_from_url(url, params={'excel_name': file_id})
        return await self.download_from_url(url, params={'word_name': file_id})