update demos

Author: b-yogesh

examples/serve/panels-demo/demo_panels/panel_histo2d.py

@@ -127,33 +127,6 @@ def render_panel(
     )
 
 
-@panel.callback(
-    Input("@app", "selectedDatasetId"),
-    Input("@app", "selectedPlaceGeometry"),
-    Input("select_var_1"),
-    Input("select_var_2"),
-    Input("button", "clicked"),
-    Output("error_message", "children"),
-)
-def update_error_message(
-    ctx: Context,
-    dataset_id: str | None = None,
-    place_geometry: str | None = None,
-    var_1_name: str | None = None,
-    var_2_name: str | None = None,
-    _clicked: bool | None = None,
-) -> str:
-    dataset = get_dataset(ctx, dataset_id)
-    if dataset is None:
-        return "Missing dataset selection"
-    elif not place_geometry:
-        return "Missing place geometry selection"
-    elif not var_1_name or not var_2_name:
-        return "Missing variable selection"
-    else:
-        return ""
-
-
 @panel.callback(
     State("@app", "selectedDatasetId"),
     State("@app", "selectedPlaceGeometry"),
@@ -190,11 +163,7 @@ def update_plot(
         ).transform
         place_geometry = shapely.ops.transform(project, place_geometry)
 
-    if (
-        place_geometry is None
-        or place_geometry.is_empty
-        or isinstance(place_geometry, shapely.geometry.Point)
-    ):
+    if place_geometry is None or isinstance(place_geometry, shapely.geometry.Point):
         return (
             None,
             "Selected geometry must cover an area.",
@@ -377,3 +346,30 @@ def show_progress(
     _clicked: bool | None = None,  # trigger, will always be True
 ) -> alt.Chart | None:
     return CircularProgress(id="button", size=28)
+
+
+@panel.callback(
+    Input("@app", "selectedDatasetId"),
+    Input("@app", "selectedPlaceGeometry"),
+    State("select_var_1"),
+    State("select_var_2"),
+    Input("button", "clicked"),
+    Output("error_message", "children"),
+)
+def update_error_message(
+    ctx: Context,
+    dataset_id: str | None = None,
+    place_geometry: str | None = None,
+    var_1_name: str | None = None,
+    var_2_name: str | None = None,
+    _clicked: bool | None = None,
+) -> str:
+    dataset = get_dataset(ctx, dataset_id)
+    if dataset is None:
+        return "Missing dataset selection"
+    elif not place_geometry:
+        return "Missing place geometry selection"
+    elif not var_1_name or not var_2_name:
+        return "Missing variable selection"
+    else:
+        return ""

examples/serve/panels-demo/demo_panels/panel_spectrum.py

@@ -106,30 +106,6 @@ def render_panel(
     )
 
 
-@panel.callback(
-    Input("@app", "selectedPlaceGroup"),
-    Input("@app", "selectedDatasetId"),
-    Input("@app", "selectedTimeLabel"),
-    Input("button", "clicked"),
-    Output("error_message", "children"),
-)
-def update_error_message(
-    ctx: Context,
-    place_group: list[dict[str, Any]] | None = None,
-    dataset_id: str | None = None,
-    _time_label: float | None = None,
-    _clicked: bool | None = None,
-) -> str:
-    dataset = get_dataset(ctx, dataset_id)
-    points = get_places(ctx, place_group)
-    if dataset is None:
-        return "Missing dataset selection"
-    elif not points:
-        return "Missing point selection"
-    else:
-        return ""
-
-
 def get_spectra(
     dataset: xr.Dataset,
     place_group: gpd.GeoDataFrame,
@@ -189,15 +165,13 @@ def get_spectra(
 
 @panel.callback(
     State("@app", "selectedDatasetTitle"),
-    State("@app", "selectedTimeLabel"),
     Input("@app", "selectedTimeLabel"),
     Output("text", "children"),
 )
 def update_text(
     ctx: Context,
     dataset_title: str | None = None,
     time_label: str | None = None,
-    _time_label: bool | None = None,
 ) -> list | None:
 
     if time_label:
@@ -209,7 +183,6 @@ def update_text(
     State("@app", "selectedDatasetId"),
     Input("@app", "selectedTimeLabel"),
     State("@app", "selectedPlaceGroup"),
-    State("@app", "selectedPlaceGeometry"),
     State("select_places", "value"),
     Input("button", "clicked"),
     Output("plot", "chart"),
@@ -220,17 +193,22 @@ def update_plot(
     dataset_id: str | None = None,
     time_label: str | None = None,
     place_group: list[dict[str, Any]] | None = None,
-    place_geometry: str | None = None,
     place: list | None = None,
     _clicked: bool | None = None,
 ) -> tuple[alt.Chart | None, str]:
     dataset = get_dataset(ctx, dataset_id)
+    has_point = any(
+        feature.get("geometry", {}).get("type") == "Point"
+        for collection in place_group
+        for feature in collection.get("features", [])
+    )
     if dataset is None:
         return None, "Missing dataset selection"
-    elif not place_geometry:
-        return None, "Missing place geometry selection"
+    elif not place_group or not has_point:
+        return None, "Missing point selection"
     elif not place:
-        return None, "Missing point value selection from dropdown"
+        return None, "Missing point selection from dropdown"
+
     place_group = gpd.GeoDataFrame(
         [
             {
@@ -304,23 +282,3 @@ def update_theme(
         theme_mode = "default"
 
     return theme_mode
-
-
-@panel.callback(
-    State("@app", "selectedDatasetId"),
-    State("@app", "selectedTimeLabel"),
-    State("@app", "selectedPlaceGroup"),
-    State("select_places", "value"),
-    Input("@app", "selectedTimeLabel"),
-    Output("plot", "chart"),
-    Output("error_message", "children"),
-)
-def update_timestep(
-    ctx: Context,
-    dataset_id: str,
-    time_label: str,
-    place_group: list[dict[str, Any]],
-    place: list,
-    _new_time_label: bool | None = None,
-) -> tuple[alt.Chart, str] | None:
-    return update_plot(ctx, dataset_id, time_label, place_group, place)