Update app.py (#87)

- Update app.py (81217ddd27c445a85a4c7b4865d6b669678af7e5)

app.py

@@ -785,18 +785,61 @@ if 'active_game' not in st.session_state:
 
 if 'username' not in st.session_state:
     st.session_state['username'] = "Guest"  # temporary default username
-def play_page():
-    # Get active game and username
-    gid = st.session_state.get('active_game')
-    uname = st.session_state.get('username')
-    avatar = st.session_state.get('avatar', '🎮')
+    
+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
+    host = host or st.session_state.get("username", "Host")
+
+    # 🔹 Get questions
+    questions = []
+
+    # 1️⃣ AI questions if topic given
+    if ai_topic:
+        ai_questions = generate_ai_questions(ai_topic, num_questions=num_questions)
+        if ai_questions:
+            questions = ai_questions
+
+    # 2️⃣ Fallback to static questions_db
+    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]
+
+    # 🔹 Store game
+    games[gid] = {
+        "game_id": gid,
+        "host": host,
+        "topics": topics,
+        "questions": questions,
+        "created_at": now_iso(),
+        "closed": False,
+        "auto_close": auto_close
+    }
+    unified_set("games", games)
+    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.warning("No active game or username found. Please join or create a game first.")
+        st.error("No active game or username found. Please join or create a game first.")
+        return
+
+    games = unified_get("games") or {}
+    game = games.get(gid)
+    if not game:
+        st.error("Game not found!")
         return
 
-    # Load questions from session or game
-    questions = st.session_state.get('game_questions') or st.session_state.get('game_data', {}).get('questions', [])
+    questions = st.session_state.get("game_questions") or game.get("questions", [])
     if not questions:
         st.error("No questions loaded.")
         return
@@ -805,156 +848,74 @@ def play_page():
     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()
 
-    # Current question index
     idx = st.session_state.get('current_index', 0)
     if idx >= len(questions):
-        st.success("All questions done — submit!")
+        st.success("All done — submit your answers!")
         return
 
-    # Get current question safely (dict or list)
     q = questions[idx]
-    if isinstance(q, dict):
-        question_text = q.get("question", "")
-        options = q.get("options", [])
-    elif isinstance(q, list):
-        # Assumes format: [question, options_list, answer]
-        question_text = q[0]
-        options = q[1]
-    else:
-        st.error(f"Invalid question format at index {idx}.")
-        return
-
     st.subheader(f"Question {idx+1}/{len(questions)}")
-    st.write(question_text)
+    st.write(q["question"])
 
-    # Timer
     elapsed = int(time.time() - st.session_state['question_started_at'])
     time_limit = 15
     st.markdown(f"**Time left:** {max(0, time_limit - elapsed)} seconds")
 
-    # Choice selection
-    choice = st.radio("Choose an answer:", options, key=f"choice_{idx}")
+    choice = st.radio("Choose an answer:", q["options"], key=f"choice_{idx}")
 
     col1, col2 = st.columns(2)
 
-    # Next button
     with col1:
-        if st.button("Next"):
+        if st.button("Next", key=f"next_{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[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()  # reset timer for next question
-
+            st.session_state['question_started_at'] = time.time()
             st.experimental_rerun()
 
-    # Submit button on last question
     with col2:
-        if idx == len(questions) - 1:
-            if st.button("Submit All Answers"):
-                answers = st.session_state.get('answers', [""] * len(questions))
-                times = st.session_state.get('answer_times', [None] * len(questions))
-
-                # Save last answer
-                taken = time.time() - st.session_state.get('question_started_at', time.time())
+        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))
                 answers[idx] = choice
-                times[idx] = taken
-
+                times[idx] = time.time() - st.session_state.get('question_started_at', time.time())
                 st.session_state['answers'] = answers
                 st.session_state['answer_times'] = times
 
-                # Compute score (you already have this function)
-                score, flags = compute_score(questions, answers, times)
-                now = now_iso()
+                # Compute score
+                score = sum([1 for i,q in enumerate(questions) if answers[i] == q["answer"]])
+                percentage = int(score / len(questions) * 100)
 
-                # Push leaderboard
-                row = {
-                    "name": uname,
+                # Update players
+                players = unified_get("players") or {}
+                players.setdefault(gid, {})
+                players[gid][uname] = {
+                    "submitted": True,
                     "score": score,
-                    "game_id": gid,
-                    "topics": ",".join(st.session_state.get('game_data', {}).get('topics', [])),
-                    "timestamp": now,
-                    "avatar": avatar,
-                    "questions": " || ".join([q[0] if isinstance(q, list) else q.get("question","") for q in questions]),
-                    "answers": " || ".join([str(a) for a in answers]),
-                    "correct_flags": " || ".join(flags)
+                    "percentage": percentage,
+                    "answers": answers,
+                    "avatar": st.session_state.get("avatar", "🎮"),
+                    "timestamp": now_iso()
                 }
-                unified_push_leaderboard(row)
+                unified_set("players", players)
 
-                # Mark player as submitted
-                players = unified_get("players") or {}
-                if players.get(gid) and players[gid].get(uname):
-                    players[gid][uname]['submitted'] = True
-                    players[gid][uname]['submitted_at'] = now
-                    players[gid][uname]['score'] = score
-                    unified_set("players", players)
-
-                # Auto-close game if enabled
-                games = unified_get("games") or {}
-                if st.session_state.get('game_data', {}).get('auto_close', True):
-                    if gid in games:
-                        games[gid]['closed'] = True
-                        games[gid]['closed_at'] = now
-                        unified_set("games", games)
-
-                st.success(f"Submitted! Score: {score}")
+                # Auto-close game
+                if game.get('auto_close', True):
+                    games[gid]['closed'] = True
+                    games[gid]['closed_at'] = now_iso()
+                    unified_set("games", games)
+
+                st.success(f"Submitted! Score: {score} / {len(questions)} ({percentage}%)")
                 st.balloons()
                 st.session_state['last_score'] = score
                 st.session_state['last_game'] = gid
                 st.session_state['current_index'] = 0
-
-# ---------- PLAY PAGE ----------
-
-# Create game
-def create_game(topics=None, num_questions=5, auto_close=True, ai_topic=None):
-    topics = topics or []
-
-    gid = f"GAME{int(time.time())}{random.randint(100,999)}"
-    game_dict = {
-        "game_id": gid,
-        "host": st.session_state.get('username', 'Host'),
-        "topics": topics,
-        "num_questions": num_questions,
-        "auto_close_on_submit": auto_close,
-        "ai_topic": ai_topic,
-        "questions": [],
-        "created_at": now_iso(),
-        "closed": False
-    }
-
-    # Add AI-generated questions if provided
-    if ai_topic:
-        ai_questions = generate_ai_questions(ai_topic, num_questions=num_questions)
-        if ai_questions:
-            game_dict["questions"].extend(ai_questions)
-        else:
-            st.warning(f"No AI questions generated for topic '{ai_topic}'. Using static topics if any.")
-
-    # Add static questions if topics provided
-    for topic in topics:
-        qs = questions_db.get(topic, [])[:num_questions]
-        game_dict["questions"].extend(qs)
-
-    # Shuffle questions
-    random.shuffle(game_dict["questions"])
-
-    # Save
-    games = unified_get("games") or {}
-    games[gid] = game_dict
-    unified_set("games", games)
-    st.session_state['games'] = games
-
-    return gid
-
-
-
 # Join game
 def join_game_page():
     st.header("Join Game")