Update api/utils.py

api/utils.py

@@ -19,9 +19,13 @@ from api.config import (
     MODEL_REFERERS
 )
 from api.models import ChatRequest
-from api.logger import setup_logger
-
-logger = setup_logger(__name__)
+from api.logger import (
+    log_generated_chat_id,
+    log_model_delay,
+    log_http_error,
+    log_request_error,
+    log_strip_prefix
+)
 
 # Helper function to create a random alphanumeric chat ID
 def generate_chat_id(length: int = 7) -> str:
@@ -74,30 +78,29 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
 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.")
+        log_strip_prefix(model_prefix)
         return content[len(model_prefix):].strip()
-    logger.debug("No prefix to strip from content.")
     return content
 
 # Process streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
     chat_id = generate_chat_id()
     chat_url = f"/chat/{chat_id}?model={request.model}"
-    logger.info(f"Generated Chat ID: {chat_id} - URL: {chat_url}")
+    log_generated_chat_id(chat_id, chat_url)
     
     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}")
+    
+    # Retrieve referer based on the model specified in the request
+    referer_path = MODEL_REFERERS.get(request.model, "/?model=default")
     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)
-        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Chat ID: {chat_id})")
+        log_model_delay(delay_seconds, chat_id, request.model)
         await asyncio.sleep(delay_seconds)
 
     json_data = {
@@ -140,39 +143,38 @@ async def process_streaming_response(request: ChatRequest):
                         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:
-            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e}")
+            log_http_error(chat_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 Chat ID {chat_id}: {e}")
+            log_request_error(chat_id, e)
             raise HTTPException(status_code=500, detail=str(e))
 
 # Process non-streaming response with headers from config.py
 async def process_non_streaming_response(request: ChatRequest):
     chat_id = generate_chat_id()
     chat_url = f"/chat/{chat_id}?model={request.model}"
-    logger.info(f"Generated Chat ID: {chat_id} - URL: {chat_url}")
+    log_generated_chat_id(chat_id, chat_url)
     
     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}")
+    
+    # Retrieve referer based on the model specified in the request
+    referer_path = MODEL_REFERERS.get(request.model, "/?model=default")
     referer_url = f"{BASE_URL}{referer_path}"
 
-    # 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(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)
-        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Chat ID: {chat_id})")
+        log_model_delay(delay_seconds, chat_id, request.model)
         await asyncio.sleep(delay_seconds)
 
     json_data = {
@@ -209,15 +211,14 @@ async def process_non_streaming_response(request: ChatRequest):
                 async for chunk in response.aiter_text():
                     full_response += chunk
         except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e}")
+            log_http_error(chat_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 Chat ID {chat_id}: {e}")
+            log_request_error(chat_id, e)
             raise HTTPException(status_code=500, detail=str(e))
     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 {