fix update

Author: MateoLostanlen

app/callbacks/data_callbacks.py

@@ -134,6 +134,20 @@ def login_callback(n_clicks, username, password, user_token, lang):
     raise PreventUpdate
 
 
+from dash import Input, Output, State, callback
+
+
+@callback(
+    Output("detection_fetch_limit", "data"),
+    Input("detection_fetch_limit_input", "value"),
+    prevent_initial_call=True,  # optional, remove if you want it to run on first load
+)
+def update_fetch_limit(value):
+    if value is None:
+        return 10  # fallback default
+    return value
+
+
 @app.callback(
     Output("available-stream-sites", "data"),
     Input("user_name", "data"),
@@ -207,19 +221,19 @@ 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"),
         Input("to_acknowledge", "data"),
         Input("unmatched_event_id_table", "data"),
+        Input("my-date-picker-single", "date"),
     ],
     [State("api_sequences", "data"), State("user_token", "data"), State("event_id_table", "data")],
     prevent_initial_call=True,
 )
 def api_watcher(
     n_intervals,
     api_cameras,
-    selected_date,
     to_acknowledge,
     unmatched_event_id_table,
+    selected_date,
     local_sequences,
     user_token,
     local_event_id_table,
@@ -285,19 +299,32 @@ def api_watcher(
             api_sequences, event_id_table = compute_overlap(
                 api_sequences, unmatched_event_table=unmatched_event_id_table
             )
+
+            print("event_id_table")
+            print(event_id_table)
             local_event_id_table = pd.read_json(StringIO(local_event_id_table), orient="split")
 
-        # Load local sequences safely
-        if local_sequences:
-            local_sequences_df = pd.read_json(StringIO(local_sequences), orient="split")
-        else:
-            local_sequences_df = pd.DataFrame()
+            # Load local sequences safely
+            if local_sequences:
+                local_sequences_df = pd.read_json(StringIO(local_sequences), orient="split")
+            else:
+                local_sequences_df = pd.DataFrame()
+
+            # Ensure valid DataFrames
+            if not isinstance(local_event_id_table, pd.DataFrame):
+                local_event_id_table = pd.DataFrame()
+            if not isinstance(event_id_table, pd.DataFrame):
+                event_id_table = pd.DataFrame()
+
+            # Check event condition: either empty or sequences match
+            event_condition = event_id_table.empty or (
+                "sequences" in local_event_id_table.columns
+                and "sequences" in event_id_table.columns
+                and np.array_equal(local_event_id_table["sequences"].values, event_id_table["sequences"].values)
+            )
 
-        if len(local_event_id_table) == len(event_id_table):
-            if len(event_id_table) == 0 or (
-                np.array_equal(local_event_id_table["sequences"].values, event_id_table["sequences"].values)
-            ):
-                # Skip update if nothing changed
+            # Now apply sequence comparison only if event condition is true
+            if event_condition:
                 if not local_sequences_df.empty and not api_sequences.empty:
                     if not sequences_have_changed(api_sequences, local_sequences_df):
                         logger.info("Skipping update: no significant change detected")
@@ -352,7 +379,7 @@ def update_sub_api_sequences(api_sequences, local_sub_sequences):
     [Output("are_detections_loaded", "data"), Output("sequence_on_display", "data"), Output("api_detections", "data")],
     [
         Input("sequence_id_on_display", "data"),
-        Input("detection_fetch_limit_input", "value"),
+        Input("detection_fetch_limit", "data"),
         Input("detection_fetch_desc", "value"),
     ],
     [

app/callbacks/display_callbacks.py

@@ -550,7 +550,10 @@ def update_fire_markers(smoke_location_str, api_sequences):
         Input("confirm-non-wildfire", "n_clicks"),
         Input("cancel-confirmation", "n_clicks"),
     ],
-    [State("sequence_id_on_display", "data"), State("user_token", "data")],
+    [
+        State("sequence_id_on_display", "data"),
+        State("user_token", "data"),
+    ],
     prevent_initial_call=True,
 )
 def acknowledge_event(
@@ -561,14 +564,13 @@ def acknowledge_event(
     logger.info("acknowledge_event")
 
     if not ctx.triggered:
-        raise dash.exceptions.PreventUpdate
+        raise PreventUpdate
 
     if user_token is None:
-        return dash.no_update
+        raise PreventUpdate
 
     triggered_id = ctx.triggered[0]["prop_id"].split(".")[0]
 
-    # Modal styles
     modal_visible_style = {
         "position": "fixed",
         "top": "50%",
@@ -580,29 +582,31 @@ def acknowledge_event(
     modal_hidden_style = {"display": "none"}
 
     client = get_client(user_token)
+    client.token = user_token
 
     if triggered_id == "acknowledge-button":
-        # Show the modal
-        if acknowledge_clicks > 0:
-            return modal_visible_style, dash.no_update
+        if acknowledge_clicks is None or acknowledge_clicks == 0:
+            raise PreventUpdate
+        return modal_visible_style, dash.no_update
 
     elif triggered_id == "confirm-wildfire":
-        # Send wildfire confirmation to the API
-        client.token = user_token
+        if confirm_wildfire is None or confirm_wildfire == 0:
+            raise PreventUpdate
         client.label_sequence(sequence_id_on_display, True)
         return modal_hidden_style, sequence_id_on_display
 
     elif triggered_id == "confirm-non-wildfire":
-        # Send non-wildfire confirmation to the API
-        client.token = user_token
+        if confirm_non_wildfire is None or confirm_non_wildfire == 0:
+            raise PreventUpdate
         client.label_sequence(sequence_id_on_display, False)
         return modal_hidden_style, sequence_id_on_display
 
     elif triggered_id == "cancel-confirmation":
-        # Cancel action
+        if cancel is None or cancel == 0:
+            raise PreventUpdate
         return modal_hidden_style, dash.no_update
 
-    raise dash.exceptions.PreventUpdate
+    raise PreventUpdate
 
 
 # Modal issue let's add this later
@@ -749,12 +753,15 @@ def update_datepicker(open_clicks, selected_date):
 def pick_live_stream_camera(n_clicks, azimuth, camera_label, azimuth_label):
     logger.info("pick_live_stream_camera")
 
+    if n_clicks is None or n_clicks == 0:
+        raise PreventUpdate
+
     if not camera_label or not azimuth_label:
         raise PreventUpdate
+
     try:
         cam_name, _, _ = camera_label.split(" ")
         azimuth = int(azimuth.replace("°", ""))
-        # detection_azimuth = int(azimuth_label.replace("°", "").strip()) Need azimuth refine first
     except Exception as e:
         logger.warning(f"[pick_live_stream_camera] Failed to parse camera info: {e}")
         raise PreventUpdate

app/index.py

@@ -58,8 +58,11 @@ def display_page(
     if triggered == "selected-camera-info" and selected_camera_info:
         return live_stream_layout(user_token, api_cameras, available_stream, selected_camera_info, lang=lang)
 
-    if (pathname == "/" or pathname is None) or triggered == "my-date-picker-single":
-        return homepage_layout(user_token, api_cameras, lang=lang)
+    if triggered == "my-date-picker-single":
+        return homepage_layout(user_token, api_cameras, lang=lang, descending_order=False)
+
+    if pathname in ["/", None]:
+        return homepage_layout(user_token, api_cameras, lang=lang, descending_order=True)
 
     if pathname == "/cameras-status":
         return cameras_status_layout(user_token, api_cameras, lang=lang)

app/layouts/main_layout.py

@@ -86,4 +86,5 @@ def get_main_layout():
         dcc.Store(id="selected-camera-info", storage_type="session"),
         dcc.Store(id="language", storage_type="session", data="fr"),
         dcc.Store(id="selected_event_id", storage_type="session", data=None),
+        dcc.Store(id="detection_fetch_limit", storage_type="session", data=10),
     ])

app/pages/homepage.py

@@ -12,7 +12,7 @@
 from utils.display import build_alerts_map
 
 
-def homepage_layout(user_token, api_cameras, lang="fr"):
+def homepage_layout(user_token, api_cameras, lang="fr", descending_order=True):
     return dbc.Container(
         [
             dbc.Row([
@@ -35,7 +35,7 @@ def homepage_layout(user_token, api_cameras, lang="fr"):
                             dbc.Checklist(
                                 id="detection_fetch_desc",
                                 options=[{"value": True}],
-                                value=[True],
+                                value=[descending_order],
                                 switch=True,
                             ),
                             html.Hr(className="my-3"),