Update api/utils.py

api/utils.py

@@ -6,10 +6,10 @@ import uuid
 import httpx
 from api.config import (
     MODEL_MAPPING,
+    headers,
     AGENT_MODE,
     TRENDING_AGENT_MODE,
-    headers,
-    BASE_URL,  # Import BASE_URL
+    BASE_URL,
 )
 from fastapi import HTTPException
 from api.models import ChatRequest
@@ -17,10 +17,29 @@ from api.logger import setup_logger
 
 logger = setup_logger(__name__)
 
+def clean_content(content: str) -> str:
+    """
+    Remove unnecessary blank lines while preserving code formatting.
+    """
+    lines = content.splitlines()
+    cleaned_lines = []
+    previous_line_empty = False
+    for line in lines:
+        if line.strip() == '':
+            if not previous_line_empty:
+                cleaned_lines.append('')
+                previous_line_empty = True
+            # Skip adding multiple consecutive empty lines
+        else:
+            cleaned_lines.append(line.rstrip())
+            previous_line_empty = False
+    return '\n'.join(cleaned_lines)
+
 def create_chat_completion_data(
     content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
 ) -> Dict[str, Any]:
-    # Removed the content cleaning function
+    # Clean the content to remove extra blank lines but preserve formatting
+    cleaned_content = clean_content(content)
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion.chunk",
@@ -29,7 +48,7 @@ def create_chat_completion_data(
         "choices": [
             {
                 "index": 0,
-                "delta": {"content": content, "role": "assistant"},
+                "delta": {"content": cleaned_content, "role": "assistant"},
                 "finish_reason": finish_reason,
             }
         ],
@@ -49,7 +68,7 @@ def message_to_dict(message):
             "data": {
                 "imageBase64": message.content[1]["image_url"]["url"],
                 "fileText": "",
-                "title": "snapshoot",
+                "title": "snapshot",
             },
         }
     else:
@@ -93,20 +112,18 @@ async def process_streaming_response(request: ChatRequest):
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
-                        content = line + "\n"
+                        content = line
                         if content.startswith("$@$v=undefined-rv1$@$"):
-                            yield f"data: {json.dumps(create_chat_completion_data(content[21:], request.model, timestamp))}\n\n"
-                        else:
-                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
-
+                            content = content[21:]
+                        yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
                 yield f"data: {json.dumps(create_chat_completion_data('', request.model, timestamp, 'stop'))}\n\n"
                 yield "data: [DONE]\n\n"
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error occurred: {e}")
-            raise HTTPException(status_code=e.response.status_code, detail="External service error")
+            raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
             logger.error(f"Error occurred during request: {e}")
-            raise HTTPException(status_code=500, detail="Request to external service failed")
+            raise HTTPException(status_code=500, detail=str(e))
 
 async def process_non_streaming_response(request: ChatRequest):
     agent_mode = AGENT_MODE.get(request.model, {})
@@ -143,13 +160,16 @@ async def process_non_streaming_response(request: ChatRequest):
                     full_response += chunk
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error occurred: {e}")
-            raise HTTPException(status_code=e.response.status_code, detail="External service error")
+            raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
             logger.error(f"Error occurred during request: {e}")
-            raise HTTPException(status_code=500, detail="Request to external service failed")
+            raise HTTPException(status_code=500, detail=str(e))
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
 
+    # Clean the content to remove extra blank lines but preserve formatting
+    cleaned_response = clean_content(full_response)
+
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",
@@ -158,7 +178,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "choices": [
             {
                 "index": 0,
-                "message": {"role": "assistant", "content": full_response},
+                "message": {"role": "assistant", "content": cleaned_response},
                 "finish_reason": "stop",
             }
         ],