display label

Author: MateoLostanlen

app/callbacks/data_callbacks.py

@@ -193,14 +193,15 @@ def api_cameras_watcher(n_intervals, api_cameras, user_token):
         Input("main_api_fetch_interval", "n_intervals"),
         Input("api_cameras", "data"),
         Input("my-date-picker-single", "date"),  # NEW: date picker input
+        Input("to_acknowledge", "data"),
     ],
     [
         State("api_sequences", "data"),
         State("user_token", "data"),
     ],
     prevent_initial_call=True,
 )
-def api_watcher(n_intervals, api_cameras, selected_date, local_sequences, user_token):
+def api_watcher(n_intervals, api_cameras, selected_date, to_acknowledge, local_sequences, user_token):
     """
     Callback to periodically fetch alerts data from the API or after date change.
 
@@ -242,8 +243,17 @@ def api_watcher(n_intervals, api_cameras, selected_date, local_sequences, user_t
 
         # Skip update if nothing changed
         if not local_sequences_df.empty and not api_sequences.empty:
-            aligned_api, aligned_local = api_sequences["id"].align(local_sequences_df["id"])
-            if all(aligned_api == aligned_local):
+            # Merge both DataFrames on 'id' to compare annotations
+            merged = pd.merge(
+                api_sequences[["id", "is_wildfire"]],
+                local_sequences_df[["id", "is_wildfire"]],
+                on="id",
+                how="inner",
+                suffixes=("", "_local"),
+            )
+
+            # If the annotations haven't changed, skip update
+            if merged["is_wildfire"].equals(merged["is_wildfire_local"]):
                 return dash.no_update
 
         return api_sequences.to_json(orient="split")

app/callbacks/display_callbacks.py

@@ -26,7 +26,7 @@
 from utils.display import (
     build_vision_polygon,
     convert_dt_to_local_tz,
-    create_event_list_from_alerts,
+    create_sequence_list,
     filter_bboxes_dict,
 )
 
@@ -83,17 +83,16 @@ def update_language_store(selected_lang):
     Output("sequence-list-container", "children"),
     [
         Input("api_sequences", "data"),
-        Input("to_acknowledge", "data"),
     ],
     State("api_cameras", "data"),
+    State("my-date-picker-single", "date"),
 )
-def update_event_list(api_sequences, to_acknowledge, cameras):
+def update_event_list(api_sequences, cameras, selected_date):
     """
-    Updates the event list based on changes in the events data or acknowledgement actions.
+    Updates the event list based on changes in the events data
 
     Parameters:
     - api_detections (json): JSON formatted data containing current alerts information.
-    - to_acknowledge (int): Event ID that is being acknowledged.
 
     Returns:
     - html.Div: A Div containing the updated list of alerts.
@@ -103,11 +102,7 @@ def update_event_list(api_sequences, to_acknowledge, cameras):
     api_sequences = pd.read_json(StringIO(api_sequences), orient="split")
     cameras = pd.read_json(StringIO(cameras), orient="split")
 
-    if len(api_sequences):
-        # Drop acknowledge event for faster update
-        api_sequences = api_sequences[~api_sequences["id"].isin([to_acknowledge])]
-
-    return create_event_list_from_alerts(api_sequences, cameras)
+    return create_sequence_list(api_sequences, cameras)
 
 
 # Select the event id

app/utils/display.py

@@ -226,38 +226,47 @@ def build_alerts_map(api_cameras, id_suffix=""):
     return map_object
 
 
-def create_event_list_from_alerts(api_events, cameras):
+def create_sequence_list(api_sequences, cameras):
     """
-    This function build the list of events on the left based on event data
+    This function builds the list of sequences on the left based on sequence data
     """
-    if api_events.empty:
+    if api_sequences.empty:
         return []
 
-    filtered_events = api_events.sort_values("started_at").drop_duplicates("id", keep="last")[::-1]
+    filtered_sequences = api_sequences.sort_values("started_at").drop_duplicates("id", keep="last")[::-1]
+
+    def get_annotation_emoji(value):
+        if value == 1.0:
+            return "🔥"
+        elif value == 0.0:
+            return "🚫"
+        else:
+            return ""
 
     return [
         html.Button(
-            id={"type": "event-button", "index": event["id"]},
+            id={"type": "event-button", "index": sequence["id"]},
             children=[
                 html.Div(
                     (
-                        f"{cameras[cameras['id'] == event['camera_id']]['name'].values[0][:-3].replace('_', ' ')}"
-                        f" : {int(event['azimuth'])}°"
+                        f"{cameras[cameras['id'] == sequence['camera_id']]['name'].values[0][:-3].replace('_', ' ')}"
+                        f" : {int(sequence['azimuth'])}°"
+                        f" {get_annotation_emoji(sequence.get('is_wildfire'))}"
                     ),
                     style={"fontWeight": "bold"},
                 ),
                 html.Div(
                     convert_dt_to_local_tz(
-                        lat=cameras[cameras["id"] == event["camera_id"]]["lat"].values[0],
-                        lon=cameras[cameras["id"] == event["camera_id"]]["lon"].values[0],
-                        str_utc_timestamp=event["started_at"],
+                        lat=cameras[cameras["id"] == sequence["camera_id"]]["lat"].values[0],
+                        lon=cameras[cameras["id"] == sequence["camera_id"]]["lon"].values[0],
+                        str_utc_timestamp=sequence["started_at"],
                     )
                 ),
             ],
             n_clicks=0,
             className="pyronear-card alert-card",
         )
-        for _, event in filtered_events.iterrows()
+        for _, sequence in filtered_sequences.iterrows()
     ]