Update app.py

app.py

@@ -3,235 +3,267 @@ import google.generativeai as genai
 import os
 import re  # For improved parsing
 
-# Set up Streamlit page
-st.title("Interactive Multiple Choice Quiz Generator")
-st.markdown("Powered by Gemini API")
+# --- Login Page ---
+def login_page():
+    st.title("Quiz Generator Login")
 
-# API Key Input from User
-gemini_api_key = st.text_input("Enter your Gemini API Key:", type="password")
+    api_options = ["Gemini API"] # Extend this list for more APIs in the future
+    selected_api = st.selectbox("Select API:", api_options)
+    api_key = st.text_input(f"Enter your {selected_api} Key:", type="password")
 
-if not gemini_api_key:
-    st.warning("Please enter your Gemini API key to generate a quiz.")
-    st.stop()
-else:
-    genai.configure(api_key=gemini_api_key)
-    model = genai.GenerativeModel('gemini-pro')
-
-    # Security Warning
+    if st.button("Login"):
+        if not api_key:
+            st.error("Please enter your API key.")
+        else:
+            st.session_state.api_key = api_key
+            st.session_state.selected_api = selected_api
+            st.session_state.logged_in = True
+            st.success(f"Logged in with {selected_api}!")
+            st.rerun() # Rerun to show the quiz app
+
+# --- Quiz Application ---
+def quiz_app():
+    st.title("Interactive Multiple Choice Quiz Generator")
+    st.markdown("Powered by Gemini API") # Keeping this as title, can be dynamically updated if more APIs are added
+
+    # Security Warning - Moved here as it is part of the quiz app
     st.markdown("<font color='red'>**Warning:** Directly entering your API key is less secure than using Streamlit Secrets or environment variables. For production, use Secrets.</font>", unsafe_allow_html=True)
 
-# Initialize session state for quiz data and progress
-if 'quiz_data' not in st.session_state:
-    st.session_state.quiz_data = None
-if 'current_question_index' not in st.session_state:
-    st.session_state.current_question_index = 0
-if 'user_answers' not in st.session_state:
-    st.session_state.user_answers = []
-if 'quiz_completed' not in st.session_state:
-    st.session_state.quiz_completed = False
-if 'score' not in st.session_state:
-    st.session_state.score = 0
-
-
-def parse_quiz_content(quiz_content):
-    """Parses the quiz content and answer key into a structured format, handling title."""
-    questions = []
-    answer_key_dict = {}
-
-    quiz_parts = quiz_content.split("Answer Key:")
-    if len(quiz_parts) != 2:
-        st.warning("Could not reliably separate quiz questions and answer key. Parsing might be imperfect.")
-        return None, None
-
-    question_section = quiz_parts[0].strip()
-    answer_key_section = quiz_parts[1].strip()
-
-    question_lines = question_section.strip().split('\n')
-    current_question = None
-    for line in question_lines:
-        line = line.strip()
-        if not line:
-            continue # Skip empty lines
-
-        if re.match(r'^\d+\.\s', line): # Start of a new question
-            if current_question: # Save previous question if exists
-                questions.append(current_question)
-            current_question = {'options': {}} # Start new question
-            current_question['question'] = re.sub(r'\*\*|\*', '', line).strip() # Question text, remove bold
-        elif re.match(r'^[A-D]\)\s', line) or re.match(r'^[A-D]\.\s', line): # Option line (handle both ')' and '.' after letter)
-            if current_question:
-                option_letter = line[0]
-                option_text = line[2:].strip() # Remove "A) " or "A. "
-                current_question['options'][option_letter] = option_text
-        elif re.match(r'^\*\*.*?\*\*$', line) or re.match(r'^\*.*?\*$', line) : # Check for title again, just in case after split. Remove bold title if found in lines.
-            pass # Ignore title lines within question section if any.
-
-    if current_question: # Append the last question
-        questions.append(current_question)
-
-
-    # --- Answer Key Parsing (No change needed) ---
-    answer_lines = answer_key_section.strip().split('\n')
-    for line in answer_lines:
-        line = line.strip()
-        match = re.match(r'(\d+)\.\s*([A-D])', line)
-        if match:
-            question_num = int(match.group(1)) - 1
-            correct_answer = match.group(2)
-            answer_key_dict[question_num] = correct_answer
-
-    # Basic validation
-    if not questions or not answer_key_dict:
-        st.error("Error parsing quiz content. Please try again or check the generated format.")
-        return None, None
-    if len(questions) != len(answer_key_dict):
-        st.warning(f"Number of questions parsed ({len(questions)}) does not match number of answers in answer key ({len(answer_key_dict)}). Parsing might be incomplete.")
-
-
-    # Combine parsed questions and answer key into quiz_data
-    quiz_data_list = []
-    for i, q_data in enumerate(questions):
-        correct_answer = answer_key_dict.get(i)
-        if correct_answer:
-            quiz_data_list.append({
-                'question': q_data['question'],
-                'options': q_data['options'],
-                'correct_answer': correct_answer
-            })
-        else:
-            st.warning(f"Could not find correct answer for question {i+1} in the answer key.")
+    # Initialize session state for quiz data and progress (if not already initialized during login)
+    if 'quiz_data' not in st.session_state:
+        st.session_state.quiz_data = None
+    if 'current_question_index' not in st.session_state:
+        st.session_state.current_question_index = 0
+    if 'user_answers' not in st.session_state:
+        st.session_state.user_answers = []
+    if 'quiz_completed' not in st.session_state:
+        st.session_state.quiz_completed = False
+    if 'score' not in st.session_state:
+        st.session_state.score = 0
+
+    # API Configuration based on selection - Moved inside quiz_app after login
+    if st.session_state.selected_api == "Gemini API":
+        try:
+            genai.configure(api_key=st.session_state.api_key)
+            model = genai.GenerativeModel('gemini-pro')
+        except Exception as e:
+            st.error(f"Error configuring Gemini API: {e}")
+            st.error("Please check your API key and network connection.")
+            st.session_state.logged_in = False # Force logout if API config fails
+            del st.session_state.api_key
+            del st.session_state.selected_api
+            st.rerun() # Go back to login page
+            return # Exit quiz_app
+
+
+    def parse_quiz_content(quiz_content):
+        """Parses the quiz content and answer key into a structured format, handling title."""
+        questions = []
+        answer_key_dict = {}
+
+        quiz_parts = quiz_content.split("Answer Key:")
+        if len(quiz_parts) != 2:
+            st.warning("Could not reliably separate quiz questions and answer key. Parsing might be imperfect.")
             return None, None
 
-    return quiz_data_list, answer_key_dict
-
-
-def display_question():
-    """Displays the current question and options for interactive quiz."""
-    if st.session_state.quiz_data is None:
-        st.error("Quiz data not loaded yet. Generate a quiz first.")
-        return
-
-    if st.session_state.current_question_index < len(st.session_state.quiz_data):
-        question_data = st.session_state.quiz_data[st.session_state.current_question_index]
-        question_number = st.session_state.current_question_index + 1
-        st.markdown(f"**Question {question_number}:** {question_data['question']}")
-
-        options_list = [f"{key}. {value}" for key, value in question_data['options'].items()]
-        user_choice = st.radio("Choose an answer:", options_list, key=f"q_{question_number}") # Unique key for radio buttons
+        question_section = quiz_parts[0].strip()
+        answer_key_section = quiz_parts[1].strip()
+
+        question_lines = question_section.strip().split('\n')
+        current_question = None
+        for line in question_lines:
+            line = line.strip()
+            if not line:
+                continue # Skip empty lines
+
+            if re.match(r'^\d+\.\s', line): # Start of a new question
+                if current_question: # Save previous question if exists
+                    questions.append(current_question)
+                current_question = {'options': {}} # Start new question
+                current_question['question'] = re.sub(r'\*\*|\*', '', line).strip() # Question text, remove bold
+            elif re.match(r'^[A-D]\)\s', line) or re.match(r'^[A-D]\.\s', line): # Option line (handle both ')' and '.' after letter)
+                if current_question:
+                    option_letter = line[0]
+                    option_text = line[2:].strip() # Remove "A) " or "A. "
+                    current_question['options'][option_letter] = option_text
+            elif re.match(r'^\*\*.*?\*\*$', line) or re.match(r'^\*.*?\*$', line) : # Check for title again, just in case after split. Remove bold title if found in lines.
+                pass # Ignore title lines within question section if any.
+
+        if current_question: # Append the last question
+            questions.append(current_question)
+
+
+        # --- Answer Key Parsing (No change needed) ---
+        answer_lines = answer_key_section.strip().split('\n')
+        for line in answer_lines:
+            line = line.strip()
+            match = re.match(r'(\d+)\.\s*([A-D])', line)
+            if match:
+                question_num = int(match.group(1)) - 1
+                correct_answer = match.group(2)
+                answer_key_dict[question_num] = correct_answer
+
+        # Basic validation
+        if not questions or not answer_key_dict:
+            st.error("Error parsing quiz content. Please try again or check the generated format.")
+            return None, None
+        if len(questions) != len(answer_key_dict):
+            st.warning(f"Number of questions parsed ({len(questions)}) does not match number of answers in answer key ({len(answer_key_dict)}). Parsing might be incomplete.")
+
+
+        # Combine parsed questions and answer key into quiz_data
+        quiz_data_list = []
+        for i, q_data in enumerate(questions):
+            correct_answer = answer_key_dict.get(i)
+            if correct_answer:
+                quiz_data_list.append({
+                    'question': q_data['question'],
+                    'options': q_data['options'],
+                    'correct_answer': correct_answer
+                })
+            else:
+                st.warning(f"Could not find correct answer for question {i+1} in the answer key.")
+                return None, None
+
+        return quiz_data_list, answer_key_dict
+
+
+    def display_question():
+        """Displays the current question and options for interactive quiz."""
+        if st.session_state.quiz_data is None:
+            st.error("Quiz data not loaded yet. Generate a quiz first.")
+            return
+
+        if st.session_state.current_question_index < len(st.session_state.quiz_data):
+            question_data = st.session_state.quiz_data[st.session_state.current_question_index]
+            question_number = st.session_state.current_question_index + 1
+            st.markdown(f"**Question {question_number}:** {question_data['question']}")
+
+            options_list = [f"{key}. {value}" for key, value in question_data['options'].items()]
+            user_choice = st.radio("Choose an answer:", options_list, key=f"q_{question_number}") # Unique key for radio buttons
+
+            if st.button("Submit Answer", key=f"submit_q_{question_number}"): # Unique key for submit button
+                selected_option_letter = user_choice.split('.')[0] # Extract A, B, C, or D
+                st.session_state.user_answers.append(selected_option_letter)
+
+                if st.session_state.current_question_index < len(st.session_state.quiz_data) - 1:
+                    st.session_state.current_question_index += 1
+                else:
+                    st.session_state.quiz_completed = True # Mark quiz as completed after last question
+                st.rerun()
+
+
+    def display_results():
+        """Displays the quiz results after completion."""
+        if st.session_state.quiz_completed:
+            st.markdown("### Quiz Results")
+            correct_count = 0
+            for i in range(len(st.session_state.quiz_data)):
+                user_answer = st.session_state.user_answers[i] if i < len(st.session_state.user_answers) else None # Handle if user didn't answer all
+                correct_answer = st.session_state.quiz_data[i]['correct_answer']
+                if user_answer == correct_answer:
+                    correct_count += 1
+                    result_text = f"**Question {i+1}:** ✅ Correct! (Your answer: {user_answer}, Correct answer: {correct_answer})"
+                    color = "green"
+                else:
+                    result_text = f"**Question {i+1}:** ❌ Incorrect. (Your answer: {user_answer if user_answer else 'Not answered'}, Correct answer: {correct_answer})"
+                    color = "red"
+                st.markdown(f"<font color='{color}'>{result_text}</font>", unsafe_allow_html=True)
+
+            percentage_correct = (correct_count / len(st.session_state.quiz_data)) * 100
+            st.markdown(f"### Final Score: {correct_count} out of {len(st.session_state.quiz_data)} correct ({percentage_correct:.2f}%)")
+            st.session_state.score = correct_count # Store score in session state
+
+
+    # User input for topic
+    topic = st.text_input("Enter the topic for your quiz:")
+
+    if topic:
+        if st.button("Generate Quiz"):
+            with st.spinner(f"Generating quiz on '{topic}'..."):
+                try:
+                    prompt = f"""
+                    Generate a multiple-choice quiz on the topic of "{topic}".
+                    The quiz should have 5 questions.
+
+                    **Formatting Instructions:**
+
+                    1. **Question Numbering:**  Start each question with a number followed by a period (e.g., "1.").
+                    2. **Question Text:**  Immediately after the question number, write the question text.
+                    3. **Options:**
+                        * List four options for each question, labeled A, B, C, and D.
+                        * Use the format: "A) Option text", "B) Option text", etc. (letter followed by a parenthesis, then a space, then the option text).
+                        * Place each option on a new line directly below the question.
+                    4. **Answer Key:**
+                        * After all questions, create a separate section titled "**Answer Key:**".
+                        * In the Answer Key, list the correct answer for each question in the format: "1. Correct option letter", "2. Correct option letter", etc. (question number, period, space, correct option letter - A, B, C, or D).
+
+                    **Example of Desired Format:**
+
+                    **Quiz Title (Optional, but good to have)**
+
+                    1. Question 1 text?
+                    A) Option A
+                    B) Option B
+                    C) Option C
+                    D) Option D
+
+                    2. Question 2 text?
+                    A) Option A
+                    B) Option B
+                    C) Option C
+                    D) Option D
+
+                    ... (and so on for 5 questions) ...
+
+                    **Answer Key:**
+                    1. C
+                    2. A
+                    3. B
+                    4. D
+                    5. A
+
+                    Please generate the quiz in this exact format.
+                    """
+                    response = model.generate_content(prompt)
+                    quiz_content = response.text
+
+
+                    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.session_state.current_question_index = 0
+                            st.session_state.user_answers = []
+                            st.session_state.quiz_completed = False
+                            st.session_state.score = 0
+                            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
+                    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.")
+
+    # Quiz Display Logic
+    if st.session_state.quiz_data:
+        if not st.session_state.quiz_completed:
+            display_question()
+        else:
+            display_results()
+    elif topic and not st.session_state.quiz_data and not st.session_state.quiz_completed: # Message if topic entered but quiz not generated yet
+        st.info("Click 'Generate Quiz' to start the quiz.")
 
-        if st.button("Submit Answer", key=f"submit_q_{question_number}"): # Unique key for submit button
-            selected_option_letter = user_choice.split('.')[0] # Extract A, B, C, or D
-            st.session_state.user_answers.append(selected_option_letter)
+# --- Main App Flow Control ---
+if 'logged_in' not in st.session_state:
+    st.session_state.logged_in = False
 
-            if st.session_state.current_question_index < len(st.session_state.quiz_data) - 1:
-                st.session_state.current_question_index += 1
-            else:
-                st.session_state.quiz_completed = True # Mark quiz as completed after last question
-            st.rerun()
-
-
-def display_results():
-    """Displays the quiz results after completion."""
-    if st.session_state.quiz_completed:
-        st.markdown("### Quiz Results")
-        correct_count = 0
-        for i in range(len(st.session_state.quiz_data)):
-            user_answer = st.session_state.user_answers[i] if i < len(st.session_state.user_answers) else None # Handle if user didn't answer all
-            correct_answer = st.session_state.quiz_data[i]['correct_answer']
-            if user_answer == correct_answer:
-                correct_count += 1
-                result_text = f"**Question {i+1}:** ✅ Correct! (Your answer: {user_answer}, Correct answer: {correct_answer})"
-                color = "green"
-            else:
-                result_text = f"**Question {i+1}:** ❌ Incorrect. (Your answer: {user_answer if user_answer else 'Not answered'}, Correct answer: {correct_answer})"
-                color = "red"
-            st.markdown(f"<font color='{color}'>{result_text}</font>", unsafe_allow_html=True)
-
-        percentage_correct = (correct_count / len(st.session_state.quiz_data)) * 100
-        st.markdown(f"### Final Score: {correct_count} out of {len(st.session_state.quiz_data)} correct ({percentage_correct:.2f}%)")
-        st.session_state.score = correct_count # Store score in session state
-
-
-# User input for topic
-topic = st.text_input("Enter the topic for your quiz:")
-
-if topic:
-    if st.button("Generate Quiz"):
-        with st.spinner(f"Generating quiz on '{topic}'..."):
-            try:
-                prompt = f"""
-                Generate a multiple-choice quiz on the topic of "{topic}".
-                The quiz should have 5 questions.
-
-                **Formatting Instructions:**
-
-                1. **Question Numbering:**  Start each question with a number followed by a period (e.g., "1.").
-                2. **Question Text:**  Immediately after the question number, write the question text.
-                3. **Options:**
-                    * List four options for each question, labeled A, B, C, and D.
-                    * Use the format: "A) Option text", "B) Option text", etc. (letter followed by a parenthesis, then a space, then the option text).
-                    * Place each option on a new line directly below the question.
-                4. **Answer Key:**
-                    * After all questions, create a separate section titled "**Answer Key:**".
-                    * In the Answer Key, list the correct answer for each question in the format: "1. Correct option letter", "2. Correct option letter", etc. (question number, period, space, correct option letter - A, B, C, or D).
-
-                **Example of Desired Format:**
-
-                **Quiz Title (Optional, but good to have)**
-
-                1. Question 1 text?
-                A) Option A
-                B) Option B
-                C) Option C
-                D) Option D
-
-                2. Question 2 text?
-                A) Option A
-                B) Option B
-                C) Option C
-                D) Option D
-
-                ... (and so on for 5 questions) ...
-
-                **Answer Key:**
-                1. C
-                2. A
-                3. B
-                4. D
-                5. A
-
-                Please generate the quiz in this exact format.
-                """
-                response = model.generate_content(prompt)
-                quiz_content = response.text
-
-
-                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.session_state.current_question_index = 0
-                        st.session_state.user_answers = []
-                        st.session_state.quiz_completed = False
-                        st.session_state.score = 0
-                        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
-                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.")
-
-# Quiz Display Logic
-if st.session_state.quiz_data:
-    if not st.session_state.quiz_completed:
-        display_question()
-    else:
-        display_results()
-elif topic and not st.session_state.quiz_data and not st.session_state.quiz_completed: # Message if topic entered but quiz not generated yet
-    st.info("Click 'Generate Quiz' to start the quiz.")
+if not st.session_state.logged_in:
+    login_page()
+else:
+    quiz_app()