Update Model

api/auth.py

@@ -14,12 +14,13 @@ import os
 import logging
 from api.models import UserRead, UserCreate, UserUpdate
 
-
 # Setup logging
 logger = logging.getLogger(__name__)
 
+# Cookie transport for JWT
 cookie_transport = CookieTransport(cookie_max_age=3600)
 
+# JWT Secret
 SECRET = os.getenv("JWT_SECRET")
 if not SECRET or len(SECRET) < 32:
     logger.error("JWT_SECRET is not set or too short.")
@@ -110,7 +111,7 @@ google_oauth_router = get_oauth_router(
     google_oauth_client,
     auth_backend,
     get_user_manager,
-    state_secret=SECRET,  # أضف هذا السطر
+    state_secret=SECRET,
     associate_by_email=True,
     redirect_url="https://mgzon-mgzon-app.hf.space/auth/google/callback",
 )
@@ -119,13 +120,13 @@ github_oauth_router = get_oauth_router(
     github_oauth_client,
     auth_backend,
     get_user_manager,
-    state_secret=SECRET,  # أضف هذا السطر
+    state_secret=SECRET,
     associate_by_email=True,
     redirect_url="https://mgzon-mgzon-app.hf.space/auth/github/callback",
 )
 
 fastapi_users = FastAPIUsers[User, int](
-    get_user_db,
+    get_user_manager,  # تم تصحيح الـ dependency من get_user_db إلى get_user_manager
     [auth_backend],
 )
 

api/endpoints.py

@@ -1,3 +1,4 @@
+# api/endpoints.py
 import os
 import uuid
 from fastapi import APIRouter, Depends, HTTPException, Request, status, UploadFile, File
@@ -31,7 +32,7 @@ if not BACKUP_HF_TOKEN:
 ROUTER_API_URL = os.getenv("ROUTER_API_URL", "https://router.huggingface.co")
 API_ENDPOINT = os.getenv("API_ENDPOINT", "https://api-inference.huggingface.co")
 FALLBACK_API_ENDPOINT = os.getenv("FALLBACK_API_ENDPOINT", "https://api-inference.huggingface.co")
-MODEL_NAME = os.getenv("MODEL_NAME", "openai/gpt-oss-120b")  # Updated to target model
+MODEL_NAME = os.getenv("MODEL_NAME", "openai/gpt-oss-120b")  # بدون :cerebras
 SECONDARY_MODEL_NAME = os.getenv("SECONDARY_MODEL_NAME", "mistralai/Mixtral-8x7B-Instruct-v0.1")
 TERTIARY_MODEL_NAME = os.getenv("TERTIARY_MODEL_NAME", "gpt2")
 CLIP_BASE_MODEL = os.getenv("CLIP_BASE_MODEL", "Salesforce/blip-image-captioning-large")

main.py

@@ -15,6 +15,7 @@ from fastapi.middleware.cors import CORSMiddleware
 from api.endpoints import router as api_router
 from api.auth import fastapi_users, auth_backend, current_active_user, get_auth_router
 from api.database import get_db, engine, Base
+from api.models import User, UserRead, UserCreate, Conversation, UserUpdate  # استيراد User
 from motor.motor_asyncio import AsyncIOMotorClient
 from pydantic import BaseModel
 from typing import List
@@ -26,7 +27,7 @@ from pathlib import Path
 from hashlib import md5
 from datetime import datetime
 from httpx_oauth.exceptions import GetIdEmailError
-from api.models import UserRead, UserCreate, Conversation, UserUpdate
+import re
 
 # Setup logging
 logging.basicConfig(level=logging.INFO)

requirements.txt

@@ -1,6 +1,6 @@
 fastapi==0.115.2
 packaging>=23.0
-uvicorn==0.30.6
+uvicorn==0.32.0  # حدثت من 0.30.6 إلى 0.32.0 للتوافق
 gradio>=4.44.1
 openai==1.42.0
 httpx==0.27.0
@@ -25,15 +25,14 @@ Pillow==10.4.0
 urllib3==2.0.7
 itsdangerous
 protobuf==3.19.6
-fastapi-users[sqlalchemy,oauth]>=13.0.0
-
-sqlalchemy>=2.0.0
+fastapi-users[sqlalchemy,oauth2]>=14.0.0  # حدثت من 13.0.0 إلى 14.0.0 للتوافق مع api/auth.py
+flash-attn>=2.0.0
+sqlalchemy>=2.0.35  # حدثت من 2.0.0 إلى 2.0.35 للتوافق مع fastapi-users
 python-jose[cryptography]>=3.3.0
 passlib[bcrypt]>=1.7.4
 httpx-oauth
 python-multipart
 aiofiles
-motor
+motor>=3.6.0
 redis
 markdown2
-

utils/generation.py

@@ -1,3 +1,4 @@
+# utils/generation.py
 import os
 import re
 import json
@@ -36,7 +37,7 @@ BACKUP_HF_TOKEN = os.getenv("BACKUP_HF_TOKEN")
 ROUTER_API_URL = os.getenv("ROUTER_API_URL", "https://router.huggingface.co")
 API_ENDPOINT = os.getenv("API_ENDPOINT", "https://api-inference.huggingface.co")
 FALLBACK_API_ENDPOINT = os.getenv("FALLBACK_API_ENDPOINT", "https://api-inference.huggingface.co")
-MODEL_NAME = os.getenv("MODEL_NAME", "openai/gpt-oss-120b")  # Updated to target model
+MODEL_NAME = os.getenv("MODEL_NAME", "openai/gpt-oss-120b")  # بدون :cerebras
 SECONDARY_MODEL_NAME = os.getenv("SECONDARY_MODEL_NAME", "mistralai/Mixtral-8x7B-Instruct-v0.1")
 TERTIARY_MODEL_NAME = os.getenv("TERTIARY_MODEL_NAME", "gpt2")
 CLIP_BASE_MODEL = os.getenv("CLIP_BASE_MODEL", "Salesforce/blip-image-captioning-large")
@@ -77,7 +78,7 @@ def check_model_availability(model_name: str, api_key: str) -> tuple[bool, str,
         if response.status_code == 200:
             data = response.json().get("data", {})
             providers = data.get("providers", [])
-            # Select the first available provider (e.g., 'together')
+            # Select the first available provider (e.g., 'cerebras')
             for provider in providers:
                 if provider.get("status") == "live":
                     provider_name = provider.get("provider")
@@ -682,7 +683,7 @@ def generate(message, history, system_prompt, temperature, reasoning_effort, ena
 
     def make_raw_preview() -> str:
         return (
-            "```text\n"
+            "```text
             "Analysis (live):\n"
             f"{raw_analysis}\n\n"
             "Response (draft):\n"