Added states for users

app.py

@@ -16,15 +16,8 @@ if os.getenv("ENV_TYPE") == "dev":
     BOOKS["Test"] = "test.json"
     MODEL_NAME_TO_CHOICE["test"] = "Test"
 
-questions_data = []
-current_question_index = 0
-answers_log = []  # Log for saving answers
-feedback_questions = ""
-available_models = []
 
-
-def get_question():
-    global questions_data, current_question_index
+def get_question(questions_data, current_question_index):
     question = questions_data[current_question_index]
     question_text = f"### Питання {current_question_index + 1}/{len(questions_data)}:\n#### {question['question']}"
     answers = [answer['answer'] for answer in question['answers']]
@@ -33,34 +26,47 @@ def get_question():
 
 
 def load_questions(model, book, student_name, class_name):
-    global questions_data, current_question_index
-    current_question_index = 0
-    answers_log.clear()
-
+    print("load_questions")
     if not model or not book or student_name is None or class_name is None:
-        return "# Будь ласка, заповніть усі поля!", []
+        return (
+            "# Будь ласка, заповніть усі поля!",  # question_output
+            [],  # answer_radio
+            [],  # questions_data_state
+        )
 
     model_path = MODELS_PATH[model]
     book_filename = BOOKS[book]
     file_path = os.path.join("questions", model_path, book_filename)
 
     if not os.path.exists(file_path):
-        return f"Файл за шляхом {file_path} не знайдено.", []
+        return (
+            f"Файл за шляхом {file_path} не знайдено.",  # question_output
+            [],  # answer_radio
+            [],  # questions_data_state
+        )
 
     with open(file_path, "r", encoding="utf-8") as file:
         questions_data = json.load(file)
 
     if questions_data:
-        return get_question()
+        question_text, answers = get_question(questions_data, 0)
+        return (
+            question_text,  # question_output
+            answers,  # answer_radio
+            questions_data,  # questions_data_state
+        )
     else:
-        return "У файлі немає питань.", []
-
+        return (
+            "У файлі немає питань.",  # question_output
+            [],  # answer_radio
+            questions_data,  # questions_data_state
+        )
 
-def get_next_question(selected_answer):
-    global current_question_index, answers_log, feedback_questions
 
+def get_next_question(selected_answer, questions_data, current_question_index, answers_log):
+    print("get_next_question answers_log", answers_log)
     if not selected_answer:
-        question_text, answers = get_question()
+        question_text, answers = get_question(questions_data, current_question_index)
         return (
             question_text,  # question_radio
             gr.update(choices=answers, value=None, interactive=True, visible=True),  # answer_radio
@@ -72,6 +78,9 @@ def get_next_question(selected_answer):
             gr.update(visible=False),  # answers_correct
             gr.update(visible=False),  # interesting_question
             gr.update(visible=False, value=""),  # feedback_questions_output
+            current_question_index, # current_question_index_state
+            answers_log, # answers_log_state
+            "", # feedback_questions_state
         )
 
     # Writing answer in log
@@ -80,11 +89,12 @@ def get_next_question(selected_answer):
         "isCorrect": any(answer['answer'] == selected_answer and answer['isCorrect'] for answer in
                          questions_data[current_question_index]['answers'])
     })
+    print("get_next_question updated answers_log", answers_log)
 
     # Move to the next question
     current_question_index += 1
     if current_question_index < len(questions_data):
-        question_text, answers = get_question()
+        question_text, answers = get_question(questions_data, current_question_index)
         return (
             question_text,  # question_radio
             gr.update(choices=answers, value=None, interactive=True, visible=True),  # answer_radio
@@ -96,6 +106,9 @@ def get_next_question(selected_answer):
             gr.update(visible=False),  # answers_correct
             gr.update(visible=False),  # interesting_question
             gr.update(visible=False, value=""),  # feedback_questions_output
+            current_question_index, # current_question_index_state
+            answers_log, # answers_log_state
+            "", # feedback_questions_state
         )
     else:
         # All questions are completed — ask for feedback
@@ -112,6 +125,9 @@ def get_next_question(selected_answer):
             gr.update(visible=True),  # answers_correct
             gr.update(visible=True),  # interesting_question
             gr.update(visible=True, value=feedback_questions),  # feedback_questions_output
+            0, # current_question_index_state
+            answers_log, # answers_log_state
+            feedback_questions, # feedback_questions_state
         )
 
 
@@ -122,8 +138,12 @@ def summarize_results(student_name,
                       feedback,
                       question_correct,
                       answers_correct,
-                      interesting_question):
-    global questions_data, answers_log, feedback_questions, available_models
+                      interesting_question,
+                      questions_data,
+                      answers_log,
+                      feedback_questions,
+                      available_models):
+    print("summarize_results questions_data", questions_data)
     questions = []
 
     if question_correct is None or answers_correct is None or interesting_question is None:
@@ -137,8 +157,14 @@ def summarize_results(student_name,
             gr.update(visible=True),  # rating_text
             gr.update(visible=True, value=feedback_questions),  # feedback_questions_output
             gr.update(visible=True),  # feedback_not_provided
+            questions_data, # questions_data_state
+            0, # current_question_index_state
+            answers_log, # answers_log_state
+            feedback_questions, # feedback_questions_state
+            available_models, # available_models_state
         )
 
+    print("summarize_results answers_log", answers_log)
     for question, answer in zip(questions_data, answers_log):
         questions.append({
             "question": question,
@@ -150,6 +176,7 @@ def summarize_results(student_name,
 
     grade_12 = (correct_answers_count / total_questions) * 12
 
+    print("summarize_results questions_data before save", questions_data)
     save_results(
         student_name,
         class_name,
@@ -170,8 +197,14 @@ def summarize_results(student_name,
         f"#### Оцінка за 12-бальною шкалою: {grade_12:.2f}.\n\n"
     )
 
-    if student_name != "Вчитель":
-        available_models.remove(model)
+    available_models_list = available_models
+    print(available_models_list)
+
+    updated_available_models = [m for m in available_models_list if
+                                m != model] if student_name != "Вчитель" else available_models_list
+
+    print(list(updated_available_models))
+    print(updated_available_models)
 
     return (
         summary,  # question_output
@@ -183,7 +216,12 @@ def summarize_results(student_name,
         gr.update(visible=False),  # rating_text
         gr.update(visible=False, value=""),  # feedback_questions_output
         gr.update(visible=False),  # feedback_not_provided
-        gr.update(choices=available_models, value=None, visible=True),  # model_radio
+        gr.update(choices=list(updated_available_models), value=None, visible=True),  # model_radio
+        [], # questions_data_state
+        0, # current_question_index_state
+        [], # answers_log_state
+        "", # feedback_questions_state
+        updated_available_models, # available_models_state
     )
 
 
@@ -206,13 +244,13 @@ def prepare_questions_for_feedback(questions, answer_log):
     return "\n".join(feedback)
 
 
-def update_students(class_name):
-    print('update_students')
+def update_students(class_name, available_models):
+    print('update_students: ', available_models)
     students = STUDENTS.get(class_name, [])
     return (
         gr.update(choices=students, value=None, visible=True),  # student_name_input
         gr.update(choices=[], value=None, visible=False),  # book_radio
-        gr.update(choices=[], value=None, visible=False),  # model_radio
+        gr.update(choices=available_models, value=None, visible=False),  # model_radio
         gr.update(value=""),  # questions_output
         gr.update(choices=[], value=None, visible=False),  # answer_radio
         gr.update(visible=False),  # next_button
@@ -224,16 +262,20 @@ def update_students(class_name):
         gr.update(value=None, visible=False),  # interesting_question_radio
         gr.update(value="", visible=False),  # feedback_input
         gr.update(visible=False),  # submit_feedback_button
+        [],  # questions_data_state
+        0,  # current_question_index_state
+        [],  # answers_log_state
+        "",  # feedback_questions_state
+        available_models,  # available_models_state
     )
 
 
-def handle_student_name_change(student_name):
-    global available_models
-
+def handle_student_name_change(student_name, available_models):
+    print("handle_student_name_change", available_models)
     if student_name == "Вчитель":
         available_models = list(MODELS.keys())
 
-    print('handle_student_name_change')
+    print("handle_student_name_change available_models: ", available_models)
     if not student_name:
         return (
             gr.update(choices=[], value=None, visible=False),  # book_radio
@@ -249,6 +291,11 @@ def handle_student_name_change(student_name):
             gr.update(value=None, visible=False),  # interesting_question_radio
             gr.update(value="", visible=False),  # feedback_input
             gr.update(visible=False),  # submit_feedback_button
+            [],  # questions_data_state
+            0,  # current_question_index_state
+            [],  # answers_log_state
+            "",  # feedback_questions_state
+            available_models,  # available_models_state
         )
 
     return (
@@ -265,16 +312,19 @@ def handle_student_name_change(student_name):
         gr.update(value=None, visible=False),  # interesting_question_radio
         gr.update(value="", visible=False),  # feedback_input
         gr.update(visible=False),  # submit_feedback_button
+        [],  # questions_data_state
+        0,  # current_question_index_state
+        [],  # answers_log_state
+        "",  # feedback_questions_state
+        available_models,  # available_models_state
     )
 
 
-def filter_models(student_name, class_name, book):
-    global available_models
-
-    print('filter_models')
+def filter_models(student_name, class_name, book, available_models):
+    print('filter_models: ', available_models)
     if not book:
         return (
-            gr.update(choices=[], value=None, visible=False),  # model_radio
+            gr.update(choices=available_models, value=None, visible=False),  # model_radio
             gr.update(value=""),  # questions_output
             gr.update(choices=[], value=None, visible=False),  # answer_radio
             gr.update(visible=False),  # next_button
@@ -286,6 +336,11 @@ def filter_models(student_name, class_name, book):
             gr.update(value=None, visible=False),  # interesting_question_radio
             gr.update(value="", visible=False),  # feedback_input
             gr.update(visible=False),  # submit_feedback_button
+            [],  # questions_data_state
+            0,  # current_question_index_state
+            [],  # answers_log_state
+            "",  # feedback_questions_state
+            available_models,  # available_models_state
         )
 
     if student_name == "Вчитель":
@@ -302,6 +357,11 @@ def filter_models(student_name, class_name, book):
             gr.update(value=None, visible=False),  # interesting_question_radio
             gr.update(value="", visible=False),  # feedback_input
             gr.update(visible=False),  # submit_feedback_button
+            [],  # questions_data_state
+            0,  # current_question_index_state
+            [],  # answers_log_state
+            "",  # feedback_questions_state
+            MODELS.keys(),  # available_models_state
         )
 
     tests = get_test_by_student_class_book(student_name, class_name, book)
@@ -321,8 +381,6 @@ def filter_models(student_name, class_name, book):
     for model in list(available_models_names):
         models_list.append(MODEL_NAME_TO_CHOICE.get(model))
 
-    available_models = models_list
-
     return (
         gr.update(choices=models_list, value=None, visible=True),  # model_radio
         gr.update(value=""),  # questions_output
@@ -336,11 +394,16 @@ def filter_models(student_name, class_name, book):
         gr.update(value=None, visible=False),  # interesting_question_radio
         gr.update(value="", visible=False),  # feedback_input
         gr.update(visible=False),  # submit_feedback_button
+        [],  # questions_data_state
+        0,  # current_question_index_state
+        [],  # answers_log_state
+        "",  # feedback_questions_state
+        models_list,  # available_models_state
     )
 
 
-def handle_model_change(model):
-    print(model)
+def handle_model_change(model, available_models):
+    print("handle_model_change", available_models)
     print("handle_model_change")
     if model is not None:
         return (
@@ -355,6 +418,11 @@ def handle_model_change(model):
             gr.update(value=None, visible=False),  # interesting_question_radio
             gr.update(value="", visible=False),  # feedback_input
             gr.update(visible=False),  # submit_feedback_button
+            [],  # questions_data_state
+            0,  # current_question_index_state
+            [],  # answers_log_state
+            "",  # feedback_questions_state
+            available_models,  # available_models_state
         )
 
     return (
@@ -369,6 +437,11 @@ def handle_model_change(model):
         gr.update(value=None, visible=False),  # interesting_question_radio
         gr.update(value="", visible=False),  # feedback_input
         gr.update(visible=False),  # submit_feedback_button
+        [],  # questions_data_state
+        0,  # current_question_index_state
+        [],  # answers_log_state
+        "",  # feedback_questions_state
+        available_models,  # available_models_state
     )
 
 
@@ -400,10 +473,17 @@ with gr.Blocks() as demo:
         feedback_input = gr.Textbox(label="Будь-який коментар про тест (за бажанням)", visible=False)
         submit_feedback_button = gr.Button("Завершити тест", visible=False)
 
+        questions_data_state = gr.State([])
+        current_question_index_state = gr.State(0)
+        answers_log_state = gr.State([])  # Log for saving answers
+        feedback_questions_state = gr.State("")
+        available_models_state = gr.State([])
+
         class_name_input.change(
             update_students,
             inputs=[
                 class_name_input,
+                available_models_state,
             ],
             outputs=[
                 student_name_input,
@@ -420,6 +500,11 @@ with gr.Blocks() as demo:
                 interesting_question_radio,
                 feedback_input,
                 submit_feedback_button,
+                questions_data_state,
+                current_question_index_state,
+                answers_log_state,
+                feedback_questions_state,
+                available_models_state,
             ]
         )
 
@@ -427,6 +512,7 @@ with gr.Blocks() as demo:
             handle_student_name_change,
             inputs=[
                 student_name_input,
+                available_models_state,
             ],
             outputs=[
                 book_radio,
@@ -442,6 +528,11 @@ with gr.Blocks() as demo:
                 interesting_question_radio,
                 feedback_input,
                 submit_feedback_button,
+                questions_data_state,
+                current_question_index_state,
+                answers_log_state,
+                feedback_questions_state,
+                available_models_state,
             ]
         )
 
@@ -451,6 +542,7 @@ with gr.Blocks() as demo:
                 student_name_input,
                 class_name_input,
                 book_radio,
+                available_models_state,
             ],
             outputs=[
                 model_radio,
@@ -465,13 +557,19 @@ with gr.Blocks() as demo:
                 interesting_question_radio,
                 feedback_input,
                 submit_feedback_button,
+                questions_data_state,
+                current_question_index_state,
+                answers_log_state,
+                feedback_questions_state,
+                available_models_state,
             ]
         )
 
         model_radio.change(
             handle_model_change,
             inputs=[
-                model_radio
+                model_radio,
+                available_models_state,
             ],
             outputs=[
                 question_output,
@@ -485,12 +583,18 @@ with gr.Blocks() as demo:
                 interesting_question_radio,
                 feedback_input,
                 submit_feedback_button,
+                questions_data_state,
+                current_question_index_state,
+                answers_log_state,
+                feedback_questions_state,
+                available_models_state,
             ]
         )
 
 
-        def update_question(model, book, student_name, class_name):
-            question, answers = load_questions(model, book, student_name, class_name)
+        def update_question(model, book, student_name, class_name, available_models):
+            question, answers, questions_data = load_questions(model, book, student_name, class_name)
+            print("update_question", questions_data)
             is_field_filled = len(answers) > 0
             return (
                 question,  # question_output
@@ -504,6 +608,11 @@ with gr.Blocks() as demo:
                 gr.update(visible=False, value=None),  # interesting_question
                 gr.update(visible=False, value=""),  # feedback_questions_output
                 gr.update(visible=False),  # feedback_not_provided
+                questions_data,  # questions_data_state
+                0,  # current_question_index_state
+                [],  # answers_log_state
+                "",  # feedback_questions_state
+                available_models,  # available_models_state
             )
 
 
@@ -514,6 +623,7 @@ with gr.Blocks() as demo:
                 book_radio,
                 student_name_input,
                 class_name_input,
+                available_models_state,
             ],
             outputs=[
                 question_output,
@@ -527,12 +637,22 @@ with gr.Blocks() as demo:
                 interesting_question_radio,
                 feedback_questions_output,
                 feedback_not_provided,
+                questions_data_state,
+                current_question_index_state,
+                answers_log_state,
+                feedback_questions_state,
+                available_models_state,
             ]
         )
 
         next_button.click(
             get_next_question,
-            inputs=[answer_radio],
+            inputs=[
+                answer_radio,
+                questions_data_state,
+                current_question_index_state,
+                answers_log_state
+            ],
             outputs=[
                 question_output,
                 answer_radio,
@@ -544,6 +664,9 @@ with gr.Blocks() as demo:
                 answers_correct_radio,
                 interesting_question_radio,
                 feedback_questions_output,
+                current_question_index_state,
+                answers_log_state,
+                feedback_questions_state,
             ]
         )
 
@@ -558,6 +681,10 @@ with gr.Blocks() as demo:
                 question_correct_radio,
                 answers_correct_radio,
                 interesting_question_radio,
+                questions_data_state,
+                answers_log_state,
+                feedback_questions_state,
+                available_models_state,
             ],
             outputs=[
                 question_output,
@@ -570,8 +697,13 @@ with gr.Blocks() as demo:
                 feedback_questions_output,
                 feedback_not_provided,
                 model_radio,
+                questions_data_state,
+                current_question_index_state,
+                answers_log_state,
+                feedback_questions_state,
+                available_models_state,
             ]
         )
 
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch(server_name="0.0.0.0")