webviz-subsurface 0.2.42__tar.gz → 0.2.43__tar.gz

webviz_subsurface-0.2.43/.gitignore

@@ -0,0 +1,23 @@
+.eggs
+*.egg-info
+__pycache__
+
+.pytest_cache
+*.pyc
+.DS_Store
+*~
+*.mypy_cache*
+_version.py
+
+# Dependency directories
+node_modules
+
+# build / generate output
+dist
+build
+
+#.vscode
+.vscode/
+
+# Python virtual environments
+.venv*

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webviz-subsurface
-Version: 0.2.42
+Version: 0.2.43
 Summary: Webviz config plugins for subsurface data
 Author: R&T Equinor
 License:                     GNU GENERAL PUBLIC LICENSE

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/webviz_subsurface/_datainput/relative_permeability.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 import pandas as pd
 from webviz_config.webviz_store import webvizstore
@@ -30,7 +30,7 @@ def load_satfunc(
 
 @webvizstore
 def load_scal_recommendation(
-    scalfile: Path, sheet_name: Optional[Union[str, int, list]] = None
+    scalfile: Path, sheet_name: str | None = None
 ) -> pd.DataFrame:
     return (
         PyscalFactory.create_scal_recommendation_list(

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/webviz_subsurface/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.42'
-__version_tuple__ = version_tuple = (0, 2, 42)
+__version__ = version = '0.2.43'
+__version_tuple__ = version_tuple = (0, 2, 43)
 
-__commit_id__ = commit_id = 'g75e39bf39'
+__commit_id__ = commit_id = 'g3810cf83b'

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/webviz_subsurface/plugins/_co2_migration/_utilities/co2volume.py

@@ -41,24 +41,24 @@ class Colors(StrEnum):
     dissolved_water = "#208eb7"
     dissolved_oil = "#A0522D"
     gas = "#C41E3A"
-    free = "#FF2400"
-    trapped = "#880808"
+    free_gas = "#FF2400"
+    trapped_gas = "#880808"
 
 
 class Marks(StrEnum):
     dissolved_water = "/"
     dissolved_oil = "x"
     gas = ""
-    free = ""
-    trapped = "."
+    free_gas = ""
+    trapped_gas = "."
 
 
 class Lines(StrEnum):
     dissolved_water = "dash"
     dissolved_oil = "longdash"
     gas = "dot"
-    free = "dot"
-    trapped = "dashdot"
+    free_gas = "dot"
+    trapped_gas = "dashdot"
 
 
 _COLOR_ZONES = [

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/webviz_subsurface/plugins/_parameter_analysis/_views/_parameter_response_view/_settings/_options.py

@@ -12,6 +12,7 @@ class ParamRespOptions(SettingsGroupABC):
         VECTOR_FILTER = "vector-filter"
         SUBMIT_VECTOR_FILTER = "submit-vector-filter"
         VECTOR_FILTER_STORE = "vector-filter-store"
+        USE_VECTORS_WITH_OBSERVATIONS = "use-vectors-with-observations"
         AUTO_COMPUTE_CORRELATIONS = "auto-compute-correlations"
 
     def __init__(
@@ -22,6 +23,24 @@ class ParamRespOptions(SettingsGroupABC):
     def layout(self) -> List[Component]:
         return [
             html.Header("Vectors for parameter correlation"),
+            wcc.Checklist(
+                id=self.register_component_unique_id(
+                    self.Ids.AUTO_COMPUTE_CORRELATIONS
+                ),
+                options=[
+                    {"label": "Calculate correlations", "value": "AutoCompute"},
+                ],
+                value=["AutoCompute"],
+            ),
+            wcc.Checklist(
+                id=self.register_component_unique_id(
+                    self.Ids.USE_VECTORS_WITH_OBSERVATIONS
+                ),
+                options=[
+                    {"label": "Use vectors with observations", "value": "UseObs"},
+                ],
+                value=["UseObs"],
+            ),
             dcc.Textarea(
                 id=self.register_component_unique_id(self.Ids.VECTOR_FILTER),
                 style={"width": "95%", "height": "60px", "resize": "none"},
@@ -43,13 +62,4 @@ class ParamRespOptions(SettingsGroupABC):
             dcc.Store(
                 id=self.register_component_unique_id(self.Ids.VECTOR_FILTER_STORE)
             ),
-            wcc.Checklist(
-                id=self.register_component_unique_id(
-                    self.Ids.AUTO_COMPUTE_CORRELATIONS
-                ),
-                options=[
-                    {"label": "Calculate correlations", "value": "AutoCompute"},
-                ],
-                value=["AutoCompute"],
-            ),
         ]

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/webviz_subsurface/plugins/_parameter_analysis/_views/_parameter_response_view/_view.py

@@ -219,12 +219,14 @@ class ParameterResponseView(ViewABC):
 
             if len(realizations) <= 1:
                 return [empty_figure()] * 4
-
-            vectors_for_param_corr = (
-                self._vectormodel.filter_vectors(column_keys, ensemble=ensemble)
-                if column_keys is not None
-                else []
-            )
+            if options is not None and options["use_vectors_with_observations"]:
+                vectors_for_param_corr = list(self._observations.keys())
+            else:
+                vectors_for_param_corr = (
+                    self._vectormodel.filter_vectors(column_keys, ensemble=ensemble)
+                    if column_keys is not None
+                    else []
+                )
 
             try:
                 # Get dataframe with vectors and dataframe with parameters and merge
@@ -360,11 +362,13 @@ class ParameterResponseView(ViewABC):
                 historical_vector_df=self._vectormodel.get_historical_vector_df(
                     selected_vector, ensemble
                 ),
-                observations=self._observations[selected_vector]
-                if options
-                and options["show_observations"]
-                and selected_vector in self._observations
-                else {},
+                observations=(
+                    self._observations[selected_vector]
+                    if options
+                    and options["show_observations"]
+                    and selected_vector in self._observations
+                    else {}
+                ),
                 color_col=param,
                 line_shape_fallback=self._vectormodel.line_shape_fallback,
             ).figure
@@ -473,6 +477,12 @@ class ParameterResponseView(ViewABC):
                 ),
                 "style",
             ),
+            Output(
+                self.settings_group_unique_id(
+                    self.Ids.OPTIONS, ParamRespOptions.Ids.VECTOR_FILTER
+                ),
+                "style",
+            ),
             Input(
                 self.settings_group_unique_id(
                     self.Ids.OPTIONS, ParamRespOptions.Ids.SUBMIT_VECTOR_FILTER
@@ -485,6 +495,12 @@ class ParameterResponseView(ViewABC):
                 ),
                 "value",
             ),
+            Input(
+                self.settings_group_unique_id(
+                    self.Ids.OPTIONS, ParamRespOptions.Ids.USE_VECTORS_WITH_OBSERVATIONS
+                ),
+                "value",
+            ),
             State(
                 self.settings_group_unique_id(
                     self.Ids.OPTIONS, ParamRespOptions.Ids.VECTOR_FILTER_STORE
@@ -497,24 +513,42 @@ class ParameterResponseView(ViewABC):
                 ),
                 "style",
             ),
+            State(
+                self.settings_group_unique_id(
+                    self.Ids.OPTIONS, ParamRespOptions.Ids.VECTOR_FILTER
+                ),
+                "style",
+            ),
         )
         @callback_typecheck
         def _update_vector_filter_store_and_button_style(
             _n_click: Union[None, int],
             vector_filter: Union[None, str],
+            use_vectors_with_observations: Union[None, str],
             stored: Union[None, str],
-            style: Dict,
-        ) -> Tuple[str, Dict]:
+            style_btn: Dict,
+            style_textarea: Dict,
+        ) -> Tuple[str, Dict, Dict]:
             """Update vector-filter-store if submit button is clicked and
             style of submit button"""
+            vector_filter_used = (
+                use_vectors_with_observations
+                and "UseObs" in use_vectors_with_observations
+            )
             ctx = callback_context.triggered[0]["prop_id"]
             button_click = "submit" in ctx
             insync = stored == vector_filter
-            style["background-color"] = (
+            style_btn["background-color"] = (
                 "#E8E8E8" if insync or button_click else "#7393B3"
             )
-            style["color"] = "#555" if insync or button_click else "#fff"
-            return vector_filter if button_click else no_update, style
+            style_btn["color"] = "#555" if insync or button_click else "#fff"
+            style_btn["visibility"] = "hidden" if vector_filter_used else "visible"
+            style_textarea["visibility"] = "hidden" if vector_filter_used else "visible"
+            return (
+                vector_filter if button_click else no_update,
+                style_btn,
+                style_textarea,
+            )
 
         @callback(
             Output(
@@ -573,6 +607,12 @@ class ParameterResponseView(ViewABC):
                 ),
                 "value",
             ),
+            Input(
+                self.settings_group_unique_id(
+                    self.Ids.OPTIONS, ParamRespOptions.Ids.USE_VECTORS_WITH_OBSERVATIONS
+                ),
+                "value",
+            ),
             Input(
                 self.settings_group_unique_id(
                     self.Ids.OPTIONS, ParamRespOptions.Ids.AUTO_COMPUTE_CORRELATIONS
@@ -602,6 +642,7 @@ class ParameterResponseView(ViewABC):
         @callback_typecheck
         def _update_plot_options(
             checkbox_options: List[str],
+            use_vectors_with_observations: List[str],
             autocompute_options: List[str],
             color_clickdata: Union[None, Dict[str, List[Dict[str, Any]]]],
             opacity: float,
@@ -618,6 +659,8 @@ class ParameterResponseView(ViewABC):
 
             return {
                 "show_dateline": "DateLine" in checkbox_options,
+                "use_vectors_with_observations": "UseObs"
+                in use_vectors_with_observations,
                 "autocompute_corr": "AutoCompute" in autocompute_options,
                 "color": None if color_clickdata is None else color,
                 "opacity": opacity,

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_property_serialization/ensemble_subplot_builder.py

@@ -87,8 +87,7 @@ class EnsembleSubplotBuilder(GraphFigureBuilderBase):
 
     def create_graph_legends(self) -> None:
         # Add legends for selected vectors - sort according to selected vectors
-        # NOTE: sorted() with key=self._selected_vectors.index requires that all of
-        # vectors in self._added_vector_traces set exist in self._selected_vectors list!
+        self._validate_vectors_are_selected(self._added_vector_traces)
         added_vector_traces = sorted(
             self._added_vector_traces, key=self._selected_vectors.index
         )
@@ -141,11 +140,12 @@ class EnsembleSubplotBuilder(GraphFigureBuilderBase):
         # Dictionary with vector name as key and list of ensemble traces as value
         vector_traces_set: Dict[str, List[dict]] = {}
 
-        # Get vectors - order not important
+        # Get vectors - sort after validation
         vectors: Set[str] = set(vectors_df.columns) - set(["DATE", "REAL"])
         self._validate_vectors_are_selected(vectors)
+        sorted_vectors = sorted(vectors, key=self._selected_vectors.index)
 
-        for vector in vectors:
+        for vector in sorted_vectors:
             self._added_vector_traces.add(vector)
 
             vector_df = vectors_df[["DATE", "REAL", vector]]
@@ -180,13 +180,14 @@ class EnsembleSubplotBuilder(GraphFigureBuilderBase):
         # Dictionary with vector name as key and list of ensemble traces as value
         vector_traces_set: Dict[str, List[dict]] = {}
 
-        # Get vectors - order not important
+        # Get vectors - sort after validation
         vectors: Set[str] = set(
             vectors_statistics_df.columns.get_level_values(0)
         ) - set(["DATE"])
         self._validate_vectors_are_selected(vectors)
+        sorted_vectors = sorted(vectors, key=self._selected_vectors.index)
 
-        for vector in vectors:
+        for vector in sorted_vectors:
             self._added_vector_traces.add(vector)
 
             # Retrieve DATE and statistics columns for specific vector
@@ -223,13 +224,14 @@ class EnsembleSubplotBuilder(GraphFigureBuilderBase):
         # Dictionary with vector name as key and list of ensemble traces as value
         vector_traces_set: Dict[str, List[dict]] = {}
 
-        # Get vectors - order not important!
+        # Get vectors - sort after validation
         vectors: Set[str] = set(
             vectors_statistics_df.columns.get_level_values(0)
         ) - set(["DATE"])
         self._validate_vectors_are_selected(vectors)
+        sorted_vectors = sorted(vectors, key=self._selected_vectors.index)
 
-        for vector in vectors:
+        for vector in sorted_vectors:
             self._added_vector_traces.add(vector)
 
             # Retrieve DATE and statistics columns for specific vector
@@ -266,10 +268,13 @@ class EnsembleSubplotBuilder(GraphFigureBuilderBase):
 
         samples = vectors_df["DATE"].tolist()
         vector_trace_set: Dict[str, dict] = {}
+
+        # Get vectors - sort after validation
         vectors: Set[str] = set(vectors_df.columns) - set(["DATE", "REAL"])
         self._validate_vectors_are_selected(vectors)
+        sorted_vectors = sorted(vectors, key=self._selected_vectors.index)
 
-        for vector in vectors:
+        for vector in sorted_vectors:
             # Set status for added history trace
             self._added_history_trace = True
 
@@ -348,9 +353,9 @@ class EnsembleSubplotBuilder(GraphFigureBuilderBase):
         `Input:`
         * vectors: Set[str] - set of vector names to verify
         """
-        for vector in vectors:
-            if vector not in self._selected_vectors:
-                raise ValueError(
-                    f'Vector "{vector}" does not exist among selected vectors: '
-                    f"{self._selected_vectors}"
-                )
+
+        missing = vectors - set(self._selected_vectors)
+        if missing:
+            raise ValueError(
+                f"Unexpected vectors found: {missing}. Does not exist among selected vectors: {self._selected_vectors}"
+            )

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/webviz_subsurface/plugins/_volumetric_analysis/volumetric_analysis.py

@@ -13,10 +13,10 @@ from webviz_subsurface._models import InplaceVolumesModel
 from webviz_subsurface._models.inplace_volumes_model import (
     extract_volframe_from_tableprovider,
 )
-from webviz_subsurface._providers import EnsembleTableProviderFactory
 from webviz_subsurface._utils.ensemble_table_provider_set_factory import (
     create_parameter_providerset_from_paths,
 )
+from webviz_subsurface._utils.webvizstore_functions import read_csv
 
 from .controllers import (
     comparison_controllers,
@@ -165,6 +165,8 @@ reek_test_data/aggregated_data/parameters.csv)
         )
 
         self.fipfile = fipfile
+        self.csvfile_vol = csvfile_vol
+        self.csvfile_parameters = csvfile_parameters
         parameters: Optional[pd.DataFrame] = None
 
         LOGGER.warning(
@@ -211,13 +213,9 @@ reek_test_data/aggregated_data/parameters.csv)
                 "#E48F72",
             ]
         )
-        if csvfile_vol:
-            table_provider = EnsembleTableProviderFactory.instance()
-            volumes_table = table_provider.create_from_ensemble_csv_file(csvfile_vol)
-            if csvfile_parameters:
-                parameters = table_provider.create_from_ensemble_csv_file(
-                    csvfile_parameters
-                )
+        if self.csvfile_vol is not None and self.csvfile_parameters is not None:
+            volumes_table = read_csv(self.csvfile_vol)
+            parameters = read_csv(self.csvfile_parameters)
 
         elif ensembles and volfiles:
             ensemble_paths = {
@@ -233,7 +231,8 @@ reek_test_data/aggregated_data/parameters.csv)
             parameters = parameter_provider_set.get_aggregated_dataframe()
         else:
             raise ValueError(
-                'Incorrent arguments. Either provide a "csvfile_vol" or "ensembles" and "volfiles"'
+                'Incorrect arguments. Either provide both "csvfile_vol" and '
+                '"csvfile_parameters" or "ensembles" and "volfiles"'
             )
 
         vcomb = VolumeValidatorAndCombinator(
@@ -281,9 +280,14 @@ reek_test_data/aggregated_data/parameters.csv)
         fipfile_qc_controller(get_uuid=self.uuid, disjoint_set_df=self.disjoint_set_df)
 
     def add_webvizstore(self) -> List[Tuple[Callable, list]]:
+        functions = []
         if self.fipfile is not None:
-            return [(get_path, [{"path": self.fipfile}])]
-        return []
+            functions.append((get_path, [{"path": self.fipfile}]))
+        if self.csvfile_vol is not None:
+            functions.append((read_csv, [{"csv_file": self.csvfile_vol}]))
+        if self.csvfile_parameters is not None:
+            functions.append((read_csv, [{"csv_file": self.csvfile_parameters}]))
+        return functions
 
 
 @webvizstore

{webviz_subsurface-0.2.42 → webviz_subsurface-0.2.43}/webviz_subsurface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webviz-subsurface
-Version: 0.2.42
+Version: 0.2.43
 Summary: Webviz config plugins for subsurface data
 Author: R&T Equinor
 License:                     GNU GENERAL PUBLIC LICENSE

webviz_subsurface-0.2.42/.gitignore

@@ -1,13 +0,0 @@
-.eggs
-*.egg-info
-__pycache__
-node_modules
-venv
-.vscode
-.pytest_cache
-*.pyc
-.DS_Store
-dist
-*~
-*.mypy_cache*
-_version.py