Solving conflicts

petar-qb · petar-qb · commit 472f7a828402 · 2024-11-15T14:46:17.000+01:00
diff --git a/vizro-core/examples/scratch_dev/app.py b/vizro-core/examples/scratch_dev/app.py
@@ -1,4 +1,5 @@
 """Dev app to try things out."""
+
 import time
 import yaml
 
@@ -27,24 +28,35 @@
 def load_from_file(filter_column=None, parametrized_species=None):
     # Load the full iris dataset
     df = px.data.iris()
-    df['date_column'] = pd.date_range(start=pd.to_datetime("2024-01-01"), periods=len(df), freq='D')
+    df["date_column"] = pd.date_range(start=pd.to_datetime("2024-01-01"), periods=len(df), freq="D")
 
     if parametrized_species:
         return df[df["species"].isin(parametrized_species)]
 
-    with open('data.yaml', 'r') as file:
+    with open("data.yaml", "r") as file:
         data = yaml.safe_load(file)
         data = data or {}
 
     filter_column = filter_column or FILTER_COLUMN
     if filter_column == "species":
-        final_df = pd.concat(objs=[
-            df[df[filter_column] == 'setosa'].head(data.get("setosa", 0)),
-            df[df[filter_column] == 'versicolor'].head(data.get("versicolor", 0)),
-            df[df[filter_column] == 'virginica'].head(data.get("virginica", 0)),
-        ], ignore_index=True)
+        final_df = pd.concat(
+            objs=[
+                df[df[filter_column] == "setosa"].head(data.get("setosa", 0)),
+                df[df[filter_column] == "versicolor"].head(data.get("versicolor", 0)),
+                df[df[filter_column] == "virginica"].head(data.get("virginica", 0)),
+            ],
+            ignore_index=True,
+        )
     elif filter_column == "sepal_length":
-        final_df = df[df[filter_column].between(data.get("min"), data.get("max",), inclusive="both")]
+        final_df = df[
+            df[filter_column].between(
+                data.get("min"),
+                data.get(
+                    "max",
+                ),
+                inclusive="both",
+            )
+        ]
     elif filter_column == "date_column":
         date_min = pd.to_datetime(data.get("date_min"))
         date_max = pd.to_datetime(data.get("date_max"))
@@ -82,16 +94,18 @@ def load_from_file(filter_column=None, parametrized_species=None):
         vm.Graph(
             id="p1-G-2",
             figure=px.scatter(data_frame=px.data.iris(), **SCATTER_CHART_CONF),
-        )
+        ),
     ],
     controls=[
         vm.Filter(id="p1-F-1", column="species", targets=["p1-G-1"], selector=vm.Dropdown(title="Dynamic filter")),
         vm.Filter(id="p1-F-2", column="species", targets=["p1-G-2"], selector=vm.Dropdown(title="Static filter")),
         vm.Parameter(
             targets=["p1-G-1.x", "p1-G-2.x"],
-            selector=vm.RadioItems(options=["species", "sepal_width"], value="species", title="Simple X-axis parameter")
-        )
-    ]
+            selector=vm.RadioItems(
+                options=["species", "sepal_width"], value="species", title="Simple X-axis parameter"
+            ),
+        ),
+    ],
 )
 
 
@@ -110,9 +124,11 @@ def load_from_file(filter_column=None, parametrized_species=None):
         vm.Filter(id="p2-F-4", column="species", selector=vm.RadioItems()),
         vm.Parameter(
             targets=["p2-G-1.x"],
-            selector=vm.RadioItems(options=["species", "sepal_width"], value="species", title="Simple X-axis parameter")
-        )
-    ]
+            selector=vm.RadioItems(
+                options=["species", "sepal_width"], value="species", title="Simple X-axis parameter"
+            ),
+        ),
+    ],
 )
 
 
@@ -129,9 +145,11 @@ def load_from_file(filter_column=None, parametrized_species=None):
         vm.Filter(id="p3-F-2", column="sepal_length", selector=vm.RangeSlider()),
         vm.Parameter(
             targets=["p3-G-1.x"],
-            selector=vm.RadioItems(options=["species", "sepal_width"], value="species", title="Simple X-axis parameter")
-        )
-    ]
+            selector=vm.RadioItems(
+                options=["species", "sepal_width"], value="species", title="Simple X-axis parameter"
+            ),
+        ),
+    ],
 )
 
 page_4 = vm.Page(
@@ -147,9 +165,11 @@ def load_from_file(filter_column=None, parametrized_species=None):
         vm.Filter(id="p4-F-2", column="date_column", selector=vm.DatePicker()),
         vm.Parameter(
             targets=["p4-G-1.x"],
-            selector=vm.RadioItems(options=["species", "sepal_width"], value="species", title="Simple X-axis parameter")
-        )
-    ]
+            selector=vm.RadioItems(
+                options=["species", "sepal_width"], value="species", title="Simple X-axis parameter"
+            ),
+        ),
+    ],
 )
 
 page_5 = vm.Page(
@@ -170,73 +190,66 @@ def load_from_file(filter_column=None, parametrized_species=None):
                 # "p5-F-1.",
             ],
             selector=vm.Dropdown(
-                options=["setosa", "versicolor", "virginica"],
-                multi=True,
-                title="Parametrized species"
-            )
+                options=["setosa", "versicolor", "virginica"], multi=True, title="Parametrized species"
+            ),
         ),
         vm.Parameter(
             targets=[
                 "p5-G-1.x",
                 # TODO: Uncomment the following target and see the magic :D
                 # "p5-F-1.",
             ],
-            selector=vm.RadioItems(options=["species", "sepal_width"], value="species", title="Simple X-axis parameter")
+            selector=vm.RadioItems(
+                options=["species", "sepal_width"], value="species", title="Simple X-axis parameter"
+            ),
         ),
-    ]
+    ],
 )
 
 
 page_6 = vm.Page(
     title="Page to test things out",
     components=[
-        vm.Graph(
-            id="graph_dynamic",
-            figure=px.bar(data_frame="load_from_file", **BAR_CHART_CONF)
-        ),
+        vm.Graph(id="graph_dynamic", figure=px.bar(data_frame="load_from_file", **BAR_CHART_CONF)),
         vm.Graph(
             id="graph_static",
             figure=px.scatter(data_frame=px.data.iris(), **SCATTER_CHART_CONF),
-        )
+        ),
     ],
     controls=[
         vm.Filter(
             id="filter_container_id",
             column=FILTER_COLUMN,
             targets=["graph_dynamic"],
             # targets=["graph_static"],
-
             # selector=vm.Dropdown(id="filter_id"),
             # selector=vm.Dropdown(id="filter_id", value=["setosa"]),
-
             # selector=vm.Checklist(id="filter_id"),
             # selector=vm.Checklist(id="filter_id", value=["setosa"]),
-
             # TODO-BUG: vm.Dropdown(multi=False) Doesn't work if value is cleared. The persistence storage become
             #  "null" and our placeholder component dmc.DateRangePicker can't process null value. It expects a value or
             #  a list of values.
             #  SOLUTION -> Create the "Universal Vizro placeholder component".
             #  TEMPORARY SOLUTION -> set clearable=False for the dynamic Dropdown(multi=False)
             # selector=vm.Dropdown(id="filter_id", multi=False), ->
             # selector=vm.Dropdown(id="filter_id", multi=False, value="setosa"),
-
             # selector=vm.RadioItems(id="filter_id"),
             # selector=vm.RadioItems(id="filter_id", value="setosa"),
-
             # selector=vm.Slider(id="filter_id"),
             # selector=vm.Slider(id="filter_id", value=5),
-
             # selector=vm.RangeSlider(id="filter_id"),
             # selector=vm.RangeSlider(id="filter_id", value=[5, 7]),
-           ),
+        ),
         vm.Parameter(
             id="parameter_x",
-            targets=["graph_dynamic.x",],
+            targets=[
+                "graph_dynamic.x",
+            ],
             selector=vm.Dropdown(
                 options=["species", "sepal_width"],
                 value="species",
                 multi=False,
-            )
+            ),
         ),
     ],
 )
diff --git a/vizro-core/src/vizro/actions/_actions_utils.py b/vizro-core/src/vizro/actions/_actions_utils.py
@@ -14,7 +14,7 @@
 from vizro.models.types import MultiValueType, SelectorType, SingleValueType
 
 if TYPE_CHECKING:
-    from vizro.models import Action, VizroBaseModel, Filter
+    from vizro.models import Action, VizroBaseModel
 
 ValidatedNoneValueType = Union[SingleValueType, MultiValueType, None, list[None]]
 
@@ -162,6 +162,7 @@ def _update_nested_figure_properties(
     current_property[keys[-1]] = value
     return figure_config
 
+
 def _get_parametrized_config(
     ctds_parameter: list[CallbackTriggerDict], target: ModelID, data_frame: bool
 ) -> dict[str, Any]:
diff --git a/vizro-core/src/vizro/actions/_on_page_load_action.py b/vizro-core/src/vizro/actions/_on_page_load_action.py
@@ -7,7 +7,6 @@
 from vizro.actions._actions_utils import _get_modified_page_figures
 from vizro.managers._model_manager import ModelID
 from vizro.models.types import capture
-from vizro.managers import model_manager, data_manager
 
 
 @capture("action")
diff --git a/vizro-core/src/vizro/models/_components/form/dropdown.py b/vizro-core/src/vizro/models/_components/form/dropdown.py
@@ -123,12 +123,8 @@ def _build_dynamic_placeholder(self):
             children=[
                 dbc.Label(self.title, html_for=self.id) if self.title else None,
                 dmc.DateRangePicker(
-                    id=self.id,
-                    value=self.value,
-                    persistence=True,
-                    persistence_type="session",
-                    style={'opacity': 0}
-                )
+                    id=self.id, value=self.value, persistence=True, persistence_type="session", style={"opacity": 0}
+                ),
             ]
         )
 
diff --git a/vizro-core/src/vizro/models/_components/form/range_slider.py b/vizro-core/src/vizro/models/_components/form/range_slider.py
@@ -124,7 +124,7 @@ def _build_static(self, current_value=None, new_min=None, new_max=None, **kwargs
                                     persistence_type="session",
                                     className="slider-text-input-field",
                                 ),
-                                dcc.Store(id=f"{self.id}_input_store", storage_type="session")
+                                dcc.Store(id=f"{self.id}_input_store", storage_type="session"),
                             ],
                             className="slider-text-input-container",
                         ),
@@ -152,4 +152,4 @@ def _build_dynamic_placeholder(self):
     def build(self):
         # We don't have to implement _build_dynamic_placeholder, _build_static here. It's possible to: if dynamic and
         # self.value is None -> set self.value + return standard build (static), but let's align it with the Dropdown.
-        return self._build_dynamic_placeholder() if self._dynamic else self._build_static()
+        return self._build_dynamic_placeholder() if self._dynamic else self._build_static()
diff --git a/vizro-core/src/vizro/models/_components/form/slider.py b/vizro-core/src/vizro/models/_components/form/slider.py
@@ -106,7 +106,7 @@ def _build_static(self, current_value=None, new_min=None, new_max=None, **kwargs
                                     persistence_type="session",
                                     className="slider-text-input-field",
                                 ),
-                                dcc.Store(id=f"{self.id}_input_store",  storage_type="session")
+                                dcc.Store(id=f"{self.id}_input_store", storage_type="session"),
                             ],
                             className="slider-text-input-container",
                         ),
diff --git a/vizro-core/src/vizro/models/_controls/filter.py b/vizro-core/src/vizro/models/_controls/filter.py
@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-from dash import dcc, html
-
 from typing import Any, Literal, Union
 
 import numpy as np
 import pandas as pd
+from dash import dcc
 from pandas.api.types import is_datetime64_any_dtype, is_numeric_dtype
 
 from vizro.managers._data_manager import DataSourceName
@@ -18,6 +17,7 @@
 from vizro._constants import FILTER_ACTION_PREFIX
 from vizro.actions import _filter
 from vizro.managers import data_manager, model_manager
+from vizro.managers._data_manager import _DynamicData
 from vizro.managers._model_manager import ModelID
 from vizro.models import Action, VizroBaseModel
 from vizro.models._components.form import (
@@ -30,8 +30,6 @@
 )
 from vizro.models._models_utils import _log_call
 from vizro.models.types import MultiValueType, SelectorType
-from vizro.models._components.form._form_utils import get_options_and_default
-from vizro.managers._data_manager import _DynamicData
 
 # Ideally we might define these as NumericalSelectorType = Union[RangeSlider, Slider] etc., but that will not work
 # with isinstance checks.
diff --git a/vizro-core/src/vizro/static/js/models/range_slider.js b/vizro-core/src/vizro/static/js/models/range_slider.js
@@ -28,19 +28,33 @@ function update_range_slider_values(
     }
     return [start, end, [start, end], [start, end]];
 
-  // slider component is the trigger
+    // slider component is the trigger
   } else if (trigger_id === self_data["id"]) {
     return [slider[0], slider[1], slider, slider];
 
-  // on_page_load is the trigger
+    // on_page_load is the trigger
   } else {
     if (input_store === null) {
-      return [dash_clientside.no_update, dash_clientside.no_update, dash_clientside.no_update, slider];
-    }
-    else {
-      if (slider[0] === start && input_store[0] === start && slider[1] === end && input_store[1] === end){
+      return [
+        dash_clientside.no_update,
+        dash_clientside.no_update,
+        dash_clientside.no_update,
+        slider,
+      ];
+    } else {
+      if (
+        slider[0] === start &&
+        input_store[0] === start &&
+        slider[1] === end &&
+        input_store[1] === end
+      ) {
         // To prevent filter_action to be triggered after on_page_load
-        return [dash_clientside.no_update, dash_clientside.no_update, dash_clientside.no_update, dash_clientside.no_update];
+        return [
+          dash_clientside.no_update,
+          dash_clientside.no_update,
+          dash_clientside.no_update,
+          dash_clientside.no_update,
+        ];
       }
       return [input_store[0], input_store[1], input_store, input_store];
     }
diff --git a/vizro-core/src/vizro/static/js/models/slider.js b/vizro-core/src/vizro/static/js/models/slider.js
@@ -14,26 +14,28 @@ function update_slider_values(start, slider, input_store, self_data) {
     }
     return [start, start, start];
 
-  // slider component is the trigger
+    // slider component is the trigger
   } else if (trigger_id === self_data["id"]) {
     return [slider, slider, slider];
 
-  // on_page_load is the trigger
+    // on_page_load is the trigger
   } else {
     if (input_store === null) {
       return [dash_clientside.no_update, dash_clientside.no_update, slider];
-    }
-    else {
+    } else {
       if (slider === start && start === input_store) {
         // To prevent filter_action to be triggered after on_page_load
-        return [dash_clientside.no_update, dash_clientside.no_update, dash_clientside.no_update];
+        return [
+          dash_clientside.no_update,
+          dash_clientside.no_update,
+          dash_clientside.no_update,
+        ];
       }
       return [input_store, input_store, input_store];
     }
   }
 }
 
-
 window.dash_clientside = {
   ...window.dash_clientside,
   slider: { update_slider_values: update_slider_values },

Original file line number	Diff line number	Diff line change
`@@ -123,12 +123,8 @@ def _build_dynamic_placeholder(self):`
`123`	`123`	`children=[`
`124`	`124`	`dbc.Label(self.title, html_for=self.id) if self.title else None,`
`125`	`125`	`dmc.DateRangePicker(`
`126`		`- id=self.id,`
`127`		`- value=self.value,`
`128`		`- persistence=True,`
`129`		`- persistence_type="session",`
`130`		`- style={'opacity': 0}`
`131`		`- )`
	`126`	`+ id=self.id, value=self.value, persistence=True, persistence_type="session", style={"opacity": 0}`
	`127`	`+ ),`
`132`	`128`	`]`
`133`	`129`	`)`
`134`	`130`