refactor: decouple usage increment from rate limit checks, add session refresh error handling.

quiz_generator/routes.py

@@ -3,7 +3,7 @@ import logging
 from fastapi import APIRouter, HTTPException, Depends
 from typing import Optional
 from src.quiz_generator.quiz import smart_quiz_generator
-from src.store import get_material, get_chunks, get_summary, save_quiz, get_quizzes, save_quiz_result, get_quiz_results, check_and_increment_daily_limit
+from src.store import get_material, get_chunks, get_summary, save_quiz, get_quizzes, save_quiz_result, get_quiz_results, check_daily_limit, increment_daily_usage, ADMIN_EMAILS
 from src.dependencies import get_current_user_id, get_current_user
 from src.config import settings
 from .schemas import QuizRequest, QuizResponse, SaveQuizResultRequest
@@ -35,7 +35,7 @@ async def generate_quiz(
 ):
     # Rate limit check
     user_email = current_user.get("email") if isinstance(current_user, dict) else getattr(current_user, "email", None)
-    if not check_and_increment_daily_limit(user_id, email=user_email, limit=20):
+    if not check_daily_limit(user_id, email=user_email, limit=20):
         raise HTTPException(429, "Daily limit of 20 requests reached. Come back tomorrow!")
 
     body.difficulty = body.difficulty.capitalize()
@@ -109,6 +109,10 @@ async def generate_quiz(
             model_name=settings.model_name,
         )
 
+        # Only increment limit if the quiz was generated successfully and saved without error
+        if not (user_email and user_email in ADMIN_EMAILS):
+            increment_daily_usage(user_id)
+
         return QuizResponse(quiz=quiz, quiz_id=saved["id"])
     except ValueError as e:
         logger.warning(f"Validation error in generate_quiz: {str(e)}")

rag/rag.py

@@ -163,7 +163,7 @@ def get_quiz_llm():
         model=settings.model_name,
         api_key=settings.gemini_api_key,
         temperature=0.3,
-        max_output_tokens=16000,
+        max_output_tokens=12000,
         timeout=300,
     )
 

store.py

@@ -646,16 +646,11 @@ def get_or_create_memory(memory_id: Optional[str] = None, seed_messages: list[di
     return mem, mid
 
 
-def check_and_increment_daily_limit(user_id: str, email: Optional[str] = None, limit: int = 20) -> bool:
+def check_daily_limit(user_id: str, email: Optional[str] = None, limit: int = 20) -> bool:
     """
-    Returns True if request is allowed, False if limit exceeded.
-    Excludes Admin Emails from Limits.
-
-    Bypasses the database RPC (which runs in UTC and resets at 3 AM Egypt time)
-    to perform the date check in python using Egypt local timezone (UTC+3), 
-    ensuring limits reset exactly at 12 AM Egypt time.
+    Checks if the user is under the daily limit. Returns True if allowed, False if exceeded.
+    Does NOT increment the count.
     """
-    # Guard: never apply limit to admin emails
     if email and email in ADMIN_EMAILS:
         return True
 
@@ -678,16 +673,51 @@ def check_and_increment_daily_limit(user_id: str, email: Optional[str] = None, l
             count = 0
         if count >= limit:
             return False
+        return True
+    except Exception as e:
+        logger.error(f"Rate limit check failed: {e}")
+        return True
+
+
+def increment_daily_usage(user_id: str) -> None:
+    """
+    Increments the daily request count for the user.
+    """
+    today = _get_today_date_str()
+    try:
+        result = _robust_execute(
+            _table_supabase("profiles")
+            .select("daily_requests, last_request_date")
+            .eq("id", user_id)
+        )
+        if not result.data:
+            return
+        profile = result.data[0] if result.data else None
+        if not profile:
+            return
+
+        last_date = profile.get("last_request_date")
+        count = profile.get("daily_requests", 0) or 0
+        if last_date != today:
+            count = 0
 
         _robust_execute(
             _table_supabase("profiles")
             .update({"daily_requests": count + 1, "last_request_date": today})
             .eq("id", user_id)
         )
-        return True
     except Exception as e:
-        logger.error(f"Rate limit check failed: {e}")
-        return True
+        logger.error(f"Failed to increment daily usage: {e}")
+
+
+def check_and_increment_daily_limit(user_id: str, email: Optional[str] = None, limit: int = 20) -> bool:
+    """
+    Check limit and increment if allowed. Deprecated/kept for compatibility.
+    """
+    allowed = check_daily_limit(user_id, email, limit)
+    if allowed and not (email and email in ADMIN_EMAILS):
+        increment_daily_usage(user_id)
+    return allowed
 
 
 def get_usage(user_id: str) -> dict:

summary_generator/routes.py

@@ -4,7 +4,7 @@ import logging
 from fastapi import APIRouter, HTTPException, Depends
 
 from src.summary_generator.summary import summarizer, web_summarizer
-from src.store import get_material, get_chunks, save_summary, get_summary as get_stored_summary, check_and_increment_daily_limit
+from src.store import get_material, get_chunks, save_summary, get_summary as get_stored_summary, check_daily_limit, increment_daily_usage
 from src.dependencies import get_current_user_id, get_current_user
 from src.config import settings
 from .schemas import SummarizeRequest, SummarizeResponse
@@ -22,7 +22,7 @@ async def generate_summary(
 ):
     # Rate limit check
     user_email = current_user.get("email") if isinstance(current_user, dict) else getattr(current_user, "email", None)
-    if not check_and_increment_daily_limit(user_id, email=user_email, limit=20):
+    if not check_daily_limit(user_id, email=user_email, limit=20):
         raise HTTPException(429, "Daily limit of 20 requests reached. Come back tomorrow!")
 
     mat = get_material(body.material_id)
@@ -58,6 +58,10 @@ async def generate_summary(
             model_name=settings.model_name,
         )
 
+        # Only increment limit if the summary was generated successfully and saved without error
+        if not (user_email and user_email in settings.admin_emails if hasattr(settings, "admin_emails") else False):
+            increment_daily_usage(user_id)
+
         return SummarizeResponse(summary=summary, time_taken=elapsed)
     except Exception as e:
         raise HTTPException(500, f"Summarization failed: {e}")