refactor: homogenize config loading

app/.env.dist

@@ -0,0 +1 @@
+PATH_ASSETS="YOUR_PATH_HERE"

app/behavior_checkbox.py

@@ -3,7 +3,7 @@ from utils_checkbox import create_checkbox
 from utils_visible import set_visible
 
 def retrieve_behavior_options_description():
-    dropdown_config = get_custom_config_dropdowns("/assets/config/config_checkbox_behavior.json")
+    dropdown_config = get_custom_config_dropdowns("config_checkbox_behavior.json")
     options = list(dropdown_config.keys())
     options = [option.title() for option in options]
     descriptions =[]

app/circumstances.py

@@ -1,10 +1,16 @@
 import gradio as gr
 import os
 from utils_visible import set_visible
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH = os.getcwd() + "/"
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+LOGO_PATH = PATH + PATH_ASSETS + "logos"
 
-PATH = os.getcwd()
 CAUSE_COL_WIDTH = "50px"
 
+
 def show_causes(choice): 
     visible = set_visible(choice)
     button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_causes(visible)
@@ -15,30 +21,29 @@ def create_causes(visible):
     dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_causes_dropdown(visible)
     return button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2
 
-
 def create_causes_buttons(visible): 
     with gr.Row() as image_row:
             with gr.Column(scale=1, min_width=CAUSE_COL_WIDTH):
                 button_collision = gr.Button("Collision with a means of transport", 
                                              visible=visible,
-                                             icon=PATH + '/assets/logos/van.png',
+                                             icon=LOGO_PATH +  '/van.png',
                                              elem_id="buttons-conditions")
                 
             with gr.Column(scale=1, min_width=CAUSE_COL_WIDTH):
                 button_deliberate_destruction = gr.Button("Destruction / Deliberatly removed", 
-                                                          icon=PATH + '/assets/logos/destruction.png',
+                                                          icon=LOGO_PATH +  '/destruction.png',
                                                           visible=visible,
                                                           elem_id="buttons-conditions")
  
             with gr.Column(scale=1, min_width=CAUSE_COL_WIDTH):
                 button_indirect_destruction = gr.Button("Indirect destruction", 
-                                                        icon=PATH + '/assets/logos/indirect.png',
+                                                        icon=LOGO_PATH +  '/indirect.png',
                                                         visible=visible,
                                                         elem_id="buttons-conditions")
 
             with gr.Column(scale=1, min_width=CAUSE_COL_WIDTH):
                 button_natural_cause = gr.Button("Natural cause", 
-                                                 icon=PATH + '/assets/logos/natural.png', 
+                                                 icon=LOGO_PATH +  '/natural.png', 
                                                  visible=visible,
                                                  elem_id="buttons-conditions")
     return button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause

app/circumstances_dropdowns.py

@@ -15,7 +15,7 @@ def reinitialise_level2():
     return dropdown_level2, openfield_level2, dropdown_extra_level2
 
 def create_dropdown_level1(label): 
-    dropdown_config = get_custom_config_dropdowns("/assets/config/config_dropdown_conditions.json")
+    dropdown_config = get_custom_config_dropdowns("config_dropdown_conditions.json")
     options = retrieve_config_options(label, dropdown_config)
     dropdown = gr.Dropdown(choices=options, label=label, interactive=True, visible=True)
     dropdown_level2, openfield_level2, dropdown_extra_level2 = reinitialise_level2()
@@ -45,7 +45,7 @@ def get_options(value):
         open_field = None
         extras = None
         extras_label = None
-        dropdown_config = get_custom_config_dropdowns("/assets/config/config_dropdown_conditions.json")
+        dropdown_config = get_custom_config_dropdowns("config_dropdown_conditions.json")
         for _, sub_dict in dropdown_config.items():
             nested_dict = sub_dict.get(value)
             if nested_dict is not None: 

app/followup_events.py

@@ -2,7 +2,7 @@ import gradio as gr
 from utils_config import get_custom_config_dropdowns
 
 def create_followup_section():
-    followup_config = get_custom_config_dropdowns("/assets/config/config_followup.json")
+    followup_config = get_custom_config_dropdowns("config_followup.json")
     followup_config = followup_config["Event follow-up"]
     gr.Markdown("Please tell us what you did with the animal.", label="description")
     with gr.Row(): 

app/main_multianimal.py

@@ -1,8 +1,16 @@
 import gradio as gr
 from gradio_modal import Modal
 import numpy as np
-from maps import get_location
+
 from utils_json import *
+from functools import partial
+from dead import show_section_dead
+from wounded import show_section_wounded
+from circumstances import show_causes
+from circumstances_dropdowns import *
+from physical_select_animal import show_physical, find_bounding_box
+from behavior_checkbox import show_behavior
+from maps import get_location
 
      
 def save_input(input, df):
@@ -24,7 +32,6 @@ with gr.Blocks() as demo:
     )
     show_markdown = gr.Markdown("This is a markdown")
     with Modal(visible=False) as modal:
-        input = gr.Textbox(label="Input 1", interactive=True)
         # ---------------------------------------------------------
         # Intro Text
         with gr.Row():
@@ -56,11 +63,121 @@ with gr.Blocks() as demo:
                     submit_location.click(get_location, inputs=[location], outputs=[identified_location])
         
         # ---------------------------------------------------------
+         # ---------------------------------------------------------
+        # Dead and Wounded Buttons
+        gr.Markdown("## The State of the Animal", label="Title")
+        gr.Markdown("Please tell us if the animal was wounded or dead.", label="description")
+        with gr.Row() as block_form:
+            with gr.Column(scale=1):
+                butt_wounded = gr.Button("Wounded", elem_id="wounded")
+            with gr.Column(scale=1):
+                butt_dead = gr.Button("Dead", elem_id="dead")
+
+        # ---------------------------------------------------------
+        # Initiate sections
+        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, radio_cause_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, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs \
+                            = 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_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead
+                                ])
+        butt_dead.click(partial_hide_section_wounded, 
+                        inputs=None, 
+                        outputs=[section_wounded, 
+                                radio_cause_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, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
+                                ])
+        # ---------------------------------------------------------
+        # 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, 
+                                    radio_cause_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, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
+                                    ])
+        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_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead
+                                                                            ])
+        # ---------------------------------------------------------
+        # Dropdowns 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])
+
+        # ---------------------------------------------------------
+        # Radio Cause Wounded
+        radio_cause_wounded.change(fn=show_causes,
+                                inputs=[radio_cause_wounded],
+                                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]
+                                )
         
+        # Dropdowns Cause 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])
+
+        # ---------------------------------------------------------
+        # Radio Behavior Wounded
+        radio_behavior_wounded.change(fn=show_behavior,
+                                    inputs=[radio_behavior_wounded, gr.Text("wounded", visible=False)],
+                                    outputs=[behavior_checkbox, behavior_text])
+
+        # ---------------------------------------------------------
+        # Radio Physical Wounded
+        radio_physical_wounded.change(fn=show_physical,
+                                    inputs=[radio_physical_wounded, gr.Text("wounded", visible=False)],
+                                    outputs=[physical_boxes_wounded])
+
+        # Checkbox Physical Wounded
+        physical_boxes_wounded.select(find_bounding_box, 
+                        inputs=[physical_boxes_wounded, gr.Textbox(value="wounded", visible=False)], 
+                        outputs=[checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
+                                    ])
+        
+
         button = gr.Button("Click me")
-        button.click(save_input, 
-                        inputs=[input, df],
-                        outputs=[df])
+        # button.click(save_input, 
+        #                 inputs=[df],
+        #                 outputs=[df])
         button.click(lambda: Modal(visible=False), None, modal)
     show_btn.click(lambda: Modal(visible=True), None, modal)
     show_btn.click(create_json)

app/physical_boxes_map.py

@@ -2,6 +2,11 @@ from PIL import Image, ImageDraw, ImageFont
 
 from physical_boxes_define import gdf
 
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+
 # Function to draw the bounding boxes on the image
 def draw_bounding_boxes(image_path, gdf):
     image = Image.open(image_path+'bird.png').convert("RGB")
@@ -10,7 +15,7 @@ def draw_bounding_boxes(image_path, gdf):
 
     # Optional: Load a font (requires a TTF file)
     # try:
-    font = ImageFont.truetype("assets/fonts/LiberationSans-Regular.ttf", 
+    font = ImageFont.truetype(PATH_ASSETS + "fonts/LiberationSans-Regular.ttf", 
                               20)
     # except IOError:
     #     print("default")
@@ -25,4 +30,4 @@ def draw_bounding_boxes(image_path, gdf):
     image.save(image_path+'bird_boxed.png', "PNG")
 
 if __name__ == "__main__":
-    draw_bounding_boxes('assets/images/', gdf)
+    draw_bounding_boxes(PATH_ASSETS + 'images/', gdf)

app/physical_checkbox.py

@@ -3,7 +3,7 @@ from utils_config import get_custom_config_dropdowns
 from utils_checkbox import create_checkbox
 #--------------------------------------------------------- 
 def get_body_parts():
-    dropdown_config = get_custom_config_dropdowns("/assets/config/config_checkbox_physical.json")
+    dropdown_config = get_custom_config_dropdowns("config_checkbox_physical.json")
     return list(dropdown_config.keys())
 
 def retrieve_config_options(label, dropdown_config):
@@ -12,7 +12,7 @@ def retrieve_config_options(label, dropdown_config):
     return options
 
 def get_options_description(value):
-        dropdown_config = get_custom_config_dropdowns("/assets/config/config_checkbox_physical.json")
+        dropdown_config = get_custom_config_dropdowns("config_checkbox_physical.json")
         # get options
         options_common = retrieve_config_options("Common", dropdown_config)
         options_for_value = retrieve_config_options(value, dropdown_config)

app/physical_select_animal.py

@@ -5,7 +5,10 @@ from shapely.geometry import Point
 from physical_checkbox import *
 from physical_boxes_define import gdf
 from utils_visible import set_visible
-
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH_ASSETS = os.getenv('PATH_ASSETS')
 
 # Function to find the matching bounding box for a given point and return the image with boxes
 def find_bounding_box(evt: gr.SelectData, img, section: str):
@@ -25,7 +28,8 @@ 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
-    img_with_boxes = gr.Image(value='assets/images/bird_boxed.png', 
+    print
+    img_with_boxes = gr.Image(value=PATH_ASSETS+'images/bird_boxed.png', 
                             show_label=False, 
                             height="600px",
                             elem_id=section,

app/utils_config.py

@@ -1,5 +1,11 @@
 import json
 import os
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH = os.getcwd() + "/"
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+PATH_CONFIG = PATH + PATH_ASSETS + "config/"
 
 def load_config(file_path):
     with open(file_path) as f:
@@ -7,8 +13,7 @@ def load_config(file_path):
     return config
 
 def get_custom_config_dropdowns(config_path):
-    path = os.getcwd()
-    dropdown_config_path = path + config_path
+    dropdown_config_path = PATH_CONFIG + config_path
     dropdown_config = load_config(dropdown_config_path)
     return dropdown_config
 

requirements.txt

@@ -2,4 +2,5 @@ gradio
 gradio_modal
 geopy
 geopandas
-pillow
+pillow
+dotenv