fixing multiuser issue

.gitignore

@@ -0,0 +1 @@
+**/__pycache__/**

logic/handlers.py

@@ -62,7 +62,7 @@ def exit():
 def validate_inputs(image, ori_img): # is_blurred
     # Perform your validation logic here
     if image is None:
-        return gr.Button("Submit", variant="primary", interactive=False), None, None, False
+        return gr.Button("Submit", variant="primary", interactive=False), None, None,  # False
         
     # Define maximum dimensions
     MAX_WIDTH = 1024
@@ -177,7 +177,8 @@ def update_user_data(username, password, country, language_choice, HF_DATASET_NA
         return gr.Dataset(samples=[]), None
 
 
-def update_language(country, language, email, password, metadata_dict, concepts_dict):
+def update_language(local_storage, metadata_dict, concepts_dict):
+    country, language, email, password, = local_storage
     # my_translator = GoogleTranslator(source='english', target=metadata_dict[country][language])
     categories = concepts_dict[country][lang2eng_mapping.get(language, language)]
     if language in words_mapping:
@@ -309,7 +310,7 @@ def handle_click_example(user_examples, concepts_dict):
     #         dropdown_values.append(None)
 
     # Need to return values for each category dropdown
-    return [image_inp, image_url_inp, long_caption_inp, exampleid_btn, category_btn, concept_btn] + additional_concepts_by_category  #, is_blurred
+    return [image_inp, image_url_inp, long_caption_inp, exampleid_btn, category_btn, concept_btn] + additional_concepts_by_category + [True]
 
 
 def is_password_correct(hashed_password, entered_password):
@@ -435,13 +436,13 @@ def blur_selected_faces(image, blur_faces_ids, faces_info, face_img, faces_count
     print(f"Face blurring time: {blurring_time:.4f} seconds")
     
     if face_count == 0:
-        return image, Modal(visible=True), face_img, faces_count, blur_faces_ids, False
+        return image, Modal(visible=True), face_img, faces_count, blur_faces_ids
     else:
-        return image, Modal(visible=False), None, None, gr.update(value=[]), True
+        return image, Modal(visible=False), None, None, gr.update(value=[])
 
 def blur_all_faces(image):
     if image is None:
-        return None, Modal(visible=False), False
+        return None, Modal(visible=False)
     else:
         # Base blur amount and bounds
         MIN_BLUR = 31  # Minimum blur amount (must be odd)
@@ -511,17 +512,17 @@ def blur_all_faces(image):
         print(f"Average time per face: {(total_time/max(1, face_count)):.4f} seconds")
 
         if face_count == 0:
-            return image, Modal(visible=True), False
+            return image, Modal(visible=True)
         else:
-            return output_image, Modal(visible=False), True
+            return output_image, Modal(visible=False)
         
 def unhide_faces(img, ori_img): # is_blurred
     if img is None:
-        return None, False
+        return None
     elif np.array_equal(img, ori_img.value):
         return img # is_blurred
     else:
-        return ori_img.value, False
+        return ori_img.value
     
 def check_exclude_fn(image):
     if image is None:

ui/layout.py

@@ -10,6 +10,25 @@ from functools import partial
 from .selection_page import build_selection_page
 from .main_page import build_main_page
 
+def get_key_by_value(dictionary, value):
+    for key, val in dictionary.items():
+        if val == value:
+            return key
+    return None
+
+def load_concepts(category, concept_btn, local_storage, loading_example, concepts):
+    country, lang, _, _ = local_storage
+    if category:
+        if lang in words_mapping:
+            category = get_key_by_value(words_mapping[lang], category) # translate back the category name
+        concept_val = None
+        # I'm doing this to avoid the case where the user load a previous example and the concept 'reamins' selected even if category changed
+        if loading_example:
+            concept_val = concept_btn if concept_btn else None
+        return gr.update(choices=sorted(concepts[country][lang2eng_mapping.get(lang, lang)][category]), value=concept_val), False
+    else:
+        return gr.update(choices=[], value=None), False
+
 def switch_ui(country, language, username, password, flag=False, metadata_dict=None):
     print(f"Language: {language}, Country: {country}")
 
@@ -37,7 +56,8 @@ def build_ui(concepts_dict, metadata_dict, HF_API_TOKEN, HF_DATASET_NAME):
         }
     """
     with gr.Blocks(css=custom_css) as ui:
-        local_storage = gr.BrowserState([None, None, "", ""])
+        local_storage = gr.State([None, None, "", ""])
+        loading_example = gr.State(False) # to check if the values are loaded from a user click on an example in 
         # First page: selection
 
         selection_page, country_choice, language_choice, proceed_btn, username, password, intro_markdown = build_selection_page(metadata_dict)
@@ -77,6 +97,15 @@ def build_ui(concepts_dict, metadata_dict, HF_API_TOKEN, HF_DATASET_NAME):
         cancel_exclude_btn = cmp_main_ui["cancel_exclude_btn"]
         confirm_exclude_btn = cmp_main_ui["confirm_exclude_btn"]
 
+
+        ### Category button
+        category_btn.change(
+            fn=partial(load_concepts, concepts=concepts_dict),
+            inputs=[category_btn, concept_btn, local_storage, loading_example],
+            outputs=[concept_btn, loading_example]
+        )
+        ####
+
         # is_blurred = gr.State(False)  # Initialize as False
 
         # Notification image is false
@@ -186,7 +215,7 @@ def build_ui(concepts_dict, metadata_dict, HF_API_TOKEN, HF_DATASET_NAME):
                                 image_inp, image_url_inp, long_caption_inp, exampleid_btn, 
                                 category_btn, concept_btn,
                                 category_concept_dropdowns[0], category_concept_dropdowns[1], category_concept_dropdowns[2], 
-                                category_concept_dropdowns[3], category_concept_dropdowns[4]
+                                category_concept_dropdowns[3], category_concept_dropdowns[4], loading_example
                             ],
                         )
 
@@ -198,8 +227,12 @@ def build_ui(concepts_dict, metadata_dict, HF_API_TOKEN, HF_DATASET_NAME):
         # Submit Button Click events
 
         proceed_btn.click(
-            fn=partial(update_language, metadata_dict=metadata_dict, concepts_dict=concepts_dict),
+            fn=partial(switch_ui, flag=False),
             inputs=[country_choice, language_choice, username, password],
+            outputs=[local_storage, selection_page, main_ui_placeholder, browse_data_placeholder],
+        ).then(
+            fn=partial(update_language, metadata_dict=metadata_dict, concepts_dict=concepts_dict),
+            inputs=[local_storage],
             outputs=[
                 country_inp, language_inp, username_inp, password_inp, category_btn, concept_btn, image_inp, 
                 image_url_inp, long_caption_inp, intro_text_inp, intro_text_inst_inp, instruct_btn, clear_btn,
@@ -208,10 +241,6 @@ def build_ui(concepts_dict, metadata_dict, HF_API_TOKEN, HF_DATASET_NAME):
                 category_concept_dropdowns[0], category_concept_dropdowns[1], category_concept_dropdowns[2], 
                 category_concept_dropdowns[3], category_concept_dropdowns[4]
             ]
-        ).then(
-            fn=partial(switch_ui, flag=False),
-            inputs=[country_choice, language_choice, username, password],
-            outputs=[local_storage, selection_page, main_ui_placeholder, browse_data_placeholder],
         ).then(
             fn=partial(update_user_data, HF_DATASET_NAME=HF_DATASET_NAME, local_ds_directory_path = LOCAL_DS_DIRECTORY_PATH),
             inputs=[username_inp, password_inp, country_choice, language_choice],
@@ -310,11 +339,11 @@ def build_ui(concepts_dict, metadata_dict, HF_API_TOKEN, HF_DATASET_NAME):
         instruct_btn.click(lambda: Modal(visible=True), None, modal)
         # ============================================ #
 
-        # Load saved values from local storage
-        @ui.load(inputs=[local_storage], outputs=[country_choice, language_choice, username, password])
-        def load_from_local_storage(saved_values):
-            print("loading from local storage", saved_values)
-            return saved_values[0], saved_values[1], saved_values[2], saved_values[3]
+        # # Load saved values from local storage (browser storage)
+        # @ui.load(inputs=[local_storage], outputs=[country_choice, language_choice, username, password])
+        # def load_from_local_storage(saved_values):
+        #     print("loading from local storage", saved_values)
+        #     return saved_values[0], saved_values[1], saved_values[2], saved_values[3]
         
         # ============================================= #
         # Exclude button 

ui/main_page.py

@@ -5,30 +5,13 @@ from data.lang2eng_map import lang2eng_mapping
 from data.words_map import words_mapping
 import datetime
 
-
-def get_key_by_value(dictionary, value):
-    for key, val in dictionary.items():
-        if val == value:
-            return key
-    return None
-
-
-def load_concepts(category, concepts, local_storage):
-    country, lang, _, _ = local_storage.value
-    if category:
-        if lang in words_mapping:
-            category = get_key_by_value(words_mapping[lang], category) # translate back the category name
-        return gr.update(choices=sorted(concepts[country][lang2eng_mapping.get(lang, lang)][category])) # value=[]
-    else:
-        return gr.update(choices=[], value=[])
-
-
 def build_main_page(concepts_dict, metadata_dict, local_storage):
     try:
         country, lang, _, _ = local_storage.value
+        if not country and not lang:
+            country, lang = "USA", "English"
     except (TypeError, ValueError):
         country, lang = "USA", "English"
-
     with gr.Column(visible=False, elem_id="main_page") as main_ui_placeholder:
         # Read the markdown file
         with open(metadata_dict["USA"]["English"]["Task"], "r", encoding="utf-8") as f:
@@ -56,12 +39,6 @@ def build_main_page(concepts_dict, metadata_dict, local_storage):
                                               allow_custom_value=False, elem_id="category_btn", multiselect=False, value=None)
                     concept_btn = gr.Dropdown(choices=[], interactive=True, label="Main Concept", 
                                              allow_custom_value=True, elem_id="concept_btn", multiselect=False)
-
-                    category_btn.change(
-                        fn=partial(load_concepts, concepts=concepts_dict, local_storage=local_storage),
-                        inputs=category_btn,
-                        outputs=[concept_btn]
-                    )
                 
                 image_inp = gr.Image(label="Image", elem_id="image_inp", format="png", height=512, width=768)
                 with gr.Row():