Update api/utils.py

api/utils.py

@@ -6,15 +6,31 @@ import uuid
 import httpx
 from api.config import MODEL_MAPPING, AGENT_MODE, TRENDING_AGENT_MODE, headers
 from fastapi import HTTPException
-from api.auth import verify_app_secret  # Correctly import verify_app_secret
-
-from api.config import APP_SECRET, BASE_URL
 from api.models import ChatRequest
-
 from api.logger import setup_logger
 
 logger = setup_logger(__name__)
 
+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 spaces
+    cleaned_content = '\n'.join([line.rstrip() for line in content.splitlines() if line.strip() != ''])
+    return {
+        "id": f"chatcmpl-{uuid.uuid4()}",
+        "object": "chat.completion.chunk",
+        "created": timestamp,
+        "model": model,
+        "choices": [
+            {
+                "index": 0,
+                "delta": {"content": cleaned_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}
@@ -34,33 +50,16 @@ def message_to_dict(message):
     else:
         return {"role": message.role, "content": message.content}
 
-def create_chat_completion_data(
-    content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
-) -> Dict[str, Any]:
-    return {
-        "id": f"chatcmpl-{uuid.uuid4()}",
-        "object": "chat.completion.chunk",
-        "created": timestamp,
-        "model": model,
-        "choices": [
-            {
-                "index": 0,
-                "delta": {"content": content, "role": "assistant"},
-                "finish_reason": finish_reason,
-            }
-        ],
-        "usage": None,
-    }
-
-
 async def process_streaming_response(request: ChatRequest):
+    agent_mode = AGENT_MODE.get(request.model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     json_data = {
         "messages": [message_to_dict(msg) for msg in request.messages],
         "previewToken": None,
         "userId": None,
         "codeModelMode": True,
-        "agentMode": AGENT_MODE.get(request.model, {}),
-        "trendingAgentMode": TRENDING_AGENT_MODE.get(request.model, {}),
+        "agentMode": agent_mode,
+        "trendingAgentMode": trending_agent_mode,
         "isMicMode": False,
         "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
@@ -89,7 +88,10 @@ async def process_streaming_response(request: ChatRequest):
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
-                        content = line + "\n"
+                        # Clean the content to remove extra spaces
+                        content = line.strip()
+                        content = '\n'.join([l.rstrip() for l in content.splitlines() if l.strip() != ''])
+                        content += "\n"
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             yield f"data: {json.dumps(create_chat_completion_data(content[21:], request.model, timestamp))}\n\n"
                         else:
@@ -105,13 +107,15 @@ async def process_streaming_response(request: ChatRequest):
             raise HTTPException(status_code=500, detail="Request to external service failed")
 
 async def process_non_streaming_response(request: ChatRequest):
+    agent_mode = AGENT_MODE.get(request.model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     json_data = {
         "messages": [message_to_dict(msg) for msg in request.messages],
         "previewToken": None,
         "userId": None,
         "codeModelMode": True,
-        "agentMode": AGENT_MODE.get(request.model, {}),
-        "trendingAgentMode": TRENDING_AGENT_MODE.get(request.model, {}),
+        "agentMode": agent_mode,
+        "trendingAgentMode": trending_agent_mode,
         "isMicMode": False,
         "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
@@ -143,6 +147,11 @@ async def process_non_streaming_response(request: ChatRequest):
             raise HTTPException(status_code=500, detail="Request to external service failed")
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
+
+    # Clean the content to remove extra spaces
+    full_response = full_response.strip()
+    full_response = '\n'.join([line.rstrip() for line in full_response.splitlines() if line.strip() != ''])
+
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",