feat: add multi animals to a data frame and clear functionality

app/assets/config/config_df.json

@@ -0,0 +1,19 @@
+{
+    "headers": [
+        "image",
+        "latitude",
+        "longitude",
+        "wounded", 
+        "dead", 
+        "circumstance",
+        "circumstance_dropdown_level1",
+        "circumstance_dropdown_level2",
+        "circumstance_openfield_level2",
+        "circumstance_dropdown_extra_level2",
+        "physical_changes_beak", 
+        "physical_changes_body",
+        "physical_changes_head", 
+        "physical_changes_feathers", 
+        "physical_changes_legs"
+    ]
+}

app/behavior_checkbox.py

@@ -1,6 +1,11 @@
+import gradio as gr
 from utils_config import get_custom_config_dropdowns
 from utils_checkbox import create_checkbox
 from utils_visible import set_visible
+from utils_json import add_data_to_individual 
+
+def on_select_behavior(behavior_checkbox): 
+    add_data_to_individual("behavior", behavior_checkbox)
 
 def retrieve_behavior_options_description():
     dropdown_config = get_custom_config_dropdowns("config_checkbox_behavior.json")

app/dead.py

@@ -6,8 +6,8 @@ from utils_json import add_data_to_individual
 def show_section_dead(visible):
     if visible==True: 
         add_data_to_individual("dead", "True")
-    else: 
-        add_data_to_individual("dead", "False")
+        add_data_to_individual("wounded", "False")
+        
     with gr.Column(visible=visible, elem_id="dead") as section_dead:
         gr.Markdown("# Dead Animal")
         gr.Markdown("## Please describe the cause of death", label="description")

app/main_multianimal.py

@@ -1,36 +1,26 @@
 import gradio as gr
 from gradio_modal import Modal
-import numpy as np
 
+from utils_df import get_headers
 from utils_json import *
+from utils_df import save_individual_to_df, get_headers
+from maps import get_location
 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):
-    #input_value = str(input)
-    df_values = np.array(df) # handle empty dataframe case
-    new_row = [input, 0, input]  # default 'age' as 0 for now
-    df_values = np.vstack([df_values, new_row])
-    df = gr.DataFrame(value=df_values)
-    return df
+from physical_checkbox import on_select_body_part
+from behavior_checkbox import show_behavior, on_select_behavior
+from style import *
+from theme import theme, css
 
-with gr.Blocks() as demo:
+with gr.Blocks(theme=theme, css=css) as demo:
     # with gr.Tab("Tab 1"):
-    show_btn = gr.Button("Show Modal")
-    df = gr.Dataframe(
-        headers=["image", "location"],
-        #datatype=["str", "number", "str"],
-        row_count=1,
-        #col_count=(3, "fixed"),
-    )
-    show_markdown = gr.Markdown("This is a markdown")
+    show_modal = gr.Button("Add an Animal")
+    df = gr.Dataframe(headers=get_headers(),
+                      visible=False)
     with Modal(visible=False) as modal:
         # ---------------------------------------------------------
         # Intro Text
@@ -54,13 +44,15 @@ with gr.Blocks() as demo:
                 identified_location= gr.Textbox(visible=False, interactive=False, 
                                                 label="Identified GPS Location")
                 with gr.Row():
+                    #to submit it
+                    submit_location = gr.Button("Get GPS Coordinates", 
+                                                visible=True, interactive=True, scale=3)
+                    submit_location.click(get_location, inputs=[location], outputs=[identified_location])
                     #to clear it
-                    clear_location = gr.ClearButton(components=[location], visible=True, interactive=True, scale=1
+                    clear_location = gr.ClearButton(components=[location, identified_location], 
+                                                    visible=True, interactive=True, scale=1
                                                     )
                     clear_location.click()
-                    #to submit it
-                    submit_location = gr.Button("Get GPS Coordinates", visible=True, interactive=True, scale=3)
-                    submit_location.click(get_location, inputs=[location], outputs=[identified_location])
         
         # ---------------------------------------------------------
          # ---------------------------------------------------------
@@ -89,7 +81,7 @@ with gr.Blocks() as demo:
     
         # ---------------------------------------------------------
         # ---------------------------------------------------------
-            # ---------------------------------------------------------
+        # ---------------------------------------------------------
         # Dead Button Logic
         partial_show_section_dead = partial(show_section_dead, True)
         partial_hide_section_wounded = partial(show_section_wounded, False)
@@ -137,7 +129,9 @@ with gr.Blocks() as demo:
         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])
-
+        dropdown_level2_dead.select(on_select_dropdown_level2)
+        openfield_level2_dead.select(on_select_openfield_level2)
+        dropdown_extra_level2_dead.select(on_select_dropdown_extra_level2)
         # ---------------------------------------------------------
         # Radio Cause Wounded
         radio_cause_wounded.change(fn=show_causes,
@@ -162,7 +156,8 @@ with gr.Blocks() as demo:
         radio_behavior_wounded.change(fn=show_behavior,
                                     inputs=[radio_behavior_wounded, gr.Text("wounded", visible=False)],
                                     outputs=[behavior_checkbox, behavior_text])
-
+        behavior_checkbox.select(on_select_behavior, 
+                                 inputs=[behavior_checkbox])
         # ---------------------------------------------------------
         # Radio Physical Wounded
         radio_physical_wounded.change(fn=show_physical,
@@ -172,17 +167,41 @@ with gr.Blocks() as demo:
         # 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
+                        outputs=[checkbox_beak, text_beak, 
+                                 checkbox_body, text_body, 
+                                 checkbox_feathers, text_feathers, 
+                                 checkbox_head, text_head, 
+                                 checkbox_legs, text_legs
                                     ])
-        
+        checkbox_beak.select(on_select_body_part, inputs=[checkbox_beak, gr.Text("beak", visible=False)])
+        checkbox_body.select(on_select_body_part, inputs=[checkbox_body, gr.Text("body", visible=False)])
+        checkbox_feathers.select(on_select_body_part, inputs=[checkbox_feathers, gr.Text("feathers", visible=False)])
+        checkbox_head.select(on_select_body_part, inputs=[checkbox_head, gr.Text("head", visible=False)])
+        checkbox_legs.select(on_select_body_part, inputs=[checkbox_legs, gr.Text("legs", visible=False)])
 
-        button = gr.Button("Click me")
-        # 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)
+        # ---------------------------------------------------------
+        # Add One Individual's Data to the Dataframe
+        with gr.Row(): 
+            button_df = gr.Button("Submit Animal Report", scale = 3)
+            button_clear = gr.ClearButton(scale = 1, 
+                                          components=[
+                location, identified_location, 
+                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,
+                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
+                ])
+        button_clear.click()
+        button_df.click(save_individual_to_df, 
+                        inputs=[df],
+                        outputs=[df])
+        button_df.click(lambda: Modal(visible=False), None, modal)
+    show_modal.click(lambda: Modal(visible=True), None, modal)
+    show_modal.click(create_json)
 
 
      

app/physical_checkbox.py

@@ -1,6 +1,7 @@
 import gradio as gr
 from utils_config import get_custom_config_dropdowns
 from utils_checkbox import create_checkbox
+from utils_json import add_data_to_individual 
 #--------------------------------------------------------- 
 def get_body_parts():
     dropdown_config = get_custom_config_dropdowns("config_checkbox_physical.json")
@@ -68,4 +69,7 @@ def process_body_parts(section, matched_box):
     checkbox_legs, text_legs = create_checkbox_legs(section, label_checkbox, visibles[4])
     return checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
           
-     
+#--------------------------------------------------------- 
+
+def on_select_body_part(body_part_checkbox, body_part): 
+    add_data_to_individual("physical_changes_" + body_part, body_part_checkbox)

app/utils_df.py

@@ -0,0 +1,38 @@
+import gradio as gr
+import pandas as pd
+from dotenv import load_dotenv
+from utils_config import load_config
+from utils_json import get_json_one_individual
+import os
+load_dotenv()
+PATH = os.getcwd() + "/"
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+PATH_CONFIG = PATH + PATH_ASSETS + "config/"
+
+def get_headers(): 
+    headers_config = load_config(PATH_CONFIG + "config_df.json")
+    headers = headers_config["headers"]
+    return headers
+
+def match_data_to_headers(headers, one_individual): 
+    new_row = {}
+    for key in headers:
+        if key in one_individual:
+            if type(one_individual[key])==list:
+                new_row[key] = ' , '.join(one_individual[key])
+            else:
+                new_row[key] = one_individual[key]
+        else:
+            new_row[key] = "NA"
+    return list(new_row.values())
+
+def save_individual_to_df(df): 
+    headers = get_headers()
+    one_individual = get_json_one_individual()
+    new_row = match_data_to_headers(headers, one_individual)
+    new_row_df = pd.DataFrame([new_row], columns=headers)  
+    df_new = pd.concat([df, new_row_df], ignore_index=True)
+    df_gr = gr.DataFrame(visible=True,
+                         value=df_new,
+                         headers=headers)
+    return df_gr

app/utils_json.py

@@ -2,7 +2,7 @@ import json
 
 def create_json(one_individual={}):
     # Serializing json
-    one_individual = json.dumps(one_individual, indent=4)
+    one_individual = json.dumps(one_individual)
     # Writing to sample.json
     with open("data/one_individual.json", "w") as outfile:
         outfile.write(one_individual)
@@ -14,3 +14,8 @@ def add_data_to_individual(key, value):
     one_individual[key] = value
     create_json(one_individual)
 
+def get_json_one_individual():
+    with open("data/one_individual.json", 'r') as openfile:
+        one_individual = json.load(openfile)
+    return one_individual
+

app/wounded.py

@@ -9,8 +9,8 @@ from utils_json import add_data_to_individual
 def show_section_wounded(visible):
     if visible==True: 
         add_data_to_individual("wounded", "True")
-    else: 
-        add_data_to_individual("wounded", "False")
+        add_data_to_individual("dead", "False")
+        
     with gr.Column(visible=visible, elem_id="wounded") as wounded_section:
         gr.Markdown("# Wounded Animal")