Update api/utils.py

api/utils.py

@@ -1,10 +1,12 @@
-from datetime import datetime
+# api/utils.py
+
 import json
-from typing import Any, Dict, Optional
+from datetime import datetime
 import uuid
-import re
+from typing import Any, Dict, Optional
 
 import httpx
+from fastapi import HTTPException
 from api.config import (
     MODEL_MAPPING,
     MODEL_ALIASES,
@@ -13,7 +15,6 @@ from api.config import (
     TRENDING_AGENT_MODE,
     BASE_URL
 )
-from fastapi import HTTPException
 from api.models import ChatRequest
 
 from api.logger import setup_logger
@@ -100,23 +101,26 @@ async def process_streaming_response(request: ChatRequest):
                 timeout=100,
             ) as response:
                 response.raise_for_status()
+                logger.info(f"Received response status: {response.status_code}")
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
                         content = line
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             content = content[21:]
+                        logger.debug(f"Streaming content: {content}")
                         yield f"data: {json.dumps(create_chat_completion_data(content, model, timestamp))}\n\n"
 
                 # Indicate the end of the stream
                 timestamp = int(datetime.now().timestamp())
+                logger.debug("Ending streaming response")
                 yield f"data: {json.dumps(create_chat_completion_data('', model, timestamp, 'stop'))}\n\n"
                 yield "data: [DONE]\n\n"
         except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred: {e}")
+            logger.error(f"HTTP error occurred: {e.response.status_code} - {e.response.text}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            logger.error(f"Error occurred during request: {e}")
+            logger.error(f"Request error occurred: {str(e)}")
             raise HTTPException(status_code=500, detail=str(e))
 
 
@@ -163,13 +167,15 @@ async def process_non_streaming_response(request: ChatRequest):
                 json=json_data,
             ) as response:
                 response.raise_for_status()
+                logger.info(f"Received response status: {response.status_code}")
                 async for chunk in response.aiter_text():
                     full_response += chunk
+                    logger.debug(f"Received chunk: {chunk}")
         except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred: {e}")
+            logger.error(f"HTTP error occurred: {e.response.status_code} - {e.response.text}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            logger.error(f"Error occurred during request: {e}")
+            logger.error(f"Request error occurred: {str(e)}")
             raise HTTPException(status_code=500, detail=str(e))
 
     if full_response.startswith("$@$v=undefined-rv1$@$"):