Update api/utils.py

api/utils.py

@@ -1,11 +1,12 @@
-import re
 from datetime import datetime
 import json
 import uuid
 import asyncio
 import random
 import string
+import re
 from typing import Any, Dict, Optional
+
 import httpx
 from fastapi import HTTPException
 from api.config import (
@@ -24,6 +25,7 @@ from api.validate import getHid  # Import the asynchronous getHid function
 
 logger = setup_logger(__name__)
 
+# Define the blocked message
 BLOCKED_MESSAGE = "Generated by BLACKBOX.AI, try unlimited chat https://www.blackbox.ai"
 
 # Helper function to create chat completion data
@@ -51,6 +53,7 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
     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
         image_base64 = message.content[1]["image_url"]["url"]
         return {
             "role": message.role,
@@ -59,6 +62,7 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
                 "imageBase64": image_base64,
                 "fileText": "",
                 "title": "snapshot",
+                # Added imagesData field here
                 "imagesData": [
                     {
                         "filePath": f"MultipleFiles/{uuid.uuid4().hex}.jpg",
@@ -77,25 +81,17 @@ def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
         return content[len(model_prefix):].strip()
     return content
 
-# Function to remove content between '$~~~$' tags
-def remove_message_between_special_tags(content: str) -> str:
-    """Remove any content that starts with '$~~~$' and ends with '$~~~$', including the tags."""
-    content = re.sub(r'\$~~~\$.*?\$~~~\$', '', content, flags=re.DOTALL)
-    return content
-
-# Improved function to remove search results but keep the links intact
-def remove_search_results(content: str) -> str:
-    """Remove search result sections, keeping the URLs intact."""
-    # Regex pattern to match search result JSON structures (looking for "link" and capturing it)
-    search_result_pattern = r'\$~~~\$.*?"link":\s*"(https?://[^\"]+).*?\$~~~\$'
-
-    # Remove content inside `$~~~$` tags that contains search result data, keeping only the URLs
-    cleaned_content = re.sub(search_result_pattern, '', content)
-    
-    # Remove unnecessary newlines or extra spaces left by the removal
-    cleaned_content = cleaned_content.strip()
-    
-    return cleaned_content
+# Helper function to remove content starting with N\n\n$~~~$ and ending with $~~~$
+def remove_enclosed_content(message: str) -> str:
+    """
+    Remove content that starts with N\n\n$~~~$ and ends with $~~~$ from the message.
+    If no such content is found, return the original message.
+    """
+    pattern = r'N\n\n\$\~\~\~\$(.*?)\$\~\~\~\$'
+    match = re.search(pattern, message, re.DOTALL)
+    if match:
+        return message[:match.start()] + message[match.end():]
+    return message
 
 # Process streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
@@ -112,19 +108,14 @@ async def process_streaming_response(request: ChatRequest):
 
     if request.model == 'o1-preview':
         delay_seconds = random.randint(1, 60)
-        logger.info(
-            f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' "
-            f"(Request ID: {request_id})"
-        )
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Request ID: {request_id})")
         await asyncio.sleep(delay_seconds)
 
     # Fetch the h-value for the 'validated' field
     h_value = await getHid()
     if not h_value:
         logger.error("Failed to retrieve h-value for validation.")
-        raise HTTPException(
-            status_code=500, detail="Validation failed due to missing h-value."
-        )
+        raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
 
     json_data = {
         "agentMode": agent_mode,
@@ -137,9 +128,7 @@ async def process_streaming_response(request: ChatRequest):
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
-        "messages": [
-            message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages
-        ],
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -157,11 +146,7 @@ async def process_streaming_response(request: ChatRequest):
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
-                "POST",
-                f"{BASE_URL}/api/chat",
-                headers=headers_api_chat,
-                json=json_data,
-                timeout=100,
+                "POST", f"{BASE_URL}/api/chat", headers=headers_api_chat, json=json_data, timeout=100
             ) as response:
                 response.raise_for_status()
                 async for chunk in response.aiter_text():
@@ -172,31 +157,22 @@ async def process_streaming_response(request: ChatRequest):
                             content = content[21:]
                         # Remove the blocked message if present
                         if BLOCKED_MESSAGE in content:
-                            logger.info(
-                                f"Blocked message detected in response for Request ID {request_id}."
-                            )
+                            logger.info(f"Blocked message detected in response for Request ID {request_id}.")
                             content = content.replace(BLOCKED_MESSAGE, '').strip()
                             if not content:
                                 continue  # Skip if content is empty after removal
-                        
-                        # Remove content between special tags
-                        content = remove_message_between_special_tags(content)
-                        
-                        # Remove search results but keep the links intact
-                        content = remove_search_results(content)
-
-                        cleaned_content = strip_model_prefix(content, model_prefix)
+                        # Remove content starting with N\n\n$~~~$ and ending with $~~~$
+                        cleaned_content = remove_enclosed_content(content)
+                        cleaned_content = strip_model_prefix(cleaned_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('', request.model, timestamp, 'stop'))}\n\n"
+                yield f"data: {json.dumps(create_chat_completion_data('ok', request.model, timestamp))}\n\n"
                 yield "data: [DONE]\n\n"
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error occurred for Request ID {request_id}: {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 Request ID {request_id}: {e}"
-            )
+            logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
 # Process non-streaming response with headers from config.py
@@ -209,23 +185,24 @@ async def process_non_streaming_response(request: ChatRequest):
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
 
+    # Adjust headers_api_chat and headers_chat since referer_url is removed
     headers_api_chat = get_headers_api_chat(BASE_URL)
+    headers_chat = get_headers_chat(
+        BASE_URL,
+        next_action=str(uuid.uuid4()),
+        next_router_state_tree=json.dumps([""]),
+    )
 
     if request.model == 'o1-preview':
-        delay_seconds = random.randint(1, 60)
-        logger.info(
-            f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' "
-            f"(Request ID: {request_id})"
-        )
+        delay_seconds = random.randint(20, 60)
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Request ID: {request_id})")
         await asyncio.sleep(delay_seconds)
 
     # Fetch the h-value for the 'validated' field
     h_value = await getHid()
     if not h_value:
         logger.error("Failed to retrieve h-value for validation.")
-        raise HTTPException(
-            status_code=500, detail="Validation failed due to missing h-value."
-        )
+        raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
 
     json_data = {
         "agentMode": agent_mode,
@@ -238,9 +215,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
-        "messages": [
-            message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages
-        ],
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -255,27 +230,26 @@ async def process_non_streaming_response(request: ChatRequest):
         "imageGenerationMode": False,  # Added this line
     }
 
-    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_api_chat, json=json_data, timeout=100
+            )
+            response.raise_for_status()
+
+            result = response.json()
+            content = result.get("choices", [{}])[0].get("text", "")
+            cleaned_content = remove_enclosed_content(content)
+            cleaned_content = strip_model_prefix(cleaned_content, model_prefix)
+            return {"choices": [{"text": cleaned_content}], "model": request.model}
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error occurred for Request ID {request_id}: {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 Request ID {request_id}: {e}"
-            )
+            logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
+
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]