feat: begin modal refactor and save individual location data as json

.gitignore

@@ -7,6 +7,7 @@ __pycache__/
 
 #Data 
 test/data/**
+data/**
 
 # C extensions
 *.so

app/main_async.py

@@ -1,155 +0,0 @@
-import gradio as gr
-import asyncio
-from functools import partial
-
-from dead import show_section_dead
-from wounded import show_section_wounded
-from circumstances_dropdowns import *
-
-def partial_show_section_wounded():
-    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(True)
-    return 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, \
-            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
-
-def partial_show_section_dead():
-    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)
-    # Your logic here to show the sections and buttons
-    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(True)
-    return 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, \
-            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 \
-                            
-
-def create_animal_tab(num_animals):
-    for animal_index in range(int(num_animals)):
-        with gr.Tab(f"Animal {animal_index + 1}"):
-            # ---------------------------------------------------------
-            # 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=f"wounded_{animal_index + 1}")
-                with gr.Column(scale=1):
-                    butt_dead = gr.Button("Dead", elem_id=f"dead_{animal_index + 1}")
-
-            # ---------------------------------------------------------
-            # 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 for the current tab
-            butt_dead.click(partial(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,
-                                    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(partial_show_section_wounded),
-                            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,
-                                    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 \
-                                ])
-            # ---------------------------------------------------------
-            # Dead Button Logic for the current tab
-            button_collision_dead.click(dropdown_collision, 
-                                        outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
-
-
-# Initialize global variables
-NUM_ANIMALS = 1
-VARIABLE_CHANGE_EVENT = asyncio.Event()
-
-# Function to change the global variable
-def change_num_animal(num_animals):
-    NUM_ANIMALS = int(num_animals)
-    print(f"Number animals: {NUM_ANIMALS}")
-    VARIABLE_CHANGE_EVENT.set()
-
-
-
-# Async function that waits for the global variable to change and then creates tabs
-async def tabbify():
-    while True: 
-        await VARIABLE_CHANGE_EVENT.wait()
-        print("Creating tabs!")
-        # Simulate tab creation logic
-        create_animal_tab(NUM_ANIMALS)
-
-
-async def main():
-
-    asyncio.create_task(tabbify())
-
-    with gr.Blocks() as demo:
-        
-
-        # Input box to enter the number of tabs
-        num_tabs = gr.Textbox(label="Enter number of animals:", value="1", interactive=True)
-        
-        # Button to trigger the generation of tabs
-        generate_button = gr.Button("Generate Tabs")
-        
-        # When the button is clicked, change the global variable
-        generate_button.click(fn=change_num_animal, inputs=[num_tabs], outputs=[])
-    demo.launch(server_name="0.0.0.0", server_port=5000)
-
-# Run the main function
-asyncio.run(main())
-

app/main_dynamic_tabs.py

@@ -1,134 +0,0 @@
-import gradio as gr
-from functools import partial
-
-from dead import show_section_dead
-from wounded import show_section_wounded
-from circumstances_dropdowns import *
-
-# Define the show_section_dead and partial_show_section_dead functions as needed
-
-def partial_show_section_wounded():
-    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(True)
-    return 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, \
-            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
-
-def partial_show_section_dead():
-    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)
-    # Your logic here to show the sections and buttons
-    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(True)
-    return 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, \
-            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 \
-                            
-
-def create_animal_tab(num_animals):
-    for animal_index in range(int(num_animals)):
-        with gr.Tab(f"Animal {animal_index + 1}"):
-            # ---------------------------------------------------------
-            # 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=f"wounded_{animal_index + 1}")
-                with gr.Column(scale=1):
-                    butt_dead = gr.Button("Dead", elem_id=f"dead_{animal_index + 1}")
-
-            # ---------------------------------------------------------
-            # 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 for the current tab
-            butt_dead.click(partial(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,
-                                    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(partial_show_section_wounded),
-                            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,
-                                    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 \
-                                ])
-            # ---------------------------------------------------------
-            # Dead Button Logic for the current tab
-            button_collision_dead.click(dropdown_collision, 
-                                        outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
-
-
-
-with gr.Blocks() as demo:
-
-    # Input box to enter the number of tabs
-    num_tabs = gr.Textbox(label="Enter number of animals:", 
-                                value="1",
-                                interactive=True)
-    
-    # Button to trigger the generation of tabs
-    generate_button = gr.Button("Generate Tabs")
-
-    # When the button is clicked, generate tabs
-    # generate_button.click(fn=create_animal_tab,
-    #             inputs=[num_tabs])
-    create_animal_tab(num_tabs)
-        
-    
-
-demo.launch(server_name="0.0.0.0", server_port=5500)

app/main_modal.py

@@ -0,0 +1,37 @@
+import gradio as gr
+from gradio_modal import Modal
+import numpy as np
+
+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
+
+with gr.Blocks() as demo:
+    with gr.Tab("Tab 1"):
+        show_btn = gr.Button("Show Modal")
+        df = gr.Dataframe(
+            headers=["name", "age", "gender"],
+            #datatype=["str", "number", "str"],
+            row_count=1,
+            col_count=(3, "fixed"),
+        )
+        show_markdown = gr.Markdown("This is a markdown")
+    with Modal(visible=False) as modal:
+            input = gr.Textbox(label="Input 1", interactive=True)
+            button = gr.Button("Click me")
+            button.click(save_input, 
+                         inputs=[input, df],
+                         outputs=[df])
+            button.click(lambda: Modal(visible=False), None, modal)
+    show_btn.click(lambda: Modal(visible=True), None, modal)
+
+
+     
+     
+     
+if __name__ == "__main__":
+    demo.launch(server_name="0.0.0.0", server_port=3333)

app/main_multianimal.py

@@ -0,0 +1,73 @@
+import gradio as gr
+from gradio_modal import Modal
+import numpy as np
+from maps import get_location
+from utils_json import *
+
+     
+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
+
+with gr.Blocks() 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")
+    with Modal(visible=False) as modal:
+        input = gr.Textbox(label="Input 1", interactive=True)
+        # ---------------------------------------------------------
+        # 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")
+
+        # ---------------------------------------------------------
+        # Camera
+        with gr.Row():
+            #with gr.Column(scale=1):
+            camera = gr.Image(elem_id="image")
+                
+        # ---------------------------------------------------------
+        # Location
+        #with gr.Row():
+            with gr.Column(scale=1):
+                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 clear it
+                    clear_location = gr.ClearButton(components=[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])
+        
+        # ---------------------------------------------------------
+        
+        button = gr.Button("Click me")
+        button.click(save_input, 
+                        inputs=[input, 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)
+
+
+     
+     
+     
+if __name__ == "__main__":
+    demo.launch(server_name="0.0.0.0", server_port=3333)

app/maps.py

@@ -1,8 +1,9 @@
 from geopy.geocoders import Nominatim
 import gradio as gr
+from utils_json import add_data_to_individual
  
 def get_location(address):
-    try: 
+    # try: 
         # calling the Nominatim tool
         loc = Nominatim(user_agent="GetLoc")
         
@@ -12,6 +13,11 @@ def get_location(address):
         # latitude and longitude
         lat = getLoc.latitude
         lon = getLoc.longitude
+
+        # Save values
+        add_data_to_individual("latitude", lat)
+        add_data_to_individual("longitude", lon)
+
         #display location processing
         value = "Latitude = " + str(lat) + "\n" + "Longitude = " + str(lon)
         identified_location= gr.Textbox(visible=True, interactive=False, 
@@ -19,9 +25,9 @@ def get_location(address):
                                         value=value)
         return identified_location
     
-    except:
-        error = "Please try another less precise location."
-        identified_location= gr.Textbox(visible=True, interactive=False, 
-                                        label="Identified GPS Location", 
-                                        value=error)
-        return identified_location
+    # except:
+    #     error = "Please try another less precise location."
+    #     identified_location= gr.Textbox(visible=True, interactive=False, 
+    #                                     label="Identified GPS Location", 
+    #                                     value=error)
+    #     return identified_location

app/utils_json.py

@@ -0,0 +1,16 @@
+import json
+
+def create_json(one_individual={}):
+    # Serializing json
+    one_individual = json.dumps(one_individual, indent=4)
+    # Writing to sample.json
+    with open("data/one_individual.json", "w") as outfile:
+        outfile.write(one_individual)
+
+def add_data_to_individual(key, value): 
+    with open("data/one_individual.json", 'r') as openfile:
+        # Reading from json file
+        one_individual = json.load(openfile)
+    one_individual[key] = value
+    create_json(one_individual)
+

requirements.txt

@@ -1,4 +1,5 @@
 gradio
+gradio_modal
 geopy
 geopandas
 pillow