Update Model

.env

@@ -0,0 +1 @@
+SQLALCHEMY_DATABASE_URL=sqlite:///data/mgzon_users.db

Dockerfile

@@ -10,11 +10,13 @@ RUN apt-get update && apt-get install -y \
     gcc \
     libc-dev \
     ffmpeg \
+    sqlite3 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Update pip
 RUN pip install --upgrade pip
 
+# Install torch and dependencies
 RUN pip install packaging torch==2.4.1
 
 # Copy requirements.txt and install dependencies
@@ -30,9 +32,12 @@ COPY . .
 # Verify files in /app
 RUN ls -R /app
 
+# Initialize the database
+ENV SQLALCHEMY_DATABASE_URL=sqlite:////data/mgzon_users.db
+RUN python init_db.py
+
 # Expose port 7860 for FastAPI
 EXPOSE 7860
 
 # Run the FastAPI app
 CMD ["python", "main.py"]
-

api/auth.py

@@ -11,6 +11,7 @@ from fastapi_users.models import UP
 from typing import Optional
 import os
 import logging
+from api.database import User, OAuthAccount
 from api.models import UserRead, UserCreate, UserUpdate
 from sqlalchemy import select
 
@@ -71,6 +72,8 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
         associate_by_email: bool = False,
         is_verified_by_default: bool = False,
     ) -> UP:
+        logger.info(f"Processing OAuth callback for {oauth_name} with account_id: {account_id}, email: {account_email}")
+        
         oauth_account_dict = {
             "oauth_name": oauth_name,
             "access_token": access_token,
@@ -89,20 +92,29 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
         existing_oauth_account = result.scalars().first()
 
         if existing_oauth_account is not None:
-            return await self.on_after_login(existing_oauth_account.user, request)
+            logger.info(f"Found existing OAuth account for {oauth_name}, account_id: {account_id}")
+            user = existing_oauth_account.user
+            if user is None:
+                logger.error(f"No user associated with OAuth account {account_id}")
+                raise ValueError("No user associated with this OAuth account")
+            logger.info(f"Returning existing user: {user.email}")
+            return await self.on_after_login(user, request)
 
         if associate_by_email:
-            # Synchronous query for get_by_email
+            logger.info(f"Associating by email: {account_email}")
             statement = select(User).where(User.email == account_email)
             result = self.user_db.session.execute(statement)
             user = result.scalars().first()
             if user is not None:
+                logger.info(f"Found existing user by email: {user.email}")
                 oauth_account.user_id = user.id
                 self.user_db.session.add(oauth_account)
                 self.user_db.session.commit()
+                logger.info(f"Associated OAuth account with user: {user.email}")
                 return await self.on_after_login(user, request)
 
         # Create new user
+        logger.info(f"Creating new user for email: {account_email}")
         user_dict = {
             "email": account_email,
             "hashed_password": self.password_helper.hash("dummy_password"),
@@ -113,10 +125,12 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
         self.user_db.session.add(user)
         self.user_db.session.commit()
         self.user_db.session.refresh(user)
+        logger.info(f"Created new user: {user.email}")
 
         oauth_account.user_id = user.id
         self.user_db.session.add(oauth_account)
         self.user_db.session.commit()
+        logger.info(f"Linked OAuth account to new user: {user.email}")
         return await self.on_after_login(user, request)
 
 async def get_user_manager(user_db: SQLAlchemyUserDatabase = Depends(get_user_db)):

api/endpoints.py

@@ -3,7 +3,8 @@ import os
 import uuid
 from fastapi import APIRouter, Depends, HTTPException, Request, status, UploadFile, File
 from fastapi.responses import StreamingResponse
-from api.models import QueryRequest, User, Conversation, Message, ConversationOut, ConversationCreate, UserUpdate
+from api.database import User, Conversation, Message
+from api.models import QueryRequest, ConversationOut, ConversationCreate, UserUpdate
 from api.auth import current_active_user
 from api.database import get_db
 from sqlalchemy.orm import Session

api/models.py

@@ -1,70 +1,7 @@
-# models.py
-from fastapi_users.db import SQLAlchemyBaseUserTable
-from sqlalchemy import Column, Integer, String, Boolean, Text, ForeignKey, DateTime
-from sqlalchemy.orm import relationship
-from sqlalchemy.ext.declarative import declarative_base
 from pydantic import BaseModel, Field
 from typing import List, Optional
 from fastapi_users import schemas
 from datetime import datetime
-import uuid
-
-Base = declarative_base()
-
-# جدول OAuth Accounts لتخزين بيانات تسجيل الدخول الخارجي
-class OAuthAccount(Base):
-    __tablename__ = "oauth_accounts"
-    id = Column(Integer, primary_key=True)
-    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
-    oauth_name = Column(String, nullable=False)
-    access_token = Column(String, nullable=False)
-    expires_at = Column(Integer, nullable=True)
-    refresh_token = Column(String, nullable=True)
-    account_id = Column(String, index=True, nullable=False)
-    account_email = Column(String, nullable=False)
-    user = relationship("User", back_populates="oauth_accounts")
-
-# نموذج المستخدم
-class User(SQLAlchemyBaseUserTable, Base):
-    __tablename__ = "users"
-    id = Column(Integer, primary_key=True, index=True)
-    email = Column(String, unique=True, index=True, nullable=False)
-    hashed_password = Column(String, nullable=True)
-    is_active = Column(Boolean, default=True)
-    is_superuser = Column(Boolean, default=False)
-    display_name = Column(String, nullable=True)  # الاسم المستعار للمستخدم
-    preferred_model = Column(String, nullable=True)  # النموذج المفضل (اسم وهمي)
-    job_title = Column(String, nullable=True)  # الوظيفة
-    education = Column(String, nullable=True)  # التعليم
-    interests = Column(Text, nullable=True)  # الاهتمامات
-    additional_info = Column(Text, nullable=True)  # معلومات إضافية
-    conversation_style = Column(String, nullable=True)  # نمط المحادثة (مثل: موجز، تحليلي)
-    oauth_accounts = relationship("OAuthAccount", back_populates="user", cascade="all, delete-orphan")
-    conversations = relationship("Conversation", back_populates="user", cascade="all, delete-orphan")
-
-# نموذج المحادثة
-class Conversation(Base):
-    __tablename__ = "conversations"
-    id = Column(Integer, primary_key=True, index=True)
-    conversation_id = Column(String, unique=True, index=True, default=lambda: str(uuid.uuid4()))
-    title = Column(String, nullable=True)
-    user_id = Column(Integer, ForeignKey("users.id"))
-    created_at = Column(DateTime, default=datetime.utcnow)
-    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
-    
-    user = relationship("User", back_populates="conversations")
-    messages = relationship("Message", back_populates="conversation", cascade="all, delete-orphan")
-
-# نموذج الرسالة
-class Message(Base):
-    __tablename__ = "messages"
-    id = Column(Integer, primary_key=True, index=True)
-    role = Column(String)
-    content = Column(Text)
-    conversation_id = Column(Integer, ForeignKey("conversations.id"))
-    created_at = Column(DateTime, default=datetime.utcnow)
-    
-    conversation = relationship("Conversation", back_populates="messages")
 
 # Pydantic schemas for fastapi-users
 class UserRead(schemas.BaseUser[int]):

init_db.py

@@ -0,0 +1,52 @@
+import os
+from sqlalchemy import create_engine, select, delete
+from sqlalchemy.orm import sessionmaker
+from api.database import Base, User, OAuthAccount, Conversation, Message
+import logging
+
+# Setup logging
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+# جلب URL قاعدة البيانات من المتغيرات البيئية
+SQLALCHEMY_DATABASE_URL = os.getenv("SQLALCHEMY_DATABASE_URL")
+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.")
+
+    # تنظيف البيانات غير المتسقة
+    with SessionLocal() as session:
+        # حذف سجلات oauth_accounts اللي مش مرتبطة بمستخدم موجود
+        stmt = delete(OAuthAccount).where(
+            OAuthAccount.user_id.notin_(select(User.id))
+        )
+        result = session.execute(stmt)
+        deleted_count = result.rowcount
+        session.commit()
+        logger.info(f"Deleted {deleted_count} orphaned OAuth accounts.")
+
+        # التأكد من إن كل المستخدمين ليهم is_active=True
+        users = session.execute(select(User)).scalars().all()
+        for user in users:
+            if not user.is_active:
+                user.is_active = True
+                logger.info(f"Updated user {user.email} to is_active=True")
+        session.commit()
+
+    logger.info("Database initialization completed.")
+
+if __name__ == "__main__":
+    init_db()

main.py

@@ -14,8 +14,8 @@ from fastapi.openapi.docs import get_swagger_ui_html
 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 api.database import get_db
+from api.models import UserRead, UserCreate, UserUpdate
 from motor.motor_asyncio import AsyncIOMotorClient
 from pydantic import BaseModel
 from typing import List
@@ -28,6 +28,7 @@ from hashlib import md5
 from datetime import datetime
 from httpx_oauth.exceptions import GetIdEmailError
 import re
+from init_db import init_db  # استيراد دالة init_db
 
 # Setup logging
 logging.basicConfig(level=logging.INFO)
@@ -79,8 +80,8 @@ CONCURRENCY_LIMIT = int(os.getenv("CONCURRENCY_LIMIT", 20))
 # Initialize FastAPI app
 @asynccontextmanager
 async def lifespan(app: FastAPI):
+    init_db()  # استدعاء دالة init_db لإنشاء الجداول وتنظيف البيانات
     await setup_mongo_index()
-    Base.metadata.create_all(bind=engine)  # Create tables on startup
     yield
 
 app = FastAPI(title="MGZon Chatbot API", lifespan=lifespan)