Updates

app.py

@@ -1,5 +1,4 @@
 import streamlit as st
-import importlib
 import os
 from fpdf import FPDF
 import uuid
@@ -22,6 +21,10 @@ if 'module_question_count' not in st.session_state:
     st.session_state.module_question_count = {}
 if 'pdf_data' not in st.session_state:
     st.session_state.pdf_data = None
+if 'submit_disabled' not in st.session_state:
+    st.session_state.submit_disabled = True
+if 'next_disabled' not in st.session_state:
+    st.session_state.next_disabled = True
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -81,11 +84,12 @@ def load_modules():
     for filename in os.listdir(module_dir):
         if filename.endswith(".py") and filename != "__init__.py":
             module_name = filename[:-3]
-            module = importlib.import_module(f"{module_dir}.{module_name}")
+            # Dynamically import the module only when needed
+            module = __import__(f"{module_dir}.{module_name}", fromlist=[''])
             modules[module_name] = {
                 "title": getattr(module, "title", module_name),
                 "description": getattr(module, "description", "No description available."),
-                "generate_question": module.generate_question
+                "generate_question": module.generate_question  # Access the generate_question function
             }
     return modules
 
@@ -104,34 +108,60 @@ def navigate_question(direction):
     if direction == "prev" and st.session_state.current_index > 0:
         st.session_state.current_index -= 1
     elif direction == "next":
-        if st.session_state.current_index < len(st.session_state.questions) - 1:
-            st.session_state.current_index += 1
-        else:
-            # Generate a new question if at the end of the list
-            new_question = generate_new_question(st.session_state.current_module, modules[st.session_state.current_module])
-            st.session_state.questions.append(new_question)
-            st.session_state.current_index += 1
+        new_question = generate_new_question(st.session_state.current_module, modules[st.session_state.current_module])
+        st.session_state.questions.append(new_question)
+        st.session_state.current_index = len(st.session_state.questions) - 1
 
 # Load all modules dynamically
 modules = load_modules()
 
 # Streamlit interface
 st.sidebar.title("Quiz Modules")
-module_name = st.sidebar.radio("Choose a module:", list(modules.keys()), index=0)
+module_name = st.sidebar.radio("Choose a module:", [modules[module]["title"] for module in modules], index=0)
+
+selected_module = None
+for module in modules:
+    if modules[module]["title"] == module_name:
+        selected_module = module
+        break
 
-if module_name != st.session_state.current_module:
-    st.session_state.current_module = module_name
+if selected_module != st.session_state.current_module:
+    st.session_state.current_module = selected_module
     st.session_state.current_index = 0
-    st.session_state.questions = [generate_new_question(module_name, modules[module_name])]
-    st.session_state.module_question_count[module_name] = 0
-    st.session_state.module_correct_count[module_name] = 0
+    st.session_state.questions = [generate_new_question(selected_module, modules[selected_module])]
+    st.session_state.module_question_count[selected_module] = 0
+    st.session_state.module_correct_count[selected_module] = 0
+    st.session_state.submit_disabled = True
+    st.session_state.next_disabled = True
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
 
 # Display module title and description
-st.title(modules[module_name]["title"])
-st.write(modules[module_name]["description"])
+st.title(modules[selected_module]["title"])
+st.write(modules[selected_module]["description"])
+
+# Navigation and PDF report buttons
+col1, col2, col3 = st.columns([1, 1, 2])
+with col1:
+    if st.button("⬅️ Prev", disabled=st.session_state.current_index == 0):
+        navigate_question("prev")
+with col2:
+    if st.button("➡️ Next", disabled=st.session_state.next_disabled):
+        st.session_state.submit_disabled = True
+        st.session_state.next_disabled = True
+        navigate_question("next")
+with col3:
+    if len(st.session_state.questions) > 0:
+        pdf = generate_pdf_report()
+        st.session_state.pdf_data = pdf  # Reset PDF cache
+        st.download_button(
+            label="Download PDF Report 📄",
+            data=st.session_state.pdf_data,
+            file_name="quiz_report.pdf",
+            mime="application/pdf"
+        )
+
 st.write(current_question["question"])
 
 # Use a form to prevent rerun on option selection
@@ -142,7 +172,10 @@ with st.form(key=f'question_form_{st.session_state.current_index}'):
         key=f"question_{st.session_state.current_index}_options",
         index=None  # No pre-selection
     )
-    submit_button = st.form_submit_button(label="Submit")
+    submit_button = st.form_submit_button(label="Submit", disabled=st.session_state.submit_disabled)
+
+if selected_answer and st.session_state.submit_disabled:
+    st.session_state.submit_disabled = False
 
 if submit_button and not current_question.get('answered', False):
     if selected_answer is None:
@@ -151,11 +184,14 @@ if submit_button and not current_question.get('answered', False):
         # Process the answer
         current_question['selected'] = selected_answer
         current_question['answered'] = True
-        st.session_state.module_question_count[module_name] += 1
+        st.session_state.module_question_count[selected_module] += 1
 
         if selected_answer == current_question['correct_answer']:
             st.session_state.correct_count += 1
-            st.session_state.module_correct_count[module_name] += 1
+            st.session_state.module_correct_count[selected_module] += 1
+
+        st.session_state.submit_disabled = True
+        st.session_state.next_disabled = False
 
 # Show correct/incorrect feedback after submission
 if current_question.get('answered', False):
@@ -172,24 +208,3 @@ if current_question.get('answered', False):
     st.write("**Step-by-Step Solution:**")
     for step in current_question['step_by_step_solution']:
         st.write(step)
-
-# Navigation buttons (placed after question and options)
-col1, col2 = st.columns([1, 1])
-with col1:
-    if st.button("⬅️ Prev", key=f'prev_button_{st.session_state.current_index}', disabled=st.session_state.current_index == 0):
-        navigate_question("prev")
-
-with col2:
-    if st.button("➡️ Next", key=f'next_button_{st.session_state.current_index}'):
-        navigate_question("next")
-
-# PDF Download Button (at the bottom)
-if len(st.session_state.questions) > 0:
-    pdf = generate_pdf_report()
-    st.session_state.pdf_data = pdf  # Reset PDF cache
-    st.download_button(
-        label="Download PDF Report 📄",
-        data=st.session_state.pdf_data,
-        file_name="quiz_report.pdf",
-        mime="application/pdf"
-    )

modules/valid_invalid_numbers.py

@@ -1,210 +1,48 @@
-import streamlit as st
-import os
-from fpdf import FPDF
-import uuid
+# modules/valid_invalid_numbers.py
 
-# Initialize session state variables
-if 'session_id' not in st.session_state:
-    st.session_state.session_id = str(uuid.uuid4())
+title = "Validity of Numbers in Bases"
+description = "This module helps determine the validity of numbers in different bases like binary, octal, decimal, and hexadecimal."
 
-if 'questions' not in st.session_state:
-    st.session_state.questions = []
-if 'current_index' not in st.session_state:
-    st.session_state.current_index = 0
-if 'current_module' not in st.session_state:
-    st.session_state.current_module = None
-if 'correct_count' not in st.session_state:
-    st.session_state.correct_count = 0
-if 'module_correct_count' not in st.session_state:
-    st.session_state.module_correct_count = {}
-if 'module_question_count' not in st.session_state:
-    st.session_state.module_question_count = {}
-if 'pdf_data' not in st.session_state:
-    st.session_state.pdf_data = None
-if 'submit_disabled' not in st.session_state:
-    st.session_state.submit_disabled = True
-if 'next_disabled' not in st.session_state:
-    st.session_state.next_disabled = True
-
-def reset_pdf_cache():
-    st.session_state.pdf_data = None
-
-def generate_pdf_report():
-    pdf = FPDF()
-    pdf.add_page()
-    pdf.set_font("Arial", size=12)
+def generate_question():
+    import random
     
-    pdf.cell(200, 10, txt="Quiz Report", ln=True, align="C")
-    pdf.ln(10)
-
-    for module, data in st.session_state.module_question_count.items():
-        correct_count = st.session_state.module_correct_count.get(module, 0)
-        total_count = data
-        pdf.cell(200, 10, txt=f"Module: {module}", ln=True, align="L")
-        pdf.ln(5)
-        pdf.cell(200, 10, txt=f"Correct Answers: {correct_count}/{total_count}", ln=True, align="L")
-        pdf.ln(5)
-
-        for entry in st.session_state.questions:
-            if entry['module'] == module:
-                question, options, selected, correct, explanation, step_by_step_solution = (
-                    entry['question'], 
-                    entry['options'], 
-                    entry['selected'] if entry['selected'] is not None else "Not Answered",
-                    entry['correct_answer'], 
-                    entry['explanation'],
-                    entry['step_by_step_solution']
-                )
-                pdf.multi_cell(0, 10, f"Q: {question}")
-                for option in options:
-                    if option == correct:
-                        pdf.set_text_color(0, 128, 0)  # Green for correct
-                        pdf.multi_cell(0, 10, f"{option}")
-                    elif option == selected:
-                        pdf.set_text_color(255, 0, 0)  # Red for incorrect
-                        pdf.multi_cell(0, 10, f"{option}")
-                    else:
-                        pdf.set_text_color(0, 0, 0)  # Default color for others
-                        pdf.multi_cell(0, 10, f"   {option}")
-                pdf.set_text_color(0, 0, 0)  # Reset color
-                pdf.multi_cell(0, 10, f"Explanation: {explanation}")
-                pdf.ln(5)
-                pdf.multi_cell(0, 10, "Step-by-Step Solution:")
-                for step in step_by_step_solution:
-                    pdf.multi_cell(0, 10, step)
-                pdf.ln(10)
-
-        pdf.ln(10)  # Add space after each module
-
-    return pdf.output(dest='S').encode('latin1', 'replace')
-
-def load_modules():
-    modules = {}
-    module_dir = "modules"
-    for filename in os.listdir(module_dir):
-        if filename.endswith(".py") and filename != "__init__.py":
-            module_name = filename[:-3]
-            # Dynamically import the module only when needed
-            module = __import__(f"{module_dir}.{module_name}", fromlist=[''])
-            modules[module_name] = {
-                "title": getattr(module, "title", module_name),
-                "description": getattr(module, "description", "No description available."),
-                "generate_question": module.generate_question  # Access the generate_question function
-            }
-    return modules
-
-def generate_new_question(module_name, module):
-    question_data = module['generate_question']()
-    # Ensure 'answered' is initialized to False and add the 'module' and 'selected' keys
-    question_data['answered'] = False
-    question_data['module'] = module_name  # Add the module name to the question data
-    question_data['selected'] = None  # Initialize 'selected' to None
-    # Ensure there are exactly 4 options
-    if len(question_data['options']) != 4:
-        st.warning(f"Question in module '{module_name}' does not have 4 options. Found {len(question_data['options'])}.")
-    return question_data
-
-def navigate_question(direction):
-    if direction == "prev" and st.session_state.current_index > 0:
-        st.session_state.current_index -= 1
-    elif direction == "next":
-        new_question = generate_new_question(st.session_state.current_module, modules[st.session_state.current_module])
-        st.session_state.questions.append(new_question)
-        st.session_state.current_index = len(st.session_state.questions) - 1
-
-# Load all modules dynamically
-modules = load_modules()
-
-# Streamlit interface
-st.sidebar.title("Quiz Modules")
-module_name = st.sidebar.radio("Choose a module:", [modules[module]["title"] for module in modules], index=0)
-
-selected_module = None
-for module in modules:
-    if modules[module]["title"] == module_name:
-        selected_module = module
-        break
-
-if selected_module != st.session_state.current_module:
-    st.session_state.current_module = selected_module
-    st.session_state.current_index = 0
-    st.session_state.questions = [generate_new_question(selected_module, modules[selected_module])]
-    st.session_state.module_question_count[selected_module] = 0
-    st.session_state.module_correct_count[selected_module] = 0
-    st.session_state.submit_disabled = True
-    st.session_state.next_disabled = True
-
-# Load the current module's question
-current_question = st.session_state.questions[st.session_state.current_index]
-
-# Display module title and description
-st.title(modules[selected_module]["title"])
-st.write(modules[selected_module]["description"])
-
-# Navigation and PDF report buttons
-col1, col2, col3 = st.columns([1, 1, 2])
-with col1:
-    if st.button("⬅️ Prev", disabled=st.session_state.current_index == 0):
-        navigate_question("prev")
-with col2:
-    if st.button("➡️ Next", disabled=st.session_state.next_disabled):
-        st.session_state.submit_disabled = True
-        st.session_state.next_disabled = True
-        navigate_question("next")
-with col3:
-    if len(st.session_state.questions) > 0:
-        pdf = generate_pdf_report()
-        st.session_state.pdf_data = pdf  # Reset PDF cache
-        st.download_button(
-            label="Download PDF Report 📄",
-            data=st.session_state.pdf_data,
-            file_name="quiz_report.pdf",
-            mime="application/pdf"
-        )
-
-st.write(current_question["question"])
-
-# Use a form to prevent rerun on option selection
-with st.form(key=f'question_form_{st.session_state.current_index}'):
-    selected_answer = st.radio(
-        "Choose an answer:", 
-        options=current_question['options'], 
-        key=f"question_{st.session_state.current_index}_options",
-        index=None  # No pre-selection
-    )
-    submit_button = st.form_submit_button(label="Submit", disabled=st.session_state.submit_disabled)
-
-if selected_answer and st.session_state.submit_disabled:
-    st.session_state.submit_disabled = False
-
-if submit_button and not current_question.get('answered', False):
-    if selected_answer is None:
-        st.warning("Please select an answer before submitting.")
-    else:
-        # Process the answer
-        current_question['selected'] = selected_answer
-        current_question['answered'] = True
-        st.session_state.module_question_count[selected_module] += 1
-
-        if selected_answer == current_question['correct_answer']:
-            st.session_state.correct_count += 1
-            st.session_state.module_correct_count[selected_module] += 1
+    base = random.choice([2, 8, 10, 16])
+    length = random.randint(3, 5)
+    
+    def generate_valid_number():
+        return ''.join([str(random.randint(0, base - 1)) for _ in range(length)])
+    
+    def generate_invalid_number():
+        valid_digits = ''.join([str(random.randint(0, base - 1)) for _ in range(length - 1)])
+        if base < 10:
+            invalid_digit = str(random.randint(base, 9))  # For bases < 10, pick an invalid digit from [base, 9]
+        else:
+            invalid_digit = random.choice('ABCDEF')  # For bases >= 10, pick a hex digit to make it invalid
+        return valid_digits + invalid_digit
 
-        st.session_state.submit_disabled = True
-        st.session_state.next_disabled = False
+    correct_answer = generate_invalid_number()
+    options = [correct_answer]
 
-# Show correct/incorrect feedback after submission
-if current_question.get('answered', False):
-    for option in current_question['options']:
-        if option == current_question['correct_answer']:
-            st.markdown(f"<span style='color:green;'>{option} ✅</span>", unsafe_allow_html=True)
-        elif option == current_question['selected']:
-            st.markdown(f"<span style='color:red;'>{option} ❌</span>", unsafe_allow_html=True)
-        else:
-            st.markdown(f"{option}")
+    # Generate valid options
+    while len(options) < 4:
+        valid_option = generate_valid_number()
+        if valid_option not in options:
+            options.append(valid_option)
+    
+    random.shuffle(options)
+    
+    question = f"Which of the following is an invalid number in base {base}?"
+    explanation = f"The number {correct_answer} is invalid in base {base} because it contains a digit outside the range 0-{base-1}."
+    step_by_step_solution = [
+        "Step 1: Identify the valid digits for the base.",
+        "Step 2: Check each option to see if it contains any invalid digits.",
+        "Step 3: The correct answer will have a digit that is not allowed in the specified base."
+    ]
     
-    # Show explanation and step-by-step solution
-    st.write(f"**Explanation:** {current_question['explanation']}")
-    st.write("**Step-by-Step Solution:**")
-    for step in current_question['step_by_step_solution']:
-        st.write(step)
+    return {
+        "question": question,
+        "options": options,
+        "correct_answer": correct_answer,
+        "explanation": explanation,
+        "step_by_step_solution": step_by_step_solution
+    }