pastastore 1.10.0__py3-none-any.whl → 1.10.2__py3-none-any.whl

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/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

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.
@@ -171,7 +185,7 @@ class HydroPandasExtension:
         metadata.pop("name", None)
         metadata.pop("meta", None)
         unit = metadata.get("unit", None)
-        if unit == "m" and np.allclose(unit_multiplier, 1e-3):
+        if unit == "m" and np.allclose(unit_multiplier, 1e3):
             metadata["unit"] = "mm"
         elif unit_multiplier != 1.0:
             metadata["unit"] = f"{unit_multiplier:.1e}*{unit}"
@@ -681,10 +695,18 @@ class HydroPandasExtension:
                     continue
                 stn = stns.loc[mask].index[0]
 
-            if unit == "mm":
+            if unit == "m":
+                unit_multiplier = 1.0
+            elif unit == "mm":
                 unit_multiplier = 1e3
+            elif unit.count("m") == 1 and unit.endswith("m"):
+                unit_multiplier = float(unit.replace("m", ""))
             else:
                 unit_multiplier = 1.0
+                logger.warning(
+                    "Unit '%s' not recognized, using unit_multiplier=%.1e."
+                    % (unit, unit_multiplier)
+                )
 
             logger.debug("Updating KNMI %s from %s to %s" % (name, itmin, itmax))
             knmi = hpd.read_knmi(

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(
@@ -1533,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)
@@ -1543,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/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.10.0"
+__version__ = "1.10.2"
 
 
 def show_versions(optional=False) -> None:

{pastastore-1.10.0.dist-info → pastastore-1.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pastastore
-Version: 1.10.0
+Version: 1.10.2
 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.10.0.dist-info → pastastore-1.10.2.dist-info}/RECORD

@@ -1,28 +1,28 @@
 docs/conf.py,sha256=XcZUTmn9fGDhhu8k3mpaLu435SpIRNpABADCCTJJuag,6291
 pastastore/__init__.py,sha256=cWwG9-YeiI4aOU0CDBGKbQgmKmmkcPd64YwPq2rRGt0,416
-pastastore/base.py,sha256=B7sPe1eEpXFSeQsgrPXc5Mvp8Xkbhe_TxML6Zlp19Lk,48172
-pastastore/connectors.py,sha256=6D2j1AUMQhHZNUhCD0tKoxf77FlQM5fTdH2m_c8KAnY,50183
+pastastore/base.py,sha256=ng64KGuKo2iMLjL0H7qG3NVNvXPwMGJBf3oLtQbt6DQ,48264
+pastastore/connectors.py,sha256=hum8KkPi28B3XBsKL_RghRCsZndf-jeFlb4baTvyDG4,50197
 pastastore/datasets.py,sha256=FHVfmKqb8beEs9NONsWrCoJY37BmlvFLSEQ1VAFmE8A,6415
 pastastore/plotting.py,sha256=ygKXdi42sPLaehze4EjU8kRE2Dk46wVxSkB9RJ2Re84,54535
-pastastore/store.py,sha256=KOs0L4AICRFRaQRdnnq2o-oadmX1CDkcg_kDtC8Tal0,67703
+pastastore/store.py,sha256=Fs_WCEGqafOKm3whLUR54tqXL1dL3FdzwxNI1DSZ2KI,69272
 pastastore/styling.py,sha256=0IEp_r-SpcaslShAZvZV6iuEhTG_YzNq-ad8krib3U0,2304
 pastastore/util.py,sha256=31dzHaK6xdFHGDkYh49qGBq1dGel2m9r7i797S3WUpQ,28505
-pastastore/version.py,sha256=EyZTJILqRXkQwkj1Pipjq7kjKw-VsZMCFcFt78vCEK0,1206
+pastastore/version.py,sha256=2Y6_CKnmHYQTxRyvvUEW2519LmIeszWd-0NYpCRyV6M,1206
 pastastore/yaml_interface.py,sha256=n6zjQ7ENrUvxszb6zE-jPLa-XVsoEOTJHQmRV1_fFt0,30818
 pastastore/extensions/__init__.py,sha256=lCN9xfX1qefUzUbE2FQ12c6NjLbf5HoNo-D8cGb5CTw,461
 pastastore/extensions/accessor.py,sha256=kftQM6dqMDoySbyTKcvmkjC5gJRp465KA18G4NVXUO0,367
-pastastore/extensions/hpd.py,sha256=VHMhGZaSIHTZNDYuyxGqWtDqlCSbucq44oT8sZRsu0E,27749
+pastastore/extensions/hpd.py,sha256=i9Ty9GyRyrtY0uqjMpWheH33oYDQM8WMmygaDEPx-w4,28581
+pastastore-1.10.2.dist-info/licenses/LICENSE,sha256=MB_6p4kXDCUsYNjslcMByBu6i7wMNRKPC36JnhzpN4o,1087
 tests/conftest.py,sha256=TB0ZUH1m45gvQd_EZO7iudvhFw4JA-8rTJ71GT6Nf1w,5061
 tests/test_001_import.py,sha256=g8AaJzWZ088A4B30_w-MrDfAVeeg8m78l--j7Onsklc,208
-tests/test_002_connectors.py,sha256=k9etSRuSFVOrSEtZyxqsCF9GwIg0T7VdDJ2SjSe6i_s,7742
+tests/test_002_connectors.py,sha256=X7IbxZZXBYd2UT8B5gu0_Jw--3Twe7KHjSBbmMwNnRk,8193
 tests/test_003_pastastore.py,sha256=nhcUJHC2KiF9KREP_2uj_T2skKooUk13T1EVtkbwQnM,10051
 tests/test_004_yaml.py,sha256=3hMNjb9s0S2rbmpyEjW6FDRAxfUZS_U1qoPl4wB-cCo,4440
 tests/test_005_maps_plots.py,sha256=L0ppGf-cudsrdxteWy3qsV4We96DW4bCBE7c6jEm6aM,1866
 tests/test_006_benchmark.py,sha256=VZG0bY7uz8DkfIZTgRCzkEDG8rguBEt_-mdGSMQLN2w,4930
 tests/test_007_hpdextension.py,sha256=1QNUahq3hzqxjKbzsjofi9Yuyqe_oDGL0vWp6iouYe4,3004
 tests/test_008_stressmodels.py,sha256=733fyCvuzjKcaLjvSMt5dTTLp-T4alzNJAToSxTIUug,4003
-pastastore-1.10.0.dist-info/LICENSE,sha256=MB_6p4kXDCUsYNjslcMByBu6i7wMNRKPC36JnhzpN4o,1087
-pastastore-1.10.0.dist-info/METADATA,sha256=xfHn3JQgATCb34Bfn3xImDDhEFGCo5x6SnK6xDQwTbQ,7579
-pastastore-1.10.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pastastore-1.10.0.dist-info/top_level.txt,sha256=1bgyMk1p23f04RK83Jju2_YAQBwyoQD_fInxoPB4YRw,22
-pastastore-1.10.0.dist-info/RECORD,,
+pastastore-1.10.2.dist-info/METADATA,sha256=8oLyVDQ95wA9wzSxBR29fMg2s81HjlvXGenukFxx2NA,7662
+pastastore-1.10.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pastastore-1.10.2.dist-info/top_level.txt,sha256=1bgyMk1p23f04RK83Jju2_YAQBwyoQD_fInxoPB4YRw,22
+pastastore-1.10.2.dist-info/RECORD,,

{pastastore-1.10.0.dist-info → pastastore-1.10.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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"),