Merge pull request #46 from sdsc-ordes/feat/simple-symptoms

README.md

@@ -13,7 +13,7 @@ short_description: Digiwild
 ## Docker
 
 ``` bash
-docker build -t ordes/digiwild . 
+docker build -t ordes/digiwild .
 ```
 
 
@@ -29,18 +29,17 @@ python3 main.py
 ### How to develop on docker
 
 ``` bash
-docker run -it -p 7860:7860 -v $(pwd):/home/user/digiwild/ ordes/digiwild
+docker run -it -p 7860:7860 -v $(pwd):/home/user/digiwild/ --entrypoint bash ordes/digiwild
 ```
 
 ## TODO
 
 - [x] Change `wounded` to `wounded / sick`
 - [x] Info formatting
-- [ ] Use in memory object instead of files to avoid writting / reading problems.
+- [x] Use in memory object instead of files to avoid writting / reading problems.
 - [ ] Connection to a database? Maybe an open MongoDB
 - [x] GPS Compatibility
 - [x] New fields suggested: Number individuals, Species, Comments
-- [ ] Save new fields values into the JSON. Perform validation too.
 - [ ] Add info and placeholder information to the different components.
 
 ## Needs
@@ -50,5 +49,3 @@ docker run -it -p 7860:7860 -v $(pwd):/home/user/digiwild/ ordes/digiwild
 - GPS location
 - Comments
 - Symptomps selection (Dropdown)
-
-## PR Updates

app/{credits.py → about.py}

@@ -1,27 +1,46 @@
+import gradio as gr
+
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH = os.getcwd() + "/"
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+PATH_ICONS = PATH + PATH_ASSETS + "icons/"
+
 credits_text = """
 # Credits
 
-## Scientific Expertise
-
-- Isabelle Wethli (Institute for Fish and Wildlife Health, University of Bern)
-- Dr. Mirjam Pewsner (Institute for Fish and Wildlife Health, University of Bern)
-- Dr. Saskia Keller (Institute for Fish and Wildlife Health, University of Bern)
+This work stemmed from a fruitful collaboration between SDSC and FIWI. 
 
-## Front End Development
+## Scientific Expertise : FIWI from UniBE 
 
-- Carlos Viviar Rios (Swiss Data Science Center)
-- Laure Vancauwenberghe (Swiss Data Science Center)
+From the [Institute for Fish and Wildlife Health, University of Bern](https://www.fiwi.vetsuisse.unibe.ch)
+- **Isabelle Wethli**
+- **Dr. Mirjam Pewsner**
+- **Dr. Saskia Keller**
 
+## Front End Development: SDSC
 
+From the [Swiss Data Science Center](https://www.datascience.ch)
+- **Carlos Viviar Rios**
+- **Laure Vancauwenberghe**
 
+## How to Contact Us? 
 
+Please reach out to FIWI via [their contacts](https://www.fiwi.vetsuisse.unibe.ch/about_us/team/index_eng.html).
 
+## Special Thanks 
 
+- **Vogelwarte** for their advice, especially Samuel Wechsler.
+- **Biolovision SA**, providers of **ornitho.ch**, for their collaboration: circumstances are matched to their current data collection schema on ornitho.ch
 
+"""
 
-### Icons 
+icons_text = """
+### Icons' Attributions
+(scroll to see all)
 
-copyright: <a href="https://www.flaticon.com/free-icons/copyright" title="copyright icons">Copyright icons created by Freepik - Flaticon</a>
+Biolovision for the circumstances icons. 
 
 flying-doves-group: <a href="https://www.flaticon.com/free-icons/animal" title="animal icons">Animal icons created by Freepik - Flaticon</a>
 
@@ -49,4 +68,31 @@ 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>
+
+contact-information: <a href="https://www.flaticon.com/free-icons/contact-information" title="contact information icons">Contact information icons created by Freepik - Flaticon</a>
+
+help: <a href="https://www.flaticon.com/free-icons/help" title="help icons">Help icons created by Freepik - Flaticon</a>
+
+question: <a href="https://www.flaticon.com/free-icons/question" title="question icons">Question icons created by Freepik - Flaticon</a>
+"""
+
+with gr.Blocks(theme='shivi/calm_seafoam') as about: 
+    with gr.Row(scale = 1): 
+        gr.Image(PATH_ICONS+"sdsc.png", 
+                 height=200,
+                 interactive=False,
+                 show_fullscreen_button = False, show_share_button=False, 
+                 show_download_button=False, show_label=False)
+        gr.Image(PATH_ICONS+"fiwi.png",
+                 height=200,
+                 interactive=False,
+                 show_fullscreen_button = False, show_share_button=False, 
+                 show_download_button=False, show_label=False)
+         
+    gr.Markdown(credits_text, show_label=False)
+    gr.Markdown(icons_text, show_label=False, height=100)

app/assets/config/config_checkbox_behavior_simple.json

@@ -0,0 +1,18 @@
+{
+    "General weakness":
+    {
+        "Description": "Abnormal breathing (dyspnoea), sudden crash, apathy, lethargy, unable to fly but responsive."
+    },
+    "Vomiting":
+    {
+        "Description": "Throwing up undigested food, regurgitating"
+    },
+    "Atypical behavior":
+    {
+        "Description": "Circling, incoordination, tremors, convulsions"
+    },
+    "No changes": 
+    {
+        "Description": "Animal is acting normally"
+    }
+}

app/assets/config/config_checkbox_physical_simple.json

@@ -0,0 +1,30 @@
+{
+    "Common":
+    {
+        "Abnormal position": {
+            "Description": "Hanging wing, tilted head, lameness"},
+        "Injury": {
+            "Description": "Visible blood, fracture, missing limb, swelling without visible injury, foreign body"}
+    },
+    "Beak":
+    {
+        "Adhesion/Discharge": {
+            "Description": "Material (food, saliva) around/ in the beak, discharge from ears/ eyes/ beak/ nose"
+            }
+    },
+    "Body": 
+    {},
+    "Feathers/Wings/Tail":
+    {
+        "Feathers and skin change": {
+            "Description": "Blackened/ burnt skin or feathers, deformed feathers, ear changes (swollen, crusts, plugged, discharge), discolored/ missing/ broken/ stained feathers, fluffed up plumage, warts/ crusts/ tumor-like growth, parasites"}
+    },
+    "Head incl. eyes": 
+    {
+        "Eye changes": {
+            "Description": "Swollen, reddened, closed, discharge, crusts"}
+    },
+    "Legs":
+    {}
+
+}

app/behavior/behavior_checkbox.py

@@ -4,28 +4,41 @@ from utils.utils_checkbox import create_checkbox
 from utils.utils_visible import set_visible
 from validation_submission.utils_individual import add_data_to_individual
 
-def on_select_behavior(behavior_checkbox, individual): 
+
+def on_select_behavior(behavior_checkbox, individual):
     behavior_checkbox = [behavior.lower() for behavior in behavior_checkbox]
     individual = add_data_to_individual("behaviors_type", behavior_checkbox, individual)
     return individual
 
-def retrieve_behavior_options_description():
-    dropdown_config = get_custom_config_dropdowns("config_checkbox_behavior.json")
+
+def retrieve_behavior_options_description(mode: str):
+    # print(f"Retrieve Behavior Option Description: {mode}")
+    if mode == "simple":
+        dropdown_config = get_custom_config_dropdowns(
+            "config_checkbox_behavior_simple.json"
+        )
+    elif mode == "advanced":
+        dropdown_config = get_custom_config_dropdowns("config_checkbox_behavior.json")
     options = list(dropdown_config.keys())
     options = [option.title() for option in options]
-    descriptions =[]
-    for _,subdict in dropdown_config.items():
+    descriptions = []
+    for _, subdict in dropdown_config.items():
         descriptions.append(subdict["Description"])
     return options, descriptions
 
-def create_behavior_checkbox(section: str, visible):
-    options, descriptions = retrieve_behavior_options_description()
+
+def create_behavior_checkbox(section: str, mode: str, visible):
+    options, descriptions = retrieve_behavior_options_description(mode)
     label_checkbox = "Behavior changes observed"
-    checkbox, text = create_checkbox("", section, label_checkbox, visible, options, descriptions)
+    checkbox, text = create_checkbox(
+        "", section, label_checkbox, visible, options, descriptions
+    )
     return checkbox, text
 
-def show_behavior(choice, section: str, individual): 
+
+def show_behavior(choice, section: str, mode: str, individual):
+    # print(f"Show Behavior: {mode}")
     visible = set_visible(choice)
-    checkbox, text = create_behavior_checkbox(section, visible)
+    checkbox, text = create_behavior_checkbox(section, mode, visible)
     individual = add_data_to_individual("behaviors_radio", choice, individual)
-    return checkbox, text, individual
+    return checkbox, text, individual

app/behavior/class_behavior_simple.py

@@ -0,0 +1,44 @@
+from pydantic import BaseModel, Field
+from typing import Literal, List, Union, Optional
+
+
+class BehaviorSimple(BaseModel):
+    type: str
+    description: Optional[str] = None  # Making the description field optional
+
+
+# --- Specific BehaviorSimple classes ---
+class GeneralWeakness(BehaviorSimple):
+    type: Literal["general weakness"]
+    description: Optional[
+        Literal[
+            "Abnormal breathing (dyspnoea), sudden crash, apathy, lethargy, unable to fly but responsive"
+        ]
+    ] = None
+
+
+class Vomiting(BehaviorSimple):
+    type: Literal["vomiting"]
+    description: Optional[Literal["Throwing up undigested food, regurgitating"]] = None
+
+
+class AtypicalBehavior(BehaviorSimple):
+    type: Literal["atypical behavior"]
+    description: Optional[
+        Literal["Circling, incoordination, tremors, convulsions"]
+    ] = None
+
+
+class NoChanges(BehaviorSimple):
+    type: Literal["no changes"]
+    description: Optional[Literal["Animal is acting normally"]] = None
+
+
+# Union of all possible behaviors
+BehaviorSimpleType = Union[GeneralWeakness, Vomiting, AtypicalBehavior, NoChanges]
+
+
+# Main class that logs multiple behaviors
+class BehaviorsSimple(BaseModel):
+    behaviors_radio: str  # e.g., "Yes"
+    behaviors_type: Optional[List[BehaviorSimpleType]] = None

app/circumstances/circumstances.py

@@ -15,7 +15,7 @@ CAUSE_COL_WIDTH = "50px"
 
 def show_circumstances(choice, individual): 
     visible = set_visible(choice)
-    individual = add_data_to_individual("wounded_dead", 
+    individual = add_data_to_individual(
                     "circumstance_radio", 
                     choice, individual)
     button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_circumstances(visible)

app/circumstances/circumstances_dropdowns.py

@@ -2,114 +2,141 @@ import gradio as gr
 from utils.utils_config import get_custom_config_dropdowns
 from validation_submission.utils_individual import add_data_to_individual
 
-#--------------------------------------------------------- LEVEL 1 DROPDOWNS
+
+# --------------------------------------------------------- LEVEL 1 DROPDOWNS
 def retrieve_config_options(label, dropdown_config):
     options = list(dropdown_config[label].keys())
     options = [option.title() for option in options]
     return options
 
-def reinitialise_level2(): 
+
+def reinitialise_level2():
     dropdown_level2 = gr.Dropdown(choices=[], visible=False)
     openfield_level2 = gr.Textbox(visible=False)
     dropdown_extra_level2 = gr.Dropdown(choices=[], visible=False)
     return dropdown_level2, openfield_level2, dropdown_extra_level2
 
-def create_dropdown_level1(label, individual): 
+
+def create_dropdown_level1(label, individual):
     dropdown_config = get_custom_config_dropdowns("config_dropdown_circumstances.json")
     options = retrieve_config_options(label, dropdown_config)
     dropdown = gr.Dropdown(choices=options, label=label, interactive=True, visible=True)
     dropdown_level2, openfield_level2, dropdown_extra_level2 = reinitialise_level2()
-    return dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2, individual
-    
+    return (
+        dropdown,
+        dropdown_level2,
+        openfield_level2,
+        dropdown_extra_level2,
+        individual,
+    )
+
+
 def dropdown_collision(individual):
     label = "Collision with a means of transport"
-    individual = add_data_to_individual("wounded_dead", "circumstance", label.lower(), individual)
+    individual = add_data_to_individual("circumstance", label.lower(), individual)
     return create_dropdown_level1(label, individual)
 
+
 def dropdown_deliberate_destruction(individual):
     label = "Destruction / Deliberatly removed"
-    individual = add_data_to_individual("wounded_dead", "circumstance", label.lower(), individual)
-    return create_dropdown_level1(label, individual)     
+    individual = add_data_to_individual("circumstance", label.lower(), individual)
+    return create_dropdown_level1(label, individual)
+
 
-def dropdown_indirect_destruction(individual): 
+def dropdown_indirect_destruction(individual):
     label = "Indirect destruction"
-    individual = add_data_to_individual("wounded_dead", "circumstance", label.lower(), individual)
-    return create_dropdown_level1(label, individual) 
+    individual = add_data_to_individual("circumstance", label.lower(), individual)
+    return create_dropdown_level1(label, individual)
+
 
-def dropdown_natural_cause(individual): 
+def dropdown_natural_cause(individual):
     label = "Natural cause"
-    individual = add_data_to_individual("wounded_dead", "circumstance", label.lower(), individual)
-    return create_dropdown_level1(label, individual)         
+    individual = add_data_to_individual("circumstance", label.lower(), individual)
+    return create_dropdown_level1(label, individual)
 
 
-#--------------------------------------------------------- LEVEL 2 DROPDOWNS
+# --------------------------------------------------------- LEVEL 2 DROPDOWNS
 def get_options(value):
-        value = value.lower()
-        options_label = None
-        options_dropdown= None
-        open_field = None
-        extras = None
-        extras_label = None
-        dropdown_config = get_custom_config_dropdowns("config_dropdown_circumstances.json")
-        for _, sub_dict in dropdown_config.items():
-            nested_dict = sub_dict.get(value)
-            if nested_dict is not None: 
-                if "Options" in nested_dict.keys():
-                    options_dict = nested_dict["Options"]
-                    options_label = list(options_dict.keys())[0]
-                    options_dropdown = list(options_dict.values())[0]
-                    options_dropdown = [option.title() for option in options_dropdown]
-                if "Open" in nested_dict.keys():
-                    open_field = nested_dict["Open"]
-                    open_field = open_field.title()
-                if "Extra" in nested_dict.keys():
-                    for key, val in nested_dict["Extra"].items():
-                        extras_label = key
-                        extras = val
-                        extras = [extra.title() for extra in extras]
-        return options_label, options_dropdown, open_field, extras, extras_label
-
-       
+    value = value.lower()
+    options_label = None
+    options_dropdown = None
+    open_field = None
+    extras = None
+    extras_label = None
+    dropdown_config = get_custom_config_dropdowns("config_dropdown_circumstances.json")
+    for _, sub_dict in dropdown_config.items():
+        nested_dict = sub_dict.get(value)
+        if nested_dict is not None:
+            if "Options" in nested_dict.keys():
+                options_dict = nested_dict["Options"]
+                options_label = list(options_dict.keys())[0]
+                options_dropdown = list(options_dict.values())[0]
+                options_dropdown = [option.title() for option in options_dropdown]
+            if "Open" in nested_dict.keys():
+                open_field = nested_dict["Open"]
+                open_field = open_field.title()
+            if "Extra" in nested_dict.keys():
+                for key, val in nested_dict["Extra"].items():
+                    extras_label = key
+                    extras = val
+                    extras = [extra.title() for extra in extras]
+    return options_label, options_dropdown, open_field, extras, extras_label
+
+
 def on_select(evt: gr.SelectData, individual):  # SelectData is a subclass of EventData
-    options_label, options_dropdown, open_field, extras, extras_label = get_options(evt.value)
-    individual = add_data_to_individual("wounded_dead", 
-                    "circumstance_type", 
-                    {"type": (evt.value).lower(),
-                     "option_dropdown_label" : options_label.lower() if options_label is not None else 'NA',
-                     "open_field_label" : open_field.lower() if open_field is not None else 'NA',
-                     "extra_label": extras_label.lower() if extras_label is not None else 'NA'
-                    }, individual)
+    options_label, options_dropdown, open_field, extras, extras_label = get_options(
+        evt.value
+    )
+    individual = add_data_to_individual(
+        "circumstance_type",
+        {
+            "type": (evt.value).lower(),
+            "option_dropdown_label": options_label.lower()
+            if options_label is not None
+            else "NA",
+            "open_field_label": open_field.lower() if open_field is not None else "NA",
+            "extra_label": extras_label.lower() if extras_label is not None else "NA",
+        },
+        individual,
+    )
     if options_dropdown is not None:
-        dropdown_level2 = gr.Dropdown(choices=options_dropdown, label=evt.value, interactive=True, visible=True)
-    else: 
+        dropdown_level2 = gr.Dropdown(
+            choices=options_dropdown, label=evt.value, interactive=True, visible=True
+        )
+    else:
         dropdown_level2 = gr.Dropdown(choices=[], visible=False)
 
     if open_field is not None:
         openfield_level2 = gr.Textbox(label=open_field, interactive=True, visible=True)
-    else: 
+    else:
         openfield_level2 = gr.Textbox(visible=False)
 
-    if extras is not None: 
-        dropdown_extra_level2 = gr.Dropdown(choices=extras, label=extras_label, interactive=True, visible=True)
-    else: 
+    if extras is not None:
+        dropdown_extra_level2 = gr.Dropdown(
+            choices=extras, label=extras_label, interactive=True, visible=True
+        )
+    else:
         dropdown_extra_level2 = gr.Dropdown(choices=[], visible=False)
     return dropdown_level2, openfield_level2, dropdown_extra_level2, individual
 
-def on_select_dropdown_level2(evt: gr.SelectData, individual): 
-    individual = add_data_to_individual("wounded_dead", 
-                "circumstance_option_dropdown", 
-                evt.value.lower(), individual)
+
+def on_select_dropdown_level2(evt: gr.SelectData, individual):
+    individual = add_data_to_individual(
+        "circumstance_option_dropdown", evt.value.lower(), individual
+    )
     return individual
 
-def on_select_dropdown_extra_level2(evt: gr.SelectData, individual):  
-    individual = add_data_to_individual("wounded_dead", 
-                 "circumstance_extra", 
-                 evt.value.lower(), individual)
+
+def on_select_dropdown_extra_level2(evt: gr.SelectData, individual):
+    individual = add_data_to_individual(
+        "circumstance_extra", evt.value.lower(), individual
+    )
+    return 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
+    )
     return individual
-    
-def on_change_openfield_level2(openfield_level2_dead, individual): 
-    print("Saving open field")
-    individual = add_data_to_individual("wounded_dead", 
-                "circumstance_open_field", 
-                str(openfield_level2_dead).lower(), individual)
-    return individual

app/classes.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Optional
+from typing import Optional, Union
 import numpy as np
 from PIL import Image
 import io
@@ -7,24 +7,30 @@ import base64
 import uuid
 
 from behavior.class_behavior import Behaviors
+from behavior.class_behavior_simple import BehaviorsSimple
 from circumstances.class_circumstance import Circumstances
 from physical.class_physical import PhysicalAnomalies
+from physical.class_physical_simple import PhysicalAnomaliesSimple
 from follow_up.class_follow_up import FollowUpEvents
 from geolocalisation.class_geolocalisation import Geolocalisation
 
+
 class Wounded(BaseModel):
     circumstances: Circumstances
-    behaviors: Behaviors
-    physical_anomalies: PhysicalAnomalies
+    behaviors: Union[Behaviors, BehaviorsSimple]
+    physical_anomalies: Union[PhysicalAnomalies, PhysicalAnomaliesSimple]
     follow_up_events: FollowUpEvents
 
+
 class Dead(BaseModel):
     circumstances: Circumstances
-    physical_anomalies: PhysicalAnomalies
+    physical_anomalies: Union[PhysicalAnomalies, PhysicalAnomaliesSimple]
     follow_up_events: FollowUpEvents
 
+
 class ImageBase64(BaseModel):
-    image: str  
+    image: str
+
     @classmethod
     def to_base64(cls, pixel_data: list):
         img_array = np.array(pixel_data, dtype=np.uint8)
@@ -33,15 +39,16 @@ class ImageBase64(BaseModel):
         buffer = io.BytesIO()
         img.save(buffer, format="PNG")
         buffer.seek(0)
-        base64_str = base64.b64encode(buffer.read()).decode('utf-8')
+        base64_str = base64.b64encode(buffer.read()).decode("utf-8")
         return cls(image=base64_str)
-    
+
+
 class Report(BaseModel):
     identifier: str
     image: ImageBase64
     image_md5: str
     geolocalisation: Geolocalisation
     wounded_state: str
-    wounded: Optional[Wounded] = None  
+    wounded: Optional[Wounded] = None
     dead_state: str
-    dead: Optional[Dead] = None 
+    dead: Optional[Dead] = None

app/contacts.py

@@ -0,0 +1,110 @@
+import gradio as gr
+
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH = os.getcwd() + "/"
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+PATH_ICONS = PATH + PATH_ASSETS + "icons/"
+
+contact_text = """
+    # Contacts
+
+    You have an animal alive or dead in front of you and you do not know what to do? 
+    Please call the contact below corresponding to your canton. (Cantons are in alphabetical order.)
+
+    ## AG: Aargau
+    117 | Departement Bau, Verkehr und Umwelt, Abteilung Wald, Sektion Jagd und Fischerei
+
+    ## AI: Appenzell Innerrhoden
+    071 788 92 87 | Bau- und Umweltdepartement, Amt für Umwelt, Fachstelle Jagd und Fischerei	
+
+    ## AR: Appenzell Ausserrhoden
+    079 698 19 16 |Departement Bau und Volkswirtschaft, Amt für Raum und Wald, Abteilung Natur und Wildtiere	
+
+    ## BE: Bern
+    0800 940 100 | Wirtschafts-, Energie- und Umweltdirektion	
+
+    ## BL: Basel-Landschaft
+    061 922 03 66, 061 552 56 59 | Volkswirtschafts- und Gesundheitsdirektion, Amt für Wald und Wild beider Basel	
+
+    ## BS: Basel-Stadt
+    061 922 03 66, 061 552 56 59 | Volkswirtschafts- und Gesundheitsdirektion, Amt für Wald und Wild beider Basel	
+
+    ## FR: Fribourg
+    026 305 23 31 | Energie, Landwirtschaft und Umwelt, Amt für Wald und Natur, Sektion Fauna, Jagd und Fischerei
+
+    ## GE: Geneva
+    022 388 55 00 | Office cantonal de l'agriculture et de la nature, Centrale d'engagement et des transmissions (CET)	
+
+    ## GL: Glarus
+    Verwaltung Bau und Umwelt, Umwelt, Wald und Energie, Jagd und Fischerei	
+
+    ## GR: Graubünden
+    055 645 66 66 | Amt für Jagd und Fischerei	Jagdbezirke - Über uns
+
+    ## JU: Jura 
+    032 420 48 00, 032 420 65 65 | Departement de l'environnement, Office de l'environnement, Chasse et protection de la faune sauvage	
+
+    ## LU: Luzern
+    041 248 81 17, 117 | Bau-, Umwelt- und Wirtschaftsdepartement, Landwirtschaft und Wald, Jagd, Wildhut und Jagdaufsicht	
+
+    ## NE: Neuchatel
+    032 889 67 80 | Service de la faune, des fôrets et de la nature, faune	
+
+    ## NW: Nidwalden
+    041 618 44 66 | Justiz- und Sicherheitsdirektion, Amt für Justiz, Abteilung Jagd und Fischerei	
+
+    ## OW: Obwalden
+    041 666 64 76 | Bau- und Raumentwicklungsdepartement, Amt für Wald und Landschaft, Wildtiere und Jagd	
+
+    ## SG: St. Gallen
+    117 | Volkwirtschaftsdepartement, Amt für Natur, Jagd und Fischerei	
+
+    ## SH: Schaffhausen
+    052 632 74 66 | Departement des Innern, Jagd und Fischerei	
+
+    ## SO: Solothurn
+    117| Volkswirtschaftdepartement, Amt für Wald, Jagd und Fischerei
+
+    ## SZ: Schwyz
+    041 819 29 29 | Umweltdepartement, Amt für Wald und Natur, Jagd und Wildtiere	
+
+    ## TG: Thurgau
+    058 345 61 50 | Jagd- und Fischereiverwaltung	
+
+    ## TI: Ticino
+    091 814 28 71 | Divisione dell'ambiente, Ufficio della caccia e della pesca	
+
+    ## UR: Uri
+    041 875 2316 | Sicherheitsdirektion, Amt für Forst und Jagd	
+
+    ## VD: Vaud 
+    021 557 88 55 | Environnement, Biodiversité et paysage, Police Faune-nature	
+
+    ## VS: Valais
+    027 606 70 00, 117 | Umwelt, Energie und Landwirtschaft, Dienststelle für Jagd, Fischerei und Wildtiere	
+
+    ## ZG: Zug
+    041 595 41 41 | Natur, Umwelt und Tiere, Arten, Lebensräume, Wildhut und Fischereiaufsicht	
+
+    """
+
+
+with gr.Blocks(theme='shivi/calm_seafoam') as contacts:
+    with gr.Row(scale = 1): 
+        gr.Image(PATH_ICONS+"help.png", height=300,
+                        interactive=False,
+                        show_fullscreen_button = False, show_share_button=False, 
+                        show_download_button=False, show_label=False)
+        gr.Image(PATH_ICONS+"contact-information.png", height=300,
+                        interactive=False,
+                        show_fullscreen_button = False, show_share_button=False, 
+                        show_download_button=False, show_label=False)
+        gr.Image(PATH_ICONS+"question.png", height=300,
+                        interactive=False,
+                        show_fullscreen_button = False, show_share_button=False, 
+                        show_download_button=False, show_label=False)
+        
+    gr.Markdown(contact_text, show_label=False)
+

app/{dead.py → dead_wounded/dead.py}

@@ -12,7 +12,7 @@ PATH = os.getcwd() + "/"
 PATH_ASSETS = os.getenv('PATH_ASSETS')
 PATH_ICONS = PATH + PATH_ASSETS + "icons/"
 
-def show_section_dead(visible, individual):
+def show_section_dead(visible, mode, individual):
     if visible==True: 
         individual = add_data_to_individual("wounded_state", "No", individual)
         individual = add_data_to_individual("dead_state", "Yes", individual)
@@ -33,7 +33,7 @@ def show_section_dead(visible, individual):
         with gr.Row():
             physical_boxes = create_bird_anatomy(False, "dead")
             with gr.Column():
-                checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts("dead", "None")
+                checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts("dead", mode, "None")
 
         gr.Button("Follow-Up Events",
                   icon=PATH_ICONS + "schedule.png",

app/{wounded.py → dead_wounded/wounded.py}

@@ -13,7 +13,7 @@ PATH = os.getcwd() + "/"
 PATH_ASSETS = os.getenv('PATH_ASSETS')
 PATH_ICONS = PATH + PATH_ASSETS + "icons/"
 
-def show_section_wounded(visible, individual):
+def show_section_wounded(visible, mode, individual):
     if visible==True: 
         individual = add_data_to_individual("wounded_state", "Yes", individual)
         individual = add_data_to_individual("dead_state", "No", individual)
@@ -32,7 +32,7 @@ def show_section_wounded(visible, individual):
                   variant= "primary")
         radio_behaviour = gr.Radio(["Yes", "No"], value=None, show_label=False, interactive=True)
         with gr.Row():
-            behavior_checkbox, behavior_text = create_behavior_checkbox("wounded", False)
+            behavior_checkbox, behavior_text = create_behavior_checkbox("wounded", mode, False)
 
         gr.Button("Are there physical changes on the animal?",
                   icon=PATH_ICONS + "cardiogram.png",
@@ -41,7 +41,7 @@ def show_section_wounded(visible, individual):
         with gr.Row():
             physical_boxes = create_bird_anatomy(False, "wounded")
             with gr.Column():
-                checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts("wounded", "None")
+                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")
 
             
         gr.Button("Follow-Up Events",

app/gradio_test/test_selectdata_event.py

@@ -1,16 +0,0 @@
-import gradio as gr
-
-with gr.Blocks() as demo:
-    table = gr.Dataframe([[1, 2, 3], [4, 5, 6]])
-    #gallery = gr.Gallery([("cat.jpg", "Cat"), ("dog.jpg", "Dog")])
-    textbox = gr.Textbox("Hello World!")
-    statement = gr.Textbox()
-
-    def on_select(evt: gr.SelectData):
-        return gr.Textbox(f"You selected {evt.value} at {evt.index} from {evt.target}")
-
-    table.select(on_select, inputs=[table], outputs=[statement])
-    #gallery.select(on_select, gallery, statement)
-    textbox.select(on_select, inputs=[textbox], outputs=[statement])
-
-demo.launch(server_name="0.0.0.0", server_port=3131)

app/gradio_test/tests_delete_gallery.py

@@ -1,25 +0,0 @@
-import gradio as gr
-
-# Example initial image list
-images = [
-    "https://via.placeholder.com/150/0000FF",
-    "https://via.placeholder.com/150/FF0000",
-    "https://via.placeholder.com/150/00FF00"
-]
-
-# Function to remove a selected image from the gallery
-def delete_image(selected_image, image_list):
-    if selected_image in image_list:
-        image_list.remove(selected_image)  # Remove the selected image
-    return image_list  # Return the updated image list
-
-# Gradio app
-with gr.Blocks() as demo:
-    gallery = gr.Gallery(value=images, label="Gallery")  # Gallery of images
-    selected_image = gr.Dropdown(choices=images, label="Select Image to Delete")  # Dropdown for selection
-    delete_button = gr.Button("Delete Selected Image")  # Button to delete
-    
-    # When button is clicked, delete the selected image and update gallery
-    delete_button.click(fn=delete_image, inputs=[selected_image, gallery], outputs=gallery)
-    
-demo.launch(server_name="0.0.0.0", server_port=3232)

app/main.py

@@ -5,8 +5,12 @@ disable_caching()
 
 from mode_advanced import advanced 
 from mode_simple import simple
+from contacts import contacts
+from about import about
 
-demo = gr.TabbedInterface([simple, advanced], ["Simple Mode" , "Advanced Reporting"],
+
+demo = gr.TabbedInterface([simple, advanced, contacts, about], 
+                          ["Simple Mode" , "Advanced Reporting", "Cantonal Contacts", "About"],
                           theme='shivi/calm_seafoam')
 
 if __name__ == "__main__":

app/mode_advanced.py

@@ -1,24 +1,23 @@
 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 geolocalisation.js_geolocation import js_geocode, display_location
 from geolocalisation.maps import get_location
-from functools import partial
-from dead import show_section_dead
-from wounded import show_section_wounded
+from dead_wounded.dead import show_section_dead
+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 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 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.utils_individual import reset_individual
+from styling.style import *
 
 from dotenv import load_dotenv
 import os
@@ -28,6 +27,7 @@ PATH_ASSETS = os.getenv('PATH_ASSETS')
 PATH_ICONS = PATH + PATH_ASSETS + "icons/"
 
 with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
+    mode = "advanced"
     individual = gr.State({})
     individual.value = add_data_to_individual("image_md5", generate_random_md5(), individual.value)
 
@@ -149,7 +149,7 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
                 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, \
                 fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
                 fe_name_recipient_dead, fe_collection_ref_dead \
-                = show_section_dead(False, individual)
+                = show_section_dead(False, mode, individual)
     
     section_wounded, individual, radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded, \
         button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, \
@@ -159,7 +159,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 \
-                            = show_section_wounded(False, individual)
+                            = show_section_wounded(False, mode, individual)
 
     # ---------------------------------------------------------
     # ---------------------------------------------------------
@@ -168,7 +168,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
     partial_show_section_dead = partial(show_section_dead, True)
     partial_hide_section_wounded = partial(show_section_wounded, False)
     butt_dead.click(partial_show_section_dead, 
-                    inputs=[individual], 
+                    inputs=[gr.Text(mode, visible=False),
+                            individual], 
                     outputs=[section_dead, 
                             individual,
                             radio_circumstance_dead, radio_physical_dead,
@@ -181,7 +182,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
                             ])
     
     butt_dead.click(partial_hide_section_wounded, 
-                    inputs=[individual], 
+                    inputs=[gr.Text(mode, visible=False),
+                            individual], 
                     outputs=[section_wounded, 
                             individual,
                             radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
@@ -200,7 +202,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
     partial_hide_section_dead = partial(show_section_dead, False)
 
     butt_wounded.click(partial_show_section_wounded, 
-                    inputs=[individual], 
+                    inputs=[gr.Text(mode, visible=False),
+                            individual], 
                     outputs=[section_wounded, 
                             individual,
                             radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
@@ -214,7 +217,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
                             ])
     
     butt_wounded.click(partial_hide_section_dead, 
-                        inputs=[individual], 
+                        inputs=[gr.Text(mode, visible=False),
+                                individual], 
                         outputs=[section_dead, 
                                 individual,
                                 radio_circumstance_dead, radio_physical_dead,
@@ -254,7 +258,9 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
     # ---------------------------------------------------------
     # Radio Physical Dead
     radio_physical_dead.change(fn=show_physical,
-                                inputs=[radio_physical_dead, gr.Text("dead", visible=False), individual],
+                                inputs=[radio_physical_dead, 
+                                        gr.Text("dead", visible=False), 
+                                        individual],
                                 outputs=[physical_boxes_dead, individual])
 
     # Checkbox Physical Dead
@@ -299,7 +305,10 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
     # ---------------------------------------------------------
     # Radio Behavior Wounded
     radio_behavior_wounded.change(fn=show_behavior,
-                                inputs=[radio_behavior_wounded, gr.Text("wounded / sick", visible=False), individual],
+                                inputs=[radio_behavior_wounded, 
+                                        gr.Text("wounded / sick", visible=False), 
+                                        gr.Text(mode, visible=False), 
+                                        individual],
                                 outputs=[behavior_checkbox, behavior_text, individual])
     behavior_checkbox.select(on_select_behavior, 
                                 inputs=[behavior_checkbox, individual],
@@ -307,7 +316,9 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
     # ---------------------------------------------------------
     # Radio Physical Wounded
     radio_physical_wounded.change(fn=show_physical,
-                                inputs=[radio_physical_wounded, gr.Text("wounded / sick", visible=False), individual],
+                                inputs=[radio_physical_wounded, 
+                                        gr.Text("wounded / sick", visible=False), 
+                                        individual],
                                 outputs=[physical_boxes_wounded, individual])
 
     # Checkbox Physical Wounded
@@ -343,10 +354,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"):
@@ -360,6 +367,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)
            
         
     # ---------------------------------------------------------
@@ -389,26 +404,35 @@ 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)
-
+        
+    # ---------------------------------------------------------
+    # VALIDATE ANIMAL 
+    button_df.click(validate_save_individual, 
+                    inputs=[individual, 
+                            error_icon,
+                            error_box,
+                            gr.Text(mode, visible=False)],
+                    outputs=[error_icon, error_box])
+    
     # ---------------------------------------------------------
-    # Button Click Logic
+    # CLEAR BUTTON
     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])  
-            
-   
-    # ---------------------------------------------------------
-    # VALIDATE ANIMAL 
-    button_df.click(validate_save_individual, inputs=[individual, error_box],
-                    outputs=[error_box])
-    # ---------------------------------------------------------
-    #CREDITS
-    with Modal(visible=False) as modal_creds:
-        gr.Markdown(credits_text)
-    show_creds.click(lambda: Modal(visible=True), None, modal_creds)
+                       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])
+

app/mode_simple.py

@@ -1,13 +1,10 @@
 import gradio as gr
 from gradio_modal import Modal
-
-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 geolocalisation.maps import get_location
 from functools import partial
-from dead import show_section_dead
-from wounded import show_section_wounded
+
+from geolocalisation.js_geolocation import js_geocode, display_location
+from dead_wounded.dead import show_section_dead
+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
@@ -15,9 +12,10 @@ from physical.physical_checkbox import on_select_body_part, hide_physical
 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 geolocalisation.js_geolocation import js_geocode, display_location
+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 dotenv import load_dotenv
@@ -28,6 +26,7 @@ PATH_ASSETS = os.getenv('PATH_ASSETS')
 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)
 
@@ -128,7 +127,7 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                 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, \
                 fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
                 fe_name_recipient_dead, fe_collection_ref_dead \
-                = show_section_dead(False, individual)
+                = show_section_dead(False, mode, individual)
     
     section_wounded, individual, radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded, \
         button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, \
@@ -138,7 +137,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 \
-                            = show_section_wounded(False, individual)
+                            = show_section_wounded(False, mode, individual)
 
     # ---------------------------------------------------------
     # ---------------------------------------------------------
@@ -147,7 +146,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     partial_show_section_dead = partial(show_section_dead, True)
     partial_hide_section_wounded = partial(show_section_wounded, False)
     butt_dead.click(partial_show_section_dead, 
-                    inputs=[individual], 
+                    inputs=[gr.Text(mode, visible=False),
+                            individual], 
                     outputs=[section_dead, 
                             individual,
                             radio_circumstance_dead, radio_physical_dead,
@@ -160,7 +160,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                             ])
     
     butt_dead.click(partial_hide_section_wounded, 
-                    inputs=[individual], 
+                    inputs=[gr.Text(mode, visible=False), 
+                            individual], 
                     outputs=[section_wounded, 
                             individual,
                             radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
@@ -179,7 +180,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     partial_hide_section_dead = partial(show_section_dead, False)
 
     butt_wounded.click(partial_show_section_wounded, 
-                    inputs=[individual], 
+                    inputs=[gr.Text(mode, visible=False), 
+                            individual], 
                     outputs=[section_wounded, 
                             individual,
                             radio_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded,
@@ -193,7 +195,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                             ])
     
     butt_wounded.click(partial_hide_section_dead, 
-                        inputs=[individual], 
+                        inputs=[gr.Text(mode, visible=False),
+                                individual], 
                         outputs=[section_dead, 
                                 individual,
                                 radio_circumstance_dead, radio_physical_dead,
@@ -233,12 +236,16 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     # ---------------------------------------------------------
     # Radio Physical Dead
     radio_physical_dead.change(fn=show_physical,
-                                inputs=[radio_physical_dead, gr.Text("dead", visible=False), individual],
+                                inputs=[radio_physical_dead, 
+                                        gr.Text("dead", visible=False),
+                                        individual],
                                 outputs=[physical_boxes_dead, individual])
 
     # Checkbox Physical Dead
     physical_boxes_dead.select(find_bounding_box, 
-                    inputs=[physical_boxes_dead, gr.Textbox(value="dead", visible=False)], 
+                    inputs=[physical_boxes_dead, 
+                            gr.Textbox(value="dead", visible=False),
+                            gr.Text(mode, visible=False)], 
                     outputs=[checkbox_beak_dead, text_beak_dead, 
                                 checkbox_body_dead, text_body_dead, 
                                 checkbox_feathers_dead, text_feathers_dead, 
@@ -278,7 +285,10 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     # ---------------------------------------------------------
     # Radio Behavior Wounded
     radio_behavior_wounded.change(fn=show_behavior,
-                                inputs=[radio_behavior_wounded, gr.Text("wounded / sick", visible=False), individual],
+                                inputs=[radio_behavior_wounded, 
+                                        gr.Text("wounded / sick", visible=False), 
+                                        gr.Text(mode, visible=False), 
+                                        individual],
                                 outputs=[behavior_checkbox, behavior_text, individual])
     behavior_checkbox.select(on_select_behavior, 
                                 inputs=[behavior_checkbox, individual],
@@ -286,12 +296,16 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     # ---------------------------------------------------------
     # Radio Physical Wounded
     radio_physical_wounded.change(fn=show_physical,
-                                inputs=[radio_physical_wounded, gr.Text("wounded / sick", visible=False), individual],
+                                inputs=[radio_physical_wounded, 
+                                        gr.Text("wounded / sick", visible=False), 
+                                        individual],
                                 outputs=[physical_boxes_wounded, individual])
 
     # Checkbox Physical Wounded
     physical_boxes_wounded.select(find_bounding_box, 
-                    inputs=[physical_boxes_wounded, gr.Textbox(value="wounded / sick", visible=False)], 
+                    inputs=[physical_boxes_wounded, 
+                            gr.Textbox(value="wounded / sick", visible=False),
+                            gr.Text(mode, visible=False)], 
                     outputs=[checkbox_beak_wounded, text_beak_wounded, 
                                 checkbox_body_wounded, text_body_wounded, 
                                 checkbox_feathers_wounded, text_feathers_wounded, 
@@ -322,10 +336,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"):
@@ -340,14 +350,21 @@ 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(): 
         button_df = gr.Button("SUBMIT OBSERVATION", icon=PATH_ICONS+"effective.png",
                               scale = 3)
-        button_clear = gr.ClearButton(value="CLEAR",
-                                      scale = 1,
-                                        components=[
+        button_clear = gr.ClearButton(value="CLEAR / Create NEW Observation",
+                                      scale = 2,
+                                      icon = PATH_ICONS+"balai-magique.png",
+                                      components=[
             camera,
             #dead reset
             radio_circumstance_dead, radio_physical_dead,
@@ -366,26 +383,36 @@ 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)
-
+        
     # ---------------------------------------------------------
-    # Button Click Logic
+    # VALIDATE & SUBMIT ANIMAL 
+    button_df.click(validate_save_individual, 
+                    inputs=[individual, 
+                            error_icon,
+                            error_box,
+                            gr.Text(mode, visible=False)],
+                    outputs=[error_icon, error_box])
+    
+     # ---------------------------------------------------------
+    # CLEAR BUTTON 
     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_box],
-                    outputs=[error_box])
-    # ---------------------------------------------------------
-    #CREDITS
-    with Modal(visible=False) as modal_creds:
-        gr.Markdown(credits_text)
-    show_creds.click(lambda: Modal(visible=True), None, modal_creds)
+

app/physical/class_physical_simple.py

@@ -0,0 +1,60 @@
+from pydantic import BaseModel, Field
+from typing import Literal, List, Union, Optional
+
+# Define common anomalies as a Literal type
+CommonAnomaliesSimple = Literal[
+    'injury',
+    'abnormal position'
+]
+
+# --- Beak-related Anomalies ---
+class BeakAnomaly(BaseModel):
+    type: Literal['beak']
+    anomaly_type: List[Literal[
+        'adhesion/discharge',
+        CommonAnomaliesSimple
+    ]]
+
+# --- Body-related Anomalies ---
+class BodyAnomaly(BaseModel):
+    type: Literal['body']
+    anomaly_type: List[Literal[
+        CommonAnomaliesSimple
+    ]]
+
+# --- Feathers/Wings/Tail-related Anomalies ---
+class FeathersWingsTailAnomaly(BaseModel):
+    type: Literal['feathers/wings/tail']
+    anomaly_type: List[Literal[
+        'feather and skin change',
+        CommonAnomaliesSimple
+    ]]
+
+# --- Head-related Anomalies (including eyes) ---
+class HeadAnomaly(BaseModel):
+    type: Literal['head incl. eyes']
+    anomaly_type: List[Literal[
+        'eye changes',
+        CommonAnomaliesSimple
+    ]]
+
+# --- Legs-related Anomalies ---
+class LegAnomaly(BaseModel):
+    type: Literal['legs']
+    anomaly_type: List[Literal[
+        CommonAnomaliesSimple
+    ]]
+
+# Union of all possible anomaly types for specific body parts
+AnomalyTypeSimple = Union[
+    BeakAnomaly,
+    BodyAnomaly,
+    LegAnomaly,
+    FeathersWingsTailAnomaly,
+    HeadAnomaly
+]
+
+# Main PhysicalAnomaly class that logs anomalies across different body parts
+class PhysicalAnomaliesSimple(BaseModel):
+    physical_radio: str
+    physical_anomalies_type: Optional[List[AnomalyTypeSimple]] = None

app/physical/physical_checkbox.py

@@ -1,85 +1,163 @@
 import gradio as gr
 from utils.utils_config import get_custom_config_dropdowns
 from utils.utils_checkbox import create_checkbox
-from validation_submission.utils_individual import add_data_to_individual 
-#--------------------------------------------------------- 
+from validation_submission.utils_individual import add_data_to_individual
+
+
+# ---------------------------------------------------------
 def get_body_parts():
     dropdown_config = get_custom_config_dropdowns("config_checkbox_physical.json")
     return list(dropdown_config.keys())
 
+
 def retrieve_config_options(label, dropdown_config):
     options = list(dropdown_config[label].keys())
     options = [option.title() for option in options]
     return options
 
-def get_options_description(value):
+
+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"
+        )
+    elif mode == "advanced":
         dropdown_config = get_custom_config_dropdowns("config_checkbox_physical.json")
-        # get options
-        options_common = retrieve_config_options("Common", dropdown_config)
-        options_for_value = retrieve_config_options(value, dropdown_config)
-        options_common.extend(options_for_value)
-        options = options_common
-        # get descriptions
-        descriptions = []
-        for key, sub_dict in dropdown_config.items():
-            if key==value or key=="Common":
-                for _, option_dict in sub_dict.items():
-                    for description_tag, description in option_dict.items():
-                        if "Description"==description_tag:
-                            descriptions.append(description)
-        return options, descriptions
-
-#--------------------------------------------------------- 
-def create_checkbox_beak(section, label_checkbox, visible):
-    body_part="Beak"
-    options, descriptions = get_options_description(body_part)
-    return create_checkbox(body_part, section, label_checkbox, visible, options, descriptions)
-
-def create_checkbox_body(section, label_checkbox, visible):
-    body_part="Body"
-    options, descriptions = get_options_description(body_part)
-    return create_checkbox(body_part, section, label_checkbox, visible, options, descriptions)
-
-def create_checkbox_feathers(section, label_checkbox, visible):
-    body_part="Feathers/Wings/Tail"
-    options, descriptions = get_options_description(body_part)
-    return create_checkbox(body_part, section, label_checkbox, visible, options, descriptions)
-
-def create_checkbox_head(section, label_checkbox, visible):
-    body_part="Head incl. eyes"
-    options, descriptions = get_options_description(body_part)
-    return create_checkbox(body_part, section, label_checkbox, visible, options, descriptions)
-
-def create_checkbox_legs(section, label_checkbox, visible):
-    body_part="Legs"
-    options, descriptions = get_options_description(body_part)
-    return create_checkbox(body_part, section, label_checkbox, visible, options, descriptions)
-
-#---------------------------------------------------------
-def process_body_parts(section, matched_box):
-    #take all except "Common"
+    # get options
+    options_common = retrieve_config_options("Common", dropdown_config)
+    options_for_value = retrieve_config_options(value, dropdown_config)
+    options_common.extend(options_for_value)
+    options = options_common
+    # get descriptions
+    descriptions = []
+    for key, sub_dict in dropdown_config.items():
+        if key == value or key == "Common":
+            for _, option_dict in sub_dict.items():
+                for description_tag, description in option_dict.items():
+                    if "Description" == description_tag:
+                        descriptions.append(description)
+    return options, descriptions
+
+
+# ---------------------------------------------------------
+def create_checkbox_beak(section, mode, label_checkbox, visible):
+    body_part = "Beak"
+    options, descriptions = get_options_description(body_part, mode)
+    return create_checkbox(
+        body_part, section, label_checkbox, visible, options, descriptions
+    )
+
+
+def create_checkbox_body(section, mode, label_checkbox, visible):
+    body_part = "Body"
+    options, descriptions = get_options_description(body_part, mode)
+    return create_checkbox(
+        body_part, section, label_checkbox, visible, options, descriptions
+    )
+
+
+def create_checkbox_feathers(section, mode, label_checkbox, visible):
+    body_part = "Feathers/Wings/Tail"
+    options, descriptions = get_options_description(body_part, mode)
+    return create_checkbox(
+        body_part, section, label_checkbox, visible, options, descriptions
+    )
+
+
+def create_checkbox_head(section, mode, label_checkbox, visible):
+    body_part = "Head incl. eyes"
+    options, descriptions = get_options_description(body_part, mode)
+    return create_checkbox(
+        body_part, section, label_checkbox, visible, options, descriptions
+    )
+
+
+def create_checkbox_legs(section, mode, label_checkbox, visible):
+    body_part = "Legs"
+    options, descriptions = get_options_description(body_part, mode)
+    return create_checkbox(
+        body_part, section, label_checkbox, visible, options, descriptions
+    )
+
+
+# ---------------------------------------------------------
+def process_body_parts(section, mode, matched_box):
+    # take all except "Common"
     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 ]
-    checkbox_beak, text_beak = create_checkbox_beak(section, label_checkbox, visibles[0])
-    checkbox_body, text_body = create_checkbox_body(section, label_checkbox, visibles[1])
-    checkbox_feathers, text_feathers = create_checkbox_feathers(section, label_checkbox, visibles[2])
-    checkbox_head, text_head = create_checkbox_head(section, label_checkbox, visibles[3])
-    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, individual): 
-    individual = add_data_to_individual("wounded_dead", "physical_type_"+body_part.lower(), body_part.lower(), individual)
-    body_part_checkbox = [body_part_check.lower() for body_part_check in body_part_checkbox]
-    individual = add_data_to_individual("wounded_dead", "physical_anomaly_"+body_part.lower(), body_part_checkbox, individual)
+    visibles = [True if matched_box == body_part else False for body_part in body_parts]
+    checkbox_beak, text_beak = create_checkbox_beak(
+        section, mode, label_checkbox, visibles[0]
+    )
+    checkbox_body, text_body = create_checkbox_body(
+        section, mode, label_checkbox, visibles[1]
+    )
+    checkbox_feathers, text_feathers = create_checkbox_feathers(
+        section, mode, label_checkbox, visibles[2]
+    )
+    checkbox_head, text_head = create_checkbox_head(
+        section, mode, label_checkbox, visibles[3]
+    )
+    checkbox_legs, text_legs = create_checkbox_legs(
+        section, mode, 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, individual):
+    individual = add_data_to_individual(
+        "physical_type_" + body_part.lower(), body_part.lower(), individual
+    )
+    body_part_checkbox = [
+        body_part_check.lower() for body_part_check in body_part_checkbox
+    ]
+    individual = add_data_to_individual(
+        "physical_anomaly_" + body_part.lower(), body_part_checkbox, individual
+    )
     return individual
 
-#--------------------------------------------------------- 
 
-def hide_physical():
-    checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts("wounded", "None")
-    return checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
-     
+# ---------------------------------------------------------
+
+
+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/physical/physical_select_animal.py

@@ -8,20 +8,22 @@ from physical.physical_checkbox import *
 from physical.physical_boxes_define import gdf
 from utils.utils_visible import set_visible
 
+from validation_submission.utils_individual import add_data_to_individual
+
 load_dotenv()
 PATH_ASSETS = os.getenv('PATH_ASSETS')
 
 # Function to find the matching bounding box for a given point and return the image with boxes
-def find_bounding_box(evt: gr.SelectData, img, section: str):
+def find_bounding_box(evt: gr.SelectData, img, section: str, mode: str):
     x, y = evt.index[0], evt.index[1]
     point = Point(x, y)
     match = gdf[gdf.contains(point)]
     if not match.empty:
         matched_box = match.iloc[0]['name']
-        checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts(section, matched_box)
+        checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts(section, mode, matched_box)
     else:
         matched_box = None
-        checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts(section, matched_box)
+        checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts(section, mode, matched_box)
     return checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
 
     
@@ -39,7 +41,7 @@ def create_bird_anatomy(visible, section: str):
 def show_physical(choice, section: str, individual): 
     visible = set_visible(choice)
     physical_boxes = create_bird_anatomy(visible, section)
-    individual = add_data_tmp("wounded_dead", "physical_radio", choice, individual)
+    individual = add_data_to_individual("physical_radio", choice, individual)
     return physical_boxes, individual
 
 

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,60 @@
 #### PROCESS FUNCTIONS 
 
 def process_circumstance(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"] = {}
+        if "type" in data["circumstance_type"]: 
+            reformatted["circumstance_type"]["type"] = data["circumstance_type"]["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
+                reformatted["circumstance_type"][key] = val
+    else: 
+        reformatted["circumstance_radio"] = None
+        reformatted["circumstance"] = None
+        reformatted["circumstance_type"] = {}
+    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,27 +1,31 @@
-import json 
+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):
-    individual, error_box = validate_individual(data, error_box)
+
+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 error_icon, error_box
+
+
 def push_to_dataset_hf(individual):
     token = os.environ.get("HF_TOKEN", None)
     api = HfApi(token=token)
     import tempfile
+
     f = tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False)
     json.dump(individual, f)
     f.flush()
     f.close()
-    path_in_repo= f"data/{individual['image_md5']}.json"
+    path_in_repo = f"data/{individual['image_md5']}.json"
     api.upload_file(
         path_or_fileobj=f.name,
         path_in_repo=path_in_repo,
         repo_id="SDSC/digiwild-dataset",
         repo_type="dataset",
-    )
+    )

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

@@ -5,25 +5,41 @@ import gradio as gr
 # from validation_submission.get_json import get_json_tmp, get_json_one_individual
 from circumstances.class_circumstance import Circumstances
 from behavior.class_behavior import Behaviors
+from behavior.class_behavior_simple import BehaviorsSimple
 from physical.class_physical import PhysicalAnomalies
+from physical.class_physical_simple import PhysicalAnomaliesSimple
 from follow_up.class_follow_up import FollowUpEvents
 from classes import Report, Wounded, Dead, ImageBase64
-from validation_submission.processing import process_circumstance, process_behaviors, process_physical, process_followup
+from validation_submission.processing import (
+    process_circumstance,
+    process_behaviors,
+    process_physical,
+    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 = {} 
+    extract = {}
     for key, val in data_dict.items():
         if keyword in key:
             extract[key] = val
     return extract
 
-def validate_individual(data, error_box):
-    error_box = reset_error_box(error_box)
-    #data = get_json_one_individual() # TODO: This should change
+
+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():
         img = ImageBase64.to_base64(data["image"])
-    else: 
+    else:
         img = None
     if "geolocalisation" in data.keys():
         geolocalisation = data["geolocalisation"]
@@ -31,71 +47,117 @@ def validate_individual(data, error_box):
         geolocalisation = None
 
     error_behavior = None
-    error_circumstance = None 
-    error_followup = None 
-    error_physical = None 
+    error_circumstance = None
+    error_followup = None
+    error_physical = None
     error_individual = None
     if "wounded_state" not in data or "dead_state" not in data:
         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")
+        data_wounded_dead = data 
         circumstance, error_circumstance = validate_circumstance(data_wounded_dead)
-        physical, error_physical = validate_physical(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(physical)
-            behavior, error_behavior = validate_behavior(data_wounded_dead)
-            try : 
-                individual = Report(identifier = data["identifier"],
-                                    image = img,
-                                    image_md5 = data["image_md5"],
-                                    geolocalisation = geolocalisation,
-                                    wounded_state = data["wounded_state"],
-                                    wounded = Wounded(circumstances = circumstance,
-                                                        behaviors = behavior,
-                                                        physical_anomalies = physical,
-                                                        follow_up_events = followup),
-                                    dead_state = data["dead_state"])
+        if data["wounded_state"] == "Yes":
+            behavior, error_behavior = validate_behavior(data_wounded_dead, mode)
+            try:
+                individual = Report(
+                    identifier=data["identifier"],
+                    image=img,
+                    image_md5=data["image_md5"],
+                    geolocalisation=geolocalisation,
+                    wounded_state=data["wounded_state"],
+                    wounded=Wounded(
+                        circumstances=circumstance,
+                        behaviors=behavior,
+                        physical_anomalies=physical,
+                        follow_up_events=followup,
+                    ),
+                    dead_state=data["dead_state"],
+                )
             except ValidationError as e:
-                print(e)
+                print("Error in wounded_state:")
+                print(e.json())
                 error_individual = e
 
-        elif data["dead_state"]=="Yes":
-            try: 
-                individual = Report(identifier = data["identifier"],
-                                    image = img,
-                                    image_md5 = data["image_md5"],
-                                    geolocalisation = geolocalisation,
-                                    wounded_state = data["wounded_state"],
-                                    dead_state = data["dead_state"],
-                                    dead = Dead(circumstances = circumstance,
-                                                        physical_anomalies = physical,
-                                                        follow_up_events = followup)
-                                        )
+        elif data["dead_state"] == "Yes":
+            try:
+                individual = Report(
+                    identifier=data["identifier"],
+                    image=img,
+                    image_md5=data["image_md5"],
+                    geolocalisation=geolocalisation,
+                    wounded_state=data["wounded_state"],
+                    dead_state=data["dead_state"],
+                    dead=Dead(
+                        circumstances=circumstance,
+                        physical_anomalies=physical,
+                        follow_up_events=followup,
+                    ),
+                )
             except ValidationError as e:
-                print(e)
+                print("Error in dead_state:")
+                print(e.json())
                 error_individual = e
     else:
-        try: 
-            individual = Report(identifier = data["identifier"],
-                                    image = img,
-                                    image_md5 = data["image_md5"],
-                                    geolocalisation = geolocalisation,
-                                    wounded_state = data["wounded_state"],
-                                    dead_state = data["dead_state"])
+        try:
+            individual = Report(
+                identifier=data["identifier"],
+                image=img,
+                image_md5=data["image_md5"],
+                geolocalisation=geolocalisation,
+                wounded_state=data["wounded_state"],
+                dead_state=data["dead_state"],
+            )
         except ValidationError as e:
-            print(e)
+            print(f"""Error in individual else: {e}""")
             error_individual = e
-    if error_behavior or error_circumstance or error_followup or error_physical or error_individual:
-        error_box = show_error(error_box, error_behavior, error_circumstance, error_followup, error_physical, error_individual)
+    if (
+        error_behavior
+        or error_circumstance
+        or error_followup
+        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,
+            error_circumstance,
+            error_followup,
+            error_physical,
+            error_individual,
+        )
         individual = None
-    else: 
-        error_box= gr.Text(label="ALL VALID.", value="Record Registered. You can return to the Display.", visible=True, elem_id="valid")
-    return individual, error_box
+    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. Remember to press the CLEAR button before submitting a new record.",
+            visible=True,
+            elem_id="valid",
+        )
+    return individual, error_icon, error_box
 
-def show_error(error_box, error_behavior, error_circumstance, error_followup, error_physical, error_individual):
+
+def show_error(
+    error_box,
+    error_behavior,
+    error_circumstance,
+    error_followup,
+    error_physical,
+    error_individual,
+):
     error_text = ""
     if error_circumstance:
         error_text += f"Error in circumstance: {error_circumstance}\n"
@@ -108,69 +170,79 @@ def show_error(error_box, error_behavior, error_circumstance, error_followup, er
     if error_individual:
         error_text += f"Error in individual: {error_individual}\n"
     error_text += "PLEASE CORRECT THESE ERRORS BEFORE SUBMITTING."
-    error_box= gr.Text(label="ERROR DETECTED !", value=error_text, visible=True, elem_id="error")
+    error_box = gr.Text(
+        label="ERROR DETECTED !", value=error_text, visible=True, elem_id="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
-def validate_circumstance(data): 
+def validate_circumstance(data):
     circumstance_raw = get_fields(data, "circumstance")
     circumstance_formatted = process_circumstance(circumstance_raw)
-    try: 
+    try:
         Circumstances.model_validate(circumstance_formatted)
         circumstances = Circumstances(**circumstance_formatted)
         error = None
     except ValidationError as e:
         error = e
-        print(e)
+        print(f"""Error in Validate_circumstance: {e}""")
         circumstances = None
     return circumstances, error
-        
 
-def validate_behavior(data): 
+
+def validate_behavior(data, mode):
     behaviors_raw = get_fields(data, "behaviors")
     behaviors_formatted = process_behaviors(behaviors_raw)
     try:
-        Behaviors.model_validate(behaviors_formatted)
-        behavior = Behaviors(**behaviors_formatted)
+        if mode == "simple":
+            BehaviorsSimple.model_validate(behaviors_formatted)
+            behavior = BehaviorsSimple(**behaviors_formatted)
+        elif mode == "advanced":
+            Behaviors.model_validate(behaviors_formatted)
+            behavior = Behaviors(**behaviors_formatted)
         error = None
     except ValidationError as e:
-        print(e)
-        print("Validation failed for the behaviors.")
+        print(f"""Error in behaviors validation: {e}""")
         behavior = None
         error = e
     return behavior, error
-        
 
-def validate_physical(data): 
+
+def validate_physical(data, mode):
     physical_raw = get_fields(data, "physical")
     physical_formatted = process_physical(physical_raw)
-    try: 
-        PhysicalAnomalies.model_validate(physical_formatted)
-        physical = PhysicalAnomalies(**physical_formatted)
+    # print(physical_formatted)
+    try:
+        if mode == "simple":
+            PhysicalAnomaliesSimple.model_validate(physical_formatted)
+            physical = PhysicalAnomaliesSimple(**physical_formatted)
+        elif mode == "advanced":
+            PhysicalAnomalies.model_validate(physical_formatted)
+            physical = PhysicalAnomalies(**physical_formatted)
         error = None
     except ValidationError as e:
-        print(e)
-        print("Validation failed for the physical anomalies.")
+        print(f"""Error in physical_anomalies validation: {e}""")
         physical = None
         error = e
     return physical, error
-        
+
+
 def validate_follow_up(data):
     followup_raw = get_fields(data, "followup")
     followup_formatted = process_followup(followup_raw)
-    try: 
+    try:
         FollowUpEvents.model_validate(followup_formatted)
         followup = FollowUpEvents(**followup_formatted)
         error = None
     except ValidationError as e:
-        print(e)
-        print("Validation failed for the follow-up events.")
+        print(f"""Error in follow-up events validation: {e}""")
+
         followup = None
     return followup, error
-    
-        
-