Update api/utils.py

api/utils.py

@@ -4,42 +4,18 @@ from typing import Any, Dict, Optional
 import uuid
 
 import httpx
-from api.config import (
-    MODEL_MAPPING,
-    headers,
-    AGENT_MODE,
-    TRENDING_AGENT_MODE,
-    BASE_URL,
-)
+from api.config import MODEL_MAPPING, headers, AGENT_MODE, TRENDING_AGENT_MODE, BASE_URL
 from fastapi import HTTPException
 from api.models import ChatRequest
+
 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]:
-    # 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",
@@ -48,19 +24,17 @@ def create_chat_completion_data(
         "choices": [
             {
                 "index": 0,
-                "delta": {"content": cleaned_content, "role": "assistant"},
+                "delta": {"content": content, "role": "assistant"},
                 "finish_reason": finish_reason,
             }
         ],
         "usage": None,
     }
 
+
 def message_to_dict(message):
     if isinstance(message.content, str):
-        result = {"role": message.role, "content": message.content}
-        if hasattr(message, 'data'):
-            result['data'] = message.data
-        return result
+        return {"role": message.role, "content": message.content}
     elif isinstance(message.content, list) and len(message.content) == 2:
         return {
             "role": message.role,
@@ -74,6 +48,7 @@ def message_to_dict(message):
     else:
         return {"role": message.role, "content": message.content}
 
+
 async def process_streaming_response(request: ChatRequest):
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
@@ -116,6 +91,7 @@ async def process_streaming_response(request: ChatRequest):
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             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:
@@ -125,6 +101,7 @@ async def process_streaming_response(request: ChatRequest):
             logger.error(f"Error occurred during request: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
+
 async def process_non_streaming_response(request: ChatRequest):
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
@@ -167,9 +144,6 @@ async def process_non_streaming_response(request: ChatRequest):
     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",
@@ -178,7 +152,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "choices": [
             {
                 "index": 0,
-                "message": {"role": "assistant", "content": cleaned_response},
+                "message": {"role": "assistant", "content": full_response},
                 "finish_reason": "stop",
             }
         ],