table optimise

core/models.py

@@ -11,7 +11,7 @@ Tables:
 - ApiKeyUsage: API key load balancing
 - RateLimit: Rate limiting
 """
-from sqlalchemy import Column, Integer, String, Text, DateTime, JSON, Boolean, ForeignKey
+from sqlalchemy import Column, Integer, String, Text, DateTime, JSON, Boolean, ForeignKey, Index
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
 from core.database import Base
@@ -29,8 +29,8 @@ class User(Base):
     """
     __tablename__ = "users"
 
-    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    user_id = Column(String(50), unique=True, index=True, nullable=False)  # Backend generated UUID
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    user_id = Column(String(50), unique=True, index=True, nullable=False)  # Backend generated UUID (public-facing)
     email = Column(String(255), unique=True, index=True, nullable=False)
     
     # Google OAuth fields
@@ -72,13 +72,12 @@ class ClientUser(Base):
     """
     __tablename__ = "client_users"
 
-    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    user_id = Column(String(50), ForeignKey("users.user_id"), index=True, nullable=True)  # Nullable for anonymous tracking
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    user_id = Column(Integer, ForeignKey("users.id"), index=True, nullable=True)  # FK to users.id (nullable for anonymous)
     client_user_id = Column(String(100), index=True, nullable=True)  # Client-side temp identifier
     
-    # IP tracking for network/location correlation
-    ipv4_address = Column(String(15), nullable=True, index=True)
-    ipv6_address = Column(String(45), nullable=True, index=True)
+    # IP tracking for network/location correlation (standardized to single column)
+    ip_address = Column(String(45), nullable=True, index=True)  # Supports both IPv4 and IPv6
     
     # Device identification
     device_fingerprint = Column(String(255), nullable=True, index=True)  # Browser fingerprint hash
@@ -110,11 +109,11 @@ class AuditLog(Base):
     """
     __tablename__ = "audit_logs"
 
-    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     log_type = Column(String(20), index=True, nullable=False)  # "client" or "server"
     
     # User tracking
-    user_id = Column(String(50), ForeignKey("users.user_id"), nullable=True, index=True)
+    user_id = Column(Integer, ForeignKey("users.id"), nullable=True, index=True)  # FK to users.id
     client_user_id = Column(String(100), nullable=True, index=True)  # For anonymous client logs
     
     # Event details
@@ -150,17 +149,22 @@ class GeminiJob(Base):
     Uses priority-tier system for worker assignment.
     """
     __tablename__ = "gemini_jobs"
+    
+    # Composite index for efficient queue polling: WHERE status = X AND next_process_at <= NOW() ORDER BY priority
+    __table_args__ = (
+        Index('ix_jobs_queue_poll', 'status', 'next_process_at', 'priority'),
+    )
 
-    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     job_id = Column(String(100), unique=True, index=True, nullable=False)  # Our ID for client
-    user_id = Column(String(50), ForeignKey("users.user_id"), index=True, nullable=False)
+    user_id = Column(Integer, ForeignKey("users.id"), index=True, nullable=False)  # FK to users.id
     job_type = Column(String(20), index=True, nullable=False)  # video, image, text, analyze
     third_party_id = Column(String(255), nullable=True)  # Gemini operation name (for video)
-    status = Column(String(20), default="queued", index=True)  # queued, processing, completed, failed, cancelled
+    status = Column(String(20), default="queued")  # queued, processing, completed, failed, cancelled
     
-    # Priority-tier worker system
-    priority = Column(String(10), default="fast", index=True)  # fast (5s), medium (30s), slow (60s)
-    next_process_at = Column(DateTime(timezone=True), nullable=True, index=True)  # When worker should pick up again
+    # Priority-tier worker system (indexed via composite index above)
+    priority = Column(String(10), default="fast")  # fast (5s), medium (30s), slow (60s)
+    next_process_at = Column(DateTime(timezone=True), nullable=True)  # When worker should pick up again
     retry_count = Column(Integer, default=0)  # Number of status check retries
     
     input_data = Column(JSON, nullable=True)  # Request details (prompt, settings, etc.)
@@ -193,9 +197,9 @@ class PaymentTransaction(Base):
     """
     __tablename__ = "payment_transactions"
 
-    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     transaction_id = Column(String(50), unique=True, index=True, nullable=False)  # Our internal ID
-    user_id = Column(String(50), ForeignKey("users.user_id"), index=True, nullable=False)
+    user_id = Column(Integer, ForeignKey("users.id"), index=True, nullable=False)  # FK to users.id
     
     # Order details
     gateway = Column(String(20), nullable=False)  # razorpay, stripe
@@ -239,8 +243,8 @@ class Contact(Base):
     """
     __tablename__ = "contacts"
 
-    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
-    user_id = Column(String(50), ForeignKey("users.user_id"), index=True, nullable=False)
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    user_id = Column(Integer, ForeignKey("users.id"), index=True, nullable=False)  # FK to users.id
     email = Column(String(255), nullable=False, index=True)  # User's email
     subject = Column(String(500), nullable=True)
     message = Column(Text, nullable=False)
@@ -260,7 +264,7 @@ class RateLimit(Base):
     """
     __tablename__ = "rate_limits"
 
-    id = Column(Integer, primary_key=True, autoincrement=True, index=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     identifier = Column(String(255), index=True, nullable=False)  # IP or email
     endpoint = Column(String(255), index=True, nullable=False)
     attempts = Column(Integer, default=0)

routers/auth.py

@@ -145,7 +145,7 @@ async def google_auth(
         if request.temp_user_id:
             # Check if this client mapping exists
             client_query = select(ClientUser).where(
-                ClientUser.user_id == user.user_id,
+                ClientUser.user_id == user.id,  # Integer FK comparison
                 ClientUser.client_user_id == request.temp_user_id
             )
             client_result = await db.execute(client_query)
@@ -154,10 +154,9 @@ async def google_auth(
             if not existing_client:
                 # Create new client user mapping
                 client_user = ClientUser(
-                    user_id=user.user_id,
+                    user_id=user.id,  # Integer FK to users.id
                     client_user_id=request.temp_user_id,
-                    ipv4_address=ip if ":" not in ip else None,
-                    ipv6_address=ip if ":" in ip else None,
+                    ip_address=ip,  # Standardized IP column
                     last_seen_at=datetime.utcnow()
                 )
                 db.add(client_user)
@@ -181,10 +180,9 @@ async def google_auth(
         # Create client user mapping if temp_user_id provided
         if request.temp_user_id:
             client_user = ClientUser(
-                user_id=user.user_id,
+                user_id=user.id,  # Integer FK to users.id (will be set after flush)
                 client_user_id=request.temp_user_id,
-                ipv4_address=ip if ":" not in ip else None,
-                ipv6_address=ip if ":" in ip else None,
+                ip_address=ip,  # Standardized IP column
                 last_seen_at=datetime.utcnow()
             )
             db.add(client_user)
@@ -192,7 +190,7 @@ async def google_auth(
     # Log successful auth
     audit_log = AuditLog(
         log_type="server",
-        user_id=user.user_id,
+        user_id=user.id,  # Integer FK to users.id
         client_user_id=request.temp_user_id,
         action="google_auth",
         ip_address=ip,
@@ -332,7 +330,7 @@ async def logout(
     # Log logout
     audit_log = AuditLog(
         log_type="server",
-        user_id=user.user_id,
+        user_id=user.id,  # Integer FK to users.id
         action="logout",
         ip_address=ip,
         status="success"

routers/blink.py

@@ -177,8 +177,7 @@ async def get_client_users(
                     "id": item.id,
                     "user_id": item.user_id,
                     "client_user_id": item.client_user_id,
-                    "ipv4_address": item.ipv4_address,
-                    "ipv6_address": item.ipv6_address,
+                    "ip_address": item.ip_address,  # Standardized IP column
                     "device_fingerprint": item.device_fingerprint,
                     "device_info": item.device_info,
                     "created_at": item.created_at.isoformat() if item.created_at else None,
@@ -495,14 +494,13 @@ async def blink(
         country, region = await get_geolocation(ip_address)
         
         # Determine server user_id (if authenticated)
-        server_user_id = current_user.user_id if current_user else None
+        server_user_id = current_user.id if current_user else None  # Integer FK or None
         
         # Always create a ClientUser entry (user_id is None for anonymous users)
         new_client_user = ClientUser(
-            user_id=server_user_id,  # None if anonymous, user_id if authenticated
+            user_id=server_user_id,  # Integer FK (None if anonymous)
             client_user_id=client_user_id,
-            ipv4_address=ipv4_address,
-            ipv6_address=ipv6_address,
+            ip_address=ip_address,  # Standardized IP column
             device_info={"user_agent": user_agent} if user_agent else None
         )
         db.add(new_client_user)

routers/contact.py

@@ -68,7 +68,7 @@ async def submit_contact(
     try:
         # Create contact record
         contact = Contact(
-            user_id=user.user_id,
+            user_id=user.id,  # Integer FK to users.id
             email=user.email,
             subject=request_body.subject.strip() if request_body.subject else None,
             message=request_body.message.strip(),

routers/gemini.py

@@ -83,7 +83,7 @@ async def create_job(
     
     job = GeminiJob(
         job_id=job_id,
-        user_id=user.user_id,
+        user_id=user.id,  # Integer FK to users.id
         job_type=job_type,
         status="queued",
         priority=priority,
@@ -277,14 +277,14 @@ async def get_jobs(
     
     # Query jobs for the current user
     query = select(GeminiJob).where(
-        GeminiJob.user_id == user.user_id
+        GeminiJob.user_id == user.id  # Integer FK comparison
     ).order_by(GeminiJob.created_at.desc()).offset(offset).limit(limit)
     
     result = await db.execute(query)
     jobs = result.scalars().all()
     
     # Get total count
-    count_query = select(func.count()).where(GeminiJob.user_id == user.user_id)
+    count_query = select(func.count()).where(GeminiJob.user_id == user.id)  # Integer FK comparison
     count_result = await db.execute(count_query)
     total_count = count_result.scalar()
     
@@ -336,7 +336,7 @@ async def get_job_status(
     """
     query = select(GeminiJob).where(
         GeminiJob.job_id == job_id,
-        GeminiJob.user_id == user.user_id
+        GeminiJob.user_id == user.id  # Integer FK comparison
     )
     result = await db.execute(query)
     job = result.scalar_one_or_none()
@@ -404,7 +404,7 @@ async def download_video(
     
     query = select(GeminiJob).where(
         GeminiJob.job_id == job_id,
-        GeminiJob.user_id == user.user_id,
+        GeminiJob.user_id == user.id,  # Integer FK comparison
         GeminiJob.job_type == "video"
     )
     result = await db.execute(query)
@@ -480,7 +480,7 @@ async def cancel_job(
     """
     query = select(GeminiJob).where(
         GeminiJob.job_id == job_id,
-        GeminiJob.user_id == user.user_id
+        GeminiJob.user_id == user.id  # Integer FK comparison
     )
     result = await db.execute(query)
     job = result.scalar_one_or_none()
@@ -522,7 +522,7 @@ async def delete_job(
     """
     query = select(GeminiJob).where(
         GeminiJob.job_id == job_id,
-        GeminiJob.user_id == user.user_id
+        GeminiJob.user_id == user.id  # Integer FK comparison
     )
     result = await db.execute(query)
     job = result.scalar_one_or_none()

routers/payments.py

@@ -271,7 +271,7 @@ async def create_order(
         # Save transaction to database
         transaction = PaymentTransaction(
             transaction_id=transaction_id,
-            user_id=user.user_id,
+            user_id=user.id,  # Integer FK to users.id
             gateway="razorpay",
             gateway_order_id=order["id"],
             package_id=package.id,
@@ -333,7 +333,7 @@ async def verify_payment(
         result = await db.execute(
             select(PaymentTransaction).where(
                 PaymentTransaction.gateway_order_id == request.razorpay_order_id,
-                PaymentTransaction.user_id == user.user_id
+                PaymentTransaction.user_id == user.id  # Integer FK comparison
             )
         )
         transaction = result.scalar_one_or_none()
@@ -487,7 +487,7 @@ async def razorpay_webhook(
                 if transaction:
                     # Find user
                     user_result = await db.execute(
-                        select(User).where(User.user_id == transaction.user_id)
+                        select(User).where(User.id == transaction.user_id)  # Integer FK lookup
                     )
                     user = user_result.scalar_one_or_none()
                     
@@ -570,7 +570,7 @@ async def get_payment_history(
     # Get total count
     count_result = await db.execute(
         select(func.count(PaymentTransaction.id))
-        .where(PaymentTransaction.user_id == user.user_id)
+        .where(PaymentTransaction.user_id == user.id)  # Integer FK comparison
     )
     total_count = count_result.scalar() or 0
     
@@ -580,7 +580,7 @@ async def get_payment_history(
     # Get paginated transactions
     result = await db.execute(
         select(PaymentTransaction)
-        .where(PaymentTransaction.user_id == user.user_id)
+        .where(PaymentTransaction.user_id == user.id)  # Integer FK comparison
         .order_by(desc(PaymentTransaction.created_at))
         .offset(offset)
         .limit(limit)

services/credit_service.py

@@ -162,7 +162,7 @@ async def refund_credit(session: AsyncSession, job, reason: str) -> bool:
     from core.models import User
     
     result = await session.execute(
-        select(User).where(User.user_id == job.user_id)
+        select(User).where(User.id == job.user_id)
     )
     user = result.scalar_one_or_none()