Update api/utils.py

api/utils.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 import json
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, List
 
 import httpx
 from api.config import (
@@ -13,7 +13,7 @@ from api.config import (
     MODEL_REFERERS
 )
 from fastapi import HTTPException
-from api.models import ChatRequest
+from api.models import ChatRequest, Message
 
 from api.logger import setup_logger
 
@@ -31,8 +31,11 @@ async def process_streaming_response(request: ChatRequest):
     dynamic_headers = headers.copy()
     dynamic_headers['Referer'] = referer_url
 
+    # Convert Message objects to dictionaries
+    messages = [msg.dict() for msg in request.messages]
+
     json_data = {
-        "messages": request.messages,  # Directly pass messages without processing
+        "messages": messages,  # Pass serialized messages
         "previewToken": None,
         "userId": None,
         "codeModelMode": True,
@@ -63,8 +66,16 @@ async def process_streaming_response(request: ChatRequest):
                 timeout=100,
             ) as response:
                 response.raise_for_status()
-                async for chunk in response.aiter_text():
-                    yield chunk  # Directly yield the chunk without modification
+                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:]
+                        # Since we've removed custom processing, directly yield the content
+                        yield f"data: {content}\n\n"
+
+                yield f"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=str(e))
@@ -72,6 +83,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, {})
@@ -82,8 +94,11 @@ async def process_non_streaming_response(request: ChatRequest):
     dynamic_headers = headers.copy()
     dynamic_headers['Referer'] = referer_url
 
+    # Convert Message objects to dictionaries
+    messages = [msg.dict() for msg in request.messages]
+
     json_data = {
-        "messages": request.messages,  # Directly pass messages without processing
+        "messages": messages,  # Pass serialized messages
         "previewToken": None,
         "userId": None,
         "codeModelMode": True,
@@ -103,7 +118,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "mobileClient": False,
         "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
     }
-
+    full_response = ""
     async with httpx.AsyncClient() as client:
         try:
             response = await client.post(
@@ -113,10 +128,29 @@ async def process_non_streaming_response(request: ChatRequest):
                 timeout=100,
             )
             response.raise_for_status()
-            return response.json()  # Directly return the JSON response
+            full_response = response.text  # Get the response text
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error occurred: {e}")
             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=str(e))
+    
+    if full_response.startswith("$@$v=undefined-rv1$@$"):
+        full_response = full_response[21:]
+
+    # Return the response as-is without custom processing
+    return {
+        "id": f"chatcmpl-{uuid.uuid4()}",
+        "object": "chat.completion",
+        "created": int(datetime.now().timestamp()),
+        "model": request.model,
+        "choices": [
+            {
+                "index": 0,
+                "message": {"role": "assistant", "content": full_response},
+                "finish_reason": "stop",
+            }
+        ],
+        "usage": None,
+    }