init frontend

app.py

@@ -15,6 +15,10 @@ from phase.Student_view.games import profitpuzzle
 from utils import db,api
 import os
 
+from utils.api import BACKEND
+st.sidebar.caption(f"Backend URL: {BACKEND}")
+
+DISABLE_DB = os.getenv("DISABLE_DB", "1") == "1"
 
 try:
     ok = api.health().get("ok")
@@ -228,28 +232,48 @@ def main():
                 submit = st.form_submit_button("Login")
 
                 if submit:
-                    conn = db.get_db_connection()
-                    if not conn:
-                        st.error("❌ Unable to connect to the database.")
-                    else:
+                    if DISABLE_DB:
+                        # Route login to your Backend Space
                         try:
-                            user = db.check_password(email, password)
-                            if user:
-                                st.session_state.user = {
-                                    "user_id": user["user_id"],
-                                    "name": user["name"],
-                                    "role": user["role"],  # "Student" or "Teacher"
-                                    "email": user["email"],
-                                }
-                                st.success(f"🎉 Logged in as {user['name']} ({user['role']})")
-                                st.session_state.current_page = (
-                                    "Student Dashboard" if user["role"] == "Student" else "Teacher Dashboard"
-                                )
-                                st.rerun()
-                            else:
-                                st.error("❌ Incorrect email or password, or account not found.")
-                        finally:
-                            conn.close()
+                            user = api.login(email, password)  # calls POST /auth/login
+                            # Normalize to the structure your app already uses
+                            st.session_state.user = {
+                                "user_id": user["user_id"],
+                                "name": user["name"],
+                                "role": user["role"],   # "Student" or "Teacher" from backend
+                                "email": user["email"],
+                            }
+                            st.success(f"🎉 Logged in as {user['name']} ({user['role']})")
+                            st.session_state.current_page = (
+                                "Student Dashboard" if user["role"] == "Student" else "Teacher Dashboard"
+                            )
+                            st.rerun()
+                        except Exception as e:
+                            st.error(f"Login failed. {e}")
+                    else:
+                        # Local fallback: keep your old direct-DB logic
+                        conn = db.get_db_connection()
+                        if not conn:
+                            st.error("❌ Unable to connect to the database.")
+                        else:
+                            try:
+                                user = db.check_password(email, password)
+                                if user:
+                                    st.session_state.user = {
+                                        "user_id": user["user_id"],
+                                        "name": user["name"],
+                                        "role": user["role"],  # "Student" or "Teacher"
+                                        "email": user["email"],
+                                    }
+                                    st.success(f"🎉 Logged in as {user['name']} ({user['role']})")
+                                    st.session_state.current_page = (
+                                        "Student Dashboard" if user["role"] == "Student" else "Teacher Dashboard"
+                                    )
+                                    st.rerun()
+                                else:
+                                    st.error("❌ Incorrect email or password, or account not found.")
+                            finally:
+                                conn.close()
 
     # --- STUDENT DASHBOARD ---
     elif page == "Student Dashboard":
@@ -308,3 +332,4 @@ def main():
 
 if __name__ == "__main__":
     main()
+

utils/api.py

@@ -1,32 +1,71 @@
 # utils/api.py
-import os, requests
+import os
+import requests
 
-BACKEND = (os.getenv("BACKEND_URL") or "").strip()
+def _normalize_backend_url(url: str) -> str:
+    url = (url or "").strip()
+    # fix accidental comma typos
+    url = url.replace(",", ".")
+    # convert huggingface.co/spaces/<owner>/<space> -> https://<owner>-<space>.hf.space
+    if "huggingface.co/spaces/" in url:
+        tail = url.split("huggingface.co/spaces/")[-1].strip("/")
+        parts = tail.split("/")
+        if len(parts) >= 2:
+            owner, space = parts[0], parts[1]
+            url = f"https://{owner}-{space}.hf.space"
+    return url.rstrip("/")
+
+BACKEND = _normalize_backend_url(os.getenv("BACKEND_URL"))
 if not BACKEND:
-    raise RuntimeError("BACKEND_URL is not set in Space secrets.")
-BACKEND = BACKEND.rstrip("/")
+    raise RuntimeError("BACKEND_URL is not set")
 
-def health():
-    r = requests.get(f"{BACKEND}/health", timeout=10)
+def _get(path: str, **kwargs):
+    r = requests.get(f"{BACKEND}{path}", timeout=kwargs.pop("timeout", 10), **kwargs)
     r.raise_for_status()
-    return r.json()
+    return r
 
-def start_agent(student_id:int, lesson_id:int, level_slug:str):
-    r = requests.post(f"{BACKEND}/agent/start", json={"student_id":student_id,"lesson_id":lesson_id,"level_slug":level_slug})
+def _post(path: str, json: dict, **kwargs):
+    r = requests.post(f"{BACKEND}{path}", json=json, timeout=kwargs.pop("timeout", 15), **kwargs)
     r.raise_for_status()
-    return r.json()
+    return r
 
-def get_quiz(student_id:int, lesson_id:int, level_slug:str):
-    r = requests.post(f"{BACKEND}/agent/quiz", json={"student_id":student_id,"lesson_id":lesson_id,"level_slug":level_slug})
-    r.raise_for_status()
-    return r.json()["items"]
+def health() -> dict:
+    # Try /health, then /
+    for path in ("/health", "/"):
+        try:
+            r = _get(path)
+            try:
+                data = r.json()
+            except Exception:
+                return {"ok": True}
+            if path == "/health":
+                return {"ok": bool(data.get("ok", True))}
+            return {"ok": data.get("status") == "ok"}
+        except Exception:
+            continue
+    raise RuntimeError(f"Backend not reachable at {BACKEND}")
 
-def grade_quiz(student_id:int, lesson_id:int, level_slug:str, answers:list[str], assignment_id:int|None=None):
-    r = requests.post(f"{BACKEND}/agent/grade", json={"student_id":student_id,"lesson_id":lesson_id,"level_slug":level_slug,"answers":answers,"assignment_id":assignment_id})
-    r.raise_for_status()
-    d = r.json(); return d["score"], d["total"]
+def start_agent(student_id: int, lesson_id: int, level_slug: str) -> dict:
+    return _post("/agent/start", json={
+        "student_id": student_id, "lesson_id": lesson_id, "level_slug": level_slug
+    }).json()
 
-def next_step(student_id:int, lesson_id:int, level_slug:str, answers:list[str], assignment_id:int|None=None):
-    r = requests.post(f"{BACKEND}/agent/coach_or_celebrate", json={"student_id":student_id,"lesson_id":lesson_id,"level_slug":level_slug,"answers":answers,"assignment_id":assignment_id})
-    r.raise_for_status()
-    return r.json()
+def get_quiz(student_id: int, lesson_id: int, level_slug: str) -> list:
+    return _post("/agent/quiz", json={
+        "student_id": student_id, "lesson_id": lesson_id, "level_slug": level_slug
+    }).json()["items"]
+
+def grade_quiz(student_id: int, lesson_id: int, level_slug: str,
+               answers: list[str], assignment_id: int | None = None):
+    data = _post("/agent/grade", json={
+        "student_id": student_id, "lesson_id": lesson_id, "level_slug": level_slug,
+        "answers": answers, "assignment_id": assignment_id
+    }).json()
+    return data["score"], data["total"]
+
+def next_step(student_id: int, lesson_id: int, level_slug: str,
+              answers: list[str], assignment_id: int | None = None) -> dict:
+    return _post("/agent/coach_or_celebrate", json={
+        "student_id": student_id, "lesson_id": lesson_id, "level_slug": level_slug,
+        "answers": answers, "assignment_id": assignment_id
+    }).json()