apmtools 0.2.25__tar.gz → 0.2.26__tar.gz

{apmtools-0.2.25 → apmtools-0.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: apmtools
-Version: 0.2.025
+Version: 0.2.026
 Summary: A collection of tools for processing air pollution monitoring data
 Project-URL: Homepage, https://github.com/federlorenz/apmtools
 Author-email: Federico Lorenzetti <lorenzetti.federico@gmail.com>

{apmtools-0.2.25 → apmtools-0.2.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apmtools"
-version = "0.2.025"
+version = "0.2.026"
 authors = [
   { name="Federico Lorenzetti", email="lorenzetti.federico@gmail.com" },
 ]

{apmtools-0.2.25 → apmtools-0.2.26}/src/apmtools/shiny/summary.py

@@ -449,9 +449,26 @@ def create_summary_app(
     subset_columns = columns
 
     @module.ui
-    def plot_tab_ui():
+    def plot_tab_ui(initial_filters=None):
+        initial_filters = initial_filters or {}
         return ui.div(
             ui.layout_columns(
+                ui.card(ui.card_header("Plot filters"),
+                        ui.input_selectize("subset_columns", "Subset columns",
+                                           choices={
+                                               c: c for c in subset_columns},
+                                           selected=initial_filters.get("columns", []), multiple=True),
+                        ui.output_ui("subset_filters"),
+                        ui.hr(),
+                        ui.input_text("datetime_start", "Start datetime",
+                                      value=initial_filters.get("start", ""),
+                                      placeholder="YYYY-MM-DD or YYYY-MM-DD HH:MM:SS"),
+                        ui.input_text("datetime_end", "End datetime",
+                                      value=initial_filters.get("end", ""),
+                                      placeholder="YYYY-MM-DD or YYYY-MM-DD HH:MM:SS"),
+                        ui.help_text(
+                            "Filters affect this plot only. A new plot inherits these selections."),
+                        ),
                 ui.card(ui.card_header("Plot settings"),
                         ui.input_select("plot_type", "Plot type",
                                         choices=PLOT_TYPES, selected=plot_type),
@@ -478,14 +495,64 @@ def create_summary_app(
                                              ),
                         ui.input_text("title", "Plot title", value=title),
                         ),
-                ui.card(ui.card_header("Plot"), ui.div(output_widget(
-                    "plot", height="100%", width="100%"), class_="summary-plot-container")),
-                col_widths=(3, 9),
+                ui.div(
+                    ui.card(ui.card_header("Plot"),
+                            ui.div(output_widget("plot", height="100%", width="100%"),
+                            class_="summary-plot-container")),
+                    ui.card(ui.card_header("Dataset used for plotting"),
+                            ui.output_data_frame("plot_table")),
+                ),
+                col_widths=(2, 2, 8),
             ),
         )
 
     @module.server
-    def plot_tab_server(input, output, session, filtered_summary):
+    def plot_tab_server(input, output, session, initial_filters=None):
+         initial_filters = initial_filters or {}
+
+          @render.ui
+           def subset_filters():
+                controls = []
+                for i, name in enumerate(list(input.subset_columns())):
+                    if name not in column_map:
+                        continue
+                    choices, _ = _subset_choices(summary, column_map[name])
+                    controls.append(ui.input_selectize(
+                        f"subset_values_{i}", f"{name} values", choices=choices,
+                        selected=initial_filters.get(
+                            "values", {}).get(name, []),
+                        multiple=True,
+                    ))
+                return ui.div(*controls) if controls else ui.help_text("Select columns to filter this plot.")
+
+            @reactive.calc
+            def filter_state():
+                names = list(input.subset_columns())
+                values = {}
+                for i, name in enumerate(names):
+                    if name in column_map:
+                        values[name] = list(input[f"subset_values_{i}"]())
+                return {"columns": names, "values": values,
+                        "start": input.datetime_start().strip(),
+                        "end": input.datetime_end().strip()}
+
+            @reactive.calc
+            def filtered_summary():
+                state = filter_state()
+                filters = {}
+                for name, keys in state["values"].items():
+                    _, mapping = _subset_choices(summary, column_map[name])
+                    selected = [mapping[key] for key in keys if key in mapping]
+                    if selected:
+                        filters[column_map[name]] = selected
+                return _apply_filters(summary, filters, state["start"], state["end"])
+
+            @render.data_frame
+            def plot_table():
+                df = selected_data()
+                return render.DataGrid(pd.DataFrame(df).reset_index(drop=True),
+                                       filters=True, height="420px")
+
             @render.ui
             def x_control():
                 kind = input.plot_type()
@@ -788,21 +855,9 @@ def create_summary_app(
                 )
                 return fig
 
-    app_ui = ui.page_sidebar(
-        ui.sidebar(
-            ui.h4("Global filters"),
-            ui.input_selectize("subset_columns", "Subset columns", choices={
-                               c: c for c in subset_columns}, selected=[], multiple=True),
-            ui.output_ui("subset_filters"),
-            ui.hr(),
-            ui.h5("Datetime filter"),
-            ui.input_text("datetime_start", "Start datetime", value="",
-                          placeholder="YYYY-MM-DD or YYYY-MM-DD HH:MM:SS"),
-            ui.input_text("datetime_end", "End datetime", value="",
-                          placeholder="YYYY-MM-DD or YYYY-MM-DD HH:MM:SS"),
-            ui.help_text(
-                "Global filters update all plots. Plot controls are independent for each tab."),
-        ),
+            return filter_state
+
+    app_ui = ui.page_fluid(
         ui.tags.style("""
             .container, .container-fluid {max-width: none !important;}
             .summary-plot-container {width:100%; height:auto; aspect-ratio: 2 / 1; min-width:0; position:relative;}
@@ -850,69 +905,15 @@ def create_summary_app(
                 class_="d-flex gap-2 mb-3",
             ),
             ui.navset_tab(ui.nav_panel("Plot 1", plot_tab_ui(
-                "plot_1"), value="plot_1"), id="plot_tabs"),
+                "plot_1", {}), value="plot_1"), id="plot_tabs"),
         ),
         title="Summary plots",
     )
 
     def server(input, output, session):
-        @render.ui
-        def subset_filters():
-            """Render one value selector for every selected subset column."""
-            selected_columns = list(input.subset_columns())
-            if not selected_columns:
-                return ui.help_text(
-                    "Select one or more columns above to choose their values."
-                )
-
-            controls = []
-            for i, selected_column in enumerate(selected_columns):
-                if selected_column not in column_map:
-                    continue
-                choices, _ = _subset_choices(
-                    summary, column_map[selected_column])
-                input_id = f"subset_values_{i}"
-                controls.append(
-                    ui.input_selectize(
-                        input_id,
-                        f"{selected_column} values",
-                        choices=choices,
-                        selected=[],
-                        multiple=True,
-                        options={
-                            "placeholder": f"Select {selected_column} values"},
-                    )
-                )
-            return ui.div(*controls)
-
-        @reactive.calc
-        def filtered_summary():
-            selected_columns = list(input.subset_columns())
-            subset_filters = {}
-
-            for i, selected_column in enumerate(selected_columns):
-                if selected_column not in column_map:
-                    continue
-                selected_keys = list(input[f"subset_values_{i}"]())
-                if not selected_keys:
-                    # An explicitly selected column with no selected values
-                    # should not remove all data; it simply contributes no
-                    # filtering condition until values are chosen.
-                    continue
-                _, value_map = _subset_choices(
-                    summary, column_map[selected_column])
-                values = [value_map[key]
-                          for key in selected_keys if key in value_map]
-                if values:
-                    subset_filters[column_map[selected_column]] = values
-
-            start = input.datetime_start().strip()
-            end = input.datetime_end().strip()
-            return _apply_filters(summary, subset_filters, start, end)
-
         next_tab = reactive.value(1)
         active_tabs = reactive.value(("plot_1",))
-        plot_tab_server("plot_1", filtered_summary)
+        tab_filters = {"plot_1": plot_tab_server("plot_1", {})}
 
         @reactive.effect
         @reactive.event(input.add_tab)
@@ -921,10 +922,16 @@ def create_summary_app(
             next_tab.set(number)
             tab_id = f"plot_{number}"
             # Register module before inserting its UI.
-            plot_tab_server(tab_id, filtered_summary)
+            selected = input.plot_tabs()
+            # Snapshot the selected plot's filters when the new plot is created.
+            inherited = dict(tab_filters[selected]
+                             ()) if selected in tab_filters else {}
+            inherited["values"] = {
+                k: list(v) for k, v in inherited.get("values", {}).items()}
+            tab_filters[tab_id] = plot_tab_server(tab_id, inherited)
             active_tabs.set((*active_tabs.get(), tab_id))
             ui.insert_nav_panel("plot_tabs", ui.nav_panel(
-                f"Plot {number}", plot_tab_ui(tab_id), value=tab_id), select=True)
+                f"Plot {number}", plot_tab_ui(tab_id, inherited), value=tab_id), select=True)
 
         @reactive.effect
         @reactive.event(input.close_tab)