fix: new icons and bug fixes in validation

app/credits.py

@@ -49,4 +49,10 @@ schedule: <a href="https://www.flaticon.com/free-icons/follow-up" title="follow
 
 Effective: <a href="https://www.flaticon.com/free-icons/cog" title="cog icons">Cog icons created by monkik - Flaticon</a>
 
+correct: <a href="https://www.flaticon.com/fr/icones-gratuites/termine" title="terminé icônes">Terminé icônes créées par kliwir art - Flaticon</a>
+
+supprimer: <a href="https://www.flaticon.com/fr/icones-gratuites/faux" title="faux icônes">Faux icônes créées par hqrloveq - Flaticon</a>
+
+balai-magique: <a href="https://www.flaticon.com/fr/icones-gratuites/la-magie" title="la magie icônes">La magie icônes créées par Freepik - Flaticon</a>
+
 """

app/mode_advanced.py

@@ -5,7 +5,8 @@ from geolocalisation.js_geolocation import js_geocode, display_location
 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.validation import reset_error_box 
+from validation_submission.utils_individual import reset_individual
 from geolocalisation.maps import get_location
 from functools import partial
 from dead import show_section_dead
@@ -354,10 +355,6 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
     fe_name_recipient_dead.input(save_fe, inputs=[fe_name_recipient_dead, gr.Textbox("recipient name", visible=False), individual],outputs=[individual])
     fe_collection_ref_dead.input(save_fe, inputs=[fe_collection_ref_dead, gr.Textbox("collection reference", visible=False), individual], outputs=[individual])
 
-    # ---------------------------------------------------------
-    # Error Box
-    error_box = gr.Text(value=None, visible=False)
-
     # ---------------------------------------------------------
     # Spacer
     with gr.Row(elem_id="centered-row"):
@@ -371,6 +368,14 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
                     justify-content: center;
                 }
                 """
+            
+    # ---------------------------------------------------------
+    # Error Box
+    with gr.Row(): 
+        error_icon = gr.Image(PATH_ICONS+"chicken.png", 
+                              height=80, width=80, visible=False,
+                              scale=1)
+        error_box = gr.Text(value=None, visible=False, scale=3)
            
         
     # ---------------------------------------------------------
@@ -400,7 +405,7 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
             checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded,
             fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, 
             fe_name_recipient_wounded, fe_collection_ref_wounded,
-            error_box
+            error_icon, error_box
             ])
         show_creds = gr.Button("CREDITS", icon=PATH_ICONS+"copyright.png", scale=0.5)
 
@@ -408,19 +413,30 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
     # Button Click Logic
     button_clear.click()
     button_clear.click(hide_physical,
-                        outputs=[checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded])
+                       inputs =[gr.Text(mode, visible=False)],
+                        outputs=[checkbox_beak_wounded, text_beak_wounded, 
+                                 checkbox_body_wounded, text_body_wounded, 
+                                 checkbox_feathers_wounded, text_feathers_wounded, 
+                                 checkbox_head_wounded, text_head_wounded, 
+                                 checkbox_legs_wounded, text_legs_wounded])
     button_clear.click(hide_physical,
-                        outputs=[checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead])
-    button_clear.click(reset_error_box, inputs=[error_box], outputs=[error_box])  
-            
+                       inputs =[gr.Text(mode, visible=False)],
+                        outputs=[checkbox_beak_dead, text_beak_dead, 
+                                 checkbox_body_dead, text_body_dead, 
+                                 checkbox_feathers_dead, text_feathers_dead, 
+                                 checkbox_head_dead, text_head_dead, 
+                                 checkbox_legs_dead, text_legs_dead])
+    button_clear.click(reset_error_box, inputs=[error_icon, error_box], outputs=[error_icon, error_box])  
+    button_clear.click(reset_individual, inputs=[individual], outputs=[individual])
    
     # ---------------------------------------------------------
     # VALIDATE ANIMAL 
     button_df.click(validate_save_individual, 
                     inputs=[individual, 
+                            error_icon,
                             error_box,
                             gr.Text(mode, visible=False)],
-                    outputs=[error_box])
+                    outputs=[individual, error_icon, error_box])
     # ---------------------------------------------------------
     #CREDITS
     with Modal(visible=False) as modal_creds:

app/mode_simple.py

@@ -1,10 +1,12 @@
 import gradio as gr
 from gradio_modal import Modal
+from functools import partial
 
 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 functools import partial
+
+
 from dead import show_section_dead
 from wounded import show_section_wounded
 from circumstances.circumstances import show_circumstances
@@ -15,6 +17,7 @@ from behavior.behavior_checkbox import show_behavior, on_select_behavior
 from follow_up.followup_events import save_fe
 from styling.style import *
 from credits import credits_text
+from validation_submission.utils_individual import reset_individual
 
 from geolocalisation.js_geolocation import js_geocode, display_location
 from validation_submission.utils_individual import generate_random_md5
@@ -356,10 +359,6 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     fe_name_recipient_dead.input(save_fe, inputs=[fe_name_recipient_dead, gr.Textbox("recipient name", visible=False), individual],outputs=[individual])
     fe_collection_ref_dead.input(save_fe, inputs=[fe_collection_ref_dead, gr.Textbox("collection reference", visible=False), individual], outputs=[individual])
 
-    # ---------------------------------------------------------
-    # Error Box
-    error_box = gr.Text(value=None, visible=False)
-
     # ---------------------------------------------------------
     # Spacer
     with gr.Row(elem_id="centered-row"):
@@ -374,6 +373,12 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                 }
                 """
             
+    # ---------------------------------------------------------
+    # Error Box
+    with gr.Row(): 
+        error_icon = gr.Image(PATH_ICONS+"chicken.png", height=80, width=80, visible=False, scale=1)
+        error_box = gr.Text(value=None, visible=False, scale=4)
+            
     # ---------------------------------------------------------
     # Allow clearing of all previous output
     with gr.Row(): 
@@ -381,7 +386,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                               scale = 3)
         button_clear = gr.ClearButton(value="CLEAR",
                                       scale = 1,
-                                        components=[
+                                      icon = PATH_ICONS+"balai-magique.png",
+                                      components=[
             camera,
             #dead reset
             radio_circumstance_dead, radio_physical_dead,
@@ -400,7 +406,7 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
             checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded,
             fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, 
             fe_name_recipient_wounded, fe_collection_ref_wounded,
-            error_box
+            error_icon, error_box
             ])
         show_creds = gr.Button("CREDITS", icon=PATH_ICONS+"copyright.png", scale=0.5)
 
@@ -408,19 +414,30 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     # Button Click Logic
     button_clear.click()
     button_clear.click(hide_physical,
-                        outputs=[checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded])
+                        inputs=[gr.Text(mode, visible=False)],
+                        outputs=[checkbox_beak_wounded, text_beak_wounded, 
+                                 checkbox_body_wounded, text_body_wounded, 
+                                 checkbox_feathers_wounded, text_feathers_wounded, 
+                                 checkbox_head_wounded, text_head_wounded, 
+                                 checkbox_legs_wounded, text_legs_wounded])
     button_clear.click(hide_physical,
-                        outputs=[checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_dead])
-    button_clear.click(reset_error_box, inputs=[error_box], outputs=[error_box])  
-            
+                        inputs=[gr.Text(mode, visible=False)],
+                        outputs=[checkbox_beak_dead, text_beak_dead, 
+                                 checkbox_body_dead, text_body_dead, 
+                                 checkbox_feathers_dead, text_feathers_dead, 
+                                 checkbox_head_dead, text_head_dead, 
+                                 checkbox_legs_dead, text_legs_dead])
+    button_clear.click(reset_error_box, inputs=[error_icon, error_box], outputs=[error_icon, error_box])  
+    button_clear.click(reset_individual, inputs=[individual], outputs=[individual])
    
     # ---------------------------------------------------------
     # VALIDATE ANIMAL 
     button_df.click(validate_save_individual, 
                     inputs=[individual, 
+                            error_icon,
                             error_box,
                             gr.Text(mode, visible=False)],
-                    outputs=[error_box])
+                    outputs=[individual, error_icon, error_box])
     # ---------------------------------------------------------
     #CREDITS
     with Modal(visible=False) as modal_creds:

app/physical/physical_checkbox.py

@@ -5,13 +5,8 @@ from validation_submission.utils_individual import add_data_to_individual
 
 
 # ---------------------------------------------------------
-def get_body_parts(mode):
-    if mode == "simple":
-        dropdown_config = get_custom_config_dropdowns(
-            "config_checkbox_physical_simple.json"
-        )
-    elif mode == "advanced":
-        dropdown_config = get_custom_config_dropdowns("config_checkbox_physical.json")
+def get_body_parts():
+    dropdown_config = get_custom_config_dropdowns("config_checkbox_physical.json")
     return list(dropdown_config.keys())
 
 
@@ -89,7 +84,7 @@ def create_checkbox_legs(section, mode, label_checkbox, visible):
 # ---------------------------------------------------------
 def process_body_parts(section, mode, matched_box):
     # take all except "Common"
-    body_parts = get_body_parts(mode)
+    body_parts = get_body_parts()
     body_parts = body_parts[1:]
     label_checkbox = "Physical changes to "
     visibles = [True if matched_box == body_part else False for body_part in body_parts]

app/styling/theme.py

@@ -1,7 +1,13 @@
-import gradio as gr
+css_for_error_box= """
+#error {background-color: #e82323 !important;
+    color: white !important;
+    font-weight: bold;}
+#valid {background-color: #07e63f !important;
+    color: white !important;
+    font-weight: bold;}
+"""
 
-css= ""
-css_old = """
+css_alternative = """
 .gradio-container {background: url(https://openclipart.org/image/2000px/279687)}
 
 /* Main background */
@@ -84,22 +90,3 @@ body {
 #error {background-color: #e82323}
 #valid {background-color: #07e63f}
 """
-
-# OLD THEME: 
-
-# css = """
-# .gradio-container {background: url(https://openclipart.org/image/2000px/279687)}
-# #image {background-color: #73b9ae}
-# #dead {background-color: #333333}
-# #wounded {background-color: #5e0724}
-# #bird-boxes {background-color: #f2f3f3}
-# #buttons-conditions {background-color: #b3b3b3}
-# #dropdown-conditions {background-color: #b3b3b3}
-# #followup {background-color: #38241c} 
-# #submit {background-color: #abb2bf}
-# #error {background-color: #e82323}
-# #valid {background-color: #07e63f}
-# """
-
-# theme = gr.themes.Soft(primary_hue="teal", secondary_hue="teal", neutral_hue="emerald",
-#                          font=[gr.themes.GoogleFont("Inconsolata"), "Arial", "sans-serif"])

app/validation_submission/processing.py

@@ -1,45 +1,61 @@
 #### PROCESS FUNCTIONS 
 
 def process_circumstance(data):
-
+    print(data)
     fields_to_check = ["option_dropdown", "open_field", "extra"]
-    if data["circumstance_radio"] == "Yes":
+    reformatted ={}
+    if ("circumstance_radio" in data.keys()) and ("circumstance" in data.keys()) and ("circumstance_type" in data.keys()) and (data["circumstance_radio"] == "Yes"):
+        reformatted["circumstance_radio"] = data["circumstance_radio"]
+        reformatted["circumstance"] = data["circumstance"]
+        reformatted["circumstance_type"] = {}
         for field in fields_to_check:
-            if data["circumstance_type"][field+"_label"] == "NA":
-                data["circumstance_type"].pop(field+"_label")
-            else :
+            if not data["circumstance_type"][field+"_label"] == "NA":
                 val = data[f"circumstance_{field}"]
                 key = data["circumstance_type"][field+"_label"]
-                data["circumstance_type"][key] = val
-                data["circumstance_type"].pop(field+"_label")
-    return data
+                print("TYPE: ", key)
+                reformatted["circumstance_type"][key] = val
+    else: 
+        reformatted["circumstance_radio"] = None
+        reformatted["circumstance"] = None
+        reformatted["circumstance_type"] = {}
+    print (reformatted)
+    return reformatted
 
 def process_behaviors(data):
     behaviors =[]
-    if data["behaviors_radio"] == "Yes":
+    reformatted = {}
+    if ("behaviors_radio" in data.keys()) and ("behaviors_type" in data.keys()) and (data["behaviors_radio"] == "Yes"):
+        reformatted["behaviors_radio"] = data["behaviors_radio"]
         for type in data["behaviors_type"]: 
             new_behavior = {}
             new_behavior["type"] = type
             behaviors.append(new_behavior)
-        data["behaviors_type"] = behaviors
-    return data 
+        reformatted["behaviors_type"] = behaviors
+    else: 
+        reformatted["behaviors_radio"] = None
+        reformatted["behaviors_type"] = []
+    return reformatted 
 
 def process_physical(data):
     body_parts= ["beak", "body", "legs", "feathers/wings/tail", "head incl. eyes"]
+    body_parts_search = ["beak", "body", "legs", "feathers", "head"]
     anomalies=[]
     reformatted = {}
-    reformatted["physical_radio"] = data["physical_radio"]
-    if data["physical_radio"] == "Yes":
-        for body_part in body_parts:
+    if ("physical_radio" in data.keys()) and (data["physical_radio"] == "Yes") and any("type_" in key for key in data.keys()) and any("anomaly_" in key for key in data.keys()):
+        reformatted["physical_radio"] = data["physical_radio"]
+        for b, body_part in enumerate(body_parts_search):
             anomaly = {}
             for key, val in data.items(): 
                 if "type_"+ body_part in key:
-                    anomaly["type"] = body_part
+                    anomaly["type"] = body_parts[b]
                 elif "anomaly_"+ body_part in key:
                     anomaly["anomaly_type"] = val
             if anomaly: 
                 anomalies.append(anomaly)
         reformatted["physical_anomalies_type"] = anomalies
+    else: 
+        reformatted["physical_radio"] = None
+        reformatted["physical_anomalies_type"] = []
     return reformatted
 
 def process_followup(data):

app/validation_submission/submission.py

@@ -1,15 +1,16 @@
 import json
 from validation_submission.validation import validate_individual
-
+import gradio as gr 
 from huggingface_hub import HfApi
 import os
 
 
-def validate_save_individual(data, error_box, mode):
-    individual, error_box = validate_individual(data, error_box, mode)
+def validate_save_individual(data, error_icon, error_box, mode):
+    individual, error_icon, error_box = validate_individual(data, error_icon, error_box, mode)
     if individual:
+        print("pushing to hugging face")
         push_to_dataset_hf(individual.model_dump())
-    return error_box
+    return individual, error_icon, error_box
 
 
 def push_to_dataset_hf(individual):

app/validation_submission/utils_individual.py

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

app/validation_submission/validation.py

@@ -17,6 +17,13 @@ from validation_submission.processing import (
     process_followup,
 )
 
+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 get_fields(data_dict, keyword):
     extract = {}
@@ -26,8 +33,8 @@ def get_fields(data_dict, keyword):
     return extract
 
 
-def validate_individual(data, error_box, mode: str):
-    error_box = reset_error_box(error_box)
+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())
     if "image" in data.keys():
@@ -48,14 +55,12 @@ def validate_individual(data, error_box, mode: str):
         data["wounded_state"] = "No"
         data["dead_state"] = "No"
     if (data["wounded_state"] == "Yes") or (data["dead_state"] == "Yes"):
-        data_wounded_dead = data  # get_json_tmp("wounded_dead")
-        # print(f"Data Wounded Dead: {data_wounded_dead}")
+        data_wounded_dead = data 
         circumstance, error_circumstance = validate_circumstance(data_wounded_dead)
         physical, error_physical = validate_physical(data_wounded_dead, mode)
         followup, error_followup = validate_follow_up(data_wounded_dead)
 
         if data["wounded_state"] == "Yes":
-            # print(f"Physical: {physical}")
             behavior, error_behavior = validate_behavior(data_wounded_dead, mode)
             try:
                 individual = Report(
@@ -116,6 +121,11 @@ def validate_individual(data, error_box, mode: str):
         or error_physical
         or error_individual
     ):
+        error_icon = gr.Image(PATH_ICONS+"supprimer.png", height=80, width=80,
+                        interactive=False,
+                        show_fullscreen_button = False, show_share_button=False, 
+                        show_download_button=False, show_label=False,
+                        visible=True)
         error_box = show_error(
             error_box,
             error_behavior,
@@ -126,13 +136,18 @@ def validate_individual(data, error_box, mode: str):
         )
         individual = None
     else:
+        error_icon = gr.Image(PATH_ICONS+"correct.png", height=80, width=80,
+                        interactive=False,
+                        show_fullscreen_button = False, show_share_button=False, 
+                        show_download_button=False, show_label=False,
+                        visible=True)
         error_box = gr.Text(
             label="ALL VALID.",
-            value="Record Registered. You can return to the Display.",
+            value="Record Registered. Remember to press the CLEAR button before submitting a new record.",
             visible=True,
             elem_id="valid",
         )
-    return individual, error_box
+    return individual, error_icon, error_box
 
 
 def show_error(
@@ -161,9 +176,10 @@ def show_error(
     return error_box
 
 
-def reset_error_box(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_box
+    return error_icon, error_box
 
 
 #### VALIDATION FUNCTIONS