zhangqian
2024-10-12 612d51a591abf0745d8186516f322a8944449ba7
处理异常
2个文件已修改
33 ■■■■■ 已修改文件
app/api/chat.py 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/service/ragflow.py 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/api/chat.py
@@ -47,17 +47,19 @@
                    message = await websocket.receive_json()
                    print(f"Received from client {chat_id}: {message}")
                    async for rag_response in ragflow_service.chat(token, chat_id, message["chatHistory"]):
                        print(f"Received from ragflow: {rag_response}")
                        json_str = rag_response[5:].strip()
                        json_data = json.loads(json_str)
                        if json_data.get("data") is not True:
                            answer = json_data.get("data", {}).get("answer", "")
                            result = {"message": answer, "type": "stream"}
                        else:
                            result = {"message": "", "type": "close"}
                        await websocket.send_json(result)
                        print(f"Forwarded to client {chat_id}: {result}")
                        try:
                            print(f"Received from ragflow: {rag_response}")
                            json_str = rag_response[5:].strip()
                            json_data = json.loads(json_str)
                            if json_data.get("data") is not True:
                                answer = json_data.get("data", {}).get("answer", "")
                                result = {"message": answer, "type": "stream"}
                            else:
                                result = {"message": "", "type": "close"}
                            await websocket.send_json(result)
                            print(f"Forwarded to client {chat_id}: {result}")
                        except Exception as e:
                            print(f"Error forwarding message to ragflow: {e}")
            # 启动任务处理客户端消息
            tasks = [
                asyncio.create_task(forward_to_ragflow())
app/service/ragflow.py
@@ -51,8 +51,11 @@
                # 检查响应状态码
                if response.status_code == 200:
                    # 流式读取响应
                    async for answer in response.aiter_text():
                        yield answer
                    try:
                        async for answer in response.aiter_text():
                            yield answer
                    except GeneratorExit as e:
                        print(e)
                        return
                else:
                    yield f"Error: {response.status_code}"