Merge branch 'main' into chore-aesthetics

.pre-commit-config.yaml

@@ -0,0 +1,21 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.4.0
+  hooks:
+  - id: check-case-conflict
+  - id: check-merge-conflict
+  - id: check-json
+  - id: check-toml
+  - id: check-xml
+  - id: check-yaml
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.1.13
+  hooks:
+    - id: ruff
+      types_or: [ python, pyi, jupyter ]
+      args: [ --exit-zero ]
+      verbose: true
+    - id: ruff-format
+      types_or: [ python, pyi, jupyter ]

app/config_utils.py

@@ -0,0 +1,14 @@
+import json
+import os
+
+def load_config(file_path):
+    with open(file_path) as f:
+        config = json.load(f)
+    return config
+
+def get_custom_config_dropdowns(config_path):
+    path = os.getcwd()
+    dropdown_config_path = path + config_path
+    dropdown_config = load_config(dropdown_config_path)
+    return dropdown_config
+

app/dead.py

@@ -1,13 +1,17 @@
 import gradio as gr
 from top_section import create_top_section, create_dropdown
+from followup_events import create_followup_section
 
 
 def show_section_dead(visible):
     with gr.Column(visible=visible, elem_id="dead") as section_dead:
         gr.Markdown("# Dead Animal")
-        gr.Markdown("Please describe the cause of death")
+        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, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_dropdown(visible)
+        
+        gr.Markdown("## Follow-up Events")
+        create_followup_section()
 
     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

@@ -1,21 +1,10 @@
 import gradio as gr
-import json
-import os
+from config_utils import get_custom_config_dropdowns
 
-def load_config(file_path):
-    with open(file_path) as f:
-        config = json.load(f)
-    return config
-
-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()
+    dropdown_config = get_custom_config_dropdowns("/assets/dropdowns/dropdown_config.json")
     options = list(dropdown_config[label].keys())
     options = [option.title() for option in options]
     return options
@@ -56,7 +45,7 @@ def get_options(value):
         open_field = None
         extras = None
         extras_label = None
-        dropdown_config = get_custom_config_dropdowns()
+        dropdown_config = get_custom_config_dropdowns("/assets/dropdowns/dropdown_config.json")
         for _, sub_dict in dropdown_config.items():
             nested_dict = sub_dict.get(value)
             if nested_dict is not None: 

app/followup_events.py

@@ -0,0 +1,16 @@
+import gradio as gr
+from config_utils import get_custom_config_dropdowns
+
+def create_followup_section():
+    followup_config = get_custom_config_dropdowns("/assets/dropdowns/followup_config.json")
+    followup_config = followup_config["Event follow-up"]
+    with gr.Row(): 
+        for key, val in followup_config.items():
+            followup_label = key
+            if "Options" in val.keys(): 
+                gr.Dropdown(choices=val["Options"], label=followup_label, visible=True)
+    with gr.Row(): 
+        for key, val in followup_config.items():
+            followup_label = key
+            if "Open" in val.keys(): 
+                gr.Textbox(label=followup_label, visible=True)

app/main.py

@@ -95,6 +95,9 @@ with gr.Blocks(theme=theme, css=css) as demo:
     
     dropdown_wounded.select(on_select, None, [dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
 
+    # ---------------------------------------------------------
+    #Follow up Events
+
     # ---------------------------------------------------------
     #Submit Button
     with gr.Column(scale=1):

app/wounded.py

@@ -1,14 +1,17 @@
 import gradio as gr
 from top_section import create_top_section, create_dropdown
+from followup_events import create_followup_section
 
 def show_section_wounded(visible):
-    #with gr.Tab("Wounded Information"):
     with gr.Column(visible=visible, elem_id="wounded") as wounded_section:
         gr.Markdown("# Wounded Animal")
-        gr.Markdown("Please describe the wound's cause.")
+        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, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_dropdown(visible)
 
+        gr.Markdown("## Follow-up Events")
+        create_followup_section()
+
     # Change variables and names
     return wounded_section, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2