Update app.py

app.py

@@ -60,6 +60,8 @@ def quiz_app():
         st.session_state.quiz_started = False
     if 'quiz_topic' not in st.session_state:
         st.session_state.quiz_topic = "" # Initialize quiz topic
+    if 'topic_from_sidebar' not in st.session_state:
+        st.session_state.topic_from_sidebar = False # Flag to track if topic is from sidebar
 
 
     # API Configuration based on selection - Moved inside quiz_app after login
@@ -233,24 +235,48 @@ def quiz_app():
             st.session_state.score = correct_count # Store score in session state
 
 
-    # User input for topic in sidebar
-    topic = st.sidebar.text_input("Quiz Topic", value=st.session_state.get('quiz_topic', ''))
-
-    if st.sidebar.button("Generate Quiz"): # Button in sidebar to generate quiz
-        st.session_state.quiz_started = True # Set quiz started to true when generate button is clicked
-        st.session_state.quiz_topic = topic # Store topic in session state to keep it in sidebar input
-        # Reset quiz state when generating a new quiz
+    # Sidebar topic input - Always visible
+    sidebar_topic = st.sidebar.text_input("New Quiz Topic", value=st.session_state.get('quiz_topic', ''))
+    if st.sidebar.button("Generate New Quiz"): # Button in sidebar to generate quiz, always resets
+        st.session_state.quiz_started = True
+        st.session_state.quiz_topic = sidebar_topic
+        st.session_state.topic_from_sidebar = True # Flag to indicate topic from sidebar
+        # Reset quiz state for new quiz
         st.session_state.quiz_data = None
         st.session_state.current_question_index = 0
         st.session_state.user_answers = []
         st.session_state.quiz_completed = False
         st.session_state.score = 0
 
-        if topic:
-            with st.spinner(f"Generating quiz on '{topic}'..."):
-                try:
-                    prompt = f"""
-                    Generate a multiple-choice quiz on the topic of "{topic}".
+
+    # Initial topic input in main area - Shown only if quiz not started or topic was from sidebar (new quiz from sidebar)
+    if not st.session_state.quiz_started or st.session_state.topic_from_sidebar:
+        initial_topic = st.text_input("Enter the topic for your quiz:", value=st.session_state.get('quiz_topic', '') if not st.session_state.topic_from_sidebar else "") # Keep value if not from sidebar, clear if from sidebar
+        if st.button("Generate Quiz"): # Button to generate quiz from initial input
+            if initial_topic:
+                st.session_state.quiz_started = True
+                st.session_state.quiz_topic = initial_topic
+                st.session_state.topic_from_sidebar = False # Reset sidebar topic flag
+                # Reset quiz state - although should be already reset if coming from sidebar, or first time
+                st.session_state.quiz_data = None
+                st.session_state.current_question_index = 0
+                st.session_state.user_answers = []
+                st.session_state.quiz_completed = False
+                st.session_state.score = 0
+            else:
+                st.warning("Please enter a topic to generate a quiz.")
+
+
+    # Quiz Generation Logic - Moved outside input blocks, runs after button presses
+    topic_to_generate = None
+    if st.session_state.quiz_started and st.session_state.quiz_data is None: # Generate only if quiz started and no data yet
+        topic_to_generate = st.session_state.quiz_topic
+
+    if topic_to_generate:
+        with st.spinner(f"Generating quiz on '{topic_to_generate}'..."):
+            try:
+                prompt = f"""
+                    Generate a multiple-choice quiz on the topic of "{topic_to_generate}".
                     The quiz should have 5 questions.
 
                     **Formatting Instructions:**
@@ -292,35 +318,33 @@ def quiz_app():
 
                     Please generate the quiz in this exact format.
                     """
-                    if st.session_state.selected_api == "Gemini API":
-                        response = model.generate_content(prompt)
-                        quiz_content = response.text
-                    elif st.session_state.selected_api == "OpenAI API":
-                        response = openai.ChatCompletion.create(
-                            model=st.session_state.openai_model,
-                            messages=[{"role": "user", "content": prompt}]
-                        )
-                        quiz_content = response.choices[0].message.content
-
-
-                    parsed_quiz_data, answer_key = parse_quiz_content(quiz_content)
-
-
-                    if quiz_content: # Check if quiz_content was generated successfully (outer if)
-                        if parsed_quiz_data: # Check if parsing was successful (inner if)
-                            st.session_state.quiz_data = parsed_quiz_data
-                            st.success(f"Quiz on '{topic}' generated successfully! Let's begin.")
-                        else: # else associated with inner if parsed_quiz_data
-                            st.error("Failed to parse quiz content. Please try generating again.")
-                            st.session_state.quiz_data = None
+                if st.session_state.selected_api == "Gemini API":
+                    response = model.generate_content(prompt)
+                    quiz_content = response.text
+                elif st.session_state.selected_api == "OpenAI API":
+                    response = openai.ChatCompletion.create(
+                        model=st.session_state.openai_model,
+                        messages=[{"role": "user", "content": prompt}]
+                    )
+                    quiz_content = response.choices[0].message.content
+
+
+                parsed_quiz_data, answer_key = parse_quiz_content(quiz_content)
+
+
+                if quiz_content: # Check if quiz_content was generated successfully (outer if)
+                    if parsed_quiz_data: # Check if parsing was successful (inner if)
+                        st.session_state.quiz_data = parsed_quiz_data
+                        st.success(f"Quiz on '{topic_to_generate}' generated successfully! Let's begin.")
+                    else: # else associated with inner if parsed_quiz_data
+                        st.error("Failed to parse quiz content. Please try generating again.")
+                        st.session_state.quiz_data = None
                     else: # else associated with outer if quiz_content
                         st.error("Failed to generate quiz content. Please try again or check your API key.")
 
-                except Exception as e:
-                    st.error(f"An error occurred: {e}")
-                    st.error("Please check your API key and network connection. If the problem persists, try a different topic or try again later.")
-        else:
-            st.warning("Please enter a topic to generate a quiz.")
+            except Exception as e:
+                st.error(f"An error occurred: {e}")
+                st.error("Please check your API key and network connection. If the problem persists, try a different topic or try again later.")
         st.rerun() # Rerun to update the quiz display based on new topic/generation
 
 
@@ -330,10 +354,8 @@ def quiz_app():
             display_question()
         else:
             display_results()
-    elif topic and not st.session_state.quiz_data and not st.session_state.quiz_completed and st.session_state.quiz_started == False: # Message if topic entered but quiz not generated yet and quiz not started
-        st.info("Enter a topic and click 'Generate Quiz' in the sidebar to start.")
-    elif not topic and not st.session_state.quiz_data and not st.session_state.quiz_completed and st.session_state.quiz_started == False:
-        st.info("Enter a topic in the sidebar to generate a quiz.")
+    elif not st.session_state.quiz_started and not st.session_state.quiz_data and not st.session_state.quiz_completed:
+        st.info("Enter a topic in the main area and click 'Generate Quiz' to start, or use the sidebar to start a new quiz anytime.")
 
 
 # --- Main App Flow Control ---