Update app.py

app.py

@@ -607,22 +607,26 @@ def join_game(game_id, username, avatar):
 def compute_score(questions, answers, times):
     total = 0
     flags = []
+
     for i, q in enumerate(questions):
         ans = answers[i] if i < len(answers) else ""
-        try:
-            correct = str(ans).strip().lower() == str(q[2]).strip().lower()
-        except Exception:
-            correct = False
+
+        correct_ans = q.get("answer", "")
+
+        correct = str(ans).strip().lower() == str(correct_ans).strip().lower()
+
         if correct:
             base = 10
             t = times[i] if i < len(times) and times[i] else 999
-            bonus = max(0, int((max(0, 15 - min(t,15)) / 15) * 5))
+            bonus = max(0, int((max(0, 15 - min(t, 15)) / 15) * 5))
             total += base + bonus
             flags.append("Yes")
         else:
             flags.append("No")
+
     return total, flags
 
+
 # ----------------- UI -----------------
 st.sidebar.title("Mode & Profile")
 mode_choice = st.sidebar.selectbox("Mode", ["Offline (local JSON)", "Online (Firebase)"], index=0)
@@ -788,26 +792,32 @@ if 'username' not in st.session_state:
     
 def create_game(host=None, topics=[], num_questions=5, auto_close=True, ai_topic=None):
     games = unified_get("games") or {}
-    gid = f"GAME{int(time.time())}"  # simple unique id
+    gid = f"GAME{int(time.time())}"
     host = host or st.session_state.get("username", "Host")
 
-    # 🔹 Get questions
     questions = []
 
-    # 1️⃣ AI questions if topic given
+    # 1️⃣ AI questions (already dict format)
     if ai_topic:
         ai_questions = generate_ai_questions(ai_topic, num_questions=num_questions)
         if ai_questions:
-            questions = ai_questions
+            for q in ai_questions:
+                questions.append({
+                    "question": q.get("question", ""),
+                    "options": q.get("options", []),
+                    "answer": q.get("answer", "")
+                })
 
-    # 2️⃣ Fallback to static questions_db
+    # 2️⃣ Static fallback (tuple → dict conversion)
     if not questions:
         for topic in topics:
-            qs = questions_db.get(topic.lower(), questions_db.get("default", []))
-            questions.extend(qs[:num_questions])
-    
-    # Ensure each question is a dict with keys: question, options, answer
-    questions = [{"question": q["question"], "options": q["options"], "answer": q["answer"]} for q in questions]
+            qs = questions_db.get(topic, [])
+            for q in qs[:num_questions]:
+                questions.append({
+                    "question": q[0],
+                    "options": q[1],
+                    "answer": q[2]
+                })
 
     # 🔹 Store game
     games[gid] = {
@@ -819,16 +829,31 @@ def create_game(host=None, topics=[], num_questions=5, auto_close=True, ai_topic
         "closed": False,
         "auto_close": auto_close
     }
+
     unified_set("games", games)
+
+    # ✅ REQUIRED: prepare play state
+    st.session_state['game_id'] = gid
+    st.session_state['active_game_id'] = gid
+    st.session_state['game_questions'] = questions
+    st.session_state['current_index'] = 0
+    st.session_state['answers'] = [""] * len(questions)
+    st.session_state['answer_times'] = [None] * len(questions)
+    st.session_state['question_started_at'] = None
+
     st.success(f"Game created: {gid} with {len(questions)} questions.")
     return gid
 
+
+    
+
 # -------------------------
 # PLAY PAGE
 # -------------------------
 def play_page():
     gid = st.session_state.get("active_game_id")
     uname = st.session_state.get("username")
+
     if not gid or not uname:
         st.error("No active game or username found. Please join or create a game first.")
         return
@@ -844,15 +869,26 @@ def play_page():
         st.error("No questions loaded.")
         return
 
-    # Ensure timer exists
+    # ---------------- FIX 3 : SAFE SESSION INIT ----------------
+    if 'current_index' not in st.session_state or st.session_state['current_index'] is None:
+        st.session_state['current_index'] = 0
+
+    if 'answers' not in st.session_state or len(st.session_state['answers']) != len(questions):
+        st.session_state['answers'] = [""] * len(questions)
+
+    if 'answer_times' not in st.session_state or len(st.session_state['answer_times']) != len(questions):
+        st.session_state['answer_times'] = [None] * len(questions)
+
     if 'question_started_at' not in st.session_state or st.session_state['question_started_at'] is None:
         st.session_state['question_started_at'] = time.time()
 
-    idx = st.session_state.get('current_index', 0)
+    idx = st.session_state['current_index']
+
     if idx >= len(questions):
         st.success("All done — submit your answers!")
         return
 
+    # ---------------- QUESTION UI ----------------
     q = questions[idx]
     st.subheader(f"Question {idx+1}/{len(questions)}")
     st.write(q["question"])
@@ -861,36 +897,49 @@ def play_page():
     time_limit = 15
     st.markdown(f"**Time left:** {max(0, time_limit - elapsed)} seconds")
 
-    choice = st.radio("Choose an answer:", q["options"], key=f"choice_{idx}")
+    # ---------------- FIX 4 : STABLE RADIO ----------------
+    choice = st.radio(
+        "Choose an answer:",
+        q["options"],
+        key=f"choice_{gid}_{idx}"
+    )
 
     col1, col2 = st.columns(2)
 
+    # ---------------- NEXT ----------------
     with col1:
-        if st.button("Next", key=f"next_{idx}"):
+        if st.button("Next", key=f"next_{gid}_{idx}"):
             taken = time.time() - st.session_state['question_started_at']
-            answers = st.session_state.get('answers', [""] * len(questions))
-            times = st.session_state.get('answer_times', [None] * len(questions))
+
+            answers = st.session_state['answers']
+            times = st.session_state['answer_times']
+
             answers[idx] = choice
             times[idx] = taken
-            st.session_state['answers'] = answers
-            st.session_state['answer_times'] = times
+
             st.session_state['current_index'] = idx + 1
             st.session_state['question_started_at'] = time.time()
-            st.experimental_rerun()
+            st.rerun()
 
+    # ---------------- SUBMIT ----------------
     with col2:
-        if idx == len(questions)-1:
-            if st.button("Submit All Answers", key=f"submit_{idx}"):
-                answers = st.session_state.get('answers', [""]*len(questions))
-                times = st.session_state.get('answer_times', [None]*len(questions))
+        if idx == len(questions) - 1:
+            if st.button("Submit All Answers", key=f"submit_{gid}_{idx}"):
+
+                answers = st.session_state['answers']
+                times = st.session_state['answer_times']
+
                 answers[idx] = choice
-                times[idx] = time.time() - st.session_state.get('question_started_at', time.time())
-                st.session_state['answers'] = answers
-                st.session_state['answer_times'] = times
+                times[idx] = time.time() - st.session_state['question_started_at']
+
+                # ---------------- FIX 5 : CORRECT SCORING ----------------
+                score, flags = compute_score(
+                    questions,
+                    answers,
+                    times
+                )
 
-                # Compute score
-                score = sum([1 for i,q in enumerate(questions) if answers[i] == q["answer"]])
-                percentage = int(score / len(questions) * 100)
+                percentage = int(score / (len(questions) * 15) * 100)
 
                 # Update players
                 players = unified_get("players") or {}
@@ -911,11 +960,16 @@ def play_page():
                     games[gid]['closed_at'] = now_iso()
                     unified_set("games", games)
 
-                st.success(f"Submitted! Score: {score} / {len(questions)} ({percentage}%)")
+                st.success(
+                    f"Submitted! Score: {score} / {len(questions) * 15} ({percentage}%)"
+                )
                 st.balloons()
+
                 st.session_state['last_score'] = score
                 st.session_state['last_game'] = gid
                 st.session_state['current_index'] = 0
+
+                
 # Join game
 def join_game_page():
     st.header("Join Game")
@@ -933,20 +987,32 @@ def join_game_page():
         if ok:
             st.success(f"Joined game {game_id} successfully!")
 
-            # Safe way to get questions
+            # Load game safely
             games = unified_get("games") or {}
             g = games.get(game_id, {})
 
-            # Ensure 'questions' key exists
+            # ✅ REQUIRED: set questions
             st.session_state['game_questions'] = g.get('questions', [])
 
+            # ✅ REQUIRED: set BOTH ids
             st.session_state['game_id'] = game_id
+            st.session_state['active_game_id'] = game_id
+
+            # ✅ REQUIRED: reset play state (prevents stored answer bugs)
+            st.session_state['current_index'] = 0
+            st.session_state['answers'] = [""] * len(st.session_state['game_questions'])
+            st.session_state['answer_times'] = [None] * len(st.session_state['game_questions'])
+            st.session_state['question_started_at'] = None
+
             st.session_state['username'] = username
             st.session_state['avatar'] = avatar
+
+            st.rerun()
         else:
             st.error(msg)
 
 
+
 # Play page
 # ----------------- Create Game -----------------