feat: remove modal and push json to HF dataset

app/behavior/behavior_checkbox.py

@@ -2,11 +2,11 @@ import gradio as gr
 from utils.utils_config import get_custom_config_dropdowns
 from utils.utils_checkbox import create_checkbox
 from utils.utils_visible import set_visible
-from validation_submission.add_json import add_data_tmp
+from validation_submission.utils_individual import add_data_to_individual
 
 def on_select_behavior(behavior_checkbox, individual): 
     behavior_checkbox = [behavior.lower() for behavior in behavior_checkbox]
-    individual = add_data_tmp("wounded_dead", "behaviors_type", behavior_checkbox)
+    individual = add_data_to_individual("behaviors_type", behavior_checkbox, individual)
     return individual
 
 def retrieve_behavior_options_description():
@@ -27,5 +27,5 @@ def create_behavior_checkbox(section: str, visible):
 def show_behavior(choice, section: str, individual): 
     visible = set_visible(choice)
     checkbox, text = create_behavior_checkbox(section, visible)
-    individual = add_data_tmp("wounded_dead", "behaviors_radio", choice, individual)
+    individual = add_data_to_individual("behaviors_radio", choice, individual)
     return checkbox, text, individual

app/circumstances/circumstances.py

@@ -3,7 +3,7 @@ import os
 from dotenv import load_dotenv
 
 from utils.utils_visible import set_visible
-from validation_submission.add_json import add_data_tmp
+from validation_submission.utils_individual import add_data_to_individual
 
 load_dotenv()
 PATH = os.getcwd() + "/"
@@ -15,7 +15,7 @@ CAUSE_COL_WIDTH = "50px"
 
 def show_circumstances(choice, individual): 
     visible = set_visible(choice)
-    individual = add_data_tmp("wounded_dead", 
+    individual = add_data_to_individual("wounded_dead", 
                     "circumstance_radio", 
                     choice, individual)
     button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_circumstances(visible)

app/circumstances/circumstances_dropdowns.py

@@ -1,6 +1,6 @@
 import gradio as gr
 from utils.utils_config import get_custom_config_dropdowns
-from validation_submission.add_json import add_data_tmp
+from validation_submission.utils_individual import add_data_to_individual
 
 #--------------------------------------------------------- LEVEL 1 DROPDOWNS
 def retrieve_config_options(label, dropdown_config):
@@ -23,22 +23,22 @@ def create_dropdown_level1(label, individual):
     
 def dropdown_collision(individual):
     label = "Collision with a means of transport"
-    individual = add_data_tmp("wounded_dead", "circumstance", label.lower(), individual)
+    individual = add_data_to_individual("wounded_dead", "circumstance", label.lower(), individual)
     return create_dropdown_level1(label, individual)
 
 def dropdown_deliberate_destruction(individual):
     label = "Destruction / Deliberatly removed"
-    individual = add_data_tmp("wounded_dead", "circumstance", label.lower(), individual)
+    individual = add_data_to_individual("wounded_dead", "circumstance", label.lower(), individual)
     return create_dropdown_level1(label, individual)     
 
 def dropdown_indirect_destruction(individual): 
     label = "Indirect destruction"
-    individual = add_data_tmp("wounded_dead", "circumstance", label.lower(), individual)
+    individual = add_data_to_individual("wounded_dead", "circumstance", label.lower(), individual)
     return create_dropdown_level1(label, individual) 
 
 def dropdown_natural_cause(individual): 
     label = "Natural cause"
-    individual = add_data_tmp("wounded_dead", "circumstance", label.lower(), individual)
+    individual = add_data_to_individual("wounded_dead", "circumstance", label.lower(), individual)
     return create_dropdown_level1(label, individual)         
 
 
@@ -72,7 +72,7 @@ def get_options(value):
        
 def on_select(evt: gr.SelectData, individual):  # SelectData is a subclass of EventData
     options_label, options_dropdown, open_field, extras, extras_label = get_options(evt.value)
-    individual = add_data_tmp("wounded_dead", 
+    individual = add_data_to_individual("wounded_dead", 
                     "circumstance_type", 
                     {"type": (evt.value).lower(),
                      "option_dropdown_label" : options_label.lower() if options_label is not None else 'NA',
@@ -96,20 +96,20 @@ def on_select(evt: gr.SelectData, individual):  # SelectData is a subclass of Ev
     return dropdown_level2, openfield_level2, dropdown_extra_level2, individual
 
 def on_select_dropdown_level2(evt: gr.SelectData, individual): 
-    individual = add_data_tmp("wounded_dead", 
+    individual = add_data_to_individual("wounded_dead", 
                 "circumstance_option_dropdown", 
                 evt.value.lower(), individual)
     return individual
 
 def on_select_dropdown_extra_level2(evt: gr.SelectData, individual):  
-    individual = add_data_tmp("wounded_dead", 
+    individual = add_data_to_individual("wounded_dead", 
                  "circumstance_extra", 
                  evt.value.lower(), individual)
     return individual
     
 def on_change_openfield_level2(openfield_level2_dead, individual): 
     print("Saving open field")
-    individual = add_data_tmp("wounded_dead", 
+    individual = add_data_to_individual("wounded_dead", 
                 "circumstance_open_field", 
                 str(openfield_level2_dead).lower(), individual)
     return individual

app/classes.py

@@ -39,6 +39,7 @@ class ImageBase64(BaseModel):
 class Report(BaseModel):
     identifier: str
     image: ImageBase64
+    image_md5: str
     geolocalisation: Geolocalisation
     wounded_state: str
     wounded: Optional[Wounded] = None  

app/dead.py

@@ -3,7 +3,7 @@ from circumstances.circumstances import create_circumstances
 from physical.physical_select_animal import create_bird_anatomy
 from physical.physical_checkbox import process_body_parts
 from follow_up.followup_events import create_followup_dropdowns, create_followup_open
-from validation_submission.add_json import add_data_to_individual
+from validation_submission.utils_individual import add_data_to_individual
 
 def show_section_dead(visible, individual):
     if visible==True: 

app/display.py

@@ -1,120 +0,0 @@
-import gradio as gr
-import pandas as pd
-from gradio_modal import Modal
-from PIL import Image
-from io import BytesIO
-import base64
-
-from validation_submission.submission import validate_save_individual
-from validation_submission.get_json import get_json_all_individuals
-
-HEADERS = ["Identifier", "Location", "Wounded", "Dead"]
-
-
-def save_display_individual(gallery, df, error_box, data):
-    individual, error_box, data = validate_save_individual(data, error_box)
-    if individual:
-        all_animals = get_json_all_individuals()
-        gallery_animals = process_animals_for_gallery(all_animals)
-        gallery = make_gallery(gallery_animals)
-        df_animals = process_animals_for_df(all_animals)
-        df = make_df(df_animals)
-    return gallery, df, error_box, data
-
-# ---------------------------------- 
-# GALLERY 
-
-def convert_image(image_base64_str): 
-    im = Image.open(BytesIO(base64.b64decode(image_base64_str)))
-    return im
-
-def set_gallery_size(len_animals): 
-    if len_animals < 10: 
-        num_cols=5
-        num_rows=2
-    else: 
-        num_cols = len_animals/2
-        num_rows = len_animals/(num_cols)
-    return num_cols, num_rows
-
-def process_animals_for_gallery(all_animals): 
-    gallery_animals = []
-    for _, animal in all_animals.items(): 
-        image = convert_image(animal["image"]["image"])
-        caption = animal["identifier"]
-        animal = (image, caption)
-        gallery_animals.append(animal)
-    return gallery_animals
-
-def make_gallery(gallery_animals):
-    num_cols, num_rows = set_gallery_size(len(gallery_animals))
-    gallery = gr.Gallery(
-        label="Gallery of Records", elem_id="gallery", 
-        columns=[num_cols], rows=[num_rows],
-        value=gallery_animals,
-        object_fit="contain", height="auto", interactive=False)
-    return gallery
-
-def keep_only_values(dict_to_filter): 
-    info_text = ""
-    values_to_ignore = ["Yes", "No", "NA"]
-    if dict_to_filter:
-        for key, val in dict_to_filter.items(): 
-            if type(val) is dict: 
-                subset_text = keep_only_values(val)
-                info_text += f"{subset_text}"
-            elif type(val) is list:
-                for item in val: 
-                    if type(item) is dict: 
-                        subset_text = keep_only_values(item)
-                        info_text += f"{subset_text}"
-            elif (val is not None) and (type(val) is not bool) and (val not in values_to_ignore): 
-                info_text += f" {key} : {val} |"
-            else:
-                print("Ignoring value: ", val)
-                print("Associated key: ", key)
-    else: 
-        info_text = "NaN"
-    return info_text
-
-# ---------------------------------- 
-# DATAFRAME 
-
-def process_animals_for_df(all_animals):
-    df_animals = {}
-    identifiers =[]
-    geo =[]
-    wounded =[]
-    dead =[]
-    for _, animal in all_animals.items(): 
-        identifier_value = animal["identifier"]
-        identifiers.append(identifier_value)
-        geo_dict = animal["geolocalisation"]
-        geo_values = keep_only_values(geo_dict)
-        geo.append(geo_values)
-        wounded_dict = animal["wounded"]
-        wounded_values = keep_only_values(wounded_dict)
-        wounded.append(wounded_values)
-        dead_dict = animal["dead"]
-        dead_values = keep_only_values(dead_dict)
-        dead.append(dead_values)
-    df_animals["Identifier"] = identifiers
-    df_animals["Location"] = geo
-    df_animals["Wounded"] = wounded
-    df_animals["Dead"] = dead
-    return df_animals
-
-
-def make_df(df_animals):
-    df = pd.DataFrame.from_dict(df_animals)
-    styled_df = df.style.set_properties(**{
-    'min-width': '25px',
-    'max-width': '50px',  # Adjust width as needed
-    'white-space': 'normal',  # Allows text to wrap to the next line
-    'word-wrap': 'break-word'  # Breaks long words to fit within the width
-    })
-    df_gradio = gr.DataFrame(visible=True,
-                         value=styled_df,
-                         headers=HEADERS, interactive=False)
-    return df_gradio
-

app/follow_up/followup_events.py

@@ -1,6 +1,6 @@
 import gradio as gr
 from utils.utils_config import get_custom_config_dropdowns
-from validation_submission.add_json import add_data_tmp
+from validation_submission.utils_individual import add_data_to_individual
 
 def create_followup_dropdowns(visible, elem_id): 
     followup_config = get_custom_config_dropdowns("config_followup.json")
@@ -40,7 +40,7 @@ def create_fe_answer_dropdown(followup_config, visible, elem_id):
     return fe_answer_dropdown
 
 def save_fe(value, key, individual): 
-    individual = add_data_tmp("wounded_dead", "followup " + key.lower(), value.lower())
+    individual = add_data_to_individual("wounded_dead", "followup " + key.lower(), value.lower())
     return individual
 
 

app/geolocalisation/maps.py

@@ -1,6 +1,6 @@
 from geopy.geocoders import Nominatim
 import gradio as gr
-from validation_submission.add_json import add_data_to_individual
+from validation_submission.utils_individual import add_data_to_individual
 from geolocalisation.class_geolocalisation import Geolocalisation
 
 

app/main.py

@@ -1,10 +1,8 @@
 import gradio as gr
 from gradio_modal import Modal
 
-from validation_submission.create_json import create_json_all_individuals, create_json_one_individual, create_tmp, reset_json
-from validation_submission.add_json import add_data_to_individual
+from validation_submission.utils_individual import add_data_to_individual
 from validation_submission.validation import reset_error_box
-from display import save_display_individual
 from geolocalisation.maps import get_location
 from functools import partial
 from dead import show_section_dead
@@ -19,6 +17,7 @@ from styling.style import *
 from styling.theme import css
 
 from geolocalisation.js_geolocation import js_geocode, display_location
+from validation_submission.utils_individual import generate_random_md5
 
 from datasets import disable_caching
 disable_caching()
@@ -29,147 +28,183 @@ data_files = "data/train-00000-of-00001.parquet"
 # with gr.Blocks(theme=theme, css=css) as demo:
 with gr.Blocks(theme='shivi/calm_seafoam') as demo:
     individual = gr.State({})
+    individual.value = add_data_to_individual("image_md5", generate_random_md5(), individual.value)
 
-#with gr.Blocks() as demo:
-    create_json_all_individuals()
     # ---------------------------------------------------------
     # Intro Text
     with gr.Row():
         with gr.Column(scale=1):
             title = gr.Markdown("# Welcome to Digiwild", label="Title")
             description = gr.Markdown("Please record your wildlife observations here !", label="description")
-    with gr.Row(): 
-        show_modal = gr.Button("Add an Animal", scale=3)
-        submit_button = gr.Button("Submit All Animals", scale=1)
-    df = gr.Dataframe(headers=["Identifier", "Location", "Wounded", "Dead"], visible=False, interactive=False)
-    gallery = gr.Gallery(
-        label="Gallery of Records", elem_id="gallery", 
-        columns=[1], rows=[1],
-        object_fit="contain", height="auto", interactive=False)
 
-    with Modal(visible=False) as modal:
-        # ---------------------------------------------------------
-        # Intro Text
-        with gr.Row():
-            with gr.Column(scale=1):
-                title = gr.Markdown("# Animal Report", label="Title")
-                description = gr.Markdown("Please record your observation here.", label="description")
+    # ---------------------------------------------------------
+    # Intro Text
+    with gr.Row():
+        with gr.Column(scale=1):
+            title = gr.Markdown("# Animal Report", label="Title")
+            description = gr.Markdown("Please record your observation here.", label="description")
 
-        # ---------------------------------------------------------
-        # Camera
-        with gr.Row():
-            def save_image(camera, individual):
-                individual = add_data_to_individual("image", camera.tolist(), individual)
-                return individual
+    # ---------------------------------------------------------
+    # Camera
+    with gr.Row():
+        def save_image(camera, individual):
+            individual = add_data_to_individual("image", camera.tolist(), individual)
+            return individual
 
-            camera = gr.Image(elem_id="image")
-            camera.input(save_image, inputs=[camera, individual], outputs=[individual])
-        # ---------------------------------------------------------
-        # Location
-        #with gr.Row():
-            with gr.Column(scale=1):
-                gr.Markdown("### Location")
-                gr.Markdown("#### Location (Using address)")
-                location = gr.Textbox(visible=True, interactive=True, label="Location of Sighting")
-                #display location processing
-                identified_location= gr.Textbox(visible=False, interactive=False, 
-                                                label="Identified GPS Location")
-                with gr.Row():
-                    #to submit it
-                    submit_location = gr.Button("Get Coordinates using address", 
-                                                visible=True, interactive=True, scale=3)
-                    submit_location.click(get_location, inputs=[location, individual], outputs=[identified_location, individual])
-                    #to clear it
-                    clear_location = gr.ClearButton(components=[location, identified_location], 
-                                                    visible=True, interactive=True, scale=1
-                                                    )
-                    clear_location.click()
+        camera = gr.Image(elem_id="image")
+        camera.input(save_image, inputs=[camera, individual], outputs=[individual])
+    # ---------------------------------------------------------
+    # Location
+    #with gr.Row():
+        with gr.Column(scale=1):
+            gr.Markdown("### Location")
+            gr.Markdown("#### Location (Using address)")
+            location = gr.Textbox(visible=True, interactive=True, label="Location of Sighting")
+            #display location processing
+            identified_location= gr.Textbox(visible=False, interactive=False, 
+                                            label="Identified GPS Location")
+            with gr.Row():
+                #to submit it
+                submit_location = gr.Button("Get Coordinates using address", 
+                                            visible=True, interactive=True, scale=3)
+                submit_location.click(get_location, inputs=[location, individual], outputs=[identified_location, individual])
+                #to clear it
+                clear_location = gr.ClearButton(components=[location, identified_location], 
+                                                visible=True, interactive=True, scale=1
+                                                )
+                clear_location.click()
 
-                # Geolocation
-                gr.Markdown("#### Location (Using GPS)")
-                location_data = gr.JSON(label="Identified GPS Location")
-                hidden_input = gr.Textbox(visible=False, elem_id="textbox_id")
-                btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required)")
-                btn_gpslocation.click(None, [], [], js=js_geocode)
-                hidden_input.change(display_location, inputs=hidden_input, outputs=location_data)
+            # Geolocation
+            gr.Markdown("#### Location (Using GPS)")
+            location_data = gr.JSON(label="Identified GPS Location")
+            hidden_input = gr.Textbox(visible=False, elem_id="textbox_id")
+            btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required)")
+            btn_gpslocation.click(None, [], [], js=js_geocode)
+            hidden_input.change(display_location, inputs=hidden_input, outputs=location_data)
 
-                
-                # Introducing text_box for Species
-                gr.Markdown("### General details")
-                with gr.Row():
-                    specie = gr.Textbox(
-                        label="Species (if known)",
-                        placeholder="e.g. European Robin, Common Blackbird",
-                        info="Enter the species name if you can identify it. If unsure, provide your best guess or general description (e.g. 'small brown bird')",
-                        visible=True,
-                        interactive=True
-                    )
+            
+            # Introducing text_box for Species
+            gr.Markdown("### General details")
+            with gr.Row():
+                specie = gr.Textbox(
+                    label="Species (if known)",
+                    placeholder="e.g. European Robin, Common Blackbird",
+                    info="Enter the species name if you can identify it. If unsure, provide your best guess or general description (e.g. 'small brown bird')",
+                    visible=True,
+                    interactive=True
+                )
 
-                # Number of individuals
-                with gr.Row():
-                    num_individuals = gr.Number(
-                        label="Number of Individuals",
-                        value=1,  # Default value
-                        minimum=1,
-                        precision=0,  # Only whole numbers
-                        info="Enter the number of animals observed",
-                        #placeholder="Enter number...",
-                        visible=True,
-                        interactive=True
-                    )
+            # Number of individuals
+            with gr.Row():
+                num_individuals = gr.Number(
+                    label="Number of Individuals",
+                    value=1,  # Default value
+                    minimum=1,
+                    precision=0,  # Only whole numbers
+                    info="Enter the number of animals observed",
+                    #placeholder="Enter number...",
+                    visible=True,
+                    interactive=True
+                )
 
-                # Introducing text_box for comments 
-                with gr.Row():
-                    comments = gr.TextArea(
-                        label="Additional Comments",
-                        placeholder="Enter any additional observations or notes about the sighting...",
-                        info="Optional: Add any relevant details about the animal(s) or circumstances",
-                        lines=3,
-                        max_lines=5,
-                        visible=True,
-                        interactive=True
-                    )
+            # Introducing text_box for comments 
+            with gr.Row():
+                comments = gr.TextArea(
+                    label="Additional Comments",
+                    placeholder="Enter any additional observations or notes about the sighting...",
+                    info="Optional: Add any relevant details about the animal(s) or circumstances",
+                    lines=3,
+                    max_lines=5,
+                    visible=True,
+                    interactive=True
+                )
 
         
+    # ---------------------------------------------------------
         # ---------------------------------------------------------
-         # ---------------------------------------------------------
-        # Dead and Wounded Buttons
-        gr.Markdown("## The State of the Animal", label="Title")
-        gr.Markdown("Please tell us if the animal was wounded / sick or dead.", label="description")
-        with gr.Row() as block_form:
-            with gr.Column(scale=1):
-                butt_wounded = gr.Button("Wounded / Sick", elem_id="wounded")
-            with gr.Column(scale=1):
-                butt_dead = gr.Button("Dead", elem_id="dead")
+    # Dead and Wounded Buttons
+    gr.Markdown("## The State of the Animal", label="Title")
+    gr.Markdown("Please tell us if the animal was wounded / sick or dead.", label="description")
+    with gr.Row() as block_form:
+        with gr.Column(scale=1):
+            butt_wounded = gr.Button("Wounded / Sick", elem_id="wounded")
+        with gr.Column(scale=1):
+            butt_dead = gr.Button("Dead", elem_id="dead")
 
-        # ---------------------------------------------------------
-        # Initiate sections
-        section_dead, individual, radio_circumstance_dead, radio_physical_dead,\
-            button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, \
-                dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, \
-                    physical_boxes_dead, \
-                    checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead, \
-                    fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
-                    fe_name_recipient_dead, fe_collection_ref_dead \
-                    = show_section_dead(False, individual)
-        
-        section_wounded, individual, radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded, \
-            button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, \
-                dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, \
-                    behavior_checkbox, behavior_text, \
-                        physical_boxes_wounded, \
+    # ---------------------------------------------------------
+    # Initiate sections
+    section_dead, individual, radio_circumstance_dead, radio_physical_dead,\
+        button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, \
+            dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, \
+                physical_boxes_dead, \
+                checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead, \
+                fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
+                fe_name_recipient_dead, fe_collection_ref_dead \
+                = show_section_dead(False, individual)
+    
+    section_wounded, individual, radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded, \
+        button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, \
+            dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, \
+                behavior_checkbox, behavior_text, \
+                    physical_boxes_wounded, \
+                        checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded, \
+                        fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
+                            fe_name_recipient_wounded, fe_collection_ref_wounded \
+                            = show_section_wounded(False, individual)
+
+    # ---------------------------------------------------------
+    # ---------------------------------------------------------
+    # ---------------------------------------------------------
+    # Dead Button Logic
+    partial_show_section_dead = partial(show_section_dead, True)
+    partial_hide_section_wounded = partial(show_section_wounded, False)
+    butt_dead.click(partial_show_section_dead, 
+                    inputs=[individual], 
+                    outputs=[section_dead, 
+                            individual,
+                            radio_circumstance_dead, radio_physical_dead,
+                            button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
+                            dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, \
+                            physical_boxes_dead, \
+                            checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead, \
+                            fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
+                            fe_name_recipient_dead, fe_collection_ref_dead \
+                            ])
+    
+    butt_dead.click(partial_hide_section_wounded, 
+                    inputs=[individual], 
+                    outputs=[section_wounded, 
+                            individual,
+                            radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
+                            button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
+                            dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
+                            behavior_checkbox, behavior_text, 
+                            physical_boxes_wounded, \
                             checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded, \
                             fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
-                                fe_name_recipient_wounded, fe_collection_ref_wounded \
-                                = show_section_wounded(False, individual)
+                            fe_name_recipient_wounded, fe_collection_ref_wounded \
+                            ])
     
-        # ---------------------------------------------------------
-        # ---------------------------------------------------------
-        # ---------------------------------------------------------
-        # Dead Button Logic
-        partial_show_section_dead = partial(show_section_dead, True)
-        partial_hide_section_wounded = partial(show_section_wounded, False)
-        butt_dead.click(partial_show_section_dead, 
+    # ---------------------------------------------------------
+    # Wounded Button Logic
+    partial_show_section_wounded = partial(show_section_wounded, True)
+    partial_hide_section_dead = partial(show_section_dead, False)
+
+    butt_wounded.click(partial_show_section_wounded, 
+                    inputs=[individual], 
+                    outputs=[section_wounded, 
+                            individual,
+                            radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
+                            button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
+                            dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
+                            behavior_checkbox, behavior_text, 
+                            physical_boxes_wounded, \
+                            checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded, \
+                            fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
+                            fe_name_recipient_wounded, fe_collection_ref_wounded \
+                            ])
+    
+    butt_wounded.click(partial_hide_section_dead, 
                         inputs=[individual], 
                         outputs=[section_dead, 
                                 individual,
@@ -181,229 +216,169 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
                                 fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
                                 fe_name_recipient_dead, fe_collection_ref_dead \
                                 ])
-        
-        butt_dead.click(partial_hide_section_wounded, 
-                        inputs=[individual], 
-                        outputs=[section_wounded, 
-                                individual,
-                                radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
-                                button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
-                                dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
-                                behavior_checkbox, behavior_text, 
-                                physical_boxes_wounded, \
-                                checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded, \
-                                fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
-                                fe_name_recipient_wounded, fe_collection_ref_wounded \
-                                ])
-        
-        # ---------------------------------------------------------
-        # Wounded Button Logic
-        partial_show_section_wounded = partial(show_section_wounded, True)
-        partial_hide_section_dead = partial(show_section_dead, False)
+    
+    # ---------------------------------------------------------
+    # ---------------------------------------------------------
+    # ---------------------------------------------------------
+    # ---------------------------------------------------------
+    # DEAD
+    # ---------------------------------------------------------
+    # Radio Circumstance Dead
+    radio_circumstance_dead.change(fn=show_circumstances,
+                            inputs=[radio_circumstance_dead, individual],
+                            outputs=[button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
+                                        dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual]
+                            )
+    
+    # Dropdowns Dead
+    button_collision_dead.click(dropdown_collision,
+                                inputs=[individual],
+                                outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+    button_deliberate_destruction_dead.click(dropdown_deliberate_destruction, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+    button_indirect_destruction_dead.click(dropdown_indirect_destruction, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+    button_natural_cause_dead.click(dropdown_natural_cause, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
 
-        butt_wounded.click(partial_show_section_wounded, 
-                        inputs=[individual], 
-                        outputs=[section_wounded, 
-                                individual,
-                                radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
-                                button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
-                                dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
-                                behavior_checkbox, behavior_text, 
-                                physical_boxes_wounded, \
-                                checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded, \
-                                fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
-                                fe_name_recipient_wounded, fe_collection_ref_wounded \
-                                ])
-        
-        butt_wounded.click(partial_hide_section_dead, 
-                           inputs=[individual], 
-                           outputs=[section_dead, 
-                                    individual,
-                                    radio_circumstance_dead, radio_physical_dead,
-                                    button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
-                                    dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, \
-                                    physical_boxes_dead, \
-                                    checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead, \
-                                    fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
-                                    fe_name_recipient_dead, fe_collection_ref_dead \
-                                    ])
-        
-        # ---------------------------------------------------------
-        # ---------------------------------------------------------
-        # ---------------------------------------------------------
-        # ---------------------------------------------------------
-        # DEAD
-        # ---------------------------------------------------------
-        # Radio Circumstance Dead
-        radio_circumstance_dead.change(fn=show_circumstances,
-                                inputs=[radio_circumstance_dead, individual],
-                                outputs=[button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
-                                            dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual]
-                                )
-        
-        # Dropdowns Dead
-        button_collision_dead.click(dropdown_collision,
-                                    inputs=[individual],
-                                    outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
-        button_deliberate_destruction_dead.click(dropdown_deliberate_destruction, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
-        button_indirect_destruction_dead.click(dropdown_indirect_destruction, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
-        button_natural_cause_dead.click(dropdown_natural_cause, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+    dropdown_dead.select(on_select, inputs=[individual], outputs=[dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+    dropdown_level2_dead.select(on_select_dropdown_level2, inputs=[individual], outputs=[individual] )
+    openfield_level2_dead.change(on_change_openfield_level2, inputs=[openfield_level2_dead, individual], outputs=[individual])
+    dropdown_extra_level2_dead.select(on_select_dropdown_extra_level2, inputs=[individual], outputs=[individual])
+    # ---------------------------------------------------------
+    # Radio Physical Dead
+    radio_physical_dead.change(fn=show_physical,
+                                inputs=[radio_physical_dead, gr.Text("dead", visible=False), individual],
+                                outputs=[physical_boxes_dead, individual])
 
-        dropdown_dead.select(on_select, inputs=[individual], outputs=[dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
-        dropdown_level2_dead.select(on_select_dropdown_level2, inputs=[individual], outputs=[individual] )
-        openfield_level2_dead.change(on_change_openfield_level2, inputs=[openfield_level2_dead, individual], outputs=[individual])
-        dropdown_extra_level2_dead.select(on_select_dropdown_extra_level2, inputs=[individual], outputs=[individual])
-        # ---------------------------------------------------------
-        # Radio Physical Dead
-        radio_physical_dead.change(fn=show_physical,
-                                    inputs=[radio_physical_dead, gr.Text("dead", visible=False), individual],
-                                    outputs=[physical_boxes_dead, individual])
+    # Checkbox Physical Dead
+    physical_boxes_dead.select(find_bounding_box, 
+                    inputs=[physical_boxes_dead, gr.Textbox(value="dead", visible=False)], 
+                    outputs=[checkbox_beak_dead, text_beak_dead, 
+                                checkbox_body_dead, text_body_dead, 
+                                checkbox_feathers_dead, text_feathers_dead, 
+                                checkbox_head_dead, text_head_dead, 
+                                checkbox_legs_dead, text_legs_dead
+                                ])
+    checkbox_beak_dead.select(on_select_body_part, inputs=[checkbox_beak_dead, gr.Text("beak", visible=False), individual], outputs=[individual])
+    checkbox_body_dead.select(on_select_body_part, inputs=[checkbox_body_dead, gr.Text("body", visible=False), individual], outputs=[individual])
+    checkbox_feathers_dead.select(on_select_body_part, inputs=[checkbox_feathers_dead, gr.Text("feathers", visible=False), individual], outputs=[individual])
+    checkbox_head_dead.select(on_select_body_part, inputs=[checkbox_head_dead, gr.Text("head", visible=False), individual], outputs=[individual])
+    checkbox_legs_dead.select(on_select_body_part, inputs=[checkbox_legs_dead, gr.Text("legs", visible=False), individual], outputs=[individual])
+    # ---------------------------------------------------------
+    # ---------------------------------------------------------
+    # ---------------------------------------------------------
+    # ---------------------------------------------------------
+    # WOUNDED
+    # ---------------------------------------------------------
+    # Radio Circumstance Wounded
+    radio_circumstance_wounded.change(fn=show_circumstances,
+                            inputs=[radio_circumstance_wounded, individual],
+                            outputs=[button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
+                                        dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual]
+                            )
+    
+    # Dropdowns Circumstance Wounded
+    button_collision_wounded.click(dropdown_collision,
+                                inputs=[individual],  
+                                outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+    button_deliberate_destruction_wounded.click(dropdown_deliberate_destruction, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+    button_indirect_destruction_wounded.click(dropdown_indirect_destruction, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+    button_natural_cause_wounded.click(dropdown_natural_cause, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+    
+    dropdown_wounded.select(on_select, inputs=[individual], outputs=[dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+    dropdown_level2_wounded.select(on_select_dropdown_level2, inputs=[individual], outputs=[individual])
+    openfield_level2_wounded.change(on_change_openfield_level2, inputs=[openfield_level2_wounded, individual])
+    dropdown_extra_level2_wounded.select(on_select_dropdown_extra_level2, inputs=[individual], outputs=[individual])
+    # ---------------------------------------------------------
+    # Radio Behavior Wounded
+    radio_behavior_wounded.change(fn=show_behavior,
+                                inputs=[radio_behavior_wounded, gr.Text("wounded / sick", visible=False), individual],
+                                outputs=[behavior_checkbox, behavior_text, individual])
+    behavior_checkbox.select(on_select_behavior, 
+                                inputs=[behavior_checkbox, individual],
+                                outputs=[individual])
+    # ---------------------------------------------------------
+    # Radio Physical Wounded
+    radio_physical_wounded.change(fn=show_physical,
+                                inputs=[radio_physical_wounded, gr.Text("wounded / sick", visible=False), individual],
+                                outputs=[physical_boxes_wounded, individual])
 
-        # Checkbox Physical Dead
-        physical_boxes_dead.select(find_bounding_box, 
-                        inputs=[physical_boxes_dead, gr.Textbox(value="dead", visible=False)], 
-                        outputs=[checkbox_beak_dead, text_beak_dead, 
-                                 checkbox_body_dead, text_body_dead, 
-                                 checkbox_feathers_dead, text_feathers_dead, 
-                                 checkbox_head_dead, text_head_dead, 
-                                 checkbox_legs_dead, text_legs_dead
-                                    ])
-        checkbox_beak_dead.select(on_select_body_part, inputs=[checkbox_beak_dead, gr.Text("beak", visible=False), individual], outputs=[individual])
-        checkbox_body_dead.select(on_select_body_part, inputs=[checkbox_body_dead, gr.Text("body", visible=False), individual], outputs=[individual])
-        checkbox_feathers_dead.select(on_select_body_part, inputs=[checkbox_feathers_dead, gr.Text("feathers", visible=False), individual], outputs=[individual])
-        checkbox_head_dead.select(on_select_body_part, inputs=[checkbox_head_dead, gr.Text("head", visible=False), individual], outputs=[individual])
-        checkbox_legs_dead.select(on_select_body_part, inputs=[checkbox_legs_dead, gr.Text("legs", visible=False), individual], outputs=[individual])
-        # ---------------------------------------------------------
-        # ---------------------------------------------------------
-        # ---------------------------------------------------------
-        # ---------------------------------------------------------
-        # WOUNDED
-        # ---------------------------------------------------------
-        # Radio Circumstance Wounded
-        radio_circumstance_wounded.change(fn=show_circumstances,
-                                inputs=[radio_circumstance_wounded, individual],
-                                outputs=[button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
-                                            dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual]
-                                )
-        
-        # Dropdowns Circumstance Wounded
-        button_collision_wounded.click(dropdown_collision,
-                                    inputs=[individual],  
-                                    outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
-        button_deliberate_destruction_wounded.click(dropdown_deliberate_destruction, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
-        button_indirect_destruction_wounded.click(dropdown_indirect_destruction, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
-        button_natural_cause_wounded.click(dropdown_natural_cause, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
-        
-        dropdown_wounded.select(on_select, inputs=[individual], outputs=[dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
-        dropdown_level2_wounded.select(on_select_dropdown_level2, inputs=[individual], outputs=[individual])
-        openfield_level2_wounded.change(on_change_openfield_level2, inputs=[openfield_level2_wounded, individual])
-        dropdown_extra_level2_wounded.select(on_select_dropdown_extra_level2, inputs=[individual], outputs=[individual])
-        # ---------------------------------------------------------
-        # Radio Behavior Wounded
-        radio_behavior_wounded.change(fn=show_behavior,
-                                    inputs=[radio_behavior_wounded, gr.Text("wounded / sick", visible=False), individual],
-                                    outputs=[behavior_checkbox, behavior_text, individual])
-        behavior_checkbox.select(on_select_behavior, 
-                                 inputs=[behavior_checkbox, individual],
-                                 outputs=[individual])
-        # ---------------------------------------------------------
-        # Radio Physical Wounded
-        radio_physical_wounded.change(fn=show_physical,
-                                    inputs=[radio_physical_wounded, gr.Text("wounded / sick", visible=False), individual],
-                                    outputs=[physical_boxes_wounded, individual])
+    # Checkbox Physical Wounded
+    physical_boxes_wounded.select(find_bounding_box, 
+                    inputs=[physical_boxes_wounded, gr.Textbox(value="wounded / sick", visible=False)], 
+                    outputs=[checkbox_beak_wounded, text_beak_wounded, 
+                                checkbox_body_wounded, text_body_wounded, 
+                                checkbox_feathers_wounded, text_feathers_wounded, 
+                                checkbox_head_wounded, text_head_wounded, 
+                                checkbox_legs_wounded, text_legs_wounded
+                                ])
+    checkbox_beak_wounded.select(on_select_body_part, inputs=[checkbox_beak_wounded, gr.Text("beak", visible=False), individual], outputs=[individual])
+    checkbox_body_wounded.select(on_select_body_part, inputs=[checkbox_body_wounded, gr.Text("body", visible=False), individual], outputs=[individual])
+    checkbox_feathers_wounded.select(on_select_body_part, inputs=[checkbox_feathers_wounded, gr.Text("feathers", visible=False), individual], outputs=[individual])
+    checkbox_head_wounded.select(on_select_body_part, inputs=[checkbox_head_wounded, gr.Text("head", visible=False), individual], outputs=[individual])
+    checkbox_legs_wounded.select(on_select_body_part, inputs=[checkbox_legs_wounded, gr.Text("legs", visible=False), individual], outputs=[individual])
+    
+    # ---------------------------------------------------------
+    # Follow Up Events Wounded 
+    fe_collection_dropdown_wounded.select(save_fe, inputs=[fe_collection_dropdown_wounded, gr.Textbox("animal collected", visible=False), individual], outputs=[individual])
+    fe_recepient_dropdown_wounded.select(save_fe, inputs=[fe_recepient_dropdown_wounded, gr.Textbox("recipient", visible=False), individual],outputs=[individual])
+    fe_radio_dropdown_wounded.select(save_fe, inputs=[fe_radio_dropdown_wounded, gr.Textbox("radiography", visible=False), individual],outputs=[individual]) 
+    fe_answer_dropdown_wounded.select(save_fe, inputs=[fe_answer_dropdown_wounded, gr.Textbox("given answer", visible=False), individual],outputs=[individual])
+    fe_name_recipient_wounded.input(save_fe, inputs=[fe_name_recipient_wounded, gr.Textbox("recipient name", visible=False), individual],outputs=[individual])
+    fe_collection_ref_wounded.input(save_fe, inputs=[fe_collection_ref_wounded, gr.Textbox("collection reference", visible=False), individual],outputs=[individual])
 
-        # Checkbox Physical Wounded
-        physical_boxes_wounded.select(find_bounding_box, 
-                        inputs=[physical_boxes_wounded, gr.Textbox(value="wounded / sick", visible=False)], 
-                        outputs=[checkbox_beak_wounded, text_beak_wounded, 
-                                 checkbox_body_wounded, text_body_wounded, 
-                                 checkbox_feathers_wounded, text_feathers_wounded, 
-                                 checkbox_head_wounded, text_head_wounded, 
-                                 checkbox_legs_wounded, text_legs_wounded
-                                    ])
-        checkbox_beak_wounded.select(on_select_body_part, inputs=[checkbox_beak_wounded, gr.Text("beak", visible=False), individual], outputs=[individual])
-        checkbox_body_wounded.select(on_select_body_part, inputs=[checkbox_body_wounded, gr.Text("body", visible=False), individual], outputs=[individual])
-        checkbox_feathers_wounded.select(on_select_body_part, inputs=[checkbox_feathers_wounded, gr.Text("feathers", visible=False), individual], outputs=[individual])
-        checkbox_head_wounded.select(on_select_body_part, inputs=[checkbox_head_wounded, gr.Text("head", visible=False), individual], outputs=[individual])
-        checkbox_legs_wounded.select(on_select_body_part, inputs=[checkbox_legs_wounded, gr.Text("legs", visible=False), individual], outputs=[individual])
-        
-        # ---------------------------------------------------------
-        # Follow Up Events Wounded 
-        fe_collection_dropdown_wounded.select(save_fe, inputs=[fe_collection_dropdown_wounded, gr.Textbox("animal collected", visible=False), individual], outputs=[individual])
-        fe_recepient_dropdown_wounded.select(save_fe, inputs=[fe_recepient_dropdown_wounded, gr.Textbox("recipient", visible=False), individual],outputs=[individual])
-        fe_radio_dropdown_wounded.select(save_fe, inputs=[fe_radio_dropdown_wounded, gr.Textbox("radiography", visible=False), individual],outputs=[individual]) 
-        fe_answer_dropdown_wounded.select(save_fe, inputs=[fe_answer_dropdown_wounded, gr.Textbox("given answer", visible=False), individual],outputs=[individual])
-        fe_name_recipient_wounded.input(save_fe, inputs=[fe_name_recipient_wounded, gr.Textbox("recipient name", visible=False), individual],outputs=[individual])
-        fe_collection_ref_wounded.input(save_fe, inputs=[fe_collection_ref_wounded, gr.Textbox("collection reference", visible=False), individual],outputs=[individual])
+    # ---------------------------------------------------------
+    # Follow Up Events Dead 
+    fe_collection_dropdown_dead.select(save_fe, inputs=[fe_collection_dropdown_dead, gr.Textbox("animal collected", visible=False), individual],outputs=[individual])
+    fe_recepient_dropdown_dead.select(save_fe, inputs=[fe_recepient_dropdown_dead, gr.Textbox("recipient", visible=False), individual],outputs=[individual])
+    fe_radio_dropdown_dead.select(save_fe, inputs=[fe_radio_dropdown_dead, gr.Textbox("radiography", visible=False), individual],outputs=[individual]) 
+    fe_answer_dropdown_dead.select(save_fe, inputs=[fe_answer_dropdown_dead, gr.Textbox("given answer", visible=False), individual],outputs=[individual])
+    fe_name_recipient_dead.input(save_fe, inputs=[fe_name_recipient_dead, gr.Textbox("recipient name", visible=False), individual],outputs=[individual])
+    fe_collection_ref_dead.input(save_fe, inputs=[fe_collection_ref_dead, gr.Textbox("collection reference", visible=False), individual], outputs=[individual])
 
-        # ---------------------------------------------------------
-        # Follow Up Events Dead 
-        fe_collection_dropdown_dead.select(save_fe, inputs=[fe_collection_dropdown_dead, gr.Textbox("animal collected", visible=False), individual],outputs=[individual])
-        fe_recepient_dropdown_dead.select(save_fe, inputs=[fe_recepient_dropdown_dead, gr.Textbox("recipient", visible=False), individual],outputs=[individual])
-        fe_radio_dropdown_dead.select(save_fe, inputs=[fe_radio_dropdown_dead, gr.Textbox("radiography", visible=False), individual],outputs=[individual]) 
-        fe_answer_dropdown_dead.select(save_fe, inputs=[fe_answer_dropdown_dead, gr.Textbox("given answer", visible=False), individual],outputs=[individual])
-        fe_name_recipient_dead.input(save_fe, inputs=[fe_name_recipient_dead, gr.Textbox("recipient name", visible=False), individual],outputs=[individual])
-        fe_collection_ref_dead.input(save_fe, inputs=[fe_collection_ref_dead, gr.Textbox("collection reference", visible=False), individual], outputs=[individual])
+    # ---------------------------------------------------------
+    # Error Box
+    error_box = gr.Text(value=None, visible=False)
 
-        # ---------------------------------------------------------
-        # Error Box
-        error_box = gr.Text(value=None, visible=False)
+    # ---------------------------------------------------------
+    # Allow clearing of all previous output
+    with gr.Row(): 
+        button_df = gr.Button("Submit Animal Report", scale = 3)
+        button_clear = gr.ClearButton(scale = 1, 
+                                        components=[
+            camera,
+            location, identified_location, 
+            #dead reset
+            radio_circumstance_dead, radio_physical_dead,
+            button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
+            dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead,
+            physical_boxes_dead,
+            checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead, 
+            fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, 
+            fe_name_recipient_dead, fe_collection_ref_dead,
+            #wounded reset
+            radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
+            button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
+            dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
+            behavior_checkbox, behavior_text, 
+            physical_boxes_wounded, 
+            checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded,
+            fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, 
+            fe_name_recipient_wounded, fe_collection_ref_wounded,
+            error_box
+            ])
 
-        # ---------------------------------------------------------
-        # Add One Individual's Data to the Dataframe
-        # And Allow clearing of all previous output
-        with gr.Row(): 
-            button_df = gr.Button("Submit Animal Report", scale = 3)
-            button_clear = gr.ClearButton(scale = 1, 
-                                          components=[
-                camera,
-                location, identified_location, 
-                #dead reset
-                radio_circumstance_dead, radio_physical_dead,
-                button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
-                dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead,
-                physical_boxes_dead,
-                checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead, 
-                fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, 
-                fe_name_recipient_dead, fe_collection_ref_dead,
-                #wounded reset
-                radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
-                button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
-                dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
-                behavior_checkbox, behavior_text, 
-                physical_boxes_wounded, 
-                checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded,
-                fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, 
-                fe_name_recipient_wounded, fe_collection_ref_wounded,
-                error_box
-                ])
-            button_close = gr.Button("Back to Display", scale = 1)
+    # ---------------------------------------------------------
+    # Button Click Logic
+    button_clear.click()
+    button_clear.click(hide_physical,
+                        outputs=[checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded])
+    button_clear.click(hide_physical,
+                        outputs=[checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead])
             
-
-        # ---------------------------------------------------------
-        # Button Click Logic
-        button_clear.click()
-        button_clear.click(hide_physical,
-                           outputs=[checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded])
-        button_clear.click(hide_physical,
-                           outputs=[checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead])
-                
-        button_clear.click(reset_error_box, inputs=[error_box], outputs=[error_box])
-        button_clear.click(reset_json)
-
-        button_df.click(save_display_individual, 
-                        inputs=[gallery, df, error_box, individual],
-                        outputs=[gallery, df, error_box, individual]
-                        )
-        button_close.click(lambda: Modal(visible=False), None, modal)
+    button_clear.click(reset_error_box, inputs=[error_box], outputs=[error_box])
     
-    # ---------------------------------------------------------
-    # Event Functions of the landing page buttons
-    show_modal.click(lambda: Modal(visible=True), None, modal)
-    show_modal.click(create_json_one_individual)
-    show_modal.click(create_tmp)
-
-    #submit_button.click(save_and_rest_df, inputs=[df], outputs=[df])
+    from validation_submission.submission import validate_save_individual
+    button_df.click(validate_save_individual, inputs=[individual, error_box],
+                    outputs=[error_box])
 
 
 if __name__ == "__main__":

app/physical/physical_boxes_map.py

@@ -17,9 +17,6 @@ def draw_bounding_boxes(image_path, gdf):
     # try:
     font = ImageFont.truetype(PATH_ASSETS + "fonts/LiberationSans-Regular.ttf", 
                               20)
-    # except IOError:
-    #     print("default")
-    #     font = ImageFont.load_default()
 
     # Draw each bounding box on the image
     for _, row in gdf.iterrows():

app/physical/physical_checkbox.py

@@ -1,7 +1,7 @@
 import gradio as gr
 from utils.utils_config import get_custom_config_dropdowns
 from utils.utils_checkbox import create_checkbox
-from validation_submission.add_json import add_data_tmp 
+from validation_submission.utils_individual import add_data_to_individual 
 #--------------------------------------------------------- 
 def get_body_parts():
     dropdown_config = get_custom_config_dropdowns("config_checkbox_physical.json")
@@ -72,9 +72,9 @@ def process_body_parts(section, matched_box):
 #--------------------------------------------------------- 
 
 def on_select_body_part(body_part_checkbox, body_part, individual): 
-    individual = add_data_tmp("wounded_dead", "physical_type_"+body_part.lower(), body_part.lower(), individual)
+    individual = add_data_to_individual("wounded_dead", "physical_type_"+body_part.lower(), body_part.lower(), individual)
     body_part_checkbox = [body_part_check.lower() for body_part_check in body_part_checkbox]
-    individual = add_data_tmp("wounded_dead", "physical_anomaly_"+body_part.lower(), body_part_checkbox, individual)
+    individual = add_data_to_individual("wounded_dead", "physical_anomaly_"+body_part.lower(), body_part_checkbox, individual)
     return individual
 
 #--------------------------------------------------------- 

app/physical/physical_select_animal.py

@@ -29,7 +29,6 @@ def find_bounding_box(evt: gr.SelectData, img, section: str):
 # Gradio app
 def create_bird_anatomy(visible, section: str):
     # Draw bounding boxes on the image
-    print
     img_with_boxes = gr.Image(value=PATH_ASSETS+'images/bird_boxed.png', 
                             show_label=False, 
                             height="600px",

app/validation_submission/add_json.py

@@ -1,19 +0,0 @@
-from validation_submission.create_json import create_json_one_individual, create_tmp
-import json 
-
-def add_data_to_individual(key, value, individual): 
-    # with open("data/one_individual.json", 'r') as openfile:
-    #     one_individual = json.load(openfile)
-    # one_individual[key] = value
-    # create_json_one_individual(one_individual)
-    individual[key] = value
-    return individual
-
-def add_data_tmp(tmp_name, key, value, individual): 
-    # with open(f"app/assets/tmp_json/tmp_{tmp_name}.json", 'r') as openfile:
-    #     tmp = json.load(openfile)
-    # tmp[key] = value
-    # create_tmp(tmp_name, tmp)
-    individual[key] = value
-    return individual
-    

app/validation_submission/get_json.py

@@ -1,20 +0,0 @@
-import json
-
-def get_json_one_individual():
-    with open("data/one_individual.json", 'r') as openfile:
-        one_individual = json.load(openfile)
-    return one_individual
-
-## TO DO : check this works
-import os
-def get_json_all_individuals():
-    all_animals = os.getfiles("data")
-    all_individuals = []
-    for animal in all_animals: 
-        all_individuals.append(animal)
-    return all_individuals
-
-def get_json_tmp(tmp_name):
-    with open(f"app/assets/tmp_json/tmp_{tmp_name}.json", "r") as openfile:
-        tmp_json = json.load(openfile)
-    return tmp_json

app/validation_submission/submission.py

@@ -1,30 +1,24 @@
 import json 
-from validation_submission.get_json import get_json_all_individuals
 from validation_submission.validation import validate_individual
 
+from huggingface_hub import HfApi
+import os
+
 def validate_save_individual(data, error_box):
     individual, error_box = validate_individual(data, error_box)
     if individual:
-        save_to_all_individuals(individual.model_dump())
-    return individual, error_box, data
-
-def save_to_all_individuals(one_individual):
-    all_individuals = get_json_all_individuals()
-    all_individuals[str(len(all_individuals))] = one_individual
-    all_individuals_for_json = json.dumps(all_individuals)
-    with open("data/all_individuals.json", "w") as outfile:
-        outfile.write(all_individuals_for_json)
-    return all_individuals
-
-from huggingface_hub import HfApi
-import os 
-
-#save all individuals one by one in JSON wish md5 hash as json name 
-def push_to_dataset_hf():
+        push_to_dataset_hf(individual.model_dump())
+    return error_box
+    
+def push_to_dataset_hf(individual):
     token = os.environ.get("HF_TOKEN", None)
     api = HfApi(token=token)
-    with open("data/all_individuals.json", "r") as f:
-            all = json.load(f)
+    import tempfile
+    f = tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False)
+    json.dump(individual, f)
+    f.flush()
+    f.close()
+    path_in_repo= f"data/{individual['image_md5']}.json"
     api.upload_file(
         path_or_fileobj=f.name,
         path_in_repo=path_in_repo,

app/validation_submission/{create_json.py → utils_individual.py}

@@ -1,8 +1,5 @@
-import json 
-
 import random
 import string
-
 import hashlib
 
 def generate_random_md5():
@@ -12,22 +9,7 @@ def generate_random_md5():
     md5_hash = hashlib.md5(random_string.encode()).hexdigest()
     return md5_hash
 
-def create_json_one_individual(one_individual={}):
-    one_individual["image_md5"] = generate_random_md5()
-    one_individual = json.dumps(one_individual)
-    with open("data/one_individual.json", "w") as outfile:
-        outfile.write(one_individual)
-
-def create_json_all_individuals(all_individuals={}):
-    all_individuals = json.dumps(all_individuals)
-    with open("data/all_individuals.json", "w") as outfile:
-        outfile.write(all_individuals)
-
-def create_tmp(tmp_name="wounded_dead", tmp={}):
-    tmp = json.dumps(tmp)
-    with open(f"app/assets/tmp_json/tmp_{tmp_name}.json", "w") as outfile:
-        outfile.write(tmp)
-
-def reset_json(): 
-    create_json_one_individual()
-    create_tmp()
+def add_data_to_individual(key, value, individual): 
+    individual[key] = value
+    return individual
+    

app/validation_submission/validation.py

@@ -2,7 +2,7 @@ import uuid
 from pydantic import ValidationError
 import gradio as gr
 
-from validation_submission.get_json import get_json_tmp, get_json_one_individual
+# from validation_submission.get_json import get_json_tmp, get_json_one_individual
 from circumstances.class_circumstance import Circumstances
 from behavior.class_behavior import Behaviors
 from physical.class_physical import PhysicalAnomalies
@@ -50,6 +50,7 @@ def validate_individual(data, error_box):
             try : 
                 individual = Report(identifier = data["identifier"],
                                     image = img,
+                                    image_md5 = data["image_md5"],
                                     geolocalisation = geolocalisation,
                                     wounded_state = data["wounded_state"],
                                     wounded = Wounded(circumstances = circumstance,
@@ -65,6 +66,7 @@ def validate_individual(data, error_box):
             try: 
                 individual = Report(identifier = data["identifier"],
                                     image = img,
+                                    image_md5 = data["image_md5"],
                                     geolocalisation = geolocalisation,
                                     wounded_state = data["wounded_state"],
                                     dead_state = data["dead_state"],
@@ -79,6 +81,7 @@ def validate_individual(data, error_box):
         try: 
             individual = Report(identifier = data["identifier"],
                                     image = img,
+                                    image_md5 = data["image_md5"],
                                     geolocalisation = geolocalisation,
                                     wounded_state = data["wounded_state"],
                                     dead_state = data["dead_state"])

app/wounded.py

@@ -4,7 +4,7 @@ from physical.physical_select_animal import create_bird_anatomy
 from physical.physical_checkbox import process_body_parts
 from behavior.behavior_checkbox import create_behavior_checkbox
 from follow_up.followup_events import create_followup_dropdowns, create_followup_open
-from validation_submission.add_json import add_data_to_individual  
+from validation_submission.utils_individual import add_data_to_individual  
 
 def show_section_wounded(visible, individual):
     if visible==True: