pastastore 1.9.0__tar.gz → 1.10.1__tar.gz

{pastastore-1.9.0 → pastastore-1.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pastastore
-Version: 1.9.0
+Version: 1.10.1
 Summary: Tools for managing Pastas time series models.
 Author: D.A. Brakenhoff
 Maintainer-email: "D.A. Brakenhoff" <d.brakenhoff@artesia-water.nl>, "R. Calje" <r.calje@artesia-water.nl>, "M.A. Vonk" <m.vonk@artesia-water.nl>
@@ -63,6 +63,7 @@ Requires-Dist: pyproj; extra == "optional"
 Requires-Dist: adjustText; extra == "optional"
 Provides-Extra: arcticdb
 Requires-Dist: arcticdb; extra == "arcticdb"
+Requires-Dist: protobuf<6,>=3.5.0.post1; extra == "arcticdb"
 Provides-Extra: lint
 Requires-Dist: ruff; extra == "lint"
 Provides-Extra: pytest
@@ -83,6 +84,7 @@ Requires-Dist: Ipython; extra == "docs"
 Requires-Dist: ipykernel; extra == "docs"
 Requires-Dist: nbsphinx; extra == "docs"
 Requires-Dist: nbsphinx_link; extra == "docs"
+Dynamic: license-file
 
 ![pastastore](https://github.com/pastas/pastastore/workflows/pastastore/badge.svg)
 [![Documentation Status](https://readthedocs.org/projects/pastastore/badge/?version=latest)](https://pastastore.readthedocs.io/en/latest/?badge=latest)

{pastastore-1.9.0 → pastastore-1.10.1}/pastastore/base.py

@@ -1477,9 +1477,10 @@ class ModelAccessor:
             names=["oseries", "modelname"],
         )
         modeldf = pd.DataFrame(index=idx)
-        modeldf = modeldf.join(
-            self.conn.oseries, on=modeldf.index.get_level_values(0)
-        ).drop("key_0", axis=1)
+        modeldf = modeldf.join(self.conn.oseries, on=modeldf.index.get_level_values(0))
+        # drop key_0 column if it exists
+        if "key_0" in modeldf.columns:
+            modeldf.drop("key_0", axis=1, inplace=True)
         modeldf["n_stressmodels"] = 0
         for onam, mlnam in modeldf.index:
             mldict = self.conn.get_models(mlnam, return_dict=True)

{pastastore-1.9.0 → pastastore-1.10.1}/pastastore/connectors.py

@@ -608,7 +608,7 @@ class ConnectorUtil:
             s.index = pd.to_datetime(s.index, unit="ms")
         s = s.sort_index()  # needed for some reason ...
         if squeeze:
-            return s.squeeze()
+            return s.squeeze(axis="columns")
         return s
 
     @staticmethod
@@ -1223,7 +1223,7 @@ class PasConnector(BaseConnector, ConnectorUtil):
         config = {
             "connector_type": self.conn_type,
             "name": self.name,
-            "path": self.parentdir,
+            "path": os.path.abspath(self.parentdir),
         }
         with open(
             os.path.join(self.path, f"{self.name}.pastastore"), "w", encoding="utf-8"

{pastastore-1.9.0 → pastastore-1.10.1}/pastastore/extensions/hpd.py

@@ -12,7 +12,7 @@ from typing import List, Optional, Union
 
 import hydropandas as hpd
 import numpy as np
-from hydropandas.io.knmi import _check_latest_measurement_date_de_bilt, get_stations
+from hydropandas.io.knmi import _get_default_settings, download_knmi_data, get_stations
 from pandas import DataFrame, Series, Timedelta, Timestamp
 from pastas.timeseries_utils import timestep_weighted_resample
 from tqdm.auto import tqdm
@@ -25,6 +25,20 @@ logger = logging.getLogger("hydropandas_extension")
 TimeType = Optional[Union[str, Timestamp]]
 
 
+def _check_latest_measurement_date_de_bilt(meteo_var: str, **kwargs):
+    # get measurements at de Bilt
+    stn_de_bilt = 550 if meteo_var == "RD" else 260
+    ts_de_bilt, _, _ = download_knmi_data(
+        stn_de_bilt,
+        meteo_var,
+        start=Timestamp.today() - Timedelta(days=60),
+        end=Timestamp.today(),
+        settings=_get_default_settings(kwargs),
+        stn_name="De Bilt",
+    )
+    return ts_de_bilt.index[-1]  # last measurement date
+
+
 @register_pastastore_accessor("hpd")
 class HydroPandasExtension:
     """HydroPandas extension for PastaStore.
@@ -45,6 +59,13 @@ class HydroPandasExtension:
         """
         self._store = store
 
+    def __repr__(self):
+        """Return string representation of HydroPandasExtension."""
+        methods = "".join(
+            [f"\n - {meth}" for meth in dir(self) if not meth.startswith("_")]
+        )
+        return "HydroPandasExtension, available methods:" + methods
+
     def add_obscollection(
         self,
         libname: str,

{pastastore-1.9.0 → pastastore-1.10.1}/pastastore/plotting.py

@@ -42,6 +42,13 @@ class Plots:
         """
         self.pstore = pstore
 
+    def __repr__(self):
+        """Return string representation of Plots submodule."""
+        methods = "".join(
+            [f"\n - {meth}" for meth in dir(self) if not meth.startswith("_")]
+        )
+        return "Plotting submodule, available methods:" + methods
+
     def _timeseries(
         self,
         libname,
@@ -477,6 +484,7 @@ class Plots:
         figsize=(6, 6),
         label=None,
         legend=True,
+        progressbar=True,
     ):
         """Plot a cumulative step histogram for a model statistic.
 
@@ -500,6 +508,8 @@ class Plots:
             of models
         legend: bool, optional
             show legend, by default True
+        progressbar: bool, optional
+            show progressbar, default is True.
 
         Returns
         -------
@@ -507,7 +517,7 @@ class Plots:
             The axes in which the cumulative histogram is plotted
         """
         statsdf = self.pstore.get_statistics(
-            [statistic], modelnames=modelnames, progressbar=False
+            [statistic], modelnames=modelnames, progressbar=progressbar
         )
 
         if ax is None:
@@ -579,15 +589,15 @@ class Plots:
             The CompareModels object containing the comparison results.
         """
         models = self.pstore.get_models(modelnames)
-        names = []
+        names = kwargs.pop("names", [])
         onames = [iml.oseries.name for iml in models]
-        if len(np.unique(onames)) == 1:
+        if len(np.unique(onames)) == 1 and len(names) == 0:
             for modelname in modelnames:
                 if onames[0] in modelname:
                     names.append(modelname.replace(onames[0], ""))
                 else:
                     names.append(modelname)
-        else:
+        elif len(np.unique(onames)) > 1:
             names = modelnames
         cm = ps.CompareModels(models, names=names)
         cm.plot(**kwargs)
@@ -617,6 +627,13 @@ class Maps:
         """
         self.pstore = pstore
 
+    def __repr__(self):
+        """Return string representation of Maps submodule."""
+        methods = "".join(
+            [f"\n - {meth}" for meth in dir(self) if not meth.startswith("_")]
+        )
+        return "Mapping submodule, available methods:" + methods
+
     def stresses(
         self,
         names=None,
@@ -627,6 +644,7 @@ class Maps:
         figsize=(10, 8),
         backgroundmap=False,
         label_kwargs=None,
+        show_legend: bool = True,
         **kwargs,
     ):
         """Plot stresses locations on map.
@@ -653,6 +671,9 @@ class Maps:
             by OpenStreetMap.Mapnik. Default option is False.
         label_kwargs: dict, optional
             dictionary with keyword arguments to pass to add_labels method
+        show_legend : bool, optional
+            add legend with each kind of stress and associated color, only possible
+            if colors are not explicitly passed. Default is True.
 
         Returns
         -------
@@ -679,7 +700,8 @@ class Maps:
         mask0 = (stresses["x"] != 0.0) | (stresses["y"] != 0.0)
 
         if "c" in kwargs:
-            c = kwargs.pop("c", None)
+            c = kwargs.pop("c")
+            kind_to_color = None
         else:
             c = stresses.loc[mask0, "kind"]
             kind_to_color = {k: f"C{i}" for i, k in enumerate(c.unique())}
@@ -687,7 +709,7 @@ class Maps:
 
         r = self._plotmap_dataframe(stresses.loc[mask0], c=c, figsize=figsize, **kwargs)
         if "ax" in kwargs:
-            ax = kwargs["ax"]
+            ax = kwargs.pop("ax")
         else:
             ax = r
         if labels:
@@ -695,6 +717,11 @@ class Maps:
                 label_kwargs = {}
             self.add_labels(stresses, ax, adjust=adjust, **label_kwargs)
 
+        if show_legend and kind_to_color is not None:
+            for k, color in kind_to_color.items():
+                ax.plot([], [], color=color, label=k, **kwargs, marker="o", ls="none")
+            ax.legend(loc=(0, 1), frameon=False, ncol=5)
+
         if backgroundmap:
             self.add_background_map(ax)
 
@@ -815,6 +842,81 @@ class Maps:
 
         return ax
 
+    def _map_helper(
+        self,
+        df,
+        column,
+        label=True,
+        adjust=False,
+        cmap="viridis",
+        norm=None,
+        vmin=None,
+        vmax=None,
+        figsize=(10, 8),
+        backgroundmap=False,
+        **kwargs,
+    ):
+        """Help function for plotting values on map.
+
+        Parameters
+        ----------
+        df: pd.DataFrame
+            dataframe containing plotting information
+        column: str
+            column with values to plot
+        label: bool, optional
+            label points, by default True
+        adjust: bool, optional
+            automated smart label placement using adjustText, by default False
+        cmap: str or colormap, optional
+            (name of) the colormap, by default "viridis"
+        norm: norm, optional
+            normalization for colorbar, by default None
+        vmin: float, optional
+            vmin for colorbar, by default None
+        vmax: float, optional
+            vmax for colorbar, by default None
+        ax : matplotlib.Axes, optional
+            axes handle, if not provided a new figure is created.
+        figsize: tuple, optional
+            figuresize, by default(10, 8)
+        backgroundmap: bool, optional
+            if True, add background map (default CRS is EPSG:28992) with default tiles
+            by OpenStreetMap.Mapnik. Default option is False.
+        progressbar: bool, optional
+            show progressbar, default is True.
+
+        Returns
+        -------
+        ax: matplotlib.Axes
+            axes object
+
+        See Also
+        --------
+        self.add_background_map
+        """
+        scatter_kwargs = {
+            "cmap": cmap,
+            "norm": norm,
+            "vmin": vmin,
+            "vmax": vmax,
+            "edgecolors": "w",
+            "linewidths": 0.7,
+        }
+        scatter_kwargs.update(kwargs)
+
+        ax = self._plotmap_dataframe(
+            df, column=column, figsize=figsize, **scatter_kwargs
+        )
+        if label:
+            df.set_index("index", inplace=True)
+            self.add_labels(df, ax, adjust=adjust)
+
+        if backgroundmap:
+            self.add_background_map(ax)
+
+        return ax
+
     def modelstat(
         self,
         statistic,
@@ -827,6 +929,7 @@ class Maps:
         vmax=None,
         figsize=(10, 8),
         backgroundmap=False,
+        progressbar=True,
         **kwargs,
     ):
         """Plot model statistic on map.
@@ -856,6 +959,8 @@ class Maps:
         backgroundmap: bool, optional
             if True, add background map (default CRS is EPSG:28992) with default tiles
             by OpenStreetMap.Mapnik. Default option is False.
+        progressbar: bool, optional
+            show progressbar, default is True.
 
         Returns
         -------
@@ -867,7 +972,7 @@ class Maps:
         self.add_background_map
         """
         statsdf = self.pstore.get_statistics(
-            [statistic], modelnames=modelnames, progressbar=False
+            [statistic], modelnames=modelnames, progressbar=progressbar
         ).to_frame()
 
         statsdf["oseries"] = [
@@ -877,28 +982,177 @@ class Maps:
         statsdf = statsdf.reset_index().set_index("oseries")
         df = statsdf.join(self.pstore.oseries, how="left")
 
-        scatter_kwargs = {
-            "cmap": cmap,
-            "norm": norm,
-            "vmin": vmin,
-            "vmax": vmax,
-            "edgecolors": "w",
-            "linewidths": 0.7,
-        }
+        return self._map_helper(
+            df,
+            column=statistic,
+            label=label,
+            adjust=adjust,
+            cmap=cmap,
+            norm=norm,
+            vmin=vmin,
+            vmax=vmax,
+            figsize=figsize,
+            backgroundmap=backgroundmap,
+            **kwargs,
+        )
 
-        scatter_kwargs.update(kwargs)
+    def modelparam(
+        self,
+        parameter,
+        modelnames=None,
+        label=True,
+        adjust=False,
+        cmap="viridis",
+        norm=None,
+        vmin=None,
+        vmax=None,
+        figsize=(10, 8),
+        backgroundmap=False,
+        progressbar=True,
+        **kwargs,
+    ):
+        """Plot model parameter value on map.
 
-        ax = self._plotmap_dataframe(
-            df, column=statistic, figsize=figsize, **scatter_kwargs
+        Parameters
+        ----------
+        parameter: str
+            name of the parameter, e.g. "rech_A" or "river_a"
+        modelnames : list of str, optional
+            list of modelnames to include
+        label: bool, optional
+            label points, by default True
+        adjust: bool, optional
+            automated smart label placement using adjustText, by default False
+        cmap: str or colormap, optional
+            (name of) the colormap, by default "viridis"
+        norm: norm, optional
+            normalization for colorbar, by default None
+        vmin: float, optional
+            vmin for colorbar, by default None
+        vmax: float, optional
+            vmax for colorbar, by default None
+        ax : matplotlib.Axes, optional
+            axes handle, if not provided a new figure is created.
+        figsize: tuple, optional
+            figuresize, by default(10, 8)
+        backgroundmap: bool, optional
+            if True, add background map (default CRS is EPSG:28992) with default tiles
+            by OpenStreetMap.Mapnik. Default option is False.
+        progressbar: bool, optional
+            show progressbar, default is True
+
+        Returns
+        -------
+        ax: matplotlib.Axes
+            axes object
+
+        See Also
+        --------
+        self.add_background_map
+        """
+        paramdf = self.pstore.get_parameters(
+            [parameter],
+            modelnames=modelnames,
+            progressbar=progressbar,
+            ignore_errors=True,
+        ).to_frame()
+
+        paramdf["oseries"] = [
+            self.pstore.get_models(m, return_dict=True)["oseries"]["name"]
+            for m in paramdf.index
+        ]
+        paramdf = paramdf.reset_index().set_index("oseries")
+        df = paramdf.join(self.pstore.oseries, how="left")
+
+        return self._map_helper(
+            df,
+            column=parameter,
+            label=label,
+            adjust=adjust,
+            cmap=cmap,
+            norm=norm,
+            vmin=vmin,
+            vmax=vmax,
+            figsize=figsize,
+            backgroundmap=backgroundmap,
+            **kwargs,
         )
-        if label:
-            df.set_index("index", inplace=True)
-            self.add_labels(df, ax, adjust=adjust)
 
-        if backgroundmap:
-            self.add_background_map(ax)
+    def signature(
+        self,
+        signature,
+        names=None,
+        label=True,
+        adjust=False,
+        cmap="viridis",
+        norm=None,
+        vmin=None,
+        vmax=None,
+        figsize=(10, 8),
+        backgroundmap=False,
+        progressbar=True,
+        **kwargs,
+    ):
+        """Plot signature value on map.
 
-        return ax
+        Parameters
+        ----------
+        signature: str
+            name of the signature, e.g. "mean_annual_maximum" or "duration_curve_slope"
+        names : list of str, optional
+            list of observation well names to include
+        label: bool, optional
+            label points, by default True
+        adjust: bool, optional
+            automated smart label placement using adjustText, by default False
+        cmap: str or colormap, optional
+            (name of) the colormap, by default "viridis"
+        norm: norm, optional
+            normalization for colorbar, by default None
+        vmin: float, optional
+            vmin for colorbar, by default None
+        vmax: float, optional
+            vmax for colorbar, by default None
+        ax : matplotlib.Axes, optional
+            axes handle, if not provided a new figure is created.
+        figsize: tuple, optional
+            figuresize, by default(10, 8)
+        backgroundmap: bool, optional
+            if True, add background map (default CRS is EPSG:28992) with default tiles
+            by OpenStreetMap.Mapnik. Default option is False.
+        progressbar: bool, optional
+            show progressbar, default is True
+
+        Returns
+        -------
+        ax: matplotlib.Axes
+            axes object
+
+        See Also
+        --------
+        self.add_background_map
+        """
+        signature_df = self.pstore.get_signatures(
+            [signature],
+            names=names,
+            progressbar=progressbar,
+            ignore_errors=True,
+        )
+        df = signature_df.join(self.pstore.oseries, how="left")
+
+        return self._map_helper(
+            df,
+            column=signature,
+            label=label,
+            adjust=adjust,
+            cmap=cmap,
+            norm=norm,
+            vmin=vmin,
+            vmax=vmax,
+            figsize=figsize,
+            backgroundmap=backgroundmap,
+            **kwargs,
+        )
 
     @staticmethod
     def _plotmap_dataframe(
@@ -948,6 +1202,7 @@ class Maps:
         if ax is None:
             return_scatter = False
             fig, ax = plt.subplots(figsize=figsize)
+            ax.set_aspect("equal", adjustable="box")
         else:
             return_scatter = True
             fig = ax.figure
@@ -1010,8 +1265,8 @@ class Maps:
         label: bool, optional, default is True
             add labels to points on map
         metadata_source: str, optional
-            whether to obtain metadata from model Timeseries or from
-            metadata in pastastore("store"), default is "model"
+            one of "model" or "store", pick whether to obtain metadata from model
+            Timeseries or from metadata in pastastore, default is "model"
         offset : float, optional
             add offset to current extent of model time series, useful
             for zooming out around models

{pastastore-1.9.0 → pastastore-1.10.1}/pastastore/store.py

@@ -5,6 +5,7 @@ import logging
 import os
 import warnings
 from functools import partial
+from pathlib import Path
 from typing import Dict, Iterable, List, Literal, Optional, Tuple, Union
 
 import numpy as np
@@ -80,15 +81,39 @@ class PastaStore:
         self.yaml = PastastoreYAML(self)
 
     @classmethod
-    def from_pastastore_config_file(cls, fname):
-        """Create a PastaStore from a pastastore config file."""
+    def from_pastastore_config_file(cls, fname, update_path: bool = True):
+        """Create a PastaStore from a pastastore config file.
+
+        Parameters
+        ----------
+        fname : str
+            path to the pastastore config file
+        update_path : bool, optional
+            when True, use path derived from location of the config file instead of
+            the stored path in the config file. If a PastaStore is moved, the path
+            in the config file will probably still refer to the old location. Set to
+            False to read the file from the path listed in the config file. In that
+            case config files do not need to be stored within the correct directory.
+
+        Returns
+        -------
+        PastaStore
+            PastaStore
+        """
         with open(fname, "r") as f:
             cfg = json.load(f)
-
         conn_type = cfg.pop("connector_type")
         if conn_type == "pas":
+            # allow loading of pas files from config file that was moved
+            if update_path:
+                # update path to the config file
+                cfg["path"] = Path(fname).parent.parent
             conn = PasConnector(**cfg)
         elif conn_type == "arcticdb":
+            if update_path:
+                prefix, _ = cfg["uri"].split("://")
+                if prefix.lower() == "lmbd":
+                    cfg["uri"] = prefix + "://" + str(Path(fname).parent)
             conn = ArcticDBConnector(**cfg)
         else:
             raise ValueError(
@@ -611,7 +636,7 @@ class PastaStore:
         modelnames: Optional[List[str]] = None,
         param_value: Optional[str] = "optimal",
         progressbar: Optional[bool] = False,
-        ignore_errors: Optional[bool] = False,
+        ignore_errors: Optional[bool] = True,
     ) -> FrameorSeriesUnion:
         """Get model parameters.
 
@@ -633,7 +658,7 @@ class PastaStore:
             show progressbar, default is False
         ignore_errors : bool, optional
             ignore errors when True, i.e. when non-existent model is
-            encountered in modelnames, by default False
+            encountered in modelnames, by default True
 
         Returns
         -------
@@ -662,7 +687,10 @@ class PastaStore:
                 pindex = parameters
 
             for c in pindex:
-                p.loc[mlname, c] = mldict["parameters"].loc[c, param_value]
+                if c in mldict["parameters"].index:
+                    p.loc[mlname, c] = mldict["parameters"].loc[c, param_value]
+                else:
+                    p.loc[mlname, c] = np.nan
 
         p = p.squeeze()
         return p.astype(float)
@@ -806,6 +834,7 @@ class PastaStore:
         solve: bool = False,
         store_models: bool = True,
         ignore_errors: bool = False,
+        suffix: Optional[str] = None,
         progressbar: bool = True,
         **kwargs,
     ) -> Union[Tuple[dict, dict], dict]:
@@ -826,6 +855,8 @@ class PastaStore:
             store the models in the database.
         ignore_errors : bool, optional
             ignore errors while creating models, by default False
+        suffix : str, optional
+            add suffix to oseries name to create model name, by default None
         progressbar : bool, optional
             show progressbar, by default True
 
@@ -846,7 +877,13 @@ class PastaStore:
         desc = "Bulk creation models"
         for o in tqdm(oseries, desc=desc) if progressbar else oseries:
             try:
-                iml = self.create_model(o, add_recharge=add_recharge)
+                if suffix is not None:
+                    modelname = f"{o}{suffix}"
+                else:
+                    modelname = o
+                iml = self.create_model(
+                    o, modelname=modelname, add_recharge=add_recharge
+                )
             except Exception as e:
                 if ignore_errors:
                     errors[o] = e
@@ -1150,13 +1187,19 @@ class PastaStore:
 
         # special for WellModels
         if stressmodel._name == "WellModel":
-            names = [s.squeeze().name for s in stresses["stress"]]
+            if isinstance(stresses["stress"], list):
+                names = [s.squeeze().name for s in stresses["stress"]]
+            else:
+                names = [stresses["stress"].squeeze().name]
+                stresses["stress"] = [stresses["stress"]]  # ugly fix for WellModel
             # check oseries is provided
             if oseries is None:
                 raise ValueError("WellModel requires 'oseries' to compute distances!")
             # compute distances and add to kwargs
             distances = (
-                self.get_distances(oseries=oseries, stresses=names).T.squeeze().values
+                self.get_distances(oseries=oseries, stresses=names)
+                .T.squeeze(axis=1)
+                .values
             )
             kwargs["distances"] = distances
             # set settings to well
@@ -1355,56 +1398,40 @@ class PastaStore:
             ):
                 solve_model(ml_name=ml_name)
 
-    def model_results(
-        self,
-        mls: Optional[Union[ps.Model, list, str]] = None,
-        progressbar: bool = True,
-    ):  # pragma: no cover
-        """Get pastas model results.
+    def check_models(self, checklist=None, modelnames=None):
+        """Check models against checklist.
 
         Parameters
         ----------
-        mls : list of str, optional
-            list of model names, by default None which means results for
-            all models will be calculated
-        progressbar : bool, optional
-            show progressbar, by default True
+        checklist : dict, optional
+            dictionary containing model check methods, by default None which
+            uses the ps.checks.checks_brakenhoff_2022 checklist. This includes:
+               - fit metric R² >= 0.6
+               - runs test for autocorrelation
+               - t95 response < half length calibration period
+               - |model parameters| < 1.96 * σ (std deviation)
+               - model parameters are not on bounds
+        modelnames : list of str, optional
+            list of modelnames to perform checks on, by default None
 
         Returns
         -------
-        results : pd.DataFrame
-            dataframe containing parameters and other statistics
-            for each model
-
-        Raises
-        ------
-        ModuleNotFoundError
-            if the art_tools module is not available
+        pd.DataFrame
+            DataFrame containing pass True/False for each check for each model
         """
-        try:
-            from art_tools import pastas_get_model_results
-        except Exception as e:
-            raise ModuleNotFoundError("You need 'art_tools' to use this method!") from e
-
-        if mls is None:
-            mls = self.conn.models
-        elif isinstance(mls, ps.Model):
-            mls = [mls.name]
-
-        results_list = []
-        desc = "Get model results"
-        for mlname in tqdm(mls, desc=desc) if progressbar else mls:
-            try:
-                iml = self.conn.get_models(mlname)
-            except Exception as e:
-                print("{1}: '{0}' could not be parsed!".format(mlname, e))
-                continue
-            iresults = pastas_get_model_results(
-                iml, par_selection="all", stats=("evp",), stderrors=True
-            )
-            results_list.append(iresults)
+        if checklist is None:
+            checklist = ps.check.checks_brakenhoff_2022
+
+        names = self.conn._parse_names(modelnames, libname="models")
 
-        return pd.concat(results_list, axis=1).transpose()
+        check_dfs = []
+        for n in names:
+            cdf = ps.check.checklist(self.models[n], checklist, report=False)["pass"]
+            cdf.name = n
+            check_dfs.append(cdf)
+        chkdf = pd.concat(check_dfs, axis=1)
+        chkdf.columns.name = "models"
+        return chkdf
 
     def to_zip(self, fname: str, overwrite=False, progressbar: bool = True):
         """Write data to zipfile.
@@ -1531,7 +1558,7 @@ class PastaStore:
         else:
             ext = "pas"
 
-        # short circuit for PasConnector when zipfile was written using pas files
+        # short-circuit for PasConnector when zipfile was written using pas files
         if conn.conn_type == "pas" and not series_ext_json:
             with ZipFile(fname, "r") as archive:
                 archive.extractall(conn.path)
@@ -1541,10 +1568,20 @@ class PastaStore:
 
         with ZipFile(fname, "r") as archive:
             namelist = [
-                fi for fi in archive.namelist() if not fi.endswith(f"_meta.{ext}")
+                fi
+                for fi in archive.namelist()
+                if not fi.endswith(f"_meta.{ext}") and not fi.endswith(os.sep)
             ]
             for f in tqdm(namelist, desc="Reading zip") if progressbar else namelist:
+                if f.endswith("_meta.json"):
+                    raise (
+                        ValueError(
+                            "The zipfile was created using pastastore <1.8.0."
+                            " Please pass `series_ext_json=True` to `from_zip()`"
+                        )
+                    )
                 libname, fjson = os.path.split(f)
+                libname = os.path.split(libname)[-1]  # in case zip is one level deeper
                 if libname in ["stresses", "oseries"]:
                     s = pd.read_json(archive.open(f), dtype=float, orient="columns")
                     if not isinstance(s.index, pd.DatetimeIndex):

{pastastore-1.9.0 → pastastore-1.10.1}/pastastore/version.py

@@ -9,7 +9,7 @@ PASTAS_VERSION = parse_version(ps.__version__)
 PASTAS_LEQ_022 = PASTAS_VERSION <= parse_version("0.22.0")
 PASTAS_GEQ_150 = PASTAS_VERSION >= parse_version("1.5.0")
 
-__version__ = "1.9.0"
+__version__ = "1.10.1"
 
 
 def show_versions(optional=False) -> None:

{pastastore-1.9.0 → pastastore-1.10.1}/pastastore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pastastore
-Version: 1.9.0
+Version: 1.10.1
 Summary: Tools for managing Pastas time series models.
 Author: D.A. Brakenhoff
 Maintainer-email: "D.A. Brakenhoff" <d.brakenhoff@artesia-water.nl>, "R. Calje" <r.calje@artesia-water.nl>, "M.A. Vonk" <m.vonk@artesia-water.nl>
@@ -63,6 +63,7 @@ Requires-Dist: pyproj; extra == "optional"
 Requires-Dist: adjustText; extra == "optional"
 Provides-Extra: arcticdb
 Requires-Dist: arcticdb; extra == "arcticdb"
+Requires-Dist: protobuf<6,>=3.5.0.post1; extra == "arcticdb"
 Provides-Extra: lint
 Requires-Dist: ruff; extra == "lint"
 Provides-Extra: pytest
@@ -83,6 +84,7 @@ Requires-Dist: Ipython; extra == "docs"
 Requires-Dist: ipykernel; extra == "docs"
 Requires-Dist: nbsphinx; extra == "docs"
 Requires-Dist: nbsphinx_link; extra == "docs"
+Dynamic: license-file
 
 ![pastastore](https://github.com/pastas/pastastore/workflows/pastastore/badge.svg)
 [![Documentation Status](https://readthedocs.org/projects/pastastore/badge/?version=latest)](https://pastastore.readthedocs.io/en/latest/?badge=latest)

{pastastore-1.9.0 → pastastore-1.10.1}/pastastore.egg-info/requires.txt

@@ -4,6 +4,7 @@ pyyaml
 
 [arcticdb]
 arcticdb
+protobuf<6,>=3.5.0.post1
 
 [docs]
 pastastore[optional]

{pastastore-1.9.0 → pastastore-1.10.1}/pyproject.toml

@@ -47,7 +47,7 @@ documentation = "https://pastastore.readthedocs.io/en/latest/"
 full = ["pastastore[arcticdb,optional]", "hydropandas"]
 extensions = ["hydropandas"]
 optional = ["contextily", "pyproj", "adjustText"]
-arcticdb = ["arcticdb"]
+arcticdb = ["arcticdb", "protobuf >=3.5.0.post1, < 6"]
 lint = ["ruff"]
 pytest = [
     "coverage",

{pastastore-1.9.0 → pastastore-1.10.1}/tests/test_002_connectors.py

@@ -34,6 +34,19 @@ def test_add_get_series(request, conn):
         conn.del_oseries("test_series")
 
 
+def test_add_get_single_value_series(request, conn):
+    o1 = pd.Series({pd.Timestamp(2025, 1, 1): 5.0})
+    o1.name = "test_single_value_series"
+    conn.add_oseries(o1, "test_single_value_series", metadata=None)
+    o2 = conn.get_oseries("test_single_value_series")
+    try:
+        assert isinstance(o2, pd.Series)
+        assert o1.equals(o2)
+        assert o1.dtype == o2.dtype
+    finally:
+        conn.del_oseries("test_single_value_series")
+
+
 def test_add_get_series_wnans(request, conn):
     o1 = pd.Series(
         index=pd.date_range("2000", periods=10, freq="D"),