Update app.py

app.py

@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+# =====================================================
+# SMART G4F GATEWAY v3.0
+# =====================================================
+
 import time
 import random
 import traceback
@@ -8,16 +12,24 @@ import logging
 
 from fastapi import FastAPI, HTTPException, Request
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse
 from pydantic import BaseModel
-import uvicorn
 
-from g4f.client import Client
+import uvicorn
 
 # =====================================================
-# IMPORT SAFE PROVIDERS ONLY
+# SAFE IMPORTS
 # =====================================================
 
-import g4f.Provider as Provider
+try:
+
+    from g4f.client import Client
+    import g4f.Provider as Provider
+
+except Exception as e:
+
+    print(f"[FATAL] G4F IMPORT ERROR: {e}")
+    raise e
 
 # =====================================================
 # CONFIG
@@ -25,9 +37,10 @@ import g4f.Provider as Provider
 
 API_KEY = "sk-your-secret-key"
 
-MODEL = "gpt-4o-mini"
+DEFAULT_MODEL = "gpt-4o-mini"
+
+MAX_RETRIES = 5
 
-MAX_RETRIES = 10
 TIMEOUT = 60
 
 # =====================================================
@@ -47,7 +60,7 @@ logger = logging.getLogger("smart-g4f")
 
 app = FastAPI(
     title="Smart G4F Gateway",
-    version="2.0"
+    version="3.0"
 )
 
 # =====================================================
@@ -63,14 +76,51 @@ app.add_middleware(
 )
 
 # =====================================================
-# API KEY AUTH
+# PROVIDERS
+# =====================================================
+
+SAFE_PROVIDERS = []
+
+PROVIDERS = [
+    ("Blackbox", "blackboxai"),
+    ("Free2GPT", "gpt-4o-mini"),
+    ("DuckDuckGo", "gpt-4o-mini"),
+]
+
+for provider_name, model_name in PROVIDERS:
+
+    try:
+
+        provider = getattr(Provider, provider_name)
+
+        SAFE_PROVIDERS.append({
+            "provider": provider,
+            "model": model_name
+        })
+
+        logger.info(f"[+] Loaded provider: {provider_name}")
+
+    except Exception as e:
+
+        logger.warning(f"[-] Failed provider {provider_name}: {e}")
+
+random.shuffle(SAFE_PROVIDERS)
+
+logger.info(f"[+] TOTAL SAFE PROVIDERS: {len(SAFE_PROVIDERS)}")
+
+# =====================================================
+# CLIENT
+# =====================================================
+
+client = Client()
+
+# =====================================================
+# AUTH
 # =====================================================
 
 def verify_api_key(req: Request):
 
-    # =========================================
     # Authorization: Bearer
-    # =========================================
 
     auth = req.headers.get("Authorization")
 
@@ -81,60 +131,27 @@ def verify_api_key(req: Request):
         if token == API_KEY:
             return True
 
-    # =========================================
     # x-api-key
-    # =========================================
 
     x_api_key = req.headers.get("x-api-key")
 
     if x_api_key and x_api_key.strip() == API_KEY:
         return True
 
-    # =========================================
-    # FAILED
-    # =========================================
-
     raise HTTPException(
         status_code=403,
         detail="Invalid API Key"
     )
 
 # =====================================================
-# SAFE PROVIDERS
+# REQUEST MODEL
 # =====================================================
 
-SAFE_PROVIDERS = []
-
-PREFERRED = [
-    ("Blackbox", "blackboxai"),
-    ("Free2GPT", "gpt-4o-mini"),
-    ("DuckDuckGo", "gpt-4o-mini"),
-]
-
-for provider_name, provider_model in PREFERRED:
-
-    try:
-
-        provider = getattr(Provider, provider_name)
-
-        SAFE_PROVIDERS.append({
-            "provider": provider,
-            "model": provider_model
-        })
-
-    except Exception as e:
-
-        logger.warning(f"Provider load failed: {provider_name} -> {e}")
-
-random.shuffle(SAFE_PROVIDERS)
-
-logger.info(f"[+] SAFE PROVIDERS: {len(SAFE_PROVIDERS)}")
+class ChatRequest(BaseModel):
 
-# =====================================================
-# CLIENT
-# =====================================================
+    prompt: str = ""
 
-client = Client()
+    model: str = DEFAULT_MODEL
 
 # =====================================================
 # SMART G4F
@@ -180,7 +197,7 @@ class SmartG4F:
 
     # =================================================
 
-    def ask(self, prompt):
+    def ask(self, prompt, model=DEFAULT_MODEL):
 
         last_error = None
 
@@ -192,16 +209,17 @@ class SmartG4F:
                 break
 
             provider = item["provider"]
-            model = item["model"]
+
+            provider_model = item["model"]
 
             try:
 
                 logger.info(
-                    f"[+] Trying provider={provider.__name__} model={model}"
+                    f"[+] Trying provider={provider.__name__}"
                 )
 
                 response = client.chat.completions.create(
-                    model=model,
+                    model=model or provider_model,
                     provider=provider,
                     messages=[
                         {
@@ -215,14 +233,17 @@ class SmartG4F:
                 text = None
 
                 try:
+
                     text = response.choices[0].message.content
-                except:
+
+                except Exception:
+
                     text = str(response)
 
                 if text and text.strip():
 
                     logger.info(
-                        f"[+] Success provider={provider.__name__}"
+                        f"[+] SUCCESS provider={provider.__name__}"
                     )
 
                     return {
@@ -236,7 +257,7 @@ class SmartG4F:
                 last_error = str(e)
 
                 logger.warning(
-                    f"[-] Failed provider={provider.__name__} error={e}"
+                    f"[-] FAILED provider={provider.__name__} error={e}"
                 )
 
                 self.mark_bad(provider)
@@ -249,14 +270,6 @@ class SmartG4F:
 
 smart = SmartG4F()
 
-# =====================================================
-# REQUEST MODEL
-# =====================================================
-
-class ChatRequest(BaseModel):
-
-    prompt: str
-
 # =====================================================
 # ROOT
 # =====================================================
@@ -268,9 +281,9 @@ async def root():
     return {
         "status": "online",
         "service": "Smart G4F Gateway",
-        "version": "2.0",
+        "version": "3.0",
         "providers": len(SAFE_PROVIDERS),
-        "auth": [
+        "auth_methods": [
             "Authorization: Bearer",
             "x-api-key"
         ]
@@ -297,21 +310,34 @@ async def health():
 
 async def models():
 
+    data = [
+        {
+            "id": "gpt-4o-mini",
+            "object": "model",
+            "owned_by": "openai",
+            "created": int(time.time())
+        },
+        {
+            "id": "blackboxai",
+            "object": "model",
+            "owned_by": "blackbox",
+            "created": int(time.time())
+        },
+        {
+            "id": "gpt-3.5-turbo",
+            "object": "model",
+            "owned_by": "openai",
+            "created": int(time.time())
+        }
+    ]
+
     return {
         "object": "list",
-        "data": [
-            {
-                "id": item["model"],
-                "object": "model",
-                "owned_by": item["provider"].__name__,
-                "created": int(time.time())
-            }
-            for item in SAFE_PROVIDERS
-        ]
+        "data": data
     }
 
 # =====================================================
-# CHAT
+# SIMPLE CHAT
 # =====================================================
 
 @app.post("/chat")
@@ -320,9 +346,21 @@ async def chat(req: Request, body: ChatRequest):
 
     verify_api_key(req)
 
+    prompt = body.prompt.strip()
+
+    if not prompt:
+
+        raise HTTPException(
+            status_code=400,
+            detail="Prompt is empty"
+        )
+
     try:
 
-        result = smart.ask(body.prompt)
+        result = smart.ask(
+            prompt=prompt,
+            model=body.model
+        )
 
         return {
             "success": True,
@@ -341,7 +379,7 @@ async def chat(req: Request, body: ChatRequest):
         )
 
 # =====================================================
-# OPENAI STYLE ENDPOINT
+# OPENAI API
 # =====================================================
 
 @app.post("/v1/chat/completions")
@@ -350,11 +388,23 @@ async def openai_chat(req: Request, body: ChatRequest):
 
     verify_api_key(req)
 
+    prompt = body.prompt.strip()
+
+    if not prompt:
+
+        raise HTTPException(
+            status_code=400,
+            detail="Prompt is empty"
+        )
+
     try:
 
-        result = smart.ask(body.prompt)
+        result = smart.ask(
+            prompt=prompt,
+            model=body.model
+        )
 
-        return {
+        return JSONResponse({
             "id": f"chatcmpl-{random.randint(100000,999999)}",
             "object": "chat.completion",
             "created": int(time.time()),
@@ -368,8 +418,13 @@ async def openai_chat(req: Request, body: ChatRequest):
                     },
                     "finish_reason": "stop"
                 }
-            ]
-        }
+            ],
+            "usage": {
+                "prompt_tokens": 0,
+                "completion_tokens": 0,
+                "total_tokens": 0
+            }
+        })
 
     except Exception as e:
 
@@ -457,7 +512,7 @@ button {{
 
 <body>
 
-<h2>🤖 Smart G4F Gateway</h2>
+<h2>🤖 Smart G4F Gateway v3.0</h2>
 
 <div id="chat"></div>
 
@@ -506,7 +561,8 @@ async function send() {{
             }},
 
             body: JSON.stringify({{
-                prompt: text
+                prompt: text,
+                model: "gpt-4o-mini"
             }})
         }});
 
@@ -538,14 +594,14 @@ if __name__ == "__main__":
     print("""
 
 ╔══════════════════════════════════════╗
-║        SMART G4F GATEWAY            ║
+║         SMART G4F GATEWAY           ║
 ╠══════════════════════════════════════╣
-║  VERSION : 2.0                      ║
+║  VERSION : 3.0                      ║
 ║  AUTH    : ENABLED                  ║
-║  MODEL   : gpt-4o-mini              ║
 ║  TEST UI : /test                    ║
 ║  CHAT    : /chat                    ║
 ║  OPENAI  : /v1/chat/completions     ║
+║  MODELS  : /v1/models               ║
 ╚══════════════════════════════════════╝
 
 """)