Update api/utils.py

api/utils.py

@@ -5,8 +5,8 @@ import uuid
 
 import httpx
 from api.config import MODEL_MAPPING, AGENT_MODE, TRENDING_AGENT_MODE, headers
-from fastapi import Depends, HTTPException  # Corrected import
-from fastapi.security import HTTPAuthorizationCredentials
+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
@@ -15,30 +15,7 @@ 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]:
-    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,
-    }
-
-
-def verify_app_secret(credentials: HTTPAuthorizationCredentials = Depends(security)):
-    if credentials.credentials != APP_SECRET:
-        raise HTTPException(status_code=403, detail="Invalid APP_SECRET")
-    return credentials.credentials
-
+# Remove redundant definition of verify_app_secret
 
 def message_to_dict(message):
     if isinstance(message.content, str):
@@ -59,7 +36,6 @@ def message_to_dict(message):
     else:
         return {"role": message.role, "content": message.content}
 
-
 async def process_streaming_response(request: ChatRequest):
     json_data = {
         "messages": [message_to_dict(msg) for msg in request.messages],
@@ -106,54 +82,7 @@ async def process_streaming_response(request: ChatRequest):
                 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=str(e))
+            raise HTTPException(status_code=e.response.status_code, detail="External service error")
         except httpx.RequestError as e:
             logger.error(f"Error occurred during request: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
-
-
-async def process_non_streaming_response(request: ChatRequest):
-    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, {}),
-        "isMicMode": False,
-        "userSystemPrompt": None,
-        "maxTokens": request.max_tokens,
-        "playgroundTopP": request.top_p,
-        "playgroundTemperature": request.temperature,
-        "isChromeExt": False,
-        "githubToken": None,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
-        "visitFromDelta": False,
-        "mobileClient": False,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
-    }
-    full_response = ""
-    async with httpx.AsyncClient() as client:
-        async with client.stream(
-            method="POST", url=f"{BASE_URL}/api/chat", headers=headers, json=json_data
-        ) as response:
-            async for chunk in response.aiter_text():
-                full_response += chunk
-    if full_response.startswith("$@$v=undefined-rv1$@$"):
-        full_response = full_response[21:]
-    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,
-    }
+            raise HTTPException(status_code=500, detail="Request to external service failed")