fix: geolocalisation specie number and comments save to report

app/classes.py

@@ -48,6 +48,9 @@ class Report(BaseModel):
     image: ImageBase64
     image_md5: str
     geolocalisation: Geolocalisation
+    specie: Optional[str]
+    number: Optional[int]
+    comments: Optional[str]
     wounded_state: str
     wounded: Optional[Wounded] = None
     dead_state: str

app/geolocalisation/class_geolocalisation.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Literal, List, Union
+from typing import Literal, List, Union, Optional
 
 class Longitude(BaseModel):
     type: Literal['longitude']
@@ -12,5 +12,5 @@ class Latitude(BaseModel):
 class Geolocalisation(BaseModel):
     longitude: Longitude
     latitude: Latitude
-    name: str
+    name: Optional[str]
 

app/geolocalisation/js_geolocation.py

@@ -1,3 +1,7 @@
+import gradio as gr 
+import json
+from geolocalisation.maps import create_geolocalisation_object, save_geolocalisation_to_json
+
 # JavaScript code to get location and update hidden_input
 js_geocode = """
     function() {
@@ -31,5 +35,20 @@ js_geocode = """
     }
 """
 
-def display_location(location_json):
-    return location_json
+def display_location(location_json, individual):
+    geo_dict = json.loads(location_json)
+    print(geo_dict)
+    print(geo_dict["error"])
+    latitude = geo_dict["latitude"]
+    longitude = geo_dict["longitude"]
+    geolocalisation = create_geolocalisation_object(latitude, longitude, "NA")
+    individual = save_geolocalisation_to_json(geolocalisation, individual)
+    locationtext = gr.Textbox(
+        f"Latitude: {latitude} | Longitude: {longitude}",
+        visible=True, 
+        show_label=False,
+        interactive=False) 
+    return locationtext, individual
+
+# def display_location(location_json):
+#     return location_json

app/mode_advanced.py

@@ -12,12 +12,14 @@ 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 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 validation_submission.utils_save import save_details, save_image
+
 
 from dotenv import load_dotenv
 import os
@@ -45,9 +47,6 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
     # ---------------------------------------------------------
     # Camera
     with gr.Row():
-        def save_image(camera, individual):
-            individual = add_data_to_individual("image", camera.tolist(), individual)
-            return individual
         camera = gr.Image(elem_id="image")
         camera.input(save_image, inputs=[camera, individual], outputs=[individual])
     
@@ -64,6 +63,10 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
                     visible=True,
                     interactive=True
                 )
+                specie.change(save_details,
+                              inputs=[gr.Textbox("specie", visible=False),
+                                      specie],
+                              outputs=individual)
 
             # Number of individuals
             with gr.Row():
@@ -77,6 +80,10 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
                     visible=True,
                     interactive=True
                 )
+                num_individuals.change(save_details,
+                              inputs=[gr.Textbox("number", visible=False),
+                                      num_individuals],
+                              outputs=individual)
 
             # Introducing text_box for comments 
             with gr.Row():
@@ -89,6 +96,10 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
                     visible=True,
                     interactive=True
                 )
+                comments.change(save_details,
+                              inputs=[gr.Textbox("comments", visible=False),
+                                      comments],
+                              outputs=individual)
 
     # ---------------------------------------------------------
     # Location
@@ -114,12 +125,15 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
         
         with gr.Column(scale=1):
             # Geolocation
-            gr.Markdown("#### Location (Using GPS)")
-            location_data = gr.JSON(label="Identified GPS Location")
+            gr.Button("Location", icon=PATH_ICONS+"pin.png", variant="primary")
+            location_data = gr.JSON(label="Identified GPS Location", visible=False)
             hidden_input = gr.Textbox(visible=False, elem_id="textbox_id") 
+            locationtext = gr.Textbox(visible=False, elem_id="textbox_id") 
             btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required)")
             btn_gpslocation.click(None, [], [], js=js_geocode)
-            hidden_input.change(display_location, inputs=hidden_input, outputs=location_data)
+            hidden_input.change(display_location, 
+                                    inputs=[hidden_input, individual], 
+                                    outputs=[locationtext, individual])
             
     # ---------------------------------------------------------
     # Dead and Wounded Buttons

app/mode_simple.py

@@ -17,6 +17,7 @@ from validation_submission.utils_individual import add_data_to_individual
 from validation_submission.submission import validate_save_individual
 from validation_submission.validation import reset_error_box
 from validation_submission.utils_individual import generate_random_md5
+from validation_submission.utils_save import save_details, save_image
 
 from dotenv import load_dotenv
 import os
@@ -44,9 +45,6 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     # ---------------------------------------------------------
     # Camera
     with gr.Row():
-        def save_image(camera, individual):
-            individual = add_data_to_individual("image", camera.tolist(), individual)
-            return individual
         camera = gr.Image(elem_id="image")
         camera.input(save_image, inputs=[camera, individual], outputs=[individual])
     
@@ -63,6 +61,10 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                     visible=True,
                     interactive=True
                 )
+                specie.change(save_details,
+                              inputs=[gr.Textbox("specie", visible=False),
+                                      specie],
+                              outputs=individual)
 
             # Number of individuals
             with gr.Row():
@@ -76,6 +78,10 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                     visible=True,
                     interactive=True
                 )
+                num_individuals.change(save_details,
+                              inputs=[gr.Textbox("number", visible=False),
+                                      num_individuals],
+                              outputs=individual)
 
             # Introducing text_box for comments 
             with gr.Row():
@@ -88,16 +94,23 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                     visible=True,
                     interactive=True
                 )
+                comments.change(save_details,
+                              inputs=[gr.Textbox("comments", visible=False),
+                                      comments],
+                              outputs=individual)
 
             with gr.Row(): 
                 with gr.Column(scale=1):
                     # Geolocation
                     gr.Button("Location", icon=PATH_ICONS+"pin.png", variant="primary")
-                    location_data = gr.JSON(label="Identified GPS Location")
+                    location_data = gr.JSON(label="Identified GPS Location", visible=False)
                     hidden_input = gr.Textbox(visible=False, elem_id="textbox_id") 
+                    locationtext = gr.Textbox(visible=False, elem_id="textbox_id") 
                     btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required)")
                     btn_gpslocation.click(None, [], [], js=js_geocode)
-                    hidden_input.change(display_location, inputs=hidden_input, outputs=location_data)
+                    hidden_input.change(display_location, 
+                                          inputs=[hidden_input, individual], 
+                                          outputs=[locationtext, individual])
             
     # ---------------------------------------------------------
     # Dead and Wounded Buttons

app/validation_submission/utils_save.py

@@ -0,0 +1,9 @@
+from validation_submission.utils_individual import add_data_to_individual
+
+def save_details(tag, data, individual):
+                individual = add_data_to_individual(tag, data, individual)
+                return individual
+
+def save_image(camera, individual):
+            individual = add_data_to_individual("image", camera.tolist(), individual)
+            return individual

app/validation_submission/validation.py

@@ -2,7 +2,6 @@ import uuid
 from pydantic import ValidationError
 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
@@ -32,19 +31,19 @@ def get_fields(data_dict, keyword):
             extract[key] = val
     return extract
 
+def field_checker(data):
+    img = ImageBase64.to_base64(data["image"]) if "image" in data.keys() else None
+    geolocalisation = data["geolocalisation"] if "geolocalisation" in data.keys() else None
+    specie = data["specie"] if "specie" in data.keys() else "NA"
+    number =  data["number"] if "specie" in data.keys() else 1
+    comments = data["comments"] if "specie" in data.keys() else "NA"
+    return img, geolocalisation, specie, number, comments
 
 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:
-        img = None
-    if "geolocalisation" in data.keys():
-        geolocalisation = data["geolocalisation"]
-    else:
-        geolocalisation = None
+    img, geolocalisation, specie, number, comments = field_checker(data)
 
     error_behavior = None
     error_circumstance = None
@@ -68,6 +67,9 @@ def validate_individual(data, error_icon, error_box, mode: str):
                     image=img,
                     image_md5=data["image_md5"],
                     geolocalisation=geolocalisation,
+                    specie=specie,
+                    number=number,
+                    comments=comments,
                     wounded_state=data["wounded_state"],
                     wounded=Wounded(
                         circumstances=circumstance,
@@ -89,6 +91,9 @@ def validate_individual(data, error_icon, error_box, mode: str):
                     image=img,
                     image_md5=data["image_md5"],
                     geolocalisation=geolocalisation,
+                    specie=specie,
+                    number=number,
+                    comments=comments,
                     wounded_state=data["wounded_state"],
                     dead_state=data["dead_state"],
                     dead=Dead(
@@ -108,6 +113,9 @@ def validate_individual(data, error_icon, error_box, mode: str):
                 image=img,
                 image_md5=data["image_md5"],
                 geolocalisation=geolocalisation,
+                specie=specie,
+                number=number,
+                comments=comments,
                 wounded_state=data["wounded_state"],
                 dead_state=data["dead_state"],
             )