Upload 13 files

.github/workflows/docker-deploy.yml

@@ -36,7 +36,7 @@ jobs:
       with:
         context: .  # The context is the root of your repository
         push: true  # Automatically push the image after building
-        tags: ${{ secrets.DOCKER_USERNAME }}/blackboxv2:v4  # Replace 'your-app-name' with your desired Docker image name
+        tags: ${{ secrets.DOCKER_USERNAME }}/blackboxv2:v12  # Replace 'your-app-name' with your desired Docker image name
 
     # Step 5: Log out of Docker Hub
     - name: Log out of Docker Hub

api/app.py

@@ -1,50 +1,41 @@
-from fastapi import FastAPI, Depends, HTTPException, Request, Response
-from fastapi.responses import JSONResponse, StreamingResponse
-from api.auth import verify_app_secret
-from api.config import ALLOWED_MODELS
-from api.models import ChatRequest
-from api.utils import process_response
-from api.logger import setup_logger
-
-logger = setup_logger(__name__)
-
-app = FastAPI(
-    title="Your API",
-    docs_url=None,          # Disable Swagger UI
-    redoc_url=None,         # Disable ReDoc
-    openapi_url=None,       # Disable OpenAPI schema
-)
-
-# Include your authentication if needed
-# from api.auth import verify_app_secret
-
-@app.post("/v1/chat/completions")
-async def chat_completions(
-    request: ChatRequest, app_secret: str = Depends(verify_app_secret)
-):
-    logger.info("Processing chat completion request")
-    if request.model not in [model["id"] for model in ALLOWED_MODELS]:
-        raise HTTPException(
-            status_code=400,
-            detail=f"Model {request.model} is not allowed."
-        )
-
-    # Process the response using Editee API
-    if request.stream:
-        # If streaming is required
-        generator = process_response(request, stream=True)
-        return StreamingResponse(generator, media_type="text/event-stream")
-    else:
-        # Non-streaming response
-        response_data = await process_response(request)
-        return JSONResponse(content=response_data)
-
-# Health check endpoints
-@app.get("/")
-@app.get("/healthz")
-@app.get("/ready")
-@app.get("/alive")
-@app.get("/status")
-@app.get("/health")
-def health_check(request: Request):
-    return Response(content='{"status": "ok"}', media_type="application/json")
+from fastapi import FastAPI, Request
+from starlette.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse
+from api.logger import setup_logger
+from api.routes import router
+
+
+logger = setup_logger(__name__)
+
+def create_app():
+    app = FastAPI(
+        title="NiansuhAI API Gateway",
+        docs_url=None,          # Disable Swagger UI
+        redoc_url=None,         # Disable ReDoc
+        openapi_url=None,       # Disable OpenAPI schema
+    )
+
+    # CORS settings
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=["*"],                   # Adjust as needed for security
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
+
+    # Include routes
+    app.include_router(router)
+
+    # Global exception handler for better error reporting
+    @app.exception_handler(Exception)
+    async def global_exception_handler(request: Request, exc: Exception):
+        logger.error(f"An error occurred: {str(exc)}")
+        return JSONResponse(
+            status_code=500,
+            content={"message": "An internal server error occurred."},
+        )
+
+    return app
+
+app = create_app()

api/config.py

@@ -1,44 +1,255 @@
-import os
-from dotenv import load_dotenv
-
-load_dotenv()
-
-# Base URL and Common Headers
-BASE_URL = "https://editee.com"
-EDITEA_API_ENDPOINT = "https://editee.com/submit/chatgptfree"
-
-# Editee API Headers
-EDITEA_HEADERS = {
-    "Accept": "application/json, text/plain, */*",
-    "Accept-Language": "en-US,en;q=0.9",
-    "Cache-Control": "no-cache",
-    "Content-Type": "application/json",
-    "Origin": BASE_URL,
-    "Pragma": "no-cache",
-    "Priority": "u=1, i",
-    "Referer": f"{BASE_URL}/chat-gpt",
-    "Sec-CH-UA": '"Chromium";v="129", "Not=A?Brand";v="8"',
-    "Sec-CH-UA-Mobile": '?0',
-    "Sec-CH-UA-Platform": '"Linux"',
-    "Sec-Fetch-Dest": 'empty',
-    "Sec-Fetch-Mode": 'cors',
-    "Sec-Fetch-Site": 'same-origin',
-    "User-Agent": 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36',
-    "X-Requested-With": 'XMLHttpRequest',
-}
-
-APP_SECRET = os.getenv("APP_SECRET")
-
-ALLOWED_MODELS = [
-    {"id": "claude", "name": "Claude"},
-    {"id": "gpt4", "name": "GPT-4"},
-    {"id": "gemini", "name": "Gemini"},
-    {"id": "mistrallarge", "name": "Mistral Large"},
-]
-
-MODEL_MAPPING = {
-    "claude-3.5-sonnet": "claude",
-    "gpt-4o": "gpt4",
-    "gemini-pro": "gemini",
-    "mistral-large": "mistrallarge",
-}
+import os
+from dotenv import load_dotenv
+
+load_dotenv()
+
+# Base URL and Common Headers
+BASE_URL = "https://www.blackbox.ai"
+common_headers = {
+    'accept': '*/*',
+    'accept-language': 'en-US,en;q=0.9',
+    'cache-control': 'no-cache',
+    'origin': BASE_URL,
+    'pragma': 'no-cache',
+    'priority': 'u=1, i',
+    'sec-ch-ua': '"Chromium";v="130", "Google Chrome";v="130", "Not?A_Brand";v="99"',
+    'sec-ch-ua-mobile': '?0',
+    'sec-ch-ua-platform': '"Windows"',
+    'sec-fetch-dest': 'empty',
+    'sec-fetch-mode': 'cors',
+    'sec-fetch-site': 'same-origin',
+    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
+                  'AppleWebKit/537.36 (KHTML, like Gecko) '
+                  'Chrome/130.0.0.0 Safari/537.36',
+}
+
+# Header Configurations for Specific API Calls
+def get_headers_api_chat(referer_url):
+    return {**common_headers, 'Content-Type': 'application/json', 'Referer': referer_url}
+
+def get_headers_chat(chat_url, next_action, next_router_state_tree):
+    return {
+        **common_headers,
+        'Accept': 'text/x-component',
+        'Content-Type': 'text/plain;charset=UTF-8',
+        'Referer': chat_url,
+        'next-action': next_action,
+        'next-router-state-tree': next_router_state_tree,
+        'next-url': '/',
+    }
+
+APP_SECRET = os.getenv("APP_SECRET")
+
+ALLOWED_MODELS = [
+    {"id": "blackboxai", "name": "blackboxai"},
+    {"id": "blackboxai-pro", "name": "blackboxai-pro"},
+    {"id": "flux", "name": "flux"},
+    {"id": "llama-3.1-8b", "name": "llama-3.1-8b"},
+    {"id": "llama-3.1-70b", "name": "llama-3.1-70b"},
+    {"id": "llama-3.1-405b", "name": "llama-3.1-405"},
+    {"id": "gpt-4o", "name": "gpt-4o"},
+    {"id": "gemini-pro", "name": "gemini-pro"},
+    {"id": "gemini-1.5-flash", "name": "gemini-1.5-flash"},
+    {"id": "claude-sonnet-3.5", "name": "claude-sonnet-3.5"},
+    {"id": "PythonAgent", "name": "PythonAgent"},
+    {"id": "JavaAgent", "name": "JavaAgent"},
+    {"id": "JavaScriptAgent", "name": "JavaScriptAgent"},
+    {"id": "HTMLAgent", "name": "HTMLAgent"},
+    {"id": "GoogleCloudAgent", "name": "GoogleCloudAgent"},
+    {"id": "AndroidDeveloper", "name": "AndroidDeveloper"},
+    {"id": "SwiftDeveloper", "name": "SwiftDeveloper"},
+    {"id": "Next.jsAgent", "name": "Next.jsAgent"},
+    {"id": "MongoDBAgent", "name": "MongoDBAgent"},
+    {"id": "PyTorchAgent", "name": "PyTorchAgent"},
+    {"id": "ReactAgent", "name": "ReactAgent"},
+    {"id": "XcodeAgent", "name": "XcodeAgent"},
+    {"id": "AngularJSAgent", "name": "AngularJSAgent"},
+    {"id": "HerokuAgent", "name": "HerokuAgent"},
+    {"id": "GodotAgent", "name": "GodotAgent"},
+    {"id": "GoAgent", "name": "GoAgent"},
+    {"id": "GitlabAgent", "name": "GitlabAgent"},
+    {"id": "GitAgent", "name": "GitAgent"},
+    {"id": "RepoMap", "name": "RepoMap"},
+    {"id": "gemini-1.5-pro-latest", "name": "gemini-pro"},
+    {"id": "gemini-1.5-pro", "name": "gemini-1.5-pro"},
+    {"id": "claude-3-5-sonnet-20240620", "name": "claude-sonnet-3.5"},
+    {"id": "claude-3-5-sonnet", "name": "claude-sonnet-3.5"},
+    {"id": "Niansuh", "name": "Niansuh"},
+    {"id": "o1-preview", "name": "o1-preview"},
+    {"id": "claude-3-5-sonnet-20241022", "name": "claude-3-5-sonnet-20241022"},
+    {"id": "claude-3-5-sonnet-x", "name": "claude-3-5-sonnet-x"},
+    
+    # Added New Agents
+    {"id": "FlaskAgent", "name": "FlaskAgent"},
+    {"id": "FirebaseAgent", "name": "FirebaseAgent"},
+    {"id": "FastAPIAgent", "name": "FastAPIAgent"},
+    {"id": "ErlangAgent", "name": "ErlangAgent"},
+    {"id": "ElectronAgent", "name": "ElectronAgent"},
+    {"id": "DockerAgent", "name": "DockerAgent"},
+    {"id": "DigitalOceanAgent", "name": "DigitalOceanAgent"},
+    {"id": "BitbucketAgent", "name": "BitbucketAgent"},
+    {"id": "AzureAgent", "name": "AzureAgent"},
+    {"id": "FlutterAgent", "name": "FlutterAgent"},
+    {"id": "YoutubeAgent", "name": "YoutubeAgent"},
+    {"id": "builderAgent", "name": "builderAgent"},
+]
+
+MODEL_MAPPING = {
+    "blackboxai": "blackboxai",
+    "blackboxai-pro": "blackboxai-pro",
+    "flux": "flux",
+    "ImageGeneration": "flux",
+    "llama-3.1-8b": "llama-3.1-8b",
+    "llama-3.1-70b": "llama-3.1-70b",
+    "llama-3.1-405b": "llama-3.1-405",
+    "gpt-4o": "gpt-4o",
+    "gemini-pro": "gemini-pro",
+    "gemini-1.5-flash": "gemini-1.5-flash",
+    "claude-sonnet-3.5": "claude-sonnet-3.5",
+    "PythonAgent": "PythonAgent",
+    "JavaAgent": "JavaAgent",
+    "JavaScriptAgent": "JavaScriptAgent",
+    "HTMLAgent": "HTMLAgent",
+    "GoogleCloudAgent": "GoogleCloudAgent",
+    "AndroidDeveloper": "AndroidDeveloper",
+    "SwiftDeveloper": "SwiftDeveloper",
+    "Next.jsAgent": "Next.jsAgent",
+    "MongoDBAgent": "MongoDBAgent",
+    "PyTorchAgent": "PyTorchAgent",
+    "ReactAgent": "ReactAgent",
+    "XcodeAgent": "XcodeAgent",
+    "AngularJSAgent": "AngularJSAgent",
+    "HerokuAgent": "HerokuAgent",
+    "GodotAgent": "GodotAgent",
+    "GoAgent": "GoAgent",
+    "GitlabAgent": "GitlabAgent",
+    "GitAgent": "GitAgent",
+    "RepoMap": "RepoMap",
+    # Additional mappings
+    "gemini-flash": "gemini-1.5-flash",
+    "claude-3.5-sonnet": "claude-sonnet-3.5",
+    "flux": "flux",
+    "gemini-1.5-pro-latest": "gemini-pro",
+    "gemini-1.5-pro": "gemini-1.5-pro",
+    "claude-3-5-sonnet-20240620": "claude-sonnet-3.5",
+    "claude-3-5-sonnet": "claude-sonnet-3.5",
+    "Niansuh": "Niansuh",
+    "o1-preview": "o1-preview",
+    "claude-3-5-sonnet-20241022": "claude-3-5-sonnet-20241022",
+    "claude-3-5-sonnet-x": "claude-3-5-sonnet-x",
+    
+    # Added New Agents
+    "FlaskAgent": "FlaskAgent",
+    "FirebaseAgent": "FirebaseAgent",
+    "FastAPIAgent": "FastAPIAgent",
+    "ErlangAgent": "ErlangAgent",
+    "ElectronAgent": "ElectronAgent",
+    "DockerAgent": "DockerAgent",
+    "DigitalOceanAgent": "DigitalOceanAgent",
+    "BitbucketAgent": "BitbucketAgent",
+    "AzureAgent": "AzureAgent",
+    "FlutterAgent": "FlutterAgent",
+    "YoutubeAgent": "YoutubeAgent",
+    "builderAgent": "builderAgent",
+}
+
+# Agent modes
+AGENT_MODE = {
+    'flux': {'mode': True, 'id': "ImageGenerationLV45LJp", 'name': "flux"},
+    'Niansuh': {'mode': True, 'id': "NiansuhAIk1HgESy", 'name': "Niansuh"},
+    'o1-preview': {'mode': True, 'id': "o1Dst8La8", 'name': "o1-preview"},
+    'claude-3-5-sonnet-20241022': {'mode': True, 'id': "Claude-Sonnet-3.5zO2HZSF", 'name': "claude-3-5-sonnet-20241022"},
+    'claude-3-5-sonnet-x': {'mode': True, 'id': "Claude-Sonnet-3.52022JE0UdQ3", 'name': "claude-3-5-sonnet-x"},
+}
+
+TRENDING_AGENT_MODE = {
+    "blackboxai": {},
+    "gemini-1.5-flash": {'mode': True, 'id': 'Gemini'},
+    "llama-3.1-8b": {'mode': True, 'id': "llama-3.1-8b"},
+    'llama-3.1-70b': {'mode': True, 'id': "llama-3.1-70b"},
+    'llama-3.1-405b': {'mode': True, 'id': "llama-3.1-405"},
+    'blackboxai-pro': {'mode': True, 'id': "BLACKBOXAI-PRO"},
+    'PythonAgent': {'mode': True, 'id': "Python Agent"},
+    'JavaAgent': {'mode': True, 'id': "Java Agent"},
+    'JavaScriptAgent': {'mode': True, 'id': "JavaScript Agent"},
+    'HTMLAgent': {'mode': True, 'id': "HTML Agent"},
+    'GoogleCloudAgent': {'mode': True, 'id': "Google Cloud Agent"},
+    'AndroidDeveloper': {'mode': True, 'id': "Android Developer"},
+    'SwiftDeveloper': {'mode': True, 'id': "Swift Developer"},
+    'Next.jsAgent': {'mode': True, 'id': "Next.js Agent"},
+    'MongoDBAgent': {'mode': True, 'id': "MongoDB Agent"},
+    'PyTorchAgent': {'mode': True, 'id': "PyTorch Agent"},
+    'ReactAgent': {'mode': True, 'id': "React Agent"},
+    'XcodeAgent': {'mode': True, 'id': "Xcode Agent"},
+    'AngularJSAgent': {'mode': True, 'id': "AngularJS Agent"},
+    'HerokuAgent': {'mode': True, 'id': "HerokuAgent"},
+    'GodotAgent': {'mode': True, 'id': "GodotAgent"},
+    'GoAgent': {'mode': True, 'id': "GoAgent"},
+    'GitlabAgent': {'mode': True, 'id': "GitlabAgent"},
+    'GitAgent': {'mode': True, 'id': "GitAgent"},
+    'RepoMap': {'mode': True, 'id': "repomap"},
+    
+    # Added New Agents
+    'FlaskAgent': {'mode': True, 'id': "FlaskAgent"},
+    'FirebaseAgent': {'mode': True, 'id': "FirebaseAgent"},
+    'FastAPIAgent': {'mode': True, 'id': "FastAPIAgent"},
+    'ErlangAgent': {'mode': True, 'id': "ErlangAgent"},
+    'ElectronAgent': {'mode': True, 'id': "ElectronAgent"},
+    'DockerAgent': {'mode': True, 'id': "DockerAgent"},
+    'DigitalOceanAgent': {'mode': True, 'id': "DigitalOceanAgent"},
+    'BitbucketAgent': {'mode': True, 'id': "BitbucketAgent"},
+    'AzureAgent': {'mode': True, 'id': "AzureAgent"},
+    'FlutterAgent': {'mode': True, 'id': "FlutterAgent"},
+    'YoutubeAgent': {'mode': True, 'id': "YoutubeAgent"},
+    'builderAgent': {'mode': True, 'id': "builderAgent"},
+}
+
+# Model prefixes
+MODEL_PREFIXES = {
+    'gpt-4o': '@GPT-4o',
+    'gemini-pro': '@Gemini-PRO',
+    'PythonAgent': '@Python Agent',
+    'JavaAgent': '@Java Agent',
+    'JavaScriptAgent': '@JavaScript Agent',
+    'HTMLAgent': '@HTML Agent',
+    'GoogleCloudAgent': '@Google Cloud Agent',
+    'AndroidDeveloper': '@Android Developer',
+    'SwiftDeveloper': '@Swift Developer',
+    'Next.jsAgent': '@Next.js Agent',
+    'MongoDBAgent': '@MongoDB Agent',
+    'PyTorchAgent': '@PyTorch Agent',
+    'ReactAgent': '@React Agent',
+    'XcodeAgent': '@Xcode Agent',
+    'AngularJSAgent': '@AngularJS Agent',
+    'HerokuAgent': '@Heroku Agent',
+    'GodotAgent': '@Godot Agent',
+    'GoAgent': '@Go Agent',
+    'GitlabAgent': '@Gitlab Agent',
+    'GitAgent': '@Gitlab Agent',
+    'blackboxai-pro': '@BLACKBOXAI-PRO',
+    'flux': '@Image Generation',
+    # Add any additional prefixes if necessary
+    
+    # Added New Agents
+    'FlaskAgent': '@Flask Agent',
+    'FirebaseAgent': '@Firebase Agent',
+    'FastAPIAgent': '@FastAPI Agent',
+    'ErlangAgent': '@Erlang Agent',
+    'ElectronAgent': '@Electron Agent',
+    'DockerAgent': '@Docker Agent',
+    'DigitalOceanAgent': '@DigitalOcean Agent',
+    'BitbucketAgent': '@Bitbucket Agent',
+    'AzureAgent': '@Azure Agent',
+    'FlutterAgent': '@Flutter Agent',
+    'YoutubeAgent': '@Youtube Agent',
+    'builderAgent': '@builder Agent',
+}
+
+# Model referers
+MODEL_REFERERS = {
+    "blackboxai": "/?model=blackboxai",
+    "gpt-4o": "/?model=gpt-4o",
+    "gemini-pro": "/?model=gemini-pro",
+    "claude-sonnet-3.5": "/?model=claude-sonnet-3.5",
+    # Add any additional referers if necessary
+}

api/logger.py

@@ -1,14 +1,54 @@
-import logging
-
-def setup_logger(name):
-    logger = logging.getLogger(name)
-    if not logger.handlers:
-        logger.setLevel(logging.INFO)
-        formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-        # Console handler
-        console_handler = logging.StreamHandler()
-        console_handler.setFormatter(formatter)
-        logger.addHandler(console_handler)
-    return logger
-
-logger = setup_logger(__name__)
+import logging
+
+# Setup logger with a consistent format
+def setup_logger(name):
+    logger = logging.getLogger(name)
+    if not logger.handlers:
+        logger.setLevel(logging.INFO)
+        formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+        
+        # Console handler
+        console_handler = logging.StreamHandler()
+        console_handler.setFormatter(formatter)
+        logger.addHandler(console_handler)
+        
+        # File Handler - Error Level
+        # error_file_handler = logging.FileHandler('error.log')
+        # error_file_handler.setFormatter(formatter)
+        # error_file_handler.setLevel(logging.ERROR)
+        # logger.addHandler(error_file_handler)
+    
+    return logger
+
+logger = setup_logger(__name__)
+
+# Log functions to structure specific logs in utils.py
+def log_generated_chat_id_with_referer(chat_id, model, referer_url):
+    """
+    Log the generated Chat ID with model and referer URL if it exists.
+    """
+    logger.info(f"Generated Chat ID: {chat_id} - Model: {model} - URL: {referer_url}")
+
+def log_model_delay(delay_seconds, model, chat_id):
+    """
+    Log the delay introduced for specific models.
+    """
+    logger.info(f"Introducing a delay of {delay_seconds} seconds for model '{model}' (Chat ID: {chat_id})")
+
+def log_http_error(error, chat_id):
+    """
+    Log HTTP errors encountered during requests.
+    """
+    logger.error(f"HTTP error occurred for Chat ID {chat_id}: {error}")
+
+def log_request_error(error, chat_id):
+    """
+    Log request errors unrelated to HTTP status.
+    """
+    logger.error(f"Request error occurred for Chat ID {chat_id}: {error}")
+
+def log_strip_prefix(model_prefix, content):
+    """
+    Log when a model prefix is stripped from the content.
+    """
+    logger.debug(f"Stripping prefix '{model_prefix}' from content.")

api/models.py

@@ -1,14 +1,14 @@
-from typing import List
-from pydantic import BaseModel
-
-class Message(BaseModel):
-    role: str
-    content: str
-
-class ChatRequest(BaseModel):
-    model: str
-    messages: List[Message]
-    stream: bool = False
-    temperature: float = 0.5
-    top_p: float = 0.9
-    max_tokens: int = 1024
+from typing import List, Optional
+from pydantic import BaseModel
+
+class Message(BaseModel):
+    role: str
+    content: str | list
+
+class ChatRequest(BaseModel):
+    model: str
+    messages: List[Message]
+    stream: Optional[bool] = False
+    temperature: Optional[float] = 0.5
+    top_p: Optional[float] = 0.9
+    max_tokens: Optional[int] = 99999999

api/utils.py

@@ -1,136 +1,227 @@
-import uuid
-from typing import List, Dict
-from aiohttp import ClientSession
-from api.models import ChatRequest
-from api.helper import format_prompt
-from api.logger import logger
-from api.config import MODEL_MAPPING, EDITEA_API_ENDPOINT, EDITEA_HEADERS
-from fastapi import HTTPException
-
-class Editee:
-    label = "Editee"
-    url = "https://editee.com"
-    api_endpoint = EDITEA_API_ENDPOINT
-    working = True
-    supports_stream = True
-    supports_system_message = True
-    supports_message_history = True
-
-    default_model = 'claude'
-    models = ['claude', 'gpt4', 'gemini', 'mistrallarge']
-
-    model_aliases = {
-        "claude-3.5-sonnet": "claude",
-        "gpt-4o": "gpt4",
-        "gemini-pro": "gemini",
-        "mistral-large": "mistrallarge",
-    }
-
-    @classmethod
-    def get_model(cls, model: str) -> str:
-        if model in cls.models:
-            return model
-        elif model in cls.model_aliases:
-            return cls.model_aliases[model]
-        else:
-            return cls.default_model
-
-    @classmethod
-    async def create_async_generator(
-        cls,
-        model: str,
-        messages: List[Dict[str, str]],
-        proxy: str = None,
-        **kwargs
-    ):
-        model = cls.get_model(model)
-        headers = EDITEA_HEADERS
-
-        async with ClientSession(headers=headers) as session:
-            prompt = format_prompt(messages)
-            data = {
-                "user_input": prompt,
-                "context": " ",
-                "template_id": "",
-                "selected_model": model
-            }
-            try:
-                async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response:
-                    response.raise_for_status()
-                    # Check if the response is in JSON format
-                    if response.headers.get('Content-Type') == 'application/json':
-                        response_data = await response.json()
-                        yield response_data['text']
-                    else:
-                        # Stream the response line by line
-                        async for line in response.content:
-                            yield line.decode('utf-8')
-            except Exception as e:
-                logger.error(f"Error in Editee API call: {e}")
-                raise HTTPException(status_code=500, detail="Error in Editee API call")
-
-# Function to process non-streaming response
-async def process_response(request: ChatRequest):
-    try:
-        model = MODEL_MAPPING.get(request.model, request.model)
-        messages = [
-            {"role": message.role, "content": message.content}
-            for message in request.messages
-        ]
-
-        generator = Editee.create_async_generator(
-            model=model,
-            messages=messages,
-            proxy=None  # Add proxy if needed
-        )
-
-        full_response = ""
-        async for chunk in generator:
-            full_response += chunk
-
-        return {
-            "id": f"chatcmpl-{uuid.uuid4()}",
-            "object": "chat.completion",
-            "created": int(uuid.uuid1().time),
-            "model": model,
-            "choices": [
-                {
-                    "index": 0,
-                    "message": {"role": "assistant", "content": full_response},
-                    "finish_reason": "stop",
-                }
-            ],
-            "usage": None,
-        }
-    except Exception as e:
-        logger.error(f"Error processing response: {e}")
-        raise HTTPException(status_code=500, detail=str(e))
-
-# Function to process streaming response
-async def process_response_stream(request: ChatRequest):
-    try:
-        model = MODEL_MAPPING.get(request.model, request.model)
-        messages = [
-            {"role": message.role, "content": message.content}
-            for message in request.messages
-        ]
-
-        generator = Editee.create_async_generator(
-            model=model,
-            messages=messages,
-            proxy=None  # Add proxy if needed
-        )
-
-        async def event_generator():
-            try:
-                async for chunk in generator:
-                    yield f"data: {chunk}\n\n"
-                yield "data: [DONE]\n\n"
-            except Exception as e:
-                logger.error(f"Error in streaming response: {e}")
-                yield f"data: [ERROR] {str(e)}\n\n"
-
-        return event_generator()
-    except Exception as e:
-        logger.error(f"Error processing streaming response: {e}")
-        raise HTTPException(status_code=500, detail=str(e))
+from datetime import datetime
+import json
+import uuid
+import asyncio
+import random
+import string
+from typing import Any, Dict, Optional
+
+import httpx
+from fastapi import HTTPException
+from api.config import (
+    MODEL_MAPPING,
+    get_headers_api_chat,
+    get_headers_chat,
+    BASE_URL,
+    AGENT_MODE,
+    TRENDING_AGENT_MODE,
+    MODEL_PREFIXES,
+    MODEL_REFERERS
+)
+from api.models import ChatRequest
+from api.logger import setup_logger
+
+logger = setup_logger(__name__)
+
+# 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))
+
+# Helper function to create chat completion data
+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,
+    }
+
+# Function to convert message to dictionary format, ensuring base64 data and optional model prefix
+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]:
+        # Ensure base64 images are always included for all models
+        return {
+            "role": message.role,
+            "content": content,
+            "data": {
+                "imageBase64": message.content[1]["image_url"]["url"],
+                "fileText": "",
+                "title": "snapshot",
+            },
+        }
+    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
+
+# 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)
+    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)
+
+    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' (Chat ID: {chat_id})")
+        await asyncio.sleep(delay_seconds)
+
+    json_data = {
+        "agentMode": agent_mode,
+        "clickedAnswer2": False,
+        "clickedAnswer3": False,
+        "clickedForceWebSearch": False,
+        "codeModelMode": True,
+        "githubToken": None,
+        "id": chat_id,
+        "isChromeExt": False,
+        "isMicMode": False,
+        "maxTokens": request.max_tokens,
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "mobileClient": False,
+        "playgroundTemperature": request.temperature,
+        "playgroundTopP": request.top_p,
+        "previewToken": None,
+        "trendingAgentMode": trending_agent_mode,
+        "userId": None,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSystemPrompt": None,
+        "validated": "00f37b34-a166-4efb-bce5-1312d87f2f94",
+        "visitFromDelta": False,
+    }
+
+    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,
+            ) as response:
+                response.raise_for_status()
+                async for line in response.aiter_lines():
+                    timestamp = int(datetime.now().timestamp())
+                    if line:
+                        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('', 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}")
+            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}")
+            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()
+    referer_url = get_referer_url(chat_id, 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([""]))
+
+    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})")
+        await asyncio.sleep(delay_seconds)
+
+    json_data = {
+        "agentMode": agent_mode,
+        "clickedAnswer2": False,
+        "clickedAnswer3": False,
+        "clickedForceWebSearch": False,
+        "codeModelMode": True,
+        "githubToken": None,
+        "id": chat_id,
+        "isChromeExt": False,
+        "isMicMode": False,
+        "maxTokens": request.max_tokens,
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "mobileClient": False,
+        "playgroundTemperature": request.temperature,
+        "playgroundTopP": request.top_p,
+        "previewToken": None,
+        "trendingAgentMode": trending_agent_mode,
+        "userId": None,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSystemPrompt": None,
+        "validated": "00f37b34-a166-4efb-bce5-1312d87f2f94",
+        "visitFromDelta": False,
+    }
+
+    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
+        except httpx.HTTPStatusError as e:
+            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:
+            logger.error(f"Error occurred during request for Chat ID {chat_id}: {e}")
+            raise HTTPException(status_code=500, detail=str(e))
+    if full_response.startswith("$@$v=undefined-rv1$@$"):
+        full_response = full_response[21:]
+
+    cleaned_full_response = strip_model_prefix(full_response, model_prefix)
+
+    return {
+        "id": f"chatcmpl-{uuid.uuid4()}",
+        "object": "chat.completion",
+        "created": int(datetime.now().timestamp()),
+        "model": request.model,
+        "choices": [
+            {
+                "index": 0,
+                "message": {"role": "assistant", "content": cleaned_full_response},
+                "finish_reason": "stop",
+            }
+        ],
+        "usage": None,
+    }

requirements.txt

@@ -1,6 +1,6 @@
-fastapi==0.95.2
-pydantic==1.10.4
-python-dotenv==0.21.0
-uvicorn==0.21.1
-gunicorn==20.1.0
-aiohttp==3.8.5
+fastapi==0.95.2
+httpx==0.23.3
+pydantic==1.10.4
+python-dotenv==0.21.0
+uvicorn==0.21.1
+gunicorn==20.1.0