Update api/utils.py

api/utils.py

@@ -1,29 +1,28 @@
-# utils.py
-
 from datetime import datetime
 import json
 import uuid
-import random
 from typing import Any, Dict, Optional
 
 import httpx
-from fastapi import HTTPException
-from api.config import (
-    get_model,
-    MODEL_PREFIXES,
+from fastapi import HTTPException, Depends
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
+
+from . import validate
+from .config import (
+    MODEL_MAPPING,
     AGENT_MODE,
     TRENDING_AGENT_MODE,
+    MODEL_PREFIXES,
     BASE_URL,
-    generate_id,
-    USER_SELECTED_MODELS,
+    APP_SECRET,
 )
-from api.models import ChatRequest
-from api.logger import setup_logger
-from api.validate import getHid
+from .models import ChatRequest
+from .logger import setup_logger
 
 logger = setup_logger(__name__)
+security = HTTPBearer()
+
 
-# Helper function to create chat completion data
 def create_chat_completion_data(
     content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
 ) -> Dict[str, Any]:
@@ -42,28 +41,18 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-# Function to strip model prefix from content if present
-def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
-    """Remove the model prefix from the response content if present."""
-    if model_prefix and content.startswith(model_prefix):
-        logger.debug(f"Stripping prefix '{model_prefix}' from content.")
-        return content[len(model_prefix):].strip()
-    return content
 
-# Function to convert message to dictionary format, ensuring base64 data and optional model prefix
+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
+
+
 def message_to_dict(message, model_prefix: Optional[str] = None):
-    content = (
-        message.content if isinstance(message.content, str)
-        else message.content[0]["text"]
-    )
+    content = message.content
     if model_prefix:
         content = f"{model_prefix} {content}"
-    if (
-        isinstance(message.content, list)
-        and len(message.content) == 2
-        and "image_url" in message.content[1]
-    ):
-        # Ensure base64 images are always included for all models
+    if isinstance(message.content, list) and len(message.content) == 2 and "image_url" in message.content[1]:
         return {
             "role": message.role,
             "content": content,
@@ -75,58 +64,39 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
         }
     return {"role": message.role, "content": content}
 
-# Process streaming response
-async def process_streaming_response(request: ChatRequest):
-    chat_id = generate_id()
-    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model}")
-
-    model = get_model(request.model)
-    agent_mode = AGENT_MODE.get(model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(model, {})
-    model_prefix = MODEL_PREFIXES.get(model, "")
-
-    headers_api_chat = {
-        'accept': '*/*',
-        'accept-language': 'en-US,en;q=0.9',
-        'cache-control': 'no-cache',
-        'content-type': 'application/json',
-        'origin': BASE_URL,
-        'pragma': 'no-cache',
-        'priority': 'u=1, i',
-        'referer': f'{BASE_URL}/',
-        'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"',
-        'sec-ch-ua-mobile': '?0',
-        'sec-ch-ua-platform': '"Linux"',
-        'sec-fetch-dest': 'empty',
-        'sec-fetch-mode': 'cors',
-        'sec-fetch-site': 'same-origin',
-        'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36'
-    }
 
+async def process_streaming_response(request: ChatRequest):
+    model_prefix = MODEL_PREFIXES.get(request.model, "")
     json_data = {
-        "agentMode": agent_mode,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "previewToken": None,
+        "userId": None,
         "codeModelMode": True,
-        "githubToken": None,
-        "id": chat_id,
-        "isChromeExt": False,
+        "agentMode": AGENT_MODE.get(request.model, {}),
+        "trendingAgentMode": TRENDING_AGENT_MODE.get(request.model, {}),
         "isMicMode": False,
+        "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
-        "messages": [
-            message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages
-        ],
-        "mobileClient": False,
-        "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
-        "previewToken": None,
-        "trendingAgentMode": trending_agent_mode,
-        "userId": None,
-        "userSelectedModel": model if model in USER_SELECTED_MODELS else None,
-        "userSystemPrompt": None,
-        "validated": getHid(),
+        "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),
+        "validated": validate.get_hid(),
+    }
+
+    headers = {
+        "Content-Type": "application/json",
+        "User-Agent": (
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+            "AppleWebKit/537.36 (KHTML, like Gecko) "
+            "Chrome/91.0.4472.124 Safari/537.36"
+        ),
     }
 
     async with httpx.AsyncClient() as client:
@@ -134,7 +104,7 @@ async def process_streaming_response(request: ChatRequest):
             async with client.stream(
                 "POST",
                 f"{BASE_URL}/api/chat",
-                headers=headers_api_chat,
+                headers=headers,
                 json=json_data,
                 timeout=100,
             ) as response:
@@ -144,107 +114,77 @@ async def process_streaming_response(request: ChatRequest):
                     if line:
                         content = line
                         if "https://www.blackbox.ai" in content:
-                            getHid(True)
-                            content = (
-                                "HID has been refreshed, please start a new conversation.\n"
-                            )
+                            validate.get_hid(True)
+                            content = "HID refreshed, please start a new conversation.\n"
                             yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
                             break
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             content = content[21:]
-                        cleaned_content = strip_model_prefix(content, model_prefix)
-                        yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, request.model, timestamp))}\n\n"
+                        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 for Chat ID {chat_id}: {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 for Chat ID {chat_id}: {e}")
+            logger.error(f"Error occurred during request: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
-# Process non-streaming response
-async def process_non_streaming_response(request: ChatRequest):
-    chat_id = generate_id()
-    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model}")
-
-    model = get_model(request.model)
-    agent_mode = AGENT_MODE.get(model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(model, {})
-    model_prefix = MODEL_PREFIXES.get(model, "")
-
-    headers_api_chat = {
-        'accept': '*/*',
-        'accept-language': 'en-US,en;q=0.9',
-        'cache-control': 'no-cache',
-        'content-type': 'application/json',
-        'origin': BASE_URL,
-        'pragma': 'no-cache',
-        'priority': 'u=1, i',
-        'referer': f'{BASE_URL}/',
-        'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"',
-        'sec-ch-ua-mobile': '?0',
-        'sec-ch-ua-platform': '"Linux"',
-        'sec-fetch-dest': 'empty',
-        'sec-fetch-mode': 'cors',
-        'sec-fetch-site': 'same-origin',
-        'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36'
-    }
 
+async def process_non_streaming_response(request: ChatRequest):
+    model_prefix = MODEL_PREFIXES.get(request.model, "")
     json_data = {
-        "agentMode": agent_mode,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "previewToken": None,
+        "userId": None,
         "codeModelMode": True,
-        "githubToken": None,
-        "id": chat_id,
-        "isChromeExt": False,
+        "agentMode": AGENT_MODE.get(request.model, {}),
+        "trendingAgentMode": TRENDING_AGENT_MODE.get(request.model, {}),
         "isMicMode": False,
+        "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
-        "messages": [
-            message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages
-        ],
-        "mobileClient": False,
-        "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
-        "previewToken": None,
-        "trendingAgentMode": trending_agent_mode,
-        "userId": None,
-        "userSelectedModel": model if model in USER_SELECTED_MODELS else None,
-        "userSystemPrompt": None,
-        "validated": getHid(),
+        "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),
+        "validated": validate.get_hid(),
+    }
+
+    headers = {
+        "Content-Type": "application/json",
+        "User-Agent": (
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+            "AppleWebKit/537.36 (KHTML, like Gecko) "
+            "Chrome/91.0.4472.124 Safari/537.36"
+        ),
     }
 
     full_response = ""
     async with httpx.AsyncClient() as client:
         try:
-            async with client.stream(
-                method="POST",
-                url=f"{BASE_URL}/api/chat",
-                headers=headers_api_chat,
-                json=json_data,
-            ) as response:
-                response.raise_for_status()
-                async for chunk in response.aiter_text():
-                    full_response += chunk
+            response = await client.post(f"{BASE_URL}/api/chat", headers=headers, json=json_data)
+            response.raise_for_status()
+            full_response = response.text
         except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {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 for Chat ID {chat_id}: {e}")
+            logger.error(f"Error occurred during request: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
     if "https://www.blackbox.ai" in full_response:
-        getHid(True)
-        full_response = "HID has been refreshed, please start a new conversation."
+        validate.get_hid(True)
+        full_response = "HID refreshed, please start a new conversation."
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
 
-    cleaned_full_response = strip_model_prefix(full_response, model_prefix)
-
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",
@@ -253,7 +193,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "choices": [
             {
                 "index": 0,
-                "message": {"role": "assistant", "content": cleaned_full_response},
+                "message": {"role": "assistant", "content": full_response},
                 "finish_reason": "stop",
             }
         ],