Update api/utils.py

api/utils.py

@@ -16,17 +16,14 @@ from api.config import (
     AGENT_MODE,
     TRENDING_AGENT_MODE,
     MODEL_PREFIXES,
-    MODEL_REFERERS,
+    MODEL_REFERERS
 )
 from api.models import ChatRequest
-from api.logger import (
-    log_generated_chat_id_with_referer,
-    log_model_delay,
-    log_http_error,
-    log_request_error,
-)
+from api.logger import setup_logger
+
+logger = setup_logger(__name__)
 
-# Helper function to generate a random alphanumeric chat ID
+# Helper function to create a random alphanumeric chat ID
 def generate_chat_id(length: int = 7) -> str:
     characters = string.ascii_letters + string.digits
     return ''.join(random.choices(characters, k=length))
@@ -50,14 +47,12 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-# Convert message to dictionary format with optional model prefix and image data
+# Function to convert message to dictionary format with optional model prefix
 def message_to_dict(message, model_prefix: Optional[str] = None):
     content = message.content
     if model_prefix:
         content = f"{model_prefix} {content}"
-    if isinstance(message.content, str):
-        return {"role": message.role, "content": content}
-    elif isinstance(message.content, list) and len(message.content) == 2:
+    if isinstance(message.content, list) and len(message.content) == 2:
         return {
             "role": message.role,
             "content": content,
@@ -70,24 +65,32 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
     else:
         return {"role": message.role, "content": content}
 
-# Streaming response processing
-async def process_streaming_response(request: ChatRequest):
-    chat_id = generate_chat_id() if request.model in MODEL_REFERERS else None
-    referer_path = MODEL_REFERERS.get(request.model, "")
-    referer_url = f"{BASE_URL}/chat/{chat_id}?model={request.model}" if chat_id else BASE_URL
-
-    # Log with chat ID, model, and referer URL if applicable
-    log_generated_chat_id_with_referer(chat_id, request.model, referer_url)
+# 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
 
+# Process streaming response with headers from config.py
+async def process_streaming_response(request: ChatRequest):
+    chat_id = generate_chat_id()
+    logger.info(f"Generated Chat ID: {chat_id}")
+    
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
+    referer_path = MODEL_REFERERS.get(request.model, f"/?model={request.model}")
+    referer_url = f"{BASE_URL}{referer_path}"
 
+    # Generate headers for API chat request with dynamic Referer
     headers_api_chat = get_headers_api_chat(referer_url)
 
+    # Introduce delay for 'o1-preview' model
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
-        log_model_delay(delay_seconds, request.model, chat_id)
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Chat ID: {chat_id})")
         await asyncio.sleep(delay_seconds)
 
     json_data = {
@@ -126,36 +129,43 @@ async def process_streaming_response(request: ChatRequest):
                 response.raise_for_status()
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
-                    content = line.lstrip("$@$v=undefined-rv1$@$")  # Trim only if needed
-                    yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
+                    if line:
+                        content = line
+                        if content.startswith("$@$v=undefined-rv1$@$"):
+                            content = content[21:]
+                        # Strip the model prefix from the response content
+                        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('', request.model, timestamp, 'stop'))}\n\n"
                 yield "data: [DONE]\n\n"
         except httpx.HTTPStatusError as e:
-            log_http_error(e, chat_id)
+            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            log_request_error(e, chat_id)
+            logger.error(f"Error occurred during request for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
-# Non-streaming response processing
+# Process non-streaming response with headers from config.py
 async def process_non_streaming_response(request: ChatRequest):
-    chat_id = generate_chat_id() if request.model in MODEL_REFERERS else None
-    referer_path = MODEL_REFERERS.get(request.model, "")
-    referer_url = f"{BASE_URL}/chat/{chat_id}?model={request.model}" if chat_id else BASE_URL
-
-    log_generated_chat_id_with_referer(chat_id, request.model, referer_url)
-
+    chat_id = generate_chat_id()
+    logger.info(f"Generated Chat ID: {chat_id}")
+    
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
+    referer_path = MODEL_REFERERS.get(request.model, f"/?model={request.model}")
+    referer_url = f"{BASE_URL}{referer_path}"
+    chat_url = f"{BASE_URL}/chat/{chat_id}?model={request.model}"
 
+    # Generate headers for API chat request and chat request with dynamic Referer
     headers_api_chat = get_headers_api_chat(referer_url)
-    headers_chat = get_headers_chat(referer_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
+    headers_chat = get_headers_chat(chat_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
 
+    # Introduce delay for 'o1-preview' model
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
-        log_model_delay(delay_seconds, request.model, chat_id)
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Chat ID: {chat_id})")
         await asyncio.sleep(delay_seconds)
 
     json_data = {
@@ -192,13 +202,16 @@ async def process_non_streaming_response(request: ChatRequest):
                 async for chunk in response.aiter_text():
                     full_response += chunk
         except httpx.HTTPStatusError as e:
-            log_http_error(e, chat_id)
+            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            log_request_error(e, chat_id)
+            logger.error(f"Error occurred during request for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=500, detail=str(e))
-    
-    full_response = full_response.lstrip("$@$v=undefined-rv1$@$")  # Trim only if needed
+    if full_response.startswith("$@$v=undefined-rv1$@$"):
+        full_response = full_response[21:]
+
+    # Strip the model prefix from the full response
+    cleaned_full_response = strip_model_prefix(full_response, model_prefix)
 
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
@@ -208,7 +221,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "choices": [
             {
                 "index": 0,
-                "message": {"role": "assistant", "content": full_response},
+                "message": {"role": "assistant", "content": cleaned_full_response},
                 "finish_reason": "stop",
             }
         ],