zhaoqingang
2025-03-28 226202d6eee6480f3386c6295be26fad42940cc8
app/service/basic.py
@@ -1,6 +1,7 @@
import json
import httpx
import requests
from Log import logger
@@ -12,7 +13,9 @@
    def _check_response(self, response: httpx.Response):
        """检查响应并处理错误"""
        if response.status_code not in [200, 201]:
            raise Exception(f"Failed to fetch data from API: {response.text}")
            # raise Exception(f"Failed to fetch data from API: {response.status_code}")
            logger.error(f"Failed to fetch data from API:")
            logger.error(response.status_code)
        response_data = response.json()
        return response_data
@@ -48,9 +51,7 @@
        url = f"{self.base_url}/exceltalk/upload/files"
        params = {'chat_id': chat_id, 'is_col': '0'}
        async with httpx.AsyncClient() as client:
        async with httpx.AsyncClient(timeout=300) as client:
            response = await client.post(
                url,
                files=files,
@@ -63,28 +64,32 @@
        params = {'chat_id': chat_id}
        data = {"query": question}
        headers = {'Content-Type': 'application/json'}
        buffer = bytearray()
        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 chunk in response.aiter_bytes():
                            json_data = process_buffer(chunk, buffer)
                            if json_data:
                                yield json_data
                                buffer.clear()
                        if decoded_line.startswith("data:"):
                            decoded_line = decoded_line[5:]
                        answer = json.loads(decoded_line)
                        answer["type"] = "message"
                        yield answer
                    except GeneratorExit as e:
                        logger.error("------------except GeneratorExit as e:---------------------")
                        logger.error(e)
                        print(e)
                        yield {"message": "内部错误", "type": "close"}
                    finally:
                        # 在所有数据接收完毕后记录日志
                        logger.info("All messages received and processed - over")
                        yield {"message": "", "type": "close"}
                    # finally:
                    #     # 在所有数据接收完毕后返回close
                    #     yield {"message": "", "type": "close"}
                else:
                    yield f"Error: {response.status_code}"
                    continue
                    # yield f"Error: {response.status_code}"
            else:
            # 在所有数据接收完毕后返回close
                yield {"message": "", "type": "close"}
    async def questions_talk(self, question, chat_id: str):
        logger.error("---------------questions_talk--------------------------")
@@ -102,27 +107,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={'word_name': file_id})
def process_buffer(data, buffer):
    def try_parse_json(data1):
        try:
            return True, json.loads(data1)
        except json.JSONDecodeError:
            return False, None
    if data.startswith(b'data:'):
        # 删除 'data:' 头
        data = data[5:].strip()
    else:
        pass
    # 直接拼接到缓冲区尝试解析JSON
    buffer.extend(data.strip())
    success, parsed_data = try_parse_json(buffer)
    if success:
        return parsed_data
    else:
        # 解析失败,继续拼接
        return None
        return await self.download_from_url(url, params={'word_name': file_id})