Fix ChunkedIteratorResult in SQLAlchemyUserDatabase and toggleBtn null error

api/auth.py

@@ -1,24 +1,26 @@
+# api/auth.py
 # SPDX-FileCopyrightText: Hadad <[email protected]>
 # SPDX-License-Identifier: Apache-2.0
 
 from fastapi_users import FastAPIUsers
 from fastapi_users.authentication import CookieTransport, JWTStrategy, AuthenticationBackend
-from fastapi_users.db import SQLAlchemyBaseUserTable, SQLAlchemyUserDatabase
+from fastapi_users.router.oauth import get_oauth_router
 from httpx_oauth.clients.google import GoogleOAuth2
 from httpx_oauth.clients.github import GitHubOAuth2
-from fastapi_users.router.oauth import get_oauth_router
-from api.database import User, OAuthAccount, get_user_db
-from api.models import UserRead, UserCreate, UserUpdate
 from fastapi_users.manager import BaseUserManager, IntegerIDMixin
 from fastapi import Depends, Request, FastAPI
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select
 from fastapi_users.models import UP
-from typing import Optional, Dict, Any
+from typing import Optional, Dict
 import os
 import logging
 import secrets
 
+from api.user_db import CustomSQLAlchemyUserDatabase, get_user_db  # استيراد من user_db.py
+from api.database import User, OAuthAccount
+from api.models import UserRead, UserCreate, UserUpdate
+
 # إعداد اللوقينج
 logger = logging.getLogger(__name__)
 
@@ -55,27 +57,6 @@ GITHUB_REDIRECT_URL = os.getenv("GITHUB_REDIRECT_URL", "https://mgzon-mgzon-app.
 google_oauth_client = GoogleOAuth2(GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET)
 github_oauth_client = GitHubOAuth2(GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET)
 
-# قاعدة بيانات المستخدم
-class CustomSQLAlchemyUserDatabase(SQLAlchemyUserDatabase):
-    def parse_id(self, value: Any) -> int:
-        """تحويل الـ ID من string إلى int لتوافق JWTStrategy"""
-        logger.debug(f"Parsing ID: {value} (type: {type(value)})")
-        return int(value) if isinstance(value, str) else value
-
-    async def get_by_email(self, email: str) -> Optional[User]:
-        logger.info(f"Checking for user with email: {email}")
-        statement = select(self.user_table).where(self.user_table.email == email)
-        result = await self.session.execute(statement)
-        return result.scalar_one_or_none()
-
-    async def create(self, create_dict: Dict[str, Any]) -> User:
-        logger.info(f"Creating user with email: {create_dict.get('email')}")
-        user = self.user_table(**create_dict)
-        self.session.add(user)
-        await self.session.commit()
-        await self.session.refresh(user)
-        return user
-
 # مدير المستخدمين
 class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
     reset_password_token_secret = SECRET

api/database.py

@@ -1,3 +1,4 @@
+# api/database.py
 # SPDX-FileCopyrightText: Hadad <[email protected]>
 # SPDX-License-Identifier: Apache-2.0
 
@@ -10,10 +11,9 @@ from sqlalchemy import Column, String, Integer, ForeignKey, DateTime, Boolean, T
 from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship
-from fastapi_users.db import SQLAlchemyBaseUserTable, SQLAlchemyUserDatabase
 from fastapi import Depends
 import aiosqlite
-from api.auth import CustomSQLAlchemyUserDatabase  # أضف هذا الـ import
+from api.user_db import CustomSQLAlchemyUserDatabase, get_user_db  # استيراد من user_db.py
 
 # إعداد اللوج
 logger = logging.getLogger(__name__)
@@ -58,7 +58,7 @@ class OAuthAccount(Base):
 
     user = relationship("User", back_populates="oauth_accounts", lazy="selectin")
 
-class User(SQLAlchemyBaseUserTable[int], Base):
+class User(Base):  # إزالة SQLAlchemyBaseUserTable لأن fastapi-users بيستخدم CustomSQLAlchemyUserDatabase
     __tablename__ = "user"
     id = Column(Integer, primary_key=True, index=True)
     email = Column(String, unique=True, index=True, nullable=False)

api/endpoints.py

@@ -141,6 +141,7 @@ async def performance_stats():
         "uptime": os.popen("uptime").read().strip()
     }
 
+
 @router.post("/api/chat")
 async def chat_endpoint(
     request: Request,
@@ -178,10 +179,15 @@ async def chat_endpoint(
     preferred_model = user.preferred_model if user else None
     model_name, api_endpoint = select_model(req.message, input_type="text", preferred_model=preferred_model)
     
+    # جرب النموذج الأساسي
     is_available, api_key, selected_endpoint = check_model_availability(model_name, HF_TOKEN)
     if not is_available:
-        logger.error(f"Model {model_name} is not available at {api_endpoint}")
-        raise HTTPException(status_code=503, detail=f"Model {model_name} is not available. Please try another model.")
+        logger.warning(f"Model {model_name} is not available at {api_endpoint}, trying fallback model.")
+        model_name = SECONDARY_MODEL_NAME  # جرب النموذج البديل
+        is_available, api_key, selected_endpoint = check_model_availability(model_name, HF_TOKEN)
+        if not is_available:
+            logger.error(f"Fallback model {model_name} is not available at {selected_endpoint}")
+            raise HTTPException(status_code=503, detail=f"No available models. Tried {MODEL_NAME} and {SECONDARY_MODEL_NAME}.")
     
     system_prompt = enhance_system_prompt(req.system_prompt, req.message, user)
     
@@ -209,12 +215,12 @@ async def chat_endpoint(
                     logger.warning(f"Unexpected non-bytes chunk in audio stream: {chunk}")
             if not audio_chunks:
                 logger.error("No audio data generated.")
-                raise HTTPException(status_code=500, detail="No audio data generated.")
+                raise HTTPException(status_code=502, detail="No audio data generated. Model may be unavailable.")
             audio_data = b"".join(audio_chunks)
             return StreamingResponse(io.BytesIO(audio_data), media_type="audio/wav")
         except Exception as e:
             logger.error(f"Audio generation failed: {e}")
-            raise HTTPException(status_code=500, detail=f"Audio generation failed: {str(e)}")
+            raise HTTPException(status_code=502, detail=f"Audio generation failed: {str(e)}")
     
     response_chunks = []
     try:
@@ -225,8 +231,37 @@ async def chat_endpoint(
                 logger.warning(f"Unexpected non-string chunk in text stream: {chunk}")
         response = "".join(response_chunks)
         if not response.strip():
-            logger.error("Empty response generated.")
-            raise HTTPException(status_code=500, detail="Empty response generated from model.")
+            logger.warning(f"Empty response from {model_name}. Trying fallback model {SECONDARY_MODEL_NAME}.")
+            # جرب النموذج البديل
+            model_name = SECONDARY_MODEL_NAME
+            is_available, api_key, selected_endpoint = check_model_availability(model_name, HF_TOKEN)
+            if not is_available:
+                logger.error(f"Fallback model {model_name} is not available at {selected_endpoint}")
+                raise HTTPException(status_code=503, detail=f"No available models. Tried {MODEL_NAME} and {SECONDARY_MODEL_NAME}.")
+            
+            stream = request_generation(
+                api_key=api_key,
+                api_base=selected_endpoint,
+                message=req.message,
+                system_prompt=system_prompt,
+                model_name=model_name,
+                chat_history=req.history,
+                temperature=req.temperature,
+                max_new_tokens=req.max_new_tokens or 2048,
+                deep_search=req.enable_browsing,
+                input_type="text",
+                output_format=req.output_format
+            )
+            response_chunks = []
+            for chunk in stream:
+                if isinstance(chunk, str):
+                    response_chunks.append(chunk)
+                else:
+                    logger.warning(f"Unexpected non-string chunk in text stream: {chunk}")
+            response = "".join(response_chunks)
+            if not response.strip():
+                logger.error(f"Empty response from fallback model {model_name}.")
+                raise HTTPException(status_code=502, detail=f"Empty response from both {MODEL_NAME} and {SECONDARY_MODEL_NAME}.")
         logger.info(f"Chat response: {response[:100]}...")
     except Exception as e:
         logger.error(f"Chat generation failed: {e}")
@@ -246,7 +281,6 @@ async def chat_endpoint(
         }
     
     return {"response": response}
-
 @router.post("/api/audio-transcription")
 async def audio_transcription_endpoint(
     request: Request,

api/models.py

@@ -1,3 +1,4 @@
+# api/models.py
 from pydantic import BaseModel, Field
 from typing import List, Optional
 from fastapi_users import schemas
@@ -34,6 +35,7 @@ class UserCreate(schemas.BaseUserCreate):
 
     model_config = {"from_attributes": True}
 
+# Pydantic schema for updating user settings
 class UserUpdate(BaseModel):
     display_name: Optional[str] = None
     preferred_model: Optional[str] = None

api/user_db.py

@@ -0,0 +1,51 @@
+# api/user_db.py
+# SPDX-FileCopyrightText: Hadad <[email protected]>
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+from typing import Any, AsyncGenerator, Dict, Optional
+
+from fastapi import Depends
+from fastapi_users.db import SQLAlchemyUserDatabase
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy import select
+
+from api.database import User, OAuthAccount  # استيراد جداولك
+
+logger = logging.getLogger(__name__)
+
+class CustomSQLAlchemyUserDatabase(SQLAlchemyUserDatabase[User, int]):
+    """
+    قاعدة بيانات مخصَّصة لمكتبة fastapi‑users.
+    تضيف طريقة parse_id التي تُحوِّل الـ ID من str → int.
+    """
+
+    def parse_id(self, value: Any) -> int:
+        logger.debug(f"Parsing user id: {value} (type={type(value)})")
+        # إذا كان الـ ID نصًا (من JWT) → حوّله إلى int
+        return int(value) if isinstance(value, str) else value
+
+    # ---------- وظائف مساعدة ----------
+    async def get_by_email(self, email: str) -> Optional[User]:
+        logger.info(f"Looking for user with email: {email}")
+        stmt = select(self.user_table).where(self.user_table.email == email)
+        result = await self.session.execute(stmt)
+        return result.scalar_one_or_none()
+
+    async def create(self, create_dict: Dict[str, Any]) -> User:
+        logger.info(f"Creating new user: {create_dict.get('email')}")
+        user = self.user_table(**create_dict)
+        self.session.add(user)
+        await self.session.commit()
+        await self.session.refresh(user)
+        return user
+
+# ---------- Dependency يُستَخدم في باقي المشروع ----------
+async def get_user_db(
+    session: AsyncSession = Depends(lambda: None)   # سيتم استبداله في database.py
+) -> AsyncGenerator[CustomSQLAlchemyUserDatabase, None]:
+    """
+    يُستَخدم كـ Depends في جميع المسارات التي تحتاج إلى قاعدة بيانات المستخدم.
+    سيتم تمرير الـ AsyncSession الفعلي من `api/database.py`.
+    """
+    yield CustomSQLAlchemyUserDatabase(session, User, OAuthAccount)

utils/web_search.py

@@ -2,7 +2,6 @@ import os
 import requests
 from bs4 import BeautifulSoup
 import logging
-import time
 
 logger = logging.getLogger(__name__)
 
@@ -12,11 +11,8 @@ def web_search(query: str) -> str:
         google_cse_id = os.getenv("GOOGLE_CSE_ID")
         if not google_api_key or not google_cse_id:
             return "Web search requires GOOGLE_API_KEY and GOOGLE_CSE_ID to be set."
-        url = f"https://www.googleapis.com/customsearch/v1?key={google_api_key}&cx={google_cse_id}&q={query}"
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
-        }
-        response = requests.get(url, headers=headers, timeout=10)
+        url = f"https://www.googleapis.com/customsearch/v1?key={google_api_key}&cx={google_cse_id}&q={query}+site:https://hager-zon.vercel.app/"
+        response = requests.get(url, timeout=10)
         response.raise_for_status()
         results = response.json().get("items", [])
         if not results:
@@ -27,8 +23,7 @@ def web_search(query: str) -> str:
             snippet = item.get("snippet", "")
             link = item.get("link", "")
             try:
-                time.sleep(2)
-                page_response = requests.get(link, headers=headers, timeout=10)
+                page_response = requests.get(link, timeout=5)
                 page_response.raise_for_status()
                 soup = BeautifulSoup(page_response.text, "html.parser")
                 paragraphs = soup.find_all("p")