Update app.py

app.py

@@ -86,49 +86,47 @@ def completed_tests(test):
 # Tests distribution over users
 import random
 
-# Global set to store all available tests
-categories_and_tests = choices
-remaining_tests = set(get_unique_tests(categories_and_tests))
-
-def assign_tests(categories_and_tests, num_tests):
+def assign_tests(num_tests):
     global remaining_tests
     assigned_tests = []
-    tests = get_unique_tests(categories_and_tests)  
+    tests = get_unique_tests(full_test_list)  
        
     # Shuffle tests 
     random.shuffle(tests)
     
+    # Updating remaining_tests 
+    if (len(remaining_tests) == 0) and (len(assigned_tests) == 0):
+        remaining_tests = set(tests)
+    # else:
+    #     remaining_tests -= set(assigned_tests) 
+
     # Last remaining tests are assigned to the last user
     if num_tests > len(remaining_tests):
-        selected_tests = remaining_tests
+        assigned_tests = remaining_tests
     
     # Ensure we still have enough tests    
     if len(remaining_tests) == 0: 
         print("***** Tests Completed *****")
-        #return ["Tests Completed"]
+        pass#return ["Tests Completed"]
     
     # Select tests that are not already assigned
     assigned_tests = [test for test in tests if test in remaining_tests][:num_tests]
     
     # Remove assigned tests from the set of all available tests
-    remaining_tests -= set(assigned_tests)
-
-    # # Update assigned tests set
-    # if len(assigned_tests) != 0:
-    #     assigned_tests.append(selected_tests)
-      
+    remaining_tests -= set(assigned_tests) 
     return assigned_tests
-
+    
 # Tracking user progress 
+
 def test_progress(test):
     global completed_tests_list
+    global len_assigned_test
 
     # Get total completed tests
     total_completed_tests, completed_tests_list = completed_tests(test)
-    completed_tests_text = "\n".join(completed_tests_list)
-    
+
     # Test completed to be displayed to the user
-    len_assigned_test = len(assign_tests(categories_and_tests, num_tests))
+    completed_tests_text = "\n".join(completed_tests_list)
 
     # Calculate how many tests are remaining
     total_remaining_tests = len_assigned_test - total_completed_tests
@@ -137,20 +135,28 @@ def test_progress(test):
         completed_tests_list.clear()
         progress_text = f"Congratulations! You have completed all tests"
     else:
-        progress_text = f"You have completed {total_completed_tests} tests. {total_remaining_tests} tests are remaining"
+        progress_text = f"Completed tests {total_completed_tests} . Remaining {total_remaining_tests}"
     return progress_text, completed_tests_text
 
-
 # Authentication function
 def update_message(request: gr.Request):
     return f"Welcome, {request.username}"
 
+
 # Gradio apps
 
 # Get test categories
-data_list = choices
-image_path="all_imgs/"
+data_list = full_test_list
+image_path="/all_imgs/"
 completed_tests_list = []
+remaining_tests = []
+
+# Get a set of tests for each user
+num_tests = 10
+assigned_tests = assign_tests(num_tests)
+len_assigned_test = len(assigned_tests)
+
+print(assigned_tests)
 
 # Flagging
 callback = gr.CSVLogger()
@@ -216,10 +222,6 @@ with demo :
     """
     )
 
-# Function to get the corresponding values of correct, close and wrong text and image for each test
-    num_tests = 10 # number of tests assigned per user
-    assigned_tests = assign_tests(data_list, num_tests)
-    
     # Assign value to each step 
     def get_test_text(test):
         correct, close, wrong, image = get_values_image_for_test(data_list, test)
@@ -233,81 +235,85 @@ with demo :
         _, completed_tests = gr.TextArea(completed_tests(test))
         return completed_tests
 
-    with gr.Row(elem_classes="row"):
-        with gr.Column():
-           image =  gr.Image(label="Written Form", elem_id="img", container=False, show_label=True, show_download_button=False)
-
     with gr.Row():
-        # First column
-        with gr.Column():
+        # First big column
+        with gr.Column(scale=1):
             
             # User progress
-            progress_text = gr.Textbox(info=" Your progress will appear here ", interactive=False, container=False, elem_id="progress_text", elem_classes="drop_color")
-            
+            progress_text = gr.Textbox(interactive=False, show_label=False, container=True, elem_id="progress_text", elem_classes="drop_color")
+            textarea_completed = gr.TextArea(info=" Your completed tests will appear here ", interactive=False, rtl=True, container=True, show_label=False, elem_classes="drop_color")
+
             # Test selection  
             tests_list = assigned_tests 
             test_dropdown = gr.Dropdown(tests_list, label="Tests",  info="Select a test", scale=1, elem_id="test_color", elem_classes="drop_color")
-            textarea_completed = gr.TextArea(info=" Your completed tests will appear here ", interactive=False, rtl=True, container=True, show_label=False, elem_classes="drop_color")
             test_dropdown.select(test_progress, test_dropdown, outputs=[progress_text, textarea_completed])
 
-        with gr.Column(): 
-            correct_text = gr.Textbox(label= "Step 1", info="Correct Text",  interactive=False, rtl=True)
-            correct_audio_record = gr.Audio(sources="microphone" ,type="filepath",  label="Record Audio", show_label=False)
-            correct_trans_text = gr.Textbox(info="Transcription",  interactive=False, rtl=True, show_label=False)
-            correct_score = gr.Textbox(label="Score", visible= False)    
-            correct_audio_record.stop_recording(fn=transcribe, inputs=[correct_audio_record, correct_text], outputs=[correct_trans_text, correct_score])
-
-        # Third column
-        with gr.Column():  
-            close_text = gr.Textbox(label="Step 2", info="Close Text",  interactive=False, rtl=True)
-            close_audio_record = gr.Audio(sources="microphone", type="filepath", label="Record Audio", show_label=False) 
-            close_trans_text = gr.Textbox(info="Transcription", interactive=False, rtl=True, show_label=False) 
-            close_score = gr.Textbox(label="Score", visible= False)
-            close_audio_record.stop_recording(fn=transcribe, inputs=[close_audio_record, close_text], outputs=[close_trans_text, close_score])
-
-        # Fourth column
-        with gr.Column(): 
-            wrong_text = gr.Textbox(label="Step 3", info="Wrong Text",  interactive=False, rtl=True)
-            wrong_audio_record = gr.Audio(sources="microphone" ,type="filepath",  label="Record Audio", show_label=False) 
-            wrong_trans_text = gr.Textbox(info="Transcription",  interactive=False, rtl=True, show_label=False)
-            wrong_score = gr.Textbox(label="Score", visible= False)
-            wrong_audio_record.stop_recording(fn=transcribe, inputs=[wrong_audio_record, wrong_text], outputs=[wrong_trans_text, wrong_score])
+        # Second big column
+        with gr.Column(scale=3):
+            # Fisrt Row for image
+            with gr.Row():
+                image =  gr.Image(elem_id="img", elem_classes="row", container=False, show_label=True, show_download_button=False) 
 
+            # Second row for steps    
             with gr.Row():
-                #user_name = gr.Request.username
-                def save_outputs(correct_text, correct_trans_text, correct_score, correct_audio_record,
-                                close_text, close_trans_text, close_score, close_audio_record,
-                                wrong_text, wrong_trans_text, wrong_score, wrong_audio_record):
-                    if any(len(text)==0 for text in [correct_trans_text, close_trans_text, wrong_trans_text]):
-                        return gr.Warning("Please complete the test before saving")
-                    return (lambda *args: callback.flag(args, username="randa"))
-
-                flag_btn = gr.Button(value="Save this test", variant="primary", scale=2)
-                # Setup the components to flag
-                callback.setup([correct_text, correct_trans_text, correct_score, correct_audio_record,
-                                close_text, close_trans_text, close_score, close_audio_record,
-                                wrong_text, wrong_trans_text, wrong_score, wrong_audio_record], "flagged_data")
-                # We can choose which components to flag 
-                flag_btn.click(save_outputs, 
-                            [correct_text, correct_trans_text, correct_score, correct_audio_record,
-                                close_text, close_trans_text, close_score, close_audio_record,
-                                wrong_text, wrong_trans_text, wrong_score, wrong_audio_record],
-                                None, preprocess=False)
-                
-                # Update test values according to the selected test
-                test_dropdown.input(get_test_text, test_dropdown, [correct_text, close_text, wrong_text, image])
+                # First sub column
+                with gr.Column(): 
+                    correct_text = gr.Textbox(label= "Step 1", info="Correct Text",  interactive=False, rtl=True)
+                    correct_audio_record = gr.Audio(sources="microphone" ,type="filepath",  label="Record Audio", show_label=False)
+                    correct_trans_text = gr.Textbox(info="Transcription",  interactive=False, rtl=True, show_label=False)
+                    correct_score = gr.Textbox(label="Score", visible= False)    
+                    correct_audio_record.stop_recording(fn=transcribe, inputs=[correct_audio_record, correct_text], outputs=[correct_trans_text, correct_score])
+
+                # Second column
+                with gr.Column(): 
+                    close_text = gr.Textbox(label="Step 2", info="Close Text",  interactive=False, rtl=True)
+                    close_audio_record = gr.Audio(sources="microphone", type="filepath", label="Record Audio", show_label=False) 
+                    close_trans_text = gr.Textbox(info="Transcription", interactive=False, rtl=True, show_label=False) 
+                    close_score = gr.Textbox(label="Score", visible= False)
+                    close_audio_record.stop_recording(fn=transcribe, inputs=[close_audio_record, close_text], outputs=[close_trans_text, close_score])
+
+                # Fourth column
+                with gr.Column(): 
+                    wrong_text = gr.Textbox(label="Step 3", info="Wrong Text",  interactive=False, rtl=True)
+                    wrong_audio_record = gr.Audio(sources="microphone" ,type="filepath",  label="Record Audio", show_label=False) 
+                    wrong_trans_text = gr.Textbox(info="Transcription",  interactive=False, rtl=True, show_label=False)
+                    wrong_score = gr.Textbox(label="Score", visible= False)
+                    wrong_audio_record.stop_recording(fn=transcribe, inputs=[wrong_audio_record, wrong_text], outputs=[wrong_trans_text, wrong_score])
+            
+                    # Third row for flag
+                    with gr.Row():
+                        #user_name = gr.Request.username
+                        def save_outputs(correct_text, correct_trans_text, correct_score, correct_audio_record,
+                                        close_text, close_trans_text, close_score, close_audio_record,
+                                        wrong_text, wrong_trans_text, wrong_score, wrong_audio_record):
+                            if any(len(text)==0 for text in [correct_trans_text, close_trans_text, wrong_trans_text]):
+                                return gr.Warning("Please complete the test before saving")
+                            return (lambda *args: callback.flag(args, username="randa"))
+
+                        flag_btn = gr.Button(value="Save this test", variant="primary", scale=2)
+                        # Setup the components to flag
+                        callback.setup([correct_text, correct_trans_text, correct_score, correct_audio_record,
+                                        close_text, close_trans_text, close_score, close_audio_record,
+                                        wrong_text, wrong_trans_text, wrong_score, wrong_audio_record], "flagged_data")
+                        # We can choose which components to flag 
+                        flag_btn.click(save_outputs, 
+                                    [correct_text, correct_trans_text, correct_score, correct_audio_record,
+                                        close_text, close_trans_text, close_score, close_audio_record,
+                                        wrong_text, wrong_trans_text, wrong_score, wrong_audio_record],
+                                        None, preprocess=False)
+                        
+                        # Update test values according to the selected test
+                        test_dropdown.input(get_test_text, test_dropdown, [correct_text, close_text, wrong_text, image])
                 
     
     # Clear the transcription after selecting a new test
     test_dropdown.select(lambda: [None]*10, None,
                                 outputs=[correct_text, close_text, wrong_text, correct_audio_record, close_audio_record, wrong_audio_record, correct_trans_text, close_trans_text, wrong_trans_text, image],
                                 queue=False)
-
-
-#demo.launch(inbrowser=True)   
-demo.launch(auth=[("randa", "randa"), ("randa1", "randa1"),("randa2", "randa2"), ("randa3", "randa3"),
-                  ("karim1", "karim1"), ("karim2", "karim2"), ("karim3", "karim3"),
-                  ("yassir1", "yassir1"), ("yassir2", "yassir2"), ("yassir3", "yassir3"),
-                  ("mehdi", "mehdi")], 
-                  share=True, inbrowser=True)
-
+#demo.launch(inbrowser=True)
+if __name__ == "__main__":
+    demo.launch(auth=[("randa", "randa"), ("randa1", "randa1"),("randa2", "randa2"), ("randa3", "randa3"),
+                    ("karim1", "karim1"), ("karim2", "karim2"), ("karim3", "karim3"),
+                    ("yassir1", "yassir1"), ("yassir2", "yassir2"), ("yassir3", "yassir3"),
+                    ("mehdi", "mehdi")], 
+                    share=True, inbrowser=True)