elkay frontend game leaderboard

phase/Student_view/game.py

@@ -125,60 +125,102 @@ def render_leaderboard(leaderboard):
 
 def _load_leaderboard(user_id: int, limit: int = 10) -> list[dict]:
     """
-    Shape returned fits render_leaderboard:
+    Returns rows shaped for render_leaderboard():
       [{"rank": int|"You", "name": str, "level": int, "xp": int, "user_id": int}, ...]
-    Prefers class leaderboard if current_class_id is set; else global.
-    Ensures current user is included and labeled "You".
+    - If DISABLE_DB=1, fetch from backend via utils.api.
+    - If local DB is enabled, use utils.db.
     """
     you_name = (st.session_state.get("user") or {}).get("name") or "You"
     class_id = st.session_state.get("current_class_id")
+    rows: list[dict] = []
 
-    # try to pick a class automatically if none set (optional)
-    if not class_id and hasattr(dbapi, "list_classes_for_student"):
-        try:
-            classes = dbapi.list_classes_for_student(user_id) or []
-            if classes:
-                class_id = classes[0]["class_id"]
-                st.session_state.current_class_id = class_id
-        except Exception:
-            pass
-
-    # fetch rows from DB
     try:
-        if class_id and hasattr(dbapi, "leaderboard_for_class"):
-            rows = dbapi.leaderboard_for_class(class_id, limit=limit) or []
-        elif hasattr(dbapi, "leaderboard_global"):
-            rows = dbapi.leaderboard_global(limit=limit) or []
+        if USE_LOCAL_DB:
+            # Local DB path
+            if not class_id and hasattr(dbapi, "list_classes_for_student"):
+                classes = dbapi.list_classes_for_student(user_id) or []
+                if classes:
+                    class_id = classes[0]["class_id"]
+                    st.session_state.current_class_id = class_id
+
+            if class_id and hasattr(dbapi, "leaderboard_for_class"):
+                rows = dbapi.leaderboard_for_class(class_id, limit=limit) or []
+            elif hasattr(dbapi, "leaderboard_global"):
+                rows = dbapi.leaderboard_global(limit=limit) or []
+            elif class_id and hasattr(dbapi, "class_student_metrics"):
+                # Build from metrics if no leaderboard helper
+                metrics = dbapi.class_student_metrics(class_id) or []
+                rows = [
+                    {
+                        "user_id": m.get("student_id"),
+                        "name": m.get("name") or m.get("email") or "Student",
+                        "xp": int(m.get("total_xp", 0)),
+                        "level": dbapi.level_from_xp(int(m.get("total_xp", 0))),
+                    }
+                    for m in metrics
+                ]
         else:
-            # fallback using existing function if needed
-            rows = []
-            if class_id and hasattr(dbapi, "class_student_metrics"):
-                for m in dbapi.class_student_metrics(class_id) or []:
-                    xp = int(m.get("total_xp", 0))
-                    rows.append({
+            # Backend API path
+            if not class_id:
+                try:
+                    classes = api.list_classes_for_student(user_id) or []
+                except Exception:
+                    classes = []
+                if classes:
+                    class_id = classes[0].get("class_id")
+                    st.session_state.current_class_id = class_id
+
+            if class_id:
+                # Use per-class metrics from backend and derive leaderboard
+                try:
+                    metrics = api.class_student_metrics(class_id) or []
+                except Exception:
+                    metrics = []
+                rows = [
+                    {
                         "user_id": m.get("student_id"),
                         "name": m.get("name") or m.get("email") or "Student",
-                        "xp": xp,
-                        "level": dbapi.level_from_xp(xp),
-                    })
-    except Exception as e:
-        st.warning(f"Leaderboard error: {e}")
+                        "xp": int(m.get("total_xp", 0)),
+                        # if backend does not send level, compute from XP
+                        "level": (int(m.get("level")) if "level" in m
+                                  else 1 + int(m.get("total_xp", 0)) // 500),
+                    }
+                    for m in metrics
+                ]
+            else:
+                # No class. At least show the current user by calling /students/{id}/stats
+                try:
+                    stats = api.user_stats(user_id) or {}
+                except Exception:
+                    stats = {}
+                rows = [{
+                    "user_id": user_id,
+                    "name": you_name,
+                    "xp": int(stats.get("xp", 0)),
+                    "level": int(stats.get("level", 1)),
+                }]
+    except Exception:
+        # Silent fallback, do not spam a yellow warning box
         rows = []
 
-    # ensure current user present
+    # Ensure current user is present
     if not any(r.get("user_id") == user_id for r in rows):
-        try:
-            stats = dbapi.user_xp_and_level(user_id) or {}
-            rows.append({
-                "user_id": user_id,
-                "name": you_name,
-                "xp": int(stats.get("xp", 0)),
-                "level": int(stats.get("level", 1)),
-            })
-        except Exception:
-            rows.append({"user_id": user_id, "name": you_name, "xp": 0, "level": 1})
-
-    # sort, rank, and mark "You"
+        # pull stats from whichever path is available
+        if USE_LOCAL_DB:
+            try:
+                s = dbapi.user_xp_and_level(user_id) or {}
+                you_xp = int(s.get("xp", 0)); you_lvl = int(s.get("level", 1))
+            except Exception:
+                you_xp, you_lvl = 0, 1
+        else:
+            try:
+                s = api.user_stats(user_id) or {}
+                you_xp = int(s.get("xp", 0)); you_lvl = int(s.get("level", 1))
+            except Exception:
+                you_xp, you_lvl = 0, 1
+        rows.append({"user_id": user_id, "name": you_name, "xp": you_xp, "level": you_lvl})
+
+    # Sort by XP desc and rank
     rows.sort(key=lambda r: int(r.get("xp", 0)), reverse=True)
     ranked = []
     for i, r in enumerate(rows, start=1):
@@ -189,17 +231,20 @@ def _load_leaderboard(user_id: int, limit: int = 10) -> list[dict]:
             "level": int(r["level"]),
             "xp": int(r["xp"]),
         })
+
+    # Mark "You"
     for r in ranked:
         if r["user_id"] == user_id:
             r["rank"] = "You"
             break
 
-    # "You" first visually, then others by rank
+    # Put "You" at the top visually
     you = [r for r in ranked if r["rank"] == "You"]
     others = [r for r in ranked if r["rank"] != "You"]
     return (you + others)[:limit]
 
 
+
 # --- MAIN GAMES HUB & ROUTER ---
 def show_games():
     load_css(os.path.join("assets", "styles.css"))