Fix ChunkedIteratorResult in SQLAlchemyUserDatabase and toggleBtn null error

api/auth.py

@@ -4,7 +4,7 @@ from fastapi_users.db import SQLAlchemyUserDatabase
 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, get_db
+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
@@ -163,7 +163,7 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
 
         user_dict = {
             "email": account_email,
-            "hashed_password": self.password_helper.hash(secrets.token_hex(32)),  # Improved random password
+            "hashed_password": self.password_helper.hash(secrets.token_hex(32)),
             "is_active": True,
             "is_verified": is_verified_by_default,
         }

api/database.py

@@ -1,8 +1,9 @@
 import os
 from sqlalchemy import Column, String, Integer, ForeignKey, DateTime, Boolean, Text
 from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
-from sqlalchemy.orm import relationship, declarative_base
-from fastapi_users.db import SQLAlchemyUserDatabase
+from sqlalchemy.orm import relationship
+from sqlalchemy.ext.declarative import declarative_base
+from fastapi_users.db import SQLAlchemyBaseUserTable, SQLAlchemyUserDatabase
 from typing import AsyncGenerator
 from fastapi import Depends
 from datetime import datetime
@@ -15,7 +16,7 @@ SQLALCHEMY_DATABASE_URL = os.getenv("SQLALCHEMY_DATABASE_URL")
 if not SQLALCHEMY_DATABASE_URL:
     raise ValueError("SQLALCHEMY_DATABASE_URL is not set in environment variables.")
 
-# إنشاء محرك async
+# إنشاء محرك async (استخدم sqlite+aiosqlite للدعم async)
 async_engine = create_async_engine(SQLALCHEMY_DATABASE_URL, echo=True)
 
 # إعداد جلسة async
@@ -77,17 +78,19 @@ class Message(Base):
     conversation = relationship("Conversation", back_populates="messages")
 
 async def get_db() -> AsyncGenerator[AsyncSession, None]:
-    async with AsyncSessionLocal() as db:
+    """Get async database session."""
+    async with AsyncSessionLocal() as session:
         try:
-            yield db
+            yield session
         finally:
-            await db.close()
+            await session.close()
 
-async def get_user_db(session: AsyncSession = Depends(get_db)):
+async def get_user_db(session: AsyncSession = Depends(get_db)) -> AsyncGenerator[SQLAlchemyUserDatabase, None]:
+    """Get user database for fastapi-users."""
     yield SQLAlchemyUserDatabase(session, User, OAuthAccount)
 
-# إنشاء الجداول بشكل async
 async def init_db():
+    """Initialize database tables asynchronously."""
     try:
         async with async_engine.begin() as conn:
             await conn.run_sync(Base.metadata.create_all)
@@ -95,4 +98,3 @@ async def init_db():
     except Exception as e:
         logger.error(f"Error creating database tables: {e}")
         raise
-

init_db.py

@@ -1,35 +1,31 @@
 import os
 import logging
-from sqlalchemy import create_engine, select, delete
-from sqlalchemy.orm import sessionmaker
-from api.database import Base, User, OAuthAccount, Conversation, Message
+from api.database import async_engine, Base, User, OAuthAccount, Conversation, Message, AsyncSessionLocal
 
 # Setup logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-# جلب URL قاعدة البيانات من المتغيرات البيئية
-SQLALCHEMY_DATABASE_URL = os.getenv("SQLALCHEMY_DATABASE_URL", "sqlite:///./data/mgzon_users.db")
-if not SQLALCHEMY_DATABASE_URL:
-    logger.error("SQLALCHEMY_DATABASE_URL is not set in environment variables.")
-    raise ValueError("SQLALCHEMY_DATABASE_URL is required.")
-
-# إنشاء المحرك
-engine = create_engine(SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False})
-
-# إعداد الجلسة
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-
 def init_db():
     logger.info("Starting database initialization...")
 
-    # إنشاء الجداول
-    Base.metadata.create_all(bind=engine)
-    logger.info("Database tables created successfully.")
+    # إنشاء الجداول (sync version for init_db.py)
+    try:
+        from sqlalchemy import create_engine
+        sync_engine = create_engine(os.getenv("SQLALCHEMY_DATABASE_URL", "sqlite:///./data/mgzon_users.db"))
+        Base.metadata.create_all(bind=sync_engine)
+        logger.info("Database tables created successfully.")
+    except Exception as e:
+        logger.error(f"Error creating database tables: {e}")
+        raise
 
-    # تنظيف البيانات غير المتسقة
-    with SessionLocal() as session:
-        try:
+    # تنظيف البيانات غير المتسقة (sync for simplicity in init_db)
+    try:
+        from sqlalchemy import select, delete
+        from sqlalchemy.orm import sessionmaker
+        sync_engine = create_engine(os.getenv("SQLALCHEMY_DATABASE_URL", "sqlite:///./data/mgzon_users.db"))
+        SyncSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=sync_engine)
+        with SyncSessionLocal() as session:
             # حذف سجلات oauth_accounts اللي مش مرتبطة بمستخدم موجود
             stmt = delete(OAuthAccount).where(
                 OAuthAccount.user_id.notin_(select(User.id))
@@ -71,12 +67,9 @@ def init_db():
                 session.commit()
                 logger.info("Test conversation created successfully.")
 
-        except Exception as e:
-            session.rollback()
-            logger.error(f"Error during initialization: {e}")
-            raise
-        finally:
-            session.close()
+    except Exception as e:
+        logger.error(f"Error during initialization: {e}")
+        raise
 
     logger.info("Database initialization completed.")