feat: subdropdowns created from config

app/assets/dropdowns/dropdown_config.json

@@ -3,12 +3,14 @@
     {
         "road vehicle": 
         {
-            "road type": {"Options" : ["highway", "main road", "secondary road", "local road/path/trail", "parking lot", "other", "unknown"]},
-            "infrastructure number": "Open"
+            
+            "Options": ["highway", "main road", "secondary road", "local road/path/trail", "parking lot", "other", "unknown"],
+            "Open": "Infrastructure number"
+            
         },
         "train": 
         {
-            "infrastructure number": "Open"
+            "Open": "Infrastructure"
         },
         "aircraft": {},
         "boat": {},
@@ -41,51 +43,34 @@
    {
          "pylone and electric grid":
          {
-              "object": 
-              {
-                "Options": ["electric line", "pole/pylon", "other", "unknown"]
-              },
-              "cause": 
-              {
-                "Options": ["collision", "electrocution", "unknown"]
-              }
+  
+            "Options": ["electric line", "pole/pylon", "other", "unknown"],
+            "Extra":
+            {
+                "Cause": ["collision", "electrocution", "unknown"]
+            }
          },
          "windfarm": {},
          "other collision": 
          {
-              "Object": 
-              {
-                "Options": ["window", "building", "lighthouse", "cable", "wire fence/barbed wire", "other crash", "unknown"]
-              }
+            "Options": ["window", "building", "lighthouse", "cable", "wire fence/barbed wire", "other crash", "unknown"]
          },
          "fall": 
          {
-              "Object": 
-              {
-                "Options": ["chimney", "empty pole", "hole/well", "other", "unknown"]
-              }
+            "Options": ["chimney", "empty pole", "hole/well", "other", "unknown"]
          },
          "development work": 
          {
-              "Type": 
-              {
-                "Options": ["transport infrastructure", "building", "other", "unknown"]
-              }
+            "Options": ["transport infrastructure", "building", "other", "unknown"]
          },
          "pollution / contamination": 
          {
-              "Type": 
-              {
-                "Options": ["oil pollution", "chemical pollution", "heavy metals", "light", "noise", "plastic ingestion", "other", "unknown"]
-              }
+            "Options": ["oil pollution", "chemical pollution", "heavy metals", "light", "noise", "plastic ingestion", "other", "unknown"]
          },
          "agricultural net protection": {},
          "vegetal / forest work": 
          {
-              "Type": 
-              {
-                "Options": ["clearing/mowing/plowing", "tree felling/pruning", "other", "unknown"]
-              }
+            "Options": ["clearing/mowing/plowing", "tree felling/pruning", "other", "unknown"]
          },
          "other": {},
          "unknown": {}
@@ -94,34 +79,22 @@
     {
         "predation": 
         {
-            "responsible": 
-            {
-                "Options": ["cat", "dog", "rooster/hen", "other domestic animal", "wild birds", "wild mammal", "other", "unknown"]
-            }
+            "Options": ["cat", "dog", "rooster/hen", "other domestic animal", "wild birds", "wild mammal", "other", "unknown"]
         },
         "weather": 
         {
-            "Type": 
-            {
-                "Options": ["cold wave", "drought", "hail", "lightening", "storm", "other", "unknown"]
-            }
+            "Options": ["cold wave", "drought", "hail", "lightening", "storm", "other", "unknown"]
         },
         "natural disaster": 
         {
-            "Type": 
-            {
-                "Options": ["fire", "avalanche", "rock fall", "mudslide", "volcanic eruption/ashes", "other", "unknown"]
-            }
+            "Options": ["fire", "avalanche", "rock fall", "mudslide", "volcanic eruption/ashes", "other", "unknown"]
         },
         "nest fall": {},
-        "strading due to exhaustion": {},
+        "stranding due to exhaustion": {},
         "disease/parasite": {},
         "accidental drowing": 
         {
-            "Container": 
-            {
-                "Options": ["drinking trough", "pool", "storm pool", "irrigation pool", "natural pool", "flood", "other container", "unknown"]
-            }
+            "Options": ["drinking trough", "pool", "storm pool", "irrigation pool", "natural pool", "flood", "other container", "unknown"]
         },
         "other": {},
         "unknown": {}

app/dead.py

@@ -3,10 +3,10 @@ from top_section import create_top_section, create_dropdown
 
 def show_section_dead(visible):
     with gr.Column(visible=visible) as section_dead:
-        gr.Markdown("# Dead")
+        gr.Markdown("# Dead Animal")
         gr.Markdown("Please describe the cause of death")
         
         image_row, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause = create_top_section(visible)      
-        dropdown_row, dropdown = create_dropdown(visible)
+        dropdown_row, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_dropdown(visible)
 
-    return section_dead, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown
+    return section_dead, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2

app/dropdowns.py

@@ -7,31 +7,86 @@ def load_config(file_path):
         config = json.load(f)
     return config
 
-def retrieve_config_options(label):
+def get_custom_config_dropdowns():
     path = os.getcwd()
     dropdown_config_path = path + "/assets/dropdowns/dropdown_config.json"
     dropdown_config = load_config(dropdown_config_path)
+    return dropdown_config
+
+#--------------------------------------------------------- LEVEL 1 DROPDOWNS
+def retrieve_config_options(label):
+    dropdown_config = get_custom_config_dropdowns()
     options = list(dropdown_config[label].keys())
     options = [option.title() for option in options]
     return options
 
+def reinitialise_level2(): 
+    dropdown_level2 = gr.Dropdown(choices=[], visible=False)
+    openfield_level2 = gr.Textbox(visible=False)
+    dropdown_extra_level2 = gr.Dropdown(choices=[], visible=False)
+    return dropdown_level2, openfield_level2, dropdown_extra_level2
 
+def create_dropdown_level1(label): 
+    options = retrieve_config_options(label)
+    dropdown = gr.Dropdown(choices=options, label=label, interactive=True)
+    dropdown_level2, openfield_level2, dropdown_extra_level2 = reinitialise_level2()
+    return dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2
+    
 def dropdown_collision():
     label = "Collision with a means of transport"
-    options = retrieve_config_options(label)
-    return gr.Dropdown(choices=options, label=label, interactive=True)
+    return create_dropdown_level1(label)
 
 def dropdown_deliberate_destruction():
     label = "Destruction / Deliberatly removed"
-    options = retrieve_config_options(label)
-    return gr.Dropdown(choices=options, label=label, interactive=True)        
+    return create_dropdown_level1(label)     
 
 def dropdown_indirect_destruction(): 
     label = "Indirect destruction"
-    options = retrieve_config_options(label)
-    return gr.Dropdown(choices=options, label=label, interactive=True)  
+    return create_dropdown_level1(label) 
 
 def dropdown_natural_cause(): 
     label = "Natural cause"
-    options = retrieve_config_options(label)
-    return gr.Dropdown(choices=options, label=label, interactive=True)            
+    return create_dropdown_level1(label)         
+
+
+#--------------------------------------------------------- LEVEL 2 DROPDOWNS
+def get_options(value):
+        value = value.lower()
+        options_dropdown= None
+        open_field = None
+        extras = None
+        extras_label = None
+        dropdown_config = get_custom_config_dropdowns()
+        for _, sub_dict in dropdown_config.items():
+            nested_dict = sub_dict.get(value)
+            if nested_dict is not None: 
+                if "Options" in nested_dict.keys():
+                    options_dropdown = nested_dict["Options"]
+                    options_dropdown = [option.title() for option in options_dropdown]
+                if "Open" in nested_dict.keys():
+                    open_field = nested_dict["Open"]
+                    open_field = open_field.title()
+                if "Extra" in nested_dict.keys():
+                    for key, val in nested_dict["Extra"].items():
+                        extras_label = key
+                        extras = val
+                        extras = [extra.title() for extra in extras]
+        return options_dropdown, open_field, extras, extras_label
+            
+def on_select(evt: gr.SelectData):  # SelectData is a subclass of EventData
+    options_dropdown, open_field, extras, extras_label = get_options(evt.value)
+    if options_dropdown is not None:
+        dropdown_level2 = gr.Dropdown(choices=options_dropdown, label=evt.value, interactive=True, visible=True)
+    else: 
+        dropdown_level2 = gr.Dropdown(choices=[], visible=False)
+
+    if open_field is not None:
+        openfield_level2 = gr.Textbox(label=open_field, interactive=True, visible=True)
+    else: 
+        openfield_level2 = gr.Textbox(visible=False)
+
+    if extras is not None: 
+        dropdown_extra_level2 = gr.Dropdown(choices=extras, label=extras_label, interactive=True, visible=True)
+    else: 
+        dropdown_extra_level2 = gr.Dropdown(choices=[], visible=False)
+    return dropdown_level2, openfield_level2, dropdown_extra_level2

app/main.py

@@ -7,15 +7,21 @@ from maps import get_location
 from style import *
 
 with gr.Blocks() as demo:
+    # ---------------------------------------------------------
+    # Intro Text
     with gr.Row():
         with gr.Column(scale=1):
             title = gr.Markdown("# Welcome to Digiwild", label="Title")
             description = gr.Markdown("Lorem ipsum", label="description")
 
+    # ---------------------------------------------------------
+    # Camera
     with gr.Row():
         with gr.Column(scale=1):
             camera = gr.Image()
-
+            
+    # ---------------------------------------------------------
+    # Location
     with gr.Row():
         with gr.Column(scale=1):
             location = gr.Textbox(visible=True, interactive=True, label="Location of Sighting")
@@ -33,7 +39,8 @@ with gr.Blocks() as demo:
                 submit_location.click(get_location, inputs=[location], outputs=[identified_location])
             
 
-
+    # ---------------------------------------------------------
+    # Dead and Wounded Buttons
     with gr.Row() as block_form:
         with gr.Column(scale=1):
             butt_dead = gr.Button("Dead")
@@ -41,47 +48,57 @@ with gr.Blocks() as demo:
         with gr.Column(scale=1):
             butt_wounded = gr.Button("Wounded")
 
+    # ---------------------------------------------------------
     # Initiate sections
-    section_dead, button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, dropdown_dead = show_section_dead(False)
-    section_wounded, button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, dropdown_wounded = show_section_wounded(False)
+    section_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 = show_section_dead(False)
+    section_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= show_section_wounded(False)
 
+    # ---------------------------------------------------------
     # 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=None, outputs=[section_dead, 
                                                                      button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
-                                                                     dropdown_dead
+                                                                     dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead
                                                                      ])
     butt_dead.click(partial_hide_section_wounded, inputs=None, outputs=[section_wounded, 
                                                                         button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
-                                                                        dropdown_wounded
+                                                                        dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded
                                                                         ])
-
+    # ---------------------------------------------------------
     # 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=None, outputs=[section_wounded, 
                                                                         button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
-                                                                        dropdown_wounded
+                                                                        dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded
                                                                         ])
     butt_wounded.click(partial_hide_section_dead, inputs=None, outputs=[section_dead, 
                                                                         button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
-                                                                        dropdown_dead
+                                                                        dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead
                                                                         ])
-
+    # ---------------------------------------------------------
     # Dropdowns Dead
-    button_collision_dead.click(dropdown_collision, outputs=dropdown_dead)
-    button_deliberate_destruction_dead.click(dropdown_deliberate_destruction, outputs=dropdown_dead)
-    button_indirect_destruction_dead.click(dropdown_indirect_destruction, outputs=dropdown_dead)
-    button_natural_cause_dead.click(dropdown_natural_cause, outputs=dropdown_dead)
+    button_collision_dead.click(dropdown_collision,  
+                                outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
+    button_deliberate_destruction_dead.click(dropdown_deliberate_destruction, outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
+    button_indirect_destruction_dead.click(dropdown_indirect_destruction, outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
+    button_natural_cause_dead.click(dropdown_natural_cause, outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
+
+    dropdown_dead.select(on_select, None, [dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
 
-    # Dropdwons Wounded
-    button_collision_wounded.click(dropdown_collision, outputs=dropdown_wounded)
-    button_deliberate_destruction_wounded.click(dropdown_deliberate_destruction, outputs=dropdown_wounded)
-    button_indirect_destruction_wounded.click(dropdown_indirect_destruction, outputs=dropdown_wounded)
-    button_natural_cause_wounded.click(dropdown_natural_cause, outputs=dropdown_wounded)
+    # ---------------------------------------------------------
+    # Dropdowns Wounded
+    button_collision_wounded.click(dropdown_collision,  
+                                outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
+    button_deliberate_destruction_wounded.click(dropdown_deliberate_destruction, outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
+    button_indirect_destruction_wounded.click(dropdown_indirect_destruction, outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
+    button_natural_cause_wounded.click(dropdown_natural_cause, outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
     
+    dropdown_wounded.select(on_select, None, [dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
 
+    # ---------------------------------------------------------
+    #Submit Button
     with gr.Column(scale=1):
         subbutt = gr.Button("Submit")
         output_message = gr.Markdown("Thank you, you didn't save this one but you could save the next")

app/top_section.py

@@ -1,23 +1,25 @@
 import gradio as gr
+import os
+
+PATH = os.getcwd()
 
 def create_top_section(visible): 
     with gr.Row() as image_row:
             with gr.Column(scale=1, min_width="50px"):
-                img1 = gr.Image(value='app/assets/van.png', show_download_button=False, show_label=False)
+                print(PATH + '/assets/logos/van.png')
+                img1 = gr.Image(value=PATH + '/assets/logos/van.png', show_download_button=False, show_label=False, height="150px")
                 button_collision = gr.Button("Collision with a means of transport", visible=visible)
                 
             with gr.Column(scale=1, min_width="50px"):
-                img2 = gr.Image(value='app/assets/destruction.png', show_download_button=False, show_label=False)
+                img2 = gr.Image(value=PATH + '/assets/logos/destruction.png', show_download_button=False, show_label=False, height="150px")
                 button_deliberate_destruction = gr.Button("Destruction / Deliberatly removed", visible=visible)
-                
-
-        #with gr.Row():
+ 
             with gr.Column(scale=1, min_width="50px"):
-                img3 = gr.Image(value='app/assets/indirect.png', show_download_button=False, show_label=False)
+                img3 = gr.Image(value=PATH + '/assets/logos/indirect.png', show_download_button=False, show_label=False, height="150px")
                 button_indirect_destruction = gr.Button("Indirect destruction", visible=visible)
 
             with gr.Column(scale=1, min_width="50px"):
-                img4 = gr.Image(value='app/assets/natural.png', show_download_button=False, show_label=False)
+                img4 = gr.Image(value=PATH + '/assets/logos/natural.png', show_download_button=False, show_label=False, height="150px")
                 button_natural_cause = gr.Button("Natural cause", visible=visible)
     return image_row, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause
 
@@ -25,7 +27,10 @@ def create_dropdown(visible):
     print(visible)
     with gr.Row() as dropdown_row:
         dropdown = gr.Dropdown(choices=[], label="Dropdown", interactive=True, visible=visible)
-    return dropdown_row, dropdown
+    openfield_level2 = gr.Textbox(visible=False)
+    dropdown_level2 = gr.Dropdown(choices=[], visible=False)
+    dropdown_extra_level2 = gr.Dropdown(choices=[], visible=False)
+    return dropdown_row, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2
 
 
      

app/wounded.py

@@ -4,10 +4,11 @@ from top_section import create_top_section, create_dropdown
 def show_section_wounded(visible):
     #with gr.Tab("Wounded Information"):
     with gr.Column(visible=visible) as wounded_section:
-        gr.Markdown("# Please describe the cause of wound")
+        gr.Markdown("# Wounded Animal")
+        gr.Markdown("Please describe the wound's cause.")
 
         image_row, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause = create_top_section(visible)      
-        dropdown_row, dropdown = create_dropdown(visible)
+        dropdown_row, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_dropdown(visible)
 
     # Change variables and names
-    return wounded_section, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown
+    return wounded_section, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2