webviz-subsurface 0.2.34__tar.gz → 0.2.36__tar.gz

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/.github/workflows/subsurface.yml

@@ -57,7 +57,6 @@ jobs:
           # Testing against our latest release (including pre-releases)
           pip install --pre --upgrade webviz-config webviz-core-components webviz-subsurface-components
 
-
       - name: 📦 Install test dependencies
         run: |
           pip install .[tests]
@@ -101,7 +100,7 @@ jobs:
           git clone --depth 1 --branch $TESTDATA_REPO_BRANCH https://github.com/$TESTDATA_REPO_OWNER/webviz-subsurface-testdata.git
           # Copy any clientside script to the test folder before running tests
           mkdir ./tests/assets && cp ./webviz_subsurface/_assets/js/* ./tests/assets
-          pytest ./tests --headless --forked --testdata-folder ./webviz-subsurface-testdata
+          pytest ./tests --headless --forked -s --testdata-folder ./webviz-subsurface-testdata
           rm -rf ./tests/assets
 
       - name: 🐳 Build Docker example image

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webviz-subsurface
-Version: 0.2.34
+Version: 0.2.36
 Summary: Webviz config plugins for subsurface data
 Home-page: https://github.com/equinor/webviz-subsurface
 Author: R&T Equinor
@@ -42,9 +42,8 @@ Requires-Dist: scipy>=1.2
 Requires-Dist: statsmodels>=0.12.1
 Requires-Dist: xtgeo>=2.20.0
 Requires-Dist: vtk>=9.2.2
-Requires-Dist: webviz-config
-Requires-Dist: webviz-core-components>=0.6
-Requires-Dist: webviz-subsurface-components==1.0.2
+Requires-Dist: webviz-config>=0.6.5
+Requires-Dist: webviz-subsurface-components>=1.0.3
 Provides-Extra: tests
 Requires-Dist: bandit; extra == "tests"
 Requires-Dist: black<24,>=22.1; extra == "tests"

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/setup.py

@@ -107,9 +107,8 @@ setup(
         "statsmodels>=0.12.1",  # indirect dependency through https://plotly.com/python/linear-fits/
         "xtgeo>=2.20.0",
         "vtk>=9.2.2",
-        "webviz-config",
-        "webviz-core-components>=0.6",
-        "webviz-subsurface-components==1.0.2",
+        "webviz-config>=0.6.5",
+        "webviz-subsurface-components>=1.0.3",
     ],
     extras_require={"tests": TESTS_REQUIRE},
     setup_requires=["setuptools_scm~=3.2"],

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/_providers/ensemble_grid_provider/_xtgeo_to_vtk_explicit_structured_grid.py

@@ -75,7 +75,7 @@ def _create_vtk_esgrid_from_verts_and_conn(
     vtk_cell_array.SetData(8, conn_idarr)
 
     vtk_esgrid = vtkExplicitStructuredGrid()
-    vtk_esgrid.SetDimensions(point_dims.tolist())
+    vtk_esgrid.SetDimensions(point_dims.tolist())  # type: ignore
     vtk_esgrid.SetPoints(vtk_points)
     vtk_esgrid.SetCells(vtk_cell_array)
 

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/_providers/ensemble_grid_provider/grid_viz_service.py

@@ -365,15 +365,15 @@ class GridVizService:
 
             plane = vtkPlane()
             plane.SetOrigin([x_0, y_0, 0])
-            plane.SetNormal(right_vec.tolist())
+            plane.SetNormal(right_vec.tolist())  # type: ignore
 
             plane_0 = vtkPlane()
             plane_0.SetOrigin([x_0, y_0, 0])
-            plane_0.SetNormal(fwd_vec.tolist())
+            plane_0.SetNormal(fwd_vec.tolist())  # type: ignore
 
             plane_1 = vtkPlane()
             plane_1.SetOrigin([x_1, y_1, 0])
-            plane_1.SetNormal((-fwd_vec).tolist())
+            plane_1.SetNormal((-fwd_vec).tolist())  # type: ignore
 
             cutter_alg.SetPlane(plane)
             cutter_alg.Update()

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/_providers/ensemble_summary_provider/_provider_impl_arrow_lazy.py

@@ -56,7 +56,7 @@ def _find_first_non_increasing_date_pair(
 ) -> Tuple[Optional[np.datetime64], Optional[np.datetime64]]:
     dates_np = table.column("DATE").to_numpy()
     offending_indices = np.asarray(np.diff(dates_np) <= np.timedelta64(0)).nonzero()[0]
-    if not offending_indices:
+    if len(offending_indices) == 0:
         return (None, None)
 
     return (dates_np[offending_indices[0]], dates_np[offending_indices[0] + 1])
@@ -313,7 +313,7 @@ class ProviderImplArrowLazy(EnsembleSummaryProvider):
             f"find_unique={et_find_unique_ms}ms)"
         )
 
-        return intersected_dates.astype(datetime.datetime).tolist()
+        return intersected_dates.astype(datetime.datetime).tolist()  # type: ignore
 
     def get_vectors_df(
         self,
@@ -377,7 +377,7 @@ class ProviderImplArrowLazy(EnsembleSummaryProvider):
             table = table.filter(real_mask)
         et_filter_ms = timer.lap_ms()
 
-        np_lookup_date = np.datetime64(date, "ms")
+        np_lookup_date = np.datetime64(date).astype("M8[ms]")
         table = sample_segmented_multi_real_table_at_date(table, np_lookup_date)
 
         et_resample_ms = timer.lap_ms()

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/_providers/ensemble_summary_provider/_provider_impl_arrow_presampled.py

@@ -374,7 +374,7 @@ class ProviderImplArrowPresampled(EnsembleSummaryProvider):
             f"find_unique={et_find_unique_ms}ms)"
         )
 
-        return intersected_dates.astype(datetime.datetime).tolist()
+        return intersected_dates.astype(datetime.datetime).tolist()  # type: ignore
 
     def get_vectors_df(
         self,

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/_providers/ensemble_summary_provider/_resampling.py

@@ -17,7 +17,7 @@ def _truncate_day_to_monday(datetime_day: np.datetime64) -> np.datetime64:
 def _quarter_start_month(datetime_day: np.datetime64) -> np.datetime64:
     # A bit hackish, utilizes the fact that datetime64 is relative to epoch
     # 1970-01-01 which is the first day in Q1.
-    datetime_month = np.datetime64(datetime_day, "M")
+    datetime_month = datetime_day.astype("M8[M]")
     return datetime_month - (datetime_month.astype(int) % 3)
 
 
@@ -30,44 +30,52 @@ def generate_normalized_sample_dates(
     """
 
     if freq == Frequency.DAILY:
-        start = np.datetime64(min_date, "D")
-        stop = np.datetime64(max_date, "D")
+        start = min_date.astype("M8[D]")
+        stop = max_date.astype("M8[D]")
         if stop < max_date:
-            stop += 1
-        sampledates = np.arange(start, stop + 1)
+            stop += np.timedelta64(1, "D")
+        sampledates = np.arange(start, stop + np.timedelta64(1, "D"))
+
     elif freq == Frequency.WEEKLY:
-        start = _truncate_day_to_monday(np.datetime64(min_date, "D"))
-        stop = _truncate_day_to_monday(np.datetime64(max_date, "D"))
+        start = _truncate_day_to_monday(min_date.astype("M8[D]"))
+        stop = _truncate_day_to_monday(max_date.astype("M8[D]"))
         if start > min_date:
-            start -= 7
+            start -= np.timedelta64(7, "D")
         if stop < max_date:
-            stop += 7
-        sampledates = np.arange(start, stop + 1, 7)
+            stop += np.timedelta64(7, "D")
+        sampledates = np.arange(
+            start, stop + np.timedelta64(1, "D"), np.timedelta64(7, "D")
+        )
+
     elif freq == Frequency.MONTHLY:
-        start = np.datetime64(min_date, "M")
-        stop = np.datetime64(max_date, "M")
+        start = min_date.astype("M8[M]")
+        stop = max_date.astype("M8[M]")
         if stop < max_date:
-            stop += 1
-        sampledates = np.arange(start, stop + 1)
+            stop += np.timedelta64(1, "M")
+        sampledates = np.arange(start, stop + np.timedelta64(1, "M"))
+
     elif freq == Frequency.QUARTERLY:
         start = _quarter_start_month(min_date)
         stop = _quarter_start_month(max_date)
         if stop < max_date:
-            stop += 3
-        sampledates = np.arange(start, stop + 1, 3)
+            stop += np.timedelta64(3, "M")
+        sampledates = np.arange(
+            start, stop + np.timedelta64(1, "M"), np.timedelta64(3, "M")
+        )
+
     elif freq == Frequency.YEARLY:
-        start = np.datetime64(min_date, "Y")
-        stop = np.datetime64(max_date, "Y")
+        start = min_date.astype("M8[Y]")
+        stop = max_date.astype("M8[Y]")
         if stop < max_date:
-            stop += 1
-        sampledates = np.arange(start, stop + 1)
+            stop += np.timedelta64(1, "Y")
+        sampledates = np.arange(start, stop + np.timedelta64(1, "Y"))
+
     else:
         raise NotImplementedError(
             f"Currently not supporting resampling to frequency {freq}."
         )
 
-    sampledates = sampledates.astype("datetime64[ms]")
-
+    sampledates = sampledates.astype("M8[ms]")
     return sampledates
 
 

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/_providers/ensemble_surface_provider/_provider_impl_file.py

@@ -11,7 +11,6 @@ import xtgeo
 from webviz_subsurface._utils.enum_shim import StrEnum
 from webviz_subsurface._utils.perf_timer import PerfTimer
 
-from ._stat_surf_cache import StatSurfCache
 from ._surface_discovery import SurfaceFileInfo
 from .ensemble_surface_provider import (
     EnsembleSurfaceProvider,
@@ -26,7 +25,6 @@ LOGGER = logging.getLogger(__name__)
 
 REL_SIM_DIR = "sim"
 REL_OBS_DIR = "obs"
-REL_STAT_CACHE_DIR = "stat_cache"
 
 
 # pylint: disable=too-few-public-methods
@@ -53,8 +51,6 @@ class ProviderImplFile(EnsembleSurfaceProvider):
         self._provider_dir = provider_dir
         self._inventory_df = surface_inventory_df
 
-        self._stat_surf_cache = StatSurfCache(self._provider_dir / REL_STAT_CACHE_DIR)
-
     @staticmethod
     # pylint: disable=too-many-locals
     def write_backing_store(
@@ -237,22 +233,10 @@ class ProviderImplFile(EnsembleSurfaceProvider):
     ) -> Optional[xtgeo.RegularSurface]:
         timer = PerfTimer()
 
-        surf = self._stat_surf_cache.fetch(address)
-        if surf:
-            LOGGER.debug(
-                f"Fetched statistical surface from cache in: {timer.elapsed_s():.2f}s"
-            )
-            return surf
-
         surf = self._create_statistical_surface(address)
-        et_create_s = timer.lap_s()
-
-        self._stat_surf_cache.store(address, surf)
-        et_write_cache_s = timer.lap_s()
 
         LOGGER.debug(
-            f"Created and wrote statistical surface to cache in: {timer.elapsed_s():.2f}s ("
-            f"create={et_create_s:.2f}s, store={et_write_cache_s:.2f}s), "
+            f"Created statistical surface in: {timer.elapsed_s():.2f}s ("
             f"[stat={address.statistic}, "
             f"attr={address.attribute}, name={address.name}, date={address.datestr}]"
         )

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/_providers/ensemble_surface_provider/_surface_to_float32_array.py

@@ -6,7 +6,7 @@ import xtgeo
 
 def surface_to_float32_array(surface: xtgeo.RegularSurface) -> io.BytesIO:
     values = surface.values.astype(np.float32)
-    values.fill_value = np.NaN
+    values.fill_value = np.nan
     values = np.ma.filled(values)
 
     # Rotate 90 deg left.

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_bhp_qc/views/_view_functions.py

@@ -20,7 +20,7 @@ def filter_df(df: pd.DataFrame, ensemble: str, wells: List[str]) -> pd.DataFrame
     in statistics.
     """
     columns = ["ENSEMBLE"] + [f"WBHP:{well}" for well in wells]
-    return df.loc[df["ENSEMBLE"] == ensemble][columns].replace(0, np.NaN)
+    return df.loc[df["ENSEMBLE"] == ensemble][columns].replace(0, np.nan)
 
 
 def calc_statistics(df: pd.DataFrame) -> pd.DataFrame:

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_co2_leakage/_utilities/plume_extent.py

@@ -105,4 +105,4 @@ def _find_contours(
 
 def _simplify(poly: np.ndarray, simplify_dist: float) -> List[List[float]]:
     simplified = shapely.geometry.LineString(poly).simplify(simplify_dist)
-    return np.array(simplified.coords).tolist()
+    return np.array(simplified.coords).tolist()  # type: ignore

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_co2_leakage/views/mainview/mainview.py

@@ -6,7 +6,7 @@ from dash import html
 from dash.development.base_component import Component
 from webviz_config.utils import StrEnum
 from webviz_config.webviz_plugin_subclasses import ViewABC, ViewElementABC
-from webviz_subsurface_components import DashSubsurfaceViewer
+from webviz_subsurface_components import SubsurfaceViewer
 
 
 class MainView(ViewABC):
@@ -48,7 +48,7 @@ class MapViewElement(ViewElementABC):
                     children=[
                         html.Div(
                             [
-                                DashSubsurfaceViewer(
+                                SubsurfaceViewer(
                                     id=self.register_component_unique_id(
                                         self.Ids.DECKGL_MAP
                                     ),

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_grid_viewer_fmu/views/view_3d/view_elements/_vtk_view_3d_element.py

@@ -2,7 +2,7 @@ from dash import dcc, html
 from dash.development.base_component import Component
 from webviz_config.utils import StrEnum
 from webviz_config.webviz_plugin_subclasses import ViewElementABC
-from webviz_subsurface_components import DashSubsurfaceViewer
+from webviz_subsurface_components import SubsurfaceViewer
 
 
 class VTKView3D(ViewElementABC):
@@ -45,7 +45,7 @@ class VTKView3D(ViewElementABC):
                 html.Div(
                     style={"position": "absolute", "width": "100%", "height": "90%"},
                     children=[
-                        DashSubsurfaceViewer(
+                        SubsurfaceViewer(
                             id=self.register_component_unique_id(VTKView3D.Ids.VIEW),
                             layers=[
                                 {

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_history_match.py

@@ -155,7 +155,7 @@ def _get_sorted_edges(number_observation_groups: int) -> Dict[str, list]:
             np.random.chisquare(df=1, size=number_observation_groups)
         )
 
-    sorted_values = np.flip(sorted_values, 0)
+    sorted_values = np.flip(sorted_values, 0)  # type: ignore
 
     p10 = np.percentile(sorted_values, 90, axis=1)
     p90 = np.percentile(sorted_values, 10, axis=1)

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_map_viewer_fmu/layout.py

@@ -3,7 +3,7 @@ from typing import Any, Callable, Dict, List, Union
 
 import webviz_core_components as wcc
 from dash import dcc, html
-from webviz_subsurface_components import DashSubsurfaceViewer  # type: ignore
+from webviz_subsurface_components import SubsurfaceViewer  # type: ignore
 
 from webviz_subsurface._utils.enum_shim import StrEnum
 
@@ -271,7 +271,7 @@ class MapViewLayout(FullScreen):
     ) -> None:
         super().__init__(
             children=html.Div(
-                DashSubsurfaceViewer(
+                SubsurfaceViewer(
                     id={"id": get_uuid(LayoutElements.DECKGLMAP), "tab": tab},
                     layers=update_map_layers(1, render_surfaces_as_images),
                     colorTables=color_tables,

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_relative_permeability.py

@@ -971,7 +971,7 @@ def add_statistic_traces(df, color_by, curves, sataxis, colors, nplots):
 
     traces = []
     for ens_no, (ens, ens_df) in enumerate(
-        df[["ENSEMBLE", "REAL", "SATNUM", sataxis] + curves].groupby(["ENSEMBLE"])
+        df[["ENSEMBLE", "REAL", "SATNUM", sataxis] + curves].groupby("ENSEMBLE")
     ):
         for satnum_no, (satnum, satnum_df) in enumerate(
             ens_df[["REAL", "SATNUM", sataxis] + curves].groupby("SATNUM")

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_rft_plotter/_plugin.py

@@ -102,6 +102,8 @@ forward_models.html?highlight=gendata_rft#MERGE_RFT_ERTOBS).
     def __init__(
         self,
         webviz_settings: WebvizSettings,
+        rft: str = "share/results/tables/rft.csv",
+        rft_ert: str = "share/results/tables/rft_ert.csv",
         csvfile_rft: Path = None,
         csvfile_rft_ert: Path = None,
         ensembles: Optional[List[str]] = None,
@@ -109,11 +111,14 @@ forward_models.html?highlight=gendata_rft#MERGE_RFT_ERTOBS).
         obsdata: Path = None,
         faultlines: Path = None,
     ) -> None:
+        # pylint: disable = too-many-arguments
         super().__init__()
 
         self._datamodel = RftPlotterDataModel(
             webviz_settings,
             ensembles,
+            rft,
+            rft_ert,
             formations,
             faultlines,
             obsdata,

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_rft_plotter/_utils/_rft_plotter_data_model.py

@@ -27,12 +27,15 @@ class RftPlotterDataModel:
         self,
         webviz_settings: WebvizSettings,
         ensembles: Optional[List[str]],
+        rft: str,
+        rft_ert: str,
         formations: Path = None,
         faultlines: Path = None,
         obsdata: Path = None,
         csvfile_rft: Path = None,
         csvfile_rft_ert: Path = None,
     ):
+        # pylint: disable = too-many-arguments
         self.formations = formations
         self.faultlines = faultlines
         self.obsdata = obsdata
@@ -67,12 +70,12 @@ class RftPlotterDataModel:
 
             self.ertdatadf = create_csvfile_providerset_from_paths(
                 ens_paths,
-                "share/results/tables/rft_ert.csv",
+                rft_ert,
             ).get_aggregated_dataframe()
 
             try:
                 self.simdf = create_csvfile_providerset_from_paths(
-                    ens_paths, "share/results/tables/rft.csv"
+                    ens_paths, rft
                 ).get_aggregated_dataframe()
 
             except ValueError as err:

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_running_time_analysis_fmu.py

@@ -557,9 +557,9 @@ def make_status_df(
         if len(set(range(min(reals), max(reals) + 1))) > len(set(reals)):
             missing_df = ens_dfs[0].copy()
             missing_df["STATUS"] = "Realization not started"
-            missing_df["RUNTIME"] = np.NaN
-            missing_df["JOB_SCALED_RUNTIME"] = np.NaN
-            missing_df["ENS_SCALED_RUNTIME"] = np.NaN
+            missing_df["RUNTIME"] = np.nan
+            missing_df["JOB_SCALED_RUNTIME"] = np.nan
+            missing_df["ENS_SCALED_RUNTIME"] = np.nan
             for missing_real in set(range(min(reals), max(reals) + 1)).difference(
                 set(reals)
             ):

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface/plugins/_well_log_viewer/well_log_viewer.py

@@ -171,7 +171,7 @@ Format of the `initial_settings` argument:
                                         self.initial_well_name
                                     )
                                 ),
-                                colorTables=self.colortables,
+                                colorMapFunctions=self.colortables,
                                 axisMnemos={"MD": ["MD"], "TVD": ["TVD"]},
                             ),
                         )

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webviz-subsurface
-Version: 0.2.34
+Version: 0.2.36
 Summary: Webviz config plugins for subsurface data
 Home-page: https://github.com/equinor/webviz-subsurface
 Author: R&T Equinor
@@ -42,9 +42,8 @@ Requires-Dist: scipy>=1.2
 Requires-Dist: statsmodels>=0.12.1
 Requires-Dist: xtgeo>=2.20.0
 Requires-Dist: vtk>=9.2.2
-Requires-Dist: webviz-config
-Requires-Dist: webviz-core-components>=0.6
-Requires-Dist: webviz-subsurface-components==1.0.2
+Requires-Dist: webviz-config>=0.6.5
+Requires-Dist: webviz-subsurface-components>=1.0.3
 Provides-Extra: tests
 Requires-Dist: bandit; extra == "tests"
 Requires-Dist: black<24,>=22.1; extra == "tests"

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface.egg-info/SOURCES.txt

@@ -29,32 +29,6 @@ tests/data/volumes.csv
 tests/integration_tests/__init__.py
 tests/integration_tests/test_parameter_filter.py
 tests/integration_tests/test_surface_selector.py
-tests/integration_tests/plugin_tests/__init__.py
-tests/integration_tests/plugin_tests/test_bhp_qc.py
-tests/integration_tests/plugin_tests/test_history_match.py
-tests/integration_tests/plugin_tests/test_line_plotter_fmu.py
-tests/integration_tests/plugin_tests/test_parameter_analysis.py
-tests/integration_tests/plugin_tests/test_parameter_correlation.py
-tests/integration_tests/plugin_tests/test_parameter_distribution.py
-tests/integration_tests/plugin_tests/test_parameter_parallel_coordinates.py
-tests/integration_tests/plugin_tests/test_parameter_response_correlation.py
-tests/integration_tests/plugin_tests/test_property_statistics.py
-tests/integration_tests/plugin_tests/test_pvt_plot.py
-tests/integration_tests/plugin_tests/test_relative_permeability.py
-tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries.py
-tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries_onebyone.py
-tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries_regional.py
-tests/integration_tests/plugin_tests/test_rft_plotter.py
-tests/integration_tests/plugin_tests/test_segy_viewer.py
-tests/integration_tests/plugin_tests/test_simulation_timeseries_onebyone.py
-tests/integration_tests/plugin_tests/test_structural_uncertainty.py
-tests/integration_tests/plugin_tests/test_surface_viewer_fmu.py
-tests/integration_tests/plugin_tests/test_surface_with_grid_crossection.py
-tests/integration_tests/plugin_tests/test_surface_with_seismic_crossection.py
-tests/integration_tests/plugin_tests/test_tornado_plotter_fmu.py
-tests/integration_tests/plugin_tests/test_vfp_analysis.py
-tests/integration_tests/plugin_tests/test_volumetric_analysis.py
-tests/integration_tests/plugin_tests/test_well_log_viewer.py
 tests/unit_tests/__init__.py
 tests/unit_tests/abbreviations_tests/__init__.py
 tests/unit_tests/abbreviations_tests/test_reservoir_simulation.py
@@ -203,7 +177,6 @@ webviz_subsurface/_providers/ensemble_summary_provider/_resampling.py
 webviz_subsurface/_providers/ensemble_summary_provider/_table_utils.py
 webviz_subsurface/_providers/ensemble_summary_provider/dev_compare_fmu_to_lazy_provider.py
 webviz_subsurface/_providers/ensemble_summary_provider/dev_provider_perf_testing.py
-webviz_subsurface/_providers/ensemble_summary_provider/dev_resampling_perf_testing.py
 webviz_subsurface/_providers/ensemble_summary_provider/ensemble_summary_provider.py
 webviz_subsurface/_providers/ensemble_summary_provider/ensemble_summary_provider_factory.py
 webviz_subsurface/_providers/ensemble_summary_provider/utils.py

{webviz_subsurface-0.2.34 → webviz_subsurface-0.2.36}/webviz_subsurface.egg-info/requires.txt

@@ -16,9 +16,8 @@ scipy>=1.2
 statsmodels>=0.12.1
 xtgeo>=2.20.0
 vtk>=9.2.2
-webviz-config
-webviz-core-components>=0.6
-webviz-subsurface-components==1.0.2
+webviz-config>=0.6.5
+webviz-subsurface-components>=1.0.3
 
 [:sys_platform == "linux"]
 res2df>=1.0

webviz_subsurface-0.2.34/tests/integration_tests/plugin_tests/test_bhp_qc.py

@@ -1,12 +0,0 @@
-# pylint: disable=no-name-in-module
-from webviz_config.plugins import BhpQc
-from webviz_config.testing import WebvizComposite
-
-
-def test_bhp_qc(_webviz_duo: WebvizComposite, shared_settings: dict) -> None:
-    plugin = BhpQc(
-        shared_settings["HM_SETTINGS"], ensembles=shared_settings["HM_ENSEMBLES"]
-    )
-
-    _webviz_duo.start_server(plugin)
-    assert not _webviz_duo.get_logs()

webviz_subsurface-0.2.34/tests/integration_tests/plugin_tests/test_history_match.py

@@ -1,18 +0,0 @@
-# pylint: disable=no-name-in-module
-from webviz_config.plugins import HistoryMatch
-
-
-def test_history_match(dash_duo, app, testdata_folder, shared_settings) -> None:
-    plugin = HistoryMatch(
-        shared_settings["HM_SETTINGS"],
-        ensembles=shared_settings["HM_ENSEMBLES"],
-        observation_file=testdata_folder
-        / "01_drogon_ahm"
-        / "share"
-        / "observations"
-        / "tables"
-        / "ert_observations.yml",
-    )
-    app.layout = plugin.layout
-    dash_duo.start_server(app)
-    assert not dash_duo.get_logs()

webviz_subsurface-0.2.34/tests/integration_tests/plugin_tests/test_line_plotter_fmu.py

@@ -1,29 +0,0 @@
-# pylint: disable=no-name-in-module
-from webviz_config.plugins import LinePlotterFMU
-
-
-def test_line_plotter_fmu(dash_duo, app, testdata_folder, shared_settings) -> None:
-    plugin = LinePlotterFMU(
-        app,
-        shared_settings["HM_SETTINGS"],
-        aggregated_csvfile=testdata_folder
-        / "reek_test_data"
-        / "aggregated_data"
-        / "smry_hm.csv",
-        aggregated_parameterfile=testdata_folder
-        / "reek_test_data"
-        / "aggregated_data"
-        / "parameters_hm.csv",
-        observation_file=testdata_folder / "reek_test_data" / "observations.yml",
-        observation_group="smry",
-        remap_observation_values={"DATE": "date"},
-        initial_data={
-            "x": "DATE",
-            "y": "FOPR",
-            "ensembles": ["iter-0", "iter-3"],
-            "colors": {"iter-0": "red", "iter-3": "blue"},
-        },
-    )
-    app.layout = plugin.layout
-    dash_duo.start_server(app)
-    assert not dash_duo.get_logs()

webviz_subsurface-0.2.34/tests/integration_tests/plugin_tests/test_parameter_analysis.py

@@ -1,26 +0,0 @@
-import warnings
-
-# pylint: disable=no-name-in-module
-from webviz_config.plugins import ParameterAnalysis
-from webviz_config.testing import WebvizComposite
-
-
-def test_parameter_analysis(
-    _webviz_duo: WebvizComposite, shared_settings: dict
-) -> None:
-    plugin = ParameterAnalysis(
-        shared_settings["HM_SETTINGS"],
-        ensembles=shared_settings["HM_ENSEMBLES"],
-        column_keys=["WWCT:*"],
-        time_index="monthly",
-        drop_constants=True,
-    )
-    _webviz_duo.start_server(plugin)
-
-    logs = []
-    for log in _webviz_duo.get_logs() or []:
-        if "dash_renderer" in log.get("message"):
-            warnings.warn(log.get("message"))
-        else:
-            logs.append(log)
-    assert not logs

webviz_subsurface-0.2.34/tests/integration_tests/plugin_tests/test_parameter_correlation.py

@@ -1,25 +0,0 @@
-# pylint: disable=no-name-in-module
-from webviz_config.plugins import ParameterCorrelation
-from webviz_config.testing import WebvizComposite
-
-
-def test_parameter_correlation(_webviz_duo: WebvizComposite, shared_settings) -> None:
-    parameter_correlation = ParameterCorrelation(
-        shared_settings["HM_SETTINGS"],
-        ensembles=shared_settings["HM_ENSEMBLES"],
-    )
-
-    _webviz_duo.start_server(parameter_correlation)
-
-    _webviz_duo.toggle_webviz_settings_drawer()
-    _webviz_duo.toggle_webviz_settings_group(
-        parameter_correlation.view("paracorr").settings_group_unique_id("settings")
-    )
-    # Using str literals directly, not IDs from the plugin as intended because
-    # the run test did not accept the imports
-
-    my_component_id = _webviz_duo.view_settings_group_unique_component_id(
-        "paracorr", "settings", "shared-ensemble"
-    )
-    _webviz_duo.wait_for_contains_text(my_component_id, "iter-0")
-    assert not _webviz_duo.get_logs()

webviz_subsurface-0.2.34/tests/integration_tests/plugin_tests/test_parameter_distribution.py

@@ -1,13 +0,0 @@
-# pylint: disable=no-name-in-module
-from webviz_config.plugins import ParameterDistribution
-
-
-def test_parameter_distribution(dash_duo, app, shared_settings) -> None:
-    plugin = ParameterDistribution(
-        app,
-        shared_settings["HM_SETTINGS"],
-        ensembles=shared_settings["HM_ENSEMBLES"],
-    )
-    app.layout = plugin.layout
-    dash_duo.start_server(app)
-    assert not dash_duo.get_logs()