Update api/utils.py

api/utils.py

@@ -14,9 +14,7 @@ from api.config import (
     get_headers_chat,
     BASE_URL,
     AGENT_MODE,
-    TRENDING_AGENT_MODE,
-    MODEL_PREFIXES,
-    MODEL_REFERERS
+    TRENDING_AGENT_MODE
 )
 from api.models import ChatRequest
 from api.logger import setup_logger
@@ -48,10 +46,8 @@ def create_chat_completion_data(
     }
 
 # Function to convert message to dictionary format, ensuring base64 data and optional model prefix
-def message_to_dict(message, model_prefix: Optional[str] = None):
+def message_to_dict(message):
     content = message.content if isinstance(message.content, str) else message.content[0]["text"]
-    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
         return {
@@ -66,29 +62,17 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
     return {"role": message.role, "content": content}
 
 # 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 get the correct referer URL for logging
-def get_referer_url(chat_id: str, model: str) -> str:
-    """Generate the referer URL based on specific models listed in MODEL_REFERERS."""
-    if model in MODEL_REFERERS:
-        return f"{BASE_URL}/chat/{chat_id}?model={model}"
-    return BASE_URL
+def strip_model_prefix(content: str) -> str:
+    return content.strip()
 
 # Process streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
     chat_id = generate_chat_id()
-    referer_url = get_referer_url(chat_id, request.model)
+    referer_url = f"{BASE_URL}/chat/{chat_id}?model={request.model}"
     logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model} - URL: {referer_url}")
 
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
 
     headers_api_chat = get_headers_api_chat(referer_url)
 
@@ -108,7 +92,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) for msg in request.messages],
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -137,7 +121,7 @@ async def process_streaming_response(request: ChatRequest):
                         content = line
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             content = content[21:]
-                        cleaned_content = strip_model_prefix(content, model_prefix)
+                        cleaned_content = strip_model_prefix(content)
                         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"
@@ -152,12 +136,11 @@ async def process_streaming_response(request: ChatRequest):
 # Process non-streaming response with headers from config.py
 async def process_non_streaming_response(request: ChatRequest):
     chat_id = generate_chat_id()
-    referer_url = get_referer_url(chat_id, request.model)
+    referer_url = f"{BASE_URL}/chat/{chat_id}?model={request.model}"
     logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model} - URL: {referer_url}")
 
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
 
     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([""]))
@@ -178,7 +161,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) for msg in request.messages],
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -209,7 +192,7 @@ async def process_non_streaming_response(request: ChatRequest):
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
 
-    cleaned_full_response = strip_model_prefix(full_response, model_prefix)
+    cleaned_full_response = strip_model_prefix(full_response)
 
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",