webviz-subsurface 0.2.39__py3-none-any.whl → 0.2.40__py3-none-any.whl

webviz_subsurface/_figures/timeseries_figure.py

@@ -211,7 +211,7 @@ class TimeSeriesFigure:
             .groupby(["DATE"])
             .agg(
                 [
-                    ("Mean", np.nanmean),
+                    ("Mean", "mean"),
                     ("P10", lambda x: np.nanpercentile(x, q=90)),
                     ("P90", lambda x: np.nanpercentile(x, q=10)),
                 ]

webviz_subsurface/_providers/ensemble_summary_provider/_provider_impl_arrow_lazy.py

@@ -160,7 +160,9 @@ class ProviderImplArrowLazy(EnsembleSummaryProvider):
             f"{len(unique_column_names)} unique column names"
         )
 
-        full_table = pa.concat_tables(per_real_tables.values(), promote=True)
+        full_table = pa.concat_tables(
+            per_real_tables.values(), promote_options="default"
+        )
         elapsed.concat_tables_s = timer.lap_s()
 
         real_arr = np.empty(full_table.num_rows, np.int32)

webviz_subsurface/_providers/ensemble_summary_provider/_provider_impl_arrow_presampled.py

@@ -214,7 +214,9 @@ class ProviderImplArrowPresampled(EnsembleSummaryProvider):
         )
 
         timer.lap_s()
-        full_table = pa.concat_tables(per_real_tables.values(), promote=True)
+        full_table = pa.concat_tables(
+            per_real_tables.values(), promote_options="default"
+        )
         elapsed.concat_tables_s = timer.lap_s()
 
         real_arr = np.empty(full_table.num_rows, np.int32)

webviz_subsurface/_providers/ensemble_table_provider/ensemble_table_provider_impl_arrow.py

@@ -101,7 +101,9 @@ class EnsembleTableProviderImplArrow(EnsembleTableProvider):
             f"{len(unique_column_names)} unique column names"
         )
 
-        full_table = pa.concat_tables(per_real_tables.values(), promote=True)
+        full_table = pa.concat_tables(
+            per_real_tables.values(), promote_options="default"
+        )
         elapsed.concat_tables_s = timer.lap_s()
 
         real_arr = np.empty(full_table.num_rows, np.int32)

webviz_subsurface/_utils/dataframe_utils.py

@@ -82,7 +82,7 @@ def make_date_column_datetime_object(df: pd.DataFrame) -> None:
     # pylint: disable = unidiomatic-typecheck
     if type(sampled_date_value) == pd.Timestamp:
         df["DATE"] = pd.Series(
-            df["DATE"].dt.to_pydatetime(), dtype=object, index=df.index
+            np.array(df["DATE"].dt.to_pydatetime()), dtype=object, index=df.index
         )
         return None
 

webviz_subsurface/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.2.40'
+__version_tuple__ = version_tuple = (0, 2, 40)
+
+__commit_id__ = commit_id = None

webviz_subsurface/plugins/_bhp_qc/views/_view_functions.py

@@ -41,15 +41,15 @@ def calc_statistics(df: pd.DataFrame) -> pd.DataFrame:
     # Calculate statistics, ignoring NaNs.
     stat_df = (
         df.groupby("ENSEMBLE")
-        .agg([np.nanmean, "count", np.nanstd, np.nanmin, np.nanmax, p10, p50, p90])
+        .agg(["mean", "count", "std", "min", "max", p10, p50, p90])
         .reset_index(drop=True, level="ENSEMBLE")
     )
     # Rename nanmin, nanmax and nanmean to min, max and mean.
     col_stat_label_map = {
-        "nanmin": "min",
-        "nanmax": "max",
-        "nanmean": "mean",
-        "nanstd": "std",
+        "min": "min",
+        "max": "max",
+        "mean": "mean",
+        "std": "std",
         "p10": "high_p10",
         "p90": "low_p90",
     }

webviz_subsurface/plugins/_co2_leakage/_utilities/co2volume.py

@@ -623,7 +623,7 @@ def _add_hover_info_in_field(
         for date in dates
     }
     prev_vals = {date: 0 for date in dates}
-    date_dict = spaced_dates(dates, 4)
+    date_dict = spaced_dates(dates, 4)  # type: ignore[arg-type]
     for name, color in zip(cat_ord["type"], colors):
         sub_df = df[df["type"] == name]
         for date in dates:

webviz_subsurface/plugins/_disk_usage.py

@@ -43,15 +43,25 @@ class DiskUsage(WebvizPluginABC):
         self.scratch_dir = scratch_dir
         self.date_input = date
         self.disk_usage = get_disk_usage(self.scratch_dir, self.date_input)
-        self.date = str(self.disk_usage["date"][0])
+
         self.theme = webviz_settings.theme
 
     @property
     def layout(self) -> html.Div:
+        if self.disk_usage.empty:
+            return html.Div(
+                [
+                    wcc.Header(
+                        f"No disk usage data found for {self.scratch_dir}.",
+                        style={"text-align": "center"},
+                    ),
+                ]
+            )
+        date = str(self.disk_usage["date"][0]) if not self.disk_usage.empty else None
         return html.Div(
             [
                 wcc.Header(
-                    f"Disk usage on {self.scratch_dir} per user as of {self.date}",
+                    f"Disk usage on {self.scratch_dir} per user as of {date}",
                     style={"text-align": "center"},
                 ),
                 wcc.FlexBox(
@@ -129,10 +139,10 @@ def get_disk_usage(scratch_dir: Path, date: Optional[str]) -> pd.DataFrame:
         df, date = _loop_dates(scratch_dir)
     else:
         df = _get_disk_usage_for_date(scratch_dir, date)
-        if df is None:
-            raise FileNotFoundError(
-                f"No disk usage file found for {date} in {scratch_dir}."
-            )
+
+        # Return early if no data is found
+        if df.empty:
+            return df
 
     df.rename(
         columns={"usageKB": "usageKiB"}, inplace=True
@@ -174,7 +184,7 @@ def get_disk_usage(scratch_dir: Path, date: Optional[str]) -> pd.DataFrame:
     return df.sort_values(by="usageGiB", axis=0, ascending=False)
 
 
-def _get_disk_usage_for_date(scratch_dir: Path, date: str) -> Optional[pd.DataFrame]:
+def _get_disk_usage_for_date(scratch_dir: Path, date: str) -> pd.DataFrame:
     csv_file = scratch_dir / ".disk_usage" / f"disk_usage_user_test_{date}.csv"
     if csv_file.exists():
         return pd.read_csv(csv_file)
@@ -182,7 +192,8 @@ def _get_disk_usage_for_date(scratch_dir: Path, date: str) -> Optional[pd.DataFr
     csv_file = scratch_dir / ".disk_usage" / f"disk_usage_user_{date}.csv"
     if csv_file.exists():
         return pd.read_csv(csv_file)
-    return None
+    # Create empty DataFrame with expected columns if no file is found
+    return pd.DataFrame(columns=["userid", "usageGiB", "date"])
 
 
 def _loop_dates(scratch_dir: Path) -> Tuple[pd.DataFrame, str]:

webviz_subsurface/plugins/_line_plotter_fmu/controllers/build_figure.py

@@ -256,14 +256,14 @@ def calc_series_statistics(
     stat_df = (
         df[["ENSEMBLE", refaxis] + vectors]
         .groupby(["ENSEMBLE", refaxis])
-        .agg([np.nanmean, np.nanmin, np.nanmax, p10, p90])
+        .agg(["mean", "min", "max", p10, p90])
         .reset_index()  # level=["label", refaxis], col_level=0)
     )
     # Rename nanmin, nanmax and nanmean to min, max and mean.
     col_stat_label_map = {
-        "nanmin": "min",
-        "nanmax": "max",
-        "nanmean": "mean",
+        "min": "min",
+        "max": "max",
+        "mean": "mean",
         "p10": "high_p10",
         "p90": "low_p90",
     }

webviz_subsurface/plugins/_map_viewer_fmu/map_viewer_fmu.py

@@ -106,7 +106,7 @@ color-tables.json for color_tables format.
         rel_surface_folder: str = "share/results/maps",
         color_tables: Path = None,
         hillshading_enabled: bool = None,
-        render_surfaces_as_images: bool = True,
+        render_surfaces_as_images: bool = False,
     ):
         super().__init__()
         self._hillshading = hillshading_enabled

webviz_subsurface/plugins/_parameter_analysis/_utils/_parameters_model.py

@@ -78,15 +78,15 @@ class ParametersModel:
             .groupby(["ENSEMBLE"])
             .agg(
                 [
-                    ("Avg", np.mean),
-                    ("Stddev", np.std),
+                    ("Avg", "mean"),
+                    ("Stddev", "std"),
                     ("P10", lambda x: np.percentile(x, 10)),
                     ("P90", lambda x: np.percentile(x, 90)),
-                    ("Min", np.min),
-                    ("Max", np.max),
+                    ("Min", "min"),
+                    ("Max", "max"),
                 ]
             )
-            .stack(0)
+            .stack(0, future_stack=True)
             .rename_axis(["ENSEMBLE", "PARAMETER"])
             .reset_index()
         )

webviz_subsurface/plugins/_property_statistics/property_statistics.py

@@ -61,7 +61,7 @@ FMU format.
 **Using raw ensemble data stored in realization folders**
 * **`ensembles`:** Which ensembles in `shared_settings` to visualize.
 * **`rel_file_pattern`:** path to `.arrow` files with summary data.
-* **`statistic_file`:** Csv file for each realization with property statistics. See the \
+* **`statistics_file`:** Csv file for each realization with property statistics. See the \
     documentation in [fmu-tools](http://fmu-docs.equinor.com/) on how to generate this data.
 * **`column_keys`:** List of vectors to extract. If not given, all vectors \
     from the simulations will be extracted. Wild card asterisk `*` can be used.

webviz_subsurface/plugins/_relative_permeability.py

@@ -982,8 +982,8 @@ def add_statistic_traces(df, color_by, curves, sataxis, colors, nplots):
             ]
             df_stat = (
                 satnum_df_shared_axis.groupby(sataxis)
-                .agg([np.nanmean, np.nanmin, np.nanmax, p10, p90])
-                .stack()
+                .agg(["mean", "min", "max", p10, p90])
+                .stack(future_stack=True)
                 .swaplevel()
             )
             for curve_no, curve in enumerate(curves):
@@ -1032,7 +1032,7 @@ def _get_fanchart_traces(
     """Renders a fanchart"""
 
     # Retrieve indices from one of the keys in series
-    x = curve_stats["nanmax"].index.tolist()
+    x = curve_stats["max"].index.tolist()
     data = FanchartData(
         samples=x,
         low_high=LowHighData(
@@ -1042,10 +1042,10 @@ def _get_fanchart_traces(
             high_name="P10",
         ),
         minimum_maximum=MinMaxData(
-            minimum=curve_stats["nanmin"].values,
-            maximum=curve_stats["nanmax"].values,
+            minimum=curve_stats["min"].values,
+            maximum=curve_stats["max"].values,
         ),
-        free_line=FreeLineData("Mean", curve_stats["nanmean"].values),
+        free_line=FreeLineData("Mean", curve_stats["mean"].values),
     )
 
     hovertemplate = f"{curve} <br>" f"Ensemble: {ens}, Satnum: {satnum}"

webviz_subsurface/plugins/_reservoir_simulation_timeseries_regional.py

@@ -1015,10 +1015,10 @@ def render_table(
                 table.append(
                     {
                         "Group": ens,
-                        "Minimum": df["nanmin"].iat[0],
-                        "Maximum": df["nanmax"].iat[0],
-                        "Mean": df["nanmean"].iat[0],
-                        "Stddev": df["nanstd"].iat[0],
+                        "Minimum": df["min"].iat[0],
+                        "Maximum": df["max"].iat[0],
+                        "Mean": df["mean"].iat[0],
+                        "Stddev": df["std"].iat[0],
                         "P10": df["p10"].iat[0],
                         "P90": df["p90"].iat[0],
                     }
@@ -1031,10 +1031,10 @@ def render_table(
             table.append(
                 {
                     "Group": col.split("_filtered_on_")[-1],
-                    "Minimum": df["nanmin"].iat[0],
-                    "Maximum": df["nanmax"].iat[0],
-                    "Mean": df["nanmean"].iat[0],
-                    "Stddev": df["nanstd"].iat[0],
+                    "Minimum": df["min"].iat[0],
+                    "Maximum": df["max"].iat[0],
+                    "Mean": df["mean"].iat[0],
+                    "Stddev": df["std"].iat[0],
                     "P10": df["p10"].iat[0],
                     "P90": df["p90"].iat[0],
                 }
@@ -1259,7 +1259,7 @@ def calc_statistics(df: pd.DataFrame) -> pd.DataFrame:
         stat_dfs.append(
             ens_df.drop(columns=["REAL", "ENSEMBLE"])
             .groupby("DATE", as_index=False)
-            .agg([np.nanmean, np.nanstd, np.nanmin, np.nanmax, p10, p90])
+            .agg(["mean", "std", "min", "max", p10, p90])
             .reset_index()
             .assign(ENSEMBLE=ens)
         )
@@ -1327,10 +1327,10 @@ def _get_fanchart_traces(
             high_name="P10",
         ),
         minimum_maximum=MinMaxData(
-            minimum=stat_df[column]["nanmin"].values,
-            maximum=stat_df[column]["nanmax"].values,
+            minimum=stat_df[column]["min"].values,
+            maximum=stat_df[column]["max"].values,
         ),
-        free_line=FreeLineData("Mean", stat_df[column]["nanmean"].values),
+        free_line=FreeLineData("Mean", stat_df[column]["mean"].values),
     )
 
     hovertemplate = f"{legend_group}"

webviz_subsurface/plugins/_running_time_analysis_fmu.py

@@ -602,7 +602,12 @@ def make_status_df(
         # Load each json-file to a DataFrame for the realization
         with open(row.FULLPATH) as fjson:
             status_dict = json.load(fjson)
-        real_df = pd.DataFrame(status_dict["jobs"])
+        if "steps" in status_dict:
+            real_df = pd.DataFrame(status_dict["steps"])
+        elif "jobs" in status_dict:
+            real_df = pd.DataFrame(status_dict["jobs"])
+        else:
+            raise KeyError(f"Neither 'steps' nor 'jobs' found in {status_file}")
 
         # If new ensemble, calculate ensemble scaled runtimes
         # for previous ensemble and reset temporary ensemble data

webviz_subsurface/plugins/_seismic_misfit.py

@@ -235,8 +235,7 @@ class SeismicMisfit(WebvizPluginABC):
 
             obsinfo = _compare_dfs_obs(self.dframeobs[attribute_name], self.ens_names)
             self.caseinfo = (
-                f"{self.caseinfo}Attribute: {attribute_name}"
-                f"\n{obsinfo}\n-----------\n"
+                f"{self.caseinfo}Attribute: {attribute_name}\n{obsinfo}\n-----------\n"
             )
 
             # get sorted list of unique region values
@@ -2441,7 +2440,7 @@ def update_obs_sim_map_plot(
                 mode="markers",
                 marker={
                     "size": marker_size,
-                    "color": ensdf_stat["coverage"],
+                    "color": ensdf_stat[coverage],
                     "cmin": -1.0,
                     "cmax": 2.0,
                     "colorscale": SEISMIC_COVERAGE,

webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_utils/vector_statistics.py

@@ -63,15 +63,15 @@ def create_vectors_statistics_df(vectors_df: pd.DataFrame) -> pd.DataFrame:
     statistics_df: pd.DataFrame = (
         vectors_df[["DATE"] + vector_names]
         .groupby(["DATE"])
-        .agg([np.nanmean, np.nanmin, np.nanmax, p10, p90, p50])
+        .agg(["mean", "min", "max", p10, p90, p50])
         .reset_index(level=["DATE"], col_level=0)
     )
 
     # Rename columns to StatisticsOptions enum types for strongly typed format
     col_stat_label_map = {
-        "nanmin": StatisticsOptions.MIN,
-        "nanmax": StatisticsOptions.MAX,
-        "nanmean": StatisticsOptions.MEAN,
+        "mean": StatisticsOptions.MEAN,
+        "min": StatisticsOptions.MIN,
+        "max": StatisticsOptions.MAX,
         "p10": StatisticsOptions.P10,
         "p90": StatisticsOptions.P90,
         "p50": StatisticsOptions.P50,

webviz_subsurface/plugins/_structural_uncertainty/views/intersection_and_map.py

@@ -115,7 +115,7 @@ def map_layout(
                         "disabled": False,
                         "label": "Hillshading",
                     },
-                    **props
+                    **props,
                 ),
             ),
         ],

webviz_subsurface/plugins/_swatinit_qc/_business_logic.py

@@ -208,7 +208,7 @@ class SwatinitQcDataModel:
             qc_vols[qc_cat.value] = 0.0
 
         # Overwrite dict values with correct figures:
-        for qc_cat, qc_df in dframe.groupby("QC_FLAG"):
+        for qc_cat, qc_df in dframe.groupby("QC_FLAG", observed=False):
             qc_vols[qc_cat] = (
                 (qc_df["SWAT"] - qc_df["SWATINIT"]) * qc_df["PORV"]
             ).sum()