Update api/utils.py

api/utils.py

@@ -3,91 +3,34 @@ import json
 import uuid
 import asyncio
 import random
-from typing import Any, Dict, Optional
-import httpx
 from fastapi import HTTPException, Request
-from dotenv import load_dotenv
-from api import validate
+import httpx
 from api.config import (
     MODEL_MAPPING,
     get_headers_api_chat,
-    get_headers_chat,
     BASE_URL,
     AGENT_MODE,
     TRENDING_AGENT_MODE,
     MODEL_PREFIXES
 )
-from api.models import ChatRequest
 from api.logger import setup_logger
-from api.rpmlimits import check_rate_limit, get_client_ip  # Import rate limit functions
+from api import validate
 
-# Initialize environment variables and logger
-load_dotenv()
 logger = setup_logger(__name__)
 
-def create_chat_completion_data(
-    content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
-) -> Dict[str, Any]:
-    return {
-        "id": f"chatcmpl-{uuid.uuid4()}",
-        "object": "chat.completion.chunk",
-        "created": timestamp,
-        "model": model,
-        "choices": [
-            {
-                "index": 0,
-                "delta": {"content": content, "role": "assistant"},
-                "finish_reason": finish_reason,
-            }
-        ],
-        "usage": None,
-    }
-
-def message_to_dict(message, model_prefix: Optional[str] = None):
-    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]:
-        return {
-            "role": message.role,
-            "content": content,
-            "data": {
-                "imageBase64": message.content[1]["image_url"]["url"],
-                "fileText": "",
-                "title": "snapshot",
-            },
-        }
-    return {"role": message.role, "content": content}
-
-def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
-    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
-
-def get_referer_url() -> str:
-    return BASE_URL
-
 async def process_streaming_response(request: ChatRequest, request_obj: Request):
-    referer_url = get_referer_url()
-    logger.info(f"Processing streaming response - Model: {request.model} - URL: {referer_url}")
-
-    client_ip = get_client_ip(request_obj)
-    check_rate_limit(client_ip)
+    referer_url = BASE_URL
+    client_ip = request_obj.client.host  # Get the client IP
+    logger.info(f"Processing streaming response - Model: {request.model} - URL: {referer_url} - IP: {client_ip}")
 
     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)
-    validated_token = validate.getHid()
+    validated_token = validate.getHid()  # Get validated token
     logger.info(f"Retrieved validated token for IP {client_ip}: {validated_token}")
 
-    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'")
-        await asyncio.sleep(delay_seconds)
-
     json_data = {
         "agentMode": agent_mode,
         "clickedAnswer2": False,
@@ -127,9 +70,7 @@ async def process_streaming_response(request: ChatRequest, request_obj: Request)
                         content = line
                         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:
@@ -140,24 +81,16 @@ async def process_streaming_response(request: ChatRequest, request_obj: Request)
             raise HTTPException(status_code=500, detail=str(e))
 
 async def process_non_streaming_response(request: ChatRequest, request_obj: Request):
-    referer_url = get_referer_url()
-    logger.info(f"Processing non-streaming response - Model: {request.model} - URL: {referer_url}")
-
-    client_ip = get_client_ip(request_obj)
-    check_rate_limit(client_ip)
+    referer_url = BASE_URL
+    client_ip = request_obj.client.host
+    logger.info(f"Processing non-streaming response - Model: {request.model} - URL: {referer_url} - IP: {client_ip}")
 
     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([""]))
-    validated_token = validate.getHid()
-
-    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'")
-        await asyncio.sleep(delay_seconds)
+    validated_token = validate.getHid()  # Get validated token
 
     json_data = {
         "agentMode": agent_mode,
@@ -216,3 +149,41 @@ async def process_non_streaming_response(request: ChatRequest, request_obj: Requ
         ],
         "usage": None,
     }
+
+def create_chat_completion_data(content: str, model: str, timestamp: int, finish_reason: Optional[str] = None):
+    return {
+        "id": f"chatcmpl-{uuid.uuid4()}",
+        "object": "chat.completion.chunk",
+        "created": timestamp,
+        "model": model,
+        "choices": [
+            {
+                "index": 0,
+                "delta": {"content": content, "role": "assistant"},
+                "finish_reason": finish_reason,
+            }
+        ],
+        "usage": None,
+    }
+
+def message_to_dict(message, model_prefix: Optional[str] = None):
+    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]:
+        return {
+            "role": message.role,
+            "content": content,
+            "data": {
+                "imageBase64": message.content[1]["image_url"]["url"],
+                "fileText": "",
+                "title": "snapshot",
+            },
+        }
+    return {"role": message.role, "content": content}
+
+def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
+    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