fix: cleaning and resets together

app/circumstances/circumstances_dropdowns.py

@@ -135,7 +135,6 @@ def on_select_dropdown_extra_level2(evt: gr.SelectData, individual):
 
 
 def on_change_openfield_level2(openfield_level2_dead, individual):
-    # print("Saving open field")
     individual = add_data_to_individual(
         "circumstance_open_field", str(openfield_level2_dead).lower(), individual
     )

app/mode_advanced.py

@@ -9,17 +9,15 @@ from dead_wounded.wounded import show_section_wounded
 from circumstances.circumstances import show_circumstances
 from circumstances.circumstances_dropdowns import *
 from physical.physical_select_animal import show_physical, find_bounding_box
-from physical.physical_checkbox import on_select_body_part, hide_physical
+from physical.physical_checkbox import on_select_body_part
 from behavior.behavior_checkbox import show_behavior, on_select_behavior
 from follow_up.followup_events import save_fe
 from styling.style import *
 from validation_submission.utils_individual import generate_random_md5
 from validation_submission.utils_individual import add_data_to_individual
 from validation_submission.submission import validate_save_individual
-from validation_submission.validation import reset_error_box 
-from validation_submission.utils_individual import reset_individual
 from validation_submission.utils_save import save_details, save_image
-
+from validation_submission.resets import reset_individual, reset_error_box, hide_physical
 
 from dotenv import load_dotenv
 import os
@@ -129,7 +127,7 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
             location_data = gr.JSON(label="Identified GPS Location", visible=False)
             hidden_input = gr.Textbox(visible=False, elem_id="textbox_id") 
             locationtext = gr.Textbox(visible=False, elem_id="textbox_id") 
-            btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required)")
+            btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required - May take a few seconds)")
             btn_gpslocation.click(None, [], [], js=js_geocode)
             hidden_input.change(display_location, 
                                     inputs=[hidden_input, individual], 

app/mode_simple.py

@@ -8,16 +8,13 @@ from dead_wounded.wounded import show_section_wounded
 from circumstances.circumstances import show_circumstances
 from circumstances.circumstances_dropdowns import *
 from physical.physical_select_animal import show_physical, find_bounding_box
-from physical.physical_checkbox import on_select_body_part, hide_physical
+from physical.physical_checkbox import on_select_body_part
 from behavior.behavior_checkbox import show_behavior, on_select_behavior
 from follow_up.followup_events import save_fe
 from styling.style import *
-from validation_submission.utils_individual import reset_individual
-from validation_submission.utils_individual import add_data_to_individual
 from validation_submission.submission import validate_save_individual
-from validation_submission.validation import reset_error_box
-from validation_submission.utils_individual import generate_random_md5
 from validation_submission.utils_save import save_details, save_image
+from validation_submission.resets import reset_individual, reset_error_box, hide_physical
 
 from dotenv import load_dotenv
 import os
@@ -29,8 +26,6 @@ PATH_ICONS = PATH + PATH_ASSETS + "icons/"
 with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     mode = "simple"
     individual = gr.State({})
-    individual.value = add_data_to_individual("image_md5", generate_random_md5(), individual.value)
-
     # ---------------------------------------------------------
     # Header Text
     with gr.Row():
@@ -106,7 +101,7 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                     location_data = gr.JSON(label="Identified GPS Location", visible=False)
                     hidden_input = gr.Textbox(visible=False, elem_id="textbox_id") 
                     locationtext = gr.Textbox(visible=False, elem_id="textbox_id") 
-                    btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required)")
+                    btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required - May take a few seconds)")
                     btn_gpslocation.click(None, [], [], js=js_geocode)
                     hidden_input.change(display_location, 
                                           inputs=[hidden_input, individual], 

app/physical/physical_checkbox.py

@@ -17,7 +17,6 @@ def retrieve_config_options(label, dropdown_config):
 
 
 def get_options_description(value, mode):
-    # print(f"Get options description: {mode}")
     if mode == "simple":
         dropdown_config = get_custom_config_dropdowns(
             "config_checkbox_physical_simple.json"
@@ -132,32 +131,3 @@ def on_select_body_part(body_part_checkbox, body_part, individual):
     )
     return individual
 
-
-# ---------------------------------------------------------
-
-
-def hide_physical(mode):
-    (
-        checkbox_beak,
-        text_beak,
-        checkbox_body,
-        text_body,
-        checkbox_feathers,
-        text_feathers,
-        checkbox_head,
-        text_head,
-        checkbox_legs,
-        text_legs,
-    ) = process_body_parts("wounded", mode, "None")
-    return (
-        checkbox_beak,
-        text_beak,
-        checkbox_body,
-        text_body,
-        checkbox_feathers,
-        text_feathers,
-        checkbox_head,
-        text_head,
-        checkbox_legs,
-        text_legs,
-    )

app/validation_submission/resets.py

@@ -0,0 +1,46 @@
+import gradio as gr
+
+from physical.physical_checkbox import process_body_parts
+
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH = os.getcwd() + "/"
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+PATH_ICONS = PATH + PATH_ASSETS + "icons/"
+
+def reset_individual(individual):
+    individual = {}
+    return individual
+
+def reset_error_box(error_icon, error_box):
+    error_icon = gr.Image(PATH_ICONS+"supprimer.png", height=80, width=80, visible=False)
+    error_box = gr.Text(value=None, visible=False)
+    return error_icon, error_box
+
+
+def hide_physical(mode):
+    (
+        checkbox_beak,
+        text_beak,
+        checkbox_body,
+        text_body,
+        checkbox_feathers,
+        text_feathers,
+        checkbox_head,
+        text_head,
+        checkbox_legs,
+        text_legs,
+    ) = process_body_parts("wounded", mode, "None")
+    return (
+        checkbox_beak,
+        text_beak,
+        checkbox_body,
+        text_body,
+        checkbox_feathers,
+        text_feathers,
+        checkbox_head,
+        text_head,
+        checkbox_legs,
+        text_legs,
+    )

app/validation_submission/utils_individual.py

@@ -1,7 +1,6 @@
 import random
 import string
 import hashlib
-import gradio as gr
 
 def generate_random_md5():
     # Generate a random string
@@ -14,7 +13,5 @@ def add_data_to_individual(key, value, individual):
     individual[key] = value
     return individual
 
-def reset_individual(individual):
-    individual = {}
-    return individual
+
     

app/validation_submission/validation.py

@@ -15,6 +15,8 @@ from validation_submission.processing import (
     process_physical,
     process_followup,
 )
+from validation_submission.utils_individual import generate_random_md5
+from validation_submission.resets import reset_error_box
 
 from dotenv import load_dotenv
 import os
@@ -43,6 +45,7 @@ def validate_individual(data, error_icon, error_box, mode: str):
     error_icon, error_box = reset_error_box(error_icon, error_box)
     # data = get_json_one_individual() # TODO: This should change
     data["identifier"] = str(uuid.uuid4())
+    data["image_md5"] = generate_random_md5()
     img, geolocalisation, specie, number, comments = field_checker(data)
 
     error_behavior = None
@@ -80,8 +83,6 @@ def validate_individual(data, error_icon, error_box, mode: str):
                     dead_state=data["dead_state"],
                 )
             except ValidationError as e:
-                print("Error in wounded_state:")
-                print(e.json())
                 error_individual = e
 
         elif data["dead_state"] == "Yes":
@@ -103,8 +104,6 @@ def validate_individual(data, error_icon, error_box, mode: str):
                     ),
                 )
             except ValidationError as e:
-                print("Error in dead_state:")
-                print(e.json())
                 error_individual = e
     else:
         try:
@@ -120,7 +119,6 @@ def validate_individual(data, error_icon, error_box, mode: str):
                 dead_state=data["dead_state"],
             )
         except ValidationError as e:
-            print(f"""Error in individual else: {e}""")
             error_individual = e
     if (
         error_behavior
@@ -184,12 +182,6 @@ def show_error(
     return error_box
 
 
-def reset_error_box(error_icon, error_box):
-    error_icon = gr.Image(PATH_ICONS+"supprimer.png", height=80, width=80, visible=False)
-    error_box = gr.Text(value=None, visible=False)
-    return error_icon, error_box
-
-
 #### VALIDATION FUNCTIONS
 def validate_circumstance(data):
     circumstance_raw = get_fields(data, "circumstance")
@@ -200,7 +192,6 @@ def validate_circumstance(data):
         error = None
     except ValidationError as e:
         error = e
-        print(f"""Error in Validate_circumstance: {e}""")
         circumstances = None
     return circumstances, error
 
@@ -217,7 +208,6 @@ def validate_behavior(data, mode):
             behavior = Behaviors(**behaviors_formatted)
         error = None
     except ValidationError as e:
-        print(f"""Error in behaviors validation: {e}""")
         behavior = None
         error = e
     return behavior, error
@@ -226,7 +216,6 @@ def validate_behavior(data, mode):
 def validate_physical(data, mode):
     physical_raw = get_fields(data, "physical")
     physical_formatted = process_physical(physical_raw)
-    # print(physical_formatted)
     try:
         if mode == "simple":
             PhysicalAnomaliesSimple.model_validate(physical_formatted)
@@ -236,7 +225,6 @@ def validate_physical(data, mode):
             physical = PhysicalAnomalies(**physical_formatted)
         error = None
     except ValidationError as e:
-        print(f"""Error in physical_anomalies validation: {e}""")
         physical = None
         error = e
     return physical, error
@@ -250,7 +238,5 @@ def validate_follow_up(data):
         followup = FollowUpEvents(**followup_formatted)
         error = None
     except ValidationError as e:
-        print(f"""Error in follow-up events validation: {e}""")
-
         followup = None
     return followup, error

test.py

@@ -1,10 +0,0 @@
-# app.py
-import gradio as gr
-
-def greet(name):
-    return f"Hello, {name}!"
-
-demo = gr.Interface(fn=greet, inputs="text", outputs="text")
-
-if __name__ == "__main__":
-    demo.launch()