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:v1  # Replace 'your-app-name' with your desired Docker image name
+        tags: ${{ secrets.DOCKER_USERNAME }}/blackboxv2:v4  # Replace 'your-app-name' with your desired Docker image name
 
     # Step 5: Log out of Docker Hub
     - name: Log out of Docker Hub

Dockerfile

@@ -23,4 +23,4 @@ COPY . /app
 EXPOSE 8001
 
 # Command to run the app with Gunicorn and Uvicorn workers
-CMD ["gunicorn", "-k", "uvicorn.workers.UvicornWorker", "--workers", "4", "--bind", "0.0.0.0:8001", "main:app"]
+CMD ["gunicorn", "-k", "uvicorn.workers.UvicornWorker", "--workers", "8", "--bind", "0.0.0.0:8001", "main:app"]

api/app.py

@@ -1,43 +1,41 @@
-# api/app.py
-
-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="GizAI 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()
+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/auth.py

@@ -1,12 +1,10 @@
-# api/auth.py
-
-from fastapi import Depends, HTTPException
-from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
-from api.config import APP_SECRET
-
-security = HTTPBearer()
-
-def verify_app_secret(credentials: HTTPAuthorizationCredentials = Depends(security)):
-    if credentials.credentials != APP_SECRET:
-        raise HTTPException(status_code=403, detail="Invalid APP_SECRET")
-    return credentials.credentials
+from fastapi import Depends, HTTPException
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
+from api.config import APP_SECRET
+
+security = HTTPBearer()
+
+def verify_app_secret(credentials: HTTPAuthorizationCredentials = Depends(security)):
+    if credentials.credentials != APP_SECRET:
+        raise HTTPException(status_code=403, detail="Invalid APP_SECRET")
+    return credentials.credentials

api/config.py

@@ -1,89 +1,249 @@
-# api/config.py
-
-import os
-from dotenv import load_dotenv
-
-load_dotenv()
-
-# Base URL and API Endpoint for GizAI
-BASE_URL = "https://app.giz.ai"
-API_ENDPOINT = "https://app.giz.ai/api/data/users/inferenceServer.infer"
-
-common_headers = {
-    'Accept': 'application/json, text/plain, */*',
-    'Accept-Language': 'en-US,en;q=0.9',
-    'Cache-Control': 'no-cache',
-    'Origin': BASE_URL,
-    'Pragma': 'no-cache',
-    '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/130.0.0.0 Safari/537.36',
-    'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"',
-    'sec-ch-ua-mobile': '?0',
-    'sec-ch-ua-platform': '"Linux"',
-    'Content-Type': 'application/json'
-}
-
-# Header Configurations for Specific API Calls
-def get_headers_api_chat(referer_url=None):
-    headers = common_headers.copy()
-    if referer_url:
-        headers['Referer'] = referer_url
-    return headers
-
-# Define GizAI Models
-CHAT_MODELS = [
-    'chat-gemini-flash',
-    'chat-gemini-pro',
-    'chat-gpt4m',
-    'chat-gpt4',
-    'claude-sonnet',
-    'claude-haiku',
-    'llama-3-70b',
-    'llama-3-8b',
-    'mistral-large',
-    'chat-o1-mini'
-]
-
-IMAGE_MODELS = [
-    'flux1',
-    'sdxl',
-    'sd',
-    'sd35',
-]
-
-MODELS = CHAT_MODELS + IMAGE_MODELS
-
-MODEL_ALIASES = {
-    # Chat model aliases
-    "gemini-flash": "chat-gemini-flash",
-    "gemini-pro": "chat-gemini-pro",
-    "gpt-4o-mini": "chat-gpt4m",
-    "gpt-4o": "chat-gpt4",
-    "claude-3.5-sonnet": "claude-sonnet",
-    "claude-3-haiku": "claude-haiku",
-    "llama-3.1-70b": "llama-3-70b",
-    "llama-3.1-8b": "llama-3-8b",
-    "o1-mini": "chat-o1-mini",
-    # Image model aliases
-    "sd-1.5": "sd",
-    "sd-3.5": "sd35",
-    "flux-schnell": "flux1",
-}
-
-DEFAULT_MODEL = 'chat-gemini-flash'
-
-MODEL_MAPPING = {model: model for model in MODELS}
-MODEL_MAPPING.update(MODEL_ALIASES)
-
-ALLOWED_MODELS = MODELS  # You can adjust this if you want to restrict further
-
-# Agent modes
-AGENT_MODE = {}
-TRENDING_AGENT_MODE = {}
-MODEL_PREFIXES = {}
-MODEL_REFERERS = {}
-
-# **Authentication Secret**
-APP_SECRET = os.getenv("APP_SECRET")
+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"},
+    
+    # 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",
+    
+    # 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"},
+}
+
+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,54 +1,54 @@
-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 (optional)
-        # 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.")
+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,19 +1,14 @@
-# api/models.py
-
-from typing import List, Optional, Union, Dict, Any  # Ensure 'Any' is imported
-from pydantic import BaseModel
-
-class ImageContent(BaseModel):
-    image_url: Dict[str, str]
-
-class Message(BaseModel):
-    role: str
-    content: Union[str, List[Dict[str, Any]]]  # 'Any' is now defined
-
-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] = 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] = 1024

api/routes.py

@@ -1,61 +1,59 @@
-# api/routes.py
-
-import json
-from fastapi import APIRouter, Depends, HTTPException, Request, Response
-from fastapi.responses import StreamingResponse
-from api.auth import verify_app_secret
-from api.config import MODELS
-from api.models import ChatRequest
-from api.utils import process_non_streaming_response, process_streaming_response
-from api.logger import setup_logger
-
-logger = setup_logger(__name__)
-
-router = APIRouter()
-
-@router.options("/v1/chat/completions")
-@router.options("/api/v1/chat/completions")
-async def chat_completions_options():
-    return Response(
-        status_code=200,
-        headers={
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Methods": "POST, OPTIONS",
-            "Access-Control-Allow-Headers": "Content-Type, Authorization",
-        },
-    )
-
-@router.get("/v1/models")
-@router.get("/api/v1/models")
-async def list_models():
-    return {"object": "list", "data": MODELS}
-
-@router.post("/v1/chat/completions")
-@router.post("/api/v1/chat/completions")
-async def chat_completions(
-    request: ChatRequest, app_secret: str = Depends(verify_app_secret)
-):
-    logger.info("Entering chat_completions route")
-    logger.info(f"Processing chat completion request for model: {request.model}")
-
-    if request.model not in MODELS:
-        raise HTTPException(
-            status_code=400,
-            detail=f"Model {request.model} is not allowed. Allowed models are: {', '.join(MODELS)}",
-        )
-
-    if request.stream:
-        logger.info("Streaming response")
-        return StreamingResponse(process_streaming_response(request), media_type="text/event-stream")
-    else:
-        logger.info("Non-streaming response")
-        return await process_non_streaming_response(request)
-
-@router.route('/')
-@router.route('/healthz')
-@router.route('/ready')
-@router.route('/alive')
-@router.route('/status')
-@router.get("/health")
-def health_check(request: Request):
-    return Response(content=json.dumps({"status": "ok"}), media_type="application/json")
+import json
+from fastapi import APIRouter, Depends, HTTPException, Request, Response
+from fastapi.responses import StreamingResponse
+from api.auth import verify_app_secret
+from api.config import ALLOWED_MODELS
+from api.models import ChatRequest
+from api.utils import process_non_streaming_response, process_streaming_response
+from api.logger import setup_logger
+
+logger = setup_logger(__name__)
+
+router = APIRouter()
+
+@router.options("/v1/chat/completions")
+@router.options("/api/v1/chat/completions")
+async def chat_completions_options():
+    return Response(
+        status_code=200,
+        headers={
+            "Access-Control-Allow-Origin": "*",
+            "Access-Control-Allow-Methods": "POST, OPTIONS",
+            "Access-Control-Allow-Headers": "Content-Type, Authorization",
+        },
+    )
+
+@router.get("/v1/models")
+@router.get("/api/v1/models")
+async def list_models():
+    return {"object": "list", "data": ALLOWED_MODELS}
+
+@router.post("/v1/chat/completions")
+@router.post("/api/v1/chat/completions")
+async def chat_completions(
+    request: ChatRequest, app_secret: str = Depends(verify_app_secret)
+):
+    logger.info("Entering chat_completions route")
+    logger.info(f"Processing chat completion request for model: {request.model}")
+
+    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. Allowed models are: {', '.join(model['id'] for model in ALLOWED_MODELS)}",
+        )
+
+    if request.stream:
+        logger.info("Streaming response")
+        return StreamingResponse(process_streaming_response(request), media_type="text/event-stream")
+    else:
+        logger.info("Non-streaming response")
+        return await process_non_streaming_response(request)
+
+@router.route('/')
+@router.route('/healthz')
+@router.route('/ready')
+@router.route('/alive')
+@router.route('/status')
+@router.get("/health")
+def health_check(request: Request):
+    return Response(content=json.dumps({"status": "ok"}), media_type="application/json")

api/utils.py

@@ -1,258 +1,227 @@
-# api/utils.py
-
-from datetime import datetime
-import json
-import uuid
-import asyncio
-import random
-import string
-from typing import Any, Dict, Optional, AsyncGenerator
-
-import httpx
-from fastapi import HTTPException
-from api.config import (
-    MODELS,
-    MODEL_ALIASES,
-    DEFAULT_MODEL,
-    API_ENDPOINT,
-    get_headers_api_chat,
-    BASE_URL,
-    MODEL_PREFIXES,
-    MODEL_REFERERS
-)
-from api.models import ChatRequest, Message
-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 a chat completion data chunk
-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: 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
-
-# Helper function to format messages
-def format_messages(messages: list[Message]) -> str:
-    # Assuming messages need to be concatenated in some way
-    return "\n".join([msg.content if isinstance(msg.content, str) else msg.content[0]["text"] for msg in messages])
-
-# Process streaming response
-async def process_streaming_response(request: ChatRequest) -> AsyncGenerator[str, None]:
-    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}")
-
-    model = request.model if request.model in MODELS else MODEL_ALIASES.get(request.model, DEFAULT_MODEL)
-    model_prefix = MODEL_PREFIXES.get(model, "")
-
-    headers_api_chat = get_headers_api_chat(referer_url)
-
-    # Prepare data based on model type
-    if model in ['flux1', 'sdxl', 'sd', 'sd35']:  # Image models
-        prompt = request.messages[-1].content if isinstance(request.messages[-1].content, str) else request.messages[-1].content[0]["text"]
-        data = {
-            "model": model,
-            "input": {
-                "width": "1024",
-                "height": "1024",
-                "steps": 4,
-                "output_format": "webp",
-                "batch_size": 1,
-                "mode": "plan",
-                "prompt": prompt
-            }
-        }
-    else:  # Chat models
-        data = {
-            "model": model,
-            "input": {
-                "messages": [
-                    {
-                        "type": "human",
-                        "content": f"{model_prefix} {format_messages(request.messages)}" if model_prefix else format_messages(request.messages)
-                    }
-                ],
-                "mode": "plan"
-            },
-            "noStream": False  # Assuming streaming
-        }
-
-    async with httpx.AsyncClient() as client:
-        try:
-            async with client.post(
-                API_ENDPOINT,
-                headers=headers_api_chat,
-                json=data,
-                timeout=100
-            ) as response:
-                response.raise_for_status()
-                # Assuming the API returns a streaming response
-                async for line in response.aiter_lines():
-                    timestamp = int(datetime.now().timestamp())
-                    if line:
-                        content = line
-                        # Depending on GizAI's response format, adjust parsing
-                        # Placeholder for content processing
-                        # Assuming content contains the message
-                        cleaned_content = strip_model_prefix(content, model_prefix)
-                        yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, model, timestamp))}\n\n"
-
-                # Indicate end of stream
-                yield f"data: {json.dumps(create_chat_completion_data('', model, int(datetime.now().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
-async def process_non_streaming_response(request: ChatRequest) -> Dict[str, Any]:
-    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}")
-
-    model = request.model if request.model in MODELS else MODEL_ALIASES.get(request.model, DEFAULT_MODEL)
-    model_prefix = MODEL_PREFIXES.get(model, "")
-
-    headers_api_chat = get_headers_api_chat(referer_url)
-
-    # Prepare data based on model type
-    if model in ['flux1', 'sdxl', 'sd', 'sd35']:  # Image models
-        prompt = request.messages[-1].content if isinstance(request.messages[-1].content, str) else request.messages[-1].content[0]["text"]
-        data = {
-            "model": model,
-            "input": {
-                "width": "1024",
-                "height": "1024",
-                "steps": 4,
-                "output_format": "webp",
-                "batch_size": 1,
-                "mode": "plan",
-                "prompt": prompt
-            }
-        }
-    else:  # Chat models
-        data = {
-            "model": model,
-            "input": {
-                "messages": [
-                    {
-                        "type": "human",
-                        "content": f"{model_prefix} {format_messages(request.messages)}" if model_prefix else format_messages(request.messages)
-                    }
-                ],
-                "mode": "plan"
-            },
-            "noStream": True  # Non-streaming
-        }
-
-    async with httpx.AsyncClient() as client:
-        try:
-            response = await client.post(
-                API_ENDPOINT,
-                headers=headers_api_chat,
-                json=data,
-                timeout=100
-            )
-            response.raise_for_status()
-            response_data = response.json()
-
-            # Process response based on GizAI's API response structure
-            # Placeholder: assuming 'output' contains the generated content
-            if model in ['flux1', 'sdxl', 'sd', 'sd35']:  # Image models
-                if response_data.get('status') == 'completed' and response_data.get('output'):
-                    images = response_data['output']
-                    # Assuming images is a list of URLs
-                    # For non-streaming, return all images at once
-                    # Adjust according to actual response
-                    return {
-                        "id": f"chatcmpl-{uuid.uuid4()}",
-                        "object": "chat.completion",
-                        "created": int(datetime.now().timestamp()),
-                        "model": model,
-                        "choices": [
-                            {
-                                "index": 0,
-                                "message": {"role": "assistant", "content": "", "images": images},
-                                "finish_reason": "stop",
-                            }
-                        ],
-                        "usage": None,
-                    }
-            else:  # Chat models
-                # Assuming response_data contains the full response
-                content = response_data.get('output', '')
-                cleaned_content = strip_model_prefix(content, model_prefix)
-                return {
-                    "id": f"chatcmpl-{uuid.uuid4()}",
-                    "object": "chat.completion",
-                    "created": int(datetime.now().timestamp()),
-                    "model": model,
-                    "choices": [
-                        {
-                            "index": 0,
-                            "message": {"role": "assistant", "content": cleaned_content},
-                            "finish_reason": "stop",
-                        }
-                    ],
-                    "usage": None,
-                }
-        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))
+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": "69783381-2ce4-4dbd-ac78-35e9063feabc",
+        "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": "69783381-2ce4-4dbd-ac78-35e9063feabc",
+        "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,
+    }