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

pastastore/yaml_interface.py

@@ -6,6 +6,7 @@ import os
 import tempfile
 from contextlib import contextmanager
 from copy import deepcopy
+from pathlib import Path
 from typing import Any, Dict, List, Optional, Union
 
 import numpy as np
@@ -13,8 +14,6 @@ import pandas as pd
 import pastas as ps
 import yaml
 
-from pastastore.version import PASTAS_LEQ_022
-
 logger = logging.getLogger(__name__)
 
 
@@ -38,9 +37,9 @@ def _convert_dict_dtypes_for_yaml(d: Dict[str, Any]):
         elif isinstance(v, datetime.datetime):
             d[k] = pd.to_datetime(v).strftime("%Y-%m-%d %H:%M:%S")
         elif isinstance(v, pd.Timedelta):
-            d[k] = v.to_timedelta64().__str__()
+            d[k] = str(v.to_timedelta64())
         elif isinstance(v, datetime.timedelta):
-            d[k] = pd.to_timedelta(v).to_timedelta64().__str__()
+            d[k] = str(pd.to_timedelta(v).to_timedelta64())
         elif isinstance(v, np.int64):
             d[k] = int(v)
         elif isinstance(v, np.float64):
@@ -109,7 +108,7 @@ def reduce_to_minimal_dict(d, keys=None):
             "stress",
             "prec",
             "evap",
-            "stressmodel" if PASTAS_LEQ_022 else "class",
+            "class",
         ]
 
     # also keep stressmodels by adding names to keys list
@@ -133,7 +132,7 @@ def temporary_yaml_from_str(yaml):
     temp.write(yaml.encode("utf-8"))
     temp.close()
     try:
-        yield temp.name
+        yield Path(temp.name)
     finally:
         os.unlink(temp.name)
 
@@ -230,7 +229,7 @@ class PastastoreYAML:
             else:
                 kind = "prec"
             pnam = self.pstore.get_nearest_stresses(onam, kind=kind).iloc[0, 0]
-            logger.info(f"  | using nearest stress with kind='{kind}': '{pnam}'")
+            logger.info("  | using nearest stress with kind='%s': '%s'", kind, pnam)
             p, pmeta = self.pstore.get_stresses(pnam, return_metadata=True)
             prec = {
                 "name": pnam,
@@ -266,7 +265,7 @@ class PastastoreYAML:
             else:
                 kind = "evap"
             enam = self.pstore.get_nearest_stresses(onam, kind=kind).iloc[0, 0]
-            logger.info(f"  | using nearest stress with kind='{kind}': '{enam}'")
+            logger.info("  | using nearest stress with kind='%s': '%s'", kind, enam)
             e, emeta = self.pstore.get_stresses(enam, return_metadata=True)
             evap = {
                 "name": enam,
@@ -291,11 +290,11 @@ class PastastoreYAML:
         if "rfunc" not in d:
             logger.info("  | no 'rfunc' provided, using 'Exponential'")
         # for pastas >= 0.23.0, convert rfunc value to dictionary with 'class' key
-        elif not isinstance(d["rfunc"], dict) and not PASTAS_LEQ_022:
+        elif not isinstance(d["rfunc"], dict):
             d["rfunc"] = {"class": d["rfunc"]}
 
         # stressmodel
-        classkey = "stressmodel" if PASTAS_LEQ_022 else "class"
+        classkey = "class"
         if classkey not in d:
             d[classkey] = "RechargeModel"
 
@@ -303,7 +302,7 @@ class PastastoreYAML:
         if ("recharge" not in d) and (d[classkey] == "RechargeModel"):
             logger.info("  | no 'recharge' type provided, using 'Linear'")
         # if pastas >= 0.23.0, recharge value must be dict with class key
-        elif not isinstance(d["recharge"], dict) and not PASTAS_LEQ_022:
+        elif not isinstance(d["recharge"], dict):
             d["recharge"] = {"class": d["recharge"]}
 
         # tarsomodel logic
@@ -314,7 +313,8 @@ class PastastoreYAML:
             if ((dmin is None) or (dmax is None)) and (oseries is None):
                 logger.info(
                     "  | no 'dmin/dmax' or 'oseries' provided,"
-                    f" filling in 'oseries': '{onam}'"
+                    " filling in 'oseries': '%s'",
+                    onam,
                 )
                 d["oseries"] = onam
 
@@ -365,7 +365,7 @@ class PastastoreYAML:
                 snam = self.pstore.get_nearest_oseries(onam).iloc[0, 0]
             else:
                 snam = self.pstore.get_nearest_stresses(onam, kind=kind).iloc[0, 0]
-            logger.info(f"  | using nearest stress with kind='{kind}': {snam}")
+            logger.info("  | using nearest stress with kind='%s': %s", kind, snam)
 
         s, smeta = self.pstore.get_stresses(snam, return_metadata=True)
         s = {
@@ -374,7 +374,7 @@ class PastastoreYAML:
             "metadata": smeta,
             "series": s.squeeze(),
         }
-        d["stress"] = [s] if PASTAS_LEQ_022 else s
+        d["stress"] = s
 
         # use stress name if not provided
         if "name" not in d:
@@ -383,9 +383,9 @@ class PastastoreYAML:
         # rfunc
         if "rfunc" not in d:
             logger.info("  | no 'rfunc' provided, using 'Gamma'")
-            d["rfunc"] = "Gamma" if PASTAS_LEQ_022 else {"class": "Gamma"}
+            d["rfunc"] = {"class": "Gamma"}
         # for pastas >= 0.23.0, convert rfunc value to dictionary with 'class' key
-        elif not isinstance(d["rfunc"], dict) and not PASTAS_LEQ_022:
+        elif not isinstance(d["rfunc"], dict):
             d["rfunc"] = {"class": d["rfunc"]}
 
         return d
@@ -441,7 +441,10 @@ class PastastoreYAML:
                     .values
                 )
                 logger.info(
-                    f"  | using {n} nearest stress(es) with kind='{kind}': {snames}"
+                    "  | using %d nearest stress(es) with kind='%s': %s",
+                    n,
+                    kind,
+                    snames,
                 )
             else:
                 snames = [snames]
@@ -472,11 +475,9 @@ class PastastoreYAML:
         # rfunc
         if "rfunc" not in d:
             logger.info("  | no 'rfunc' provided, using 'HantushWellModel'")
-            d["rfunc"] = (
-                "HantushWellModel" if PASTAS_LEQ_022 else {"class": "HantushWellModel"}
-            )
+            d["rfunc"] = {"class": "HantushWellModel"}
         # for pastas >= 0.23.0, convert rfunc value to dictionary with 'class' key
-        elif not isinstance(d["rfunc"], dict) and not PASTAS_LEQ_022:
+        elif not isinstance(d["rfunc"], dict):
             d["rfunc"] = {"class": d["rfunc"]}
 
         if "up" not in d:
@@ -510,7 +511,7 @@ class PastastoreYAML:
         else:
             onam = str(mlyml.pop("oseries"))
 
-        logger.info(f"Building model '{mlnam}' for oseries '{onam}'")
+        logger.info("Building model '%s' for oseries '%s'", mlnam, onam)
         o, ometa = self.pstore.get_oseries(onam, return_metadata=True)
 
         # create model to obtain default model settings
@@ -528,14 +529,11 @@ class PastastoreYAML:
                 name = smyml.get("name", smnam)
             else:
                 name = smnam
-            logger.info(f"| parsing stressmodel: '{name}'")
+            logger.info("| parsing stressmodel: '%s'", name)
 
             # check whether smtyp is defined
-            classkey = "stressmodel" if PASTAS_LEQ_022 else "class"
+            classkey = "class"
             if smyml is not None:
-                if PASTAS_LEQ_022:
-                    if "class" in smyml:
-                        smyml["stressmodel"] = smyml.pop("class")
                 if classkey in smyml:
                     smtyp = True
                 else:
@@ -637,10 +635,10 @@ class PastastoreYAML:
         """
         if "\n" in fyaml or "\r" in fyaml:
             with temporary_yaml_from_str(fyaml) as fyaml:
-                with open(fyaml, "r") as f:
+                with fyaml.open("r", encoding="utf-8") as f:
                     yml = yaml.load(f, Loader=yaml.CFullLoader)
-        elif os.path.exists(fyaml):
-            with open(fyaml, "r") as f:
+        elif Path(fyaml).exists():
+            with Path(fyaml).open("r", encoding="utf-8") as f:
                 yml = yaml.load(f, Loader=yaml.CFullLoader)
         else:
             raise ValueError(
@@ -655,8 +653,8 @@ class PastastoreYAML:
 
             mldict = self.construct_mldict(mlyml, mlnam)
 
-            # load model
-            ml = ps.io.base._load_model(mldict)
+            # Use pastas' internal _load_model - required for model reconstruction
+            ml = ps.io.base._load_model(mldict)  # noqa: SLF001
             models.append(ml)
 
         return models
@@ -664,7 +662,7 @@ class PastastoreYAML:
     def export_stored_models_per_oseries(
         self,
         oseries: Optional[Union[List[str], str]] = None,
-        outdir: Optional[str] = ".",
+        outdir: Optional[Path | str] = ".",
         minimal_yaml: Optional[bool] = False,
         use_nearest: Optional[bool] = False,
     ):
@@ -690,7 +688,7 @@ class PastastoreYAML:
             the time series are actually the nearest ones! Only used
             when minimal_yaml=True. Default is False.
         """
-        onames = self.pstore.conn._parse_names(oseries, "oseries")
+        onames = self.pstore.conn.parse_names(oseries, "oseries")
 
         for onam in onames:
             try:
@@ -716,7 +714,7 @@ class PastastoreYAML:
                 name = d.pop("name")
                 model_dicts[name] = d
 
-            with open(os.path.join(outdir, f"{onam}.yaml"), "w") as f:
+            with (Path(outdir) / f"{onam}.yaml").open("w", encoding="utf-8") as f:
                 yaml.dump(model_dicts, f, Dumper=yaml.CDumper)
 
     def export_models(
@@ -758,7 +756,7 @@ class PastastoreYAML:
             filename for YAML file, only used if `split=False`
         """
         if models is None:
-            modelnames = self.pstore.conn._parse_names(modelnames, "models")
+            modelnames = self.pstore.conn.parse_names(modelnames, "models")
             model_list = self.pstore.get_models(
                 modelnames, return_dict=True, squeeze=False
             )
@@ -783,13 +781,13 @@ class PastastoreYAML:
                 name = d.pop("name")
                 model_dicts[name] = d
 
-            with open(os.path.join(outdir, filename), "w") as f:
+            with (Path(outdir) / filename).open("w", encoding="utf-8") as f:
                 yaml.dump(model_dicts, f, Dumper=yaml.CDumper)
 
     @staticmethod
     def export_model(
         ml: Union[ps.Model, dict],
-        outdir: Optional[str] = ".",
+        outdir: Optional[Path | str] = ".",
         minimal_yaml: Optional[bool] = False,
         use_nearest: Optional[bool] = False,
     ):
@@ -816,7 +814,7 @@ class PastastoreYAML:
             name = ml["name"]
         else:
             name = ml.name
-        with open(os.path.join(outdir, f"{name}.yaml"), "w") as f:
+        with (Path(outdir) / f"{name}.yaml").open("w", encoding="utf-8") as f:
             if isinstance(ml, ps.Model):
                 mldict = deepcopy(ml.to_dict(series=False))
             elif isinstance(ml, dict):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pastastore
-Version: 1.10.2
+Version: 1.11.0
 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>
@@ -52,6 +52,7 @@ License-File: LICENSE
 Requires-Dist: pastas>=0.13
 Requires-Dist: tqdm>=4.36
 Requires-Dist: pyyaml
+Requires-Dist: colorama
 Provides-Extra: full
 Requires-Dist: pastastore[arcticdb,optional]; extra == "full"
 Requires-Dist: hydropandas; extra == "full"
@@ -63,7 +64,6 @@ 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
@@ -74,9 +74,6 @@ Requires-Dist: pytest-cov; extra == "pytest"
 Requires-Dist: pytest-dependency; extra == "pytest"
 Requires-Dist: pytest-benchmark; extra == "pytest"
 Requires-Dist: codacy-coverage; extra == "pytest"
-Provides-Extra: test
-Requires-Dist: pastastore[arcticdb,lint,optional,pytest]; extra == "test"
-Requires-Dist: hydropandas[full]; extra == "test"
 Provides-Extra: docs
 Requires-Dist: pastastore[optional]; extra == "docs"
 Requires-Dist: sphinx_rtd_theme; extra == "docs"
@@ -84,6 +81,11 @@ Requires-Dist: Ipython; extra == "docs"
 Requires-Dist: ipykernel; extra == "docs"
 Requires-Dist: nbsphinx; extra == "docs"
 Requires-Dist: nbsphinx_link; extra == "docs"
+Provides-Extra: test
+Requires-Dist: pastastore[arcticdb,optional,pytest]; extra == "test"
+Requires-Dist: hydropandas[full]; extra == "test"
+Provides-Extra: dev
+Requires-Dist: pastastore[docs,lint,test]; extra == "dev"
 Dynamic: license-file
 
 ![pastastore](https://github.com/pastas/pastastore/workflows/pastastore/badge.svg)
@@ -106,8 +108,12 @@ left off without having to reload everything.
 
 Install the module with `pip install pastastore`.
 
-For installing in development mode, clone the repository and install by typing
-`pip install -e .` from the module root directory.
+For development, clone the repository and install all development, testing, and
+documentation dependencies with:
+
+```sh
+pip install -e .[dev]
+```
 
 For plotting background maps, the `contextily` and `pyproj` packages are
 required. For a full install, including optional dependencies for plotting and
@@ -180,4 +186,4 @@ pstore.to_zip("my_backup.zip")
 ```
 
 For more elaborate examples, refer to the
-[Notebooks](https://pastastore.readthedocs.io/latest/examples.html#example-notebooks).
+[Notebooks](https://pastastore.readthedocs.io/en/latest/examples.html#example-notebooks).

pastastore-1.11.0.dist-info/RECORD

@@ -0,0 +1,30 @@
+docs/conf.py,sha256=XcZUTmn9fGDhhu8k3mpaLu435SpIRNpABADCCTJJuag,6291
+pastastore/__init__.py,sha256=It_5KcVu7tMdo0QL9DXUNWtMKUDSLNfjzcuomkRdnUE,547
+pastastore/base.py,sha256=1dh2Zg9p1_qvFTvXm0NQWvCjtbn4GxR_3VI8pioC0ro,66447
+pastastore/connectors.py,sha256=6tOVsNKSoVK1PPa87IXzL4oKndKXRXKKjvo0iSx_Cqc,29866
+pastastore/datasets.py,sha256=qLucdtbn4v4DmQkj9QeYytiRlGzcn28bq3zeV4KOUi0,6198
+pastastore/plotting.py,sha256=Zvesn7yY_z4LXdTLNT5TDui1YJ1wcm_yTvgqw6h2iQg,55697
+pastastore/store.py,sha256=yYCDSnyYJRdQgho5_9smaCXAl9YVPBls7nn1KVszkrA,69484
+pastastore/styling.py,sha256=0IEp_r-SpcaslShAZvZV6iuEhTG_YzNq-ad8krib3U0,2304
+pastastore/typing.py,sha256=wsn50wH_LV3J6WXNpAUcRnSJppmGqYsX6kGCg49uGzY,376
+pastastore/util.py,sha256=XA_a7DGwqh7dkC_axdUkZvIv6GOv9bLuD8JuU-iEklI,35552
+pastastore/validator.py,sha256=DTlvDhMvzVpt3029l-6oRHdhGGCAx_HuseMb42ZLxjo,18336
+pastastore/version.py,sha256=EoknNjhECKV7q5OOsr1xudTsLXdOOYUUN92J1FZ6gZ0,1147
+pastastore/yaml_interface.py,sha256=x05edO_N-F9ia-nn5LlKzGdGATFHaGs9rwQAGvuDrnM,30577
+pastastore/extensions/__init__.py,sha256=pHZQha6yhq3fwsoDWvXW-lYEbUUmlfCcHMrYoK_1Hxs,505
+pastastore/extensions/accessor.py,sha256=kftQM6dqMDoySbyTKcvmkjC5gJRp465KA18G4NVXUO0,367
+pastastore/extensions/hpd.py,sha256=bTX3UebPKAVZikIgDfHh6xrK7sHVAT2EbiImh1e7_OE,29728
+pastastore-1.11.0.dist-info/licenses/LICENSE,sha256=MB_6p4kXDCUsYNjslcMByBu6i7wMNRKPC36JnhzpN4o,1087
+tests/conftest.py,sha256=paJy1re7l_HQEnnqQLbc3cL4Q_3CKTtJSY3DPeHEvkA,4916
+tests/test_001_import.py,sha256=o31MWpMNxngnytJeEnPz_0UTcT-XbG1JqggvrWLvSUY,238
+tests/test_002_connectors.py,sha256=o5uXrylGUiHvOAaQ-IqhM8LJ4WC1ktHBecmZ0TUreqg,9442
+tests/test_003_pastastore.py,sha256=HpwIoVu4FQ1oAkPxm7hhVCqqDtJ4bsd3IyYHa896mnI,11337
+tests/test_004_yaml.py,sha256=3hMNjb9s0S2rbmpyEjW6FDRAxfUZS_U1qoPl4wB-cCo,4440
+tests/test_005_maps_plots.py,sha256=HVfkTQhtpONl8N8Uv39nJMrkLYOmMYy9T2AjpzYmUp4,2152
+tests/test_006_benchmark.py,sha256=hEk2kpYKpghI7RDQaSuWkSzkF9lNphm8VgBxouVtWAU,4940
+tests/test_007_hpdextension.py,sha256=QKXct8sBKIypAYmI7URypYPaAtCJgM464u7D3yJMNow,4304
+tests/test_008_stressmodels.py,sha256=733fyCvuzjKcaLjvSMt5dTTLp-T4alzNJAToSxTIUug,4003
+pastastore-1.11.0.dist-info/METADATA,sha256=zjJNGAYXBLWnUIm0pm-8jEH4BP9z0lZPf5hvKkmhbic,7717
+pastastore-1.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pastastore-1.11.0.dist-info/top_level.txt,sha256=1bgyMk1p23f04RK83Jju2_YAQBwyoQD_fInxoPB4YRw,22
+pastastore-1.11.0.dist-info/RECORD,,

tests/conftest.py

@@ -44,14 +44,10 @@ def initialize_project(conn):
 
     # well 1
     s = pd.read_csv("./tests/data/well_month_end.csv", index_col=0, parse_dates=True)
-    try:
-        s = ps.ts.timestep_weighted_resample(
-            s,
-            pd.date_range(s.index[0] - pd.offsets.MonthBegin(), s.index[-1], freq="D"),
-        ).bfill()
-    except AttributeError:
-        # pastas<=0.22.0
-        pass
+    s = ps.ts.timestep_weighted_resample(
+        s,
+        pd.date_range(s.index[0] - pd.offsets.MonthBegin(), s.index[-1], freq="D"),
+    ).bfill()
     pstore.add_stress(s, "well1", kind="well", metadata={"x": 164691, "y": 423579})
     # add second well
     pstore.add_stress(
@@ -104,7 +100,6 @@ def delete_arcticdb_test_db():
     name = "test_project"
     connector = pst.ArcticDBConnector(name, connstr)
     pst.util.delete_arcticdb_connector(connector)
-    print("ArcticDBConnector 'test_project' deleted.")
 
 
 _has_pkg_cache = {}

tests/test_001_import.py

@@ -5,4 +5,5 @@ import warnings
 def test_import():
     with warnings.catch_warnings():
         warnings.simplefilter(action="ignore", category=FutureWarning)
-        import pastastore  # noqa: F401
+        import pastastore
+    pastastore.show_versions(optional=True)

tests/test_002_connectors.py

@@ -73,7 +73,7 @@ def test_add_get_dataframe(request, conn):
     o1.index.name = "test_idx"
     conn.add_oseries(o1, "test_df", metadata=None)
     o2 = conn.get_oseries("test_df")
-    # little hack as PasConnector does preserve DataFrames after load...
+    # PasConnector does not preserve DataFrames after load, so convert if needed.
     if conn.conn_type == "pas":
         o2 = o2.to_frame()
     try:
@@ -93,10 +93,29 @@ def test_add_pastas_timeseries(request, conn):
     ts = ps.timeseries.TimeSeries(o1, metadata={"x": 100000.0, "y": 400000.0})
     try:
         conn.add_oseries(ts, "test_pastas_ts", metadata=None)
-    except DeprecationWarning:
+    except TypeError:
         pass
 
 
+def test_add_series_illegal_filename(request, conn):
+    o1 = pd.Series(
+        index=pd.date_range("2000", periods=10, freq="D"),
+        data=0.0,
+    )
+    o1.name = r"test\series/illegal_chars"
+    conn.add_oseries(o1, o1.name, metadata=None)
+    o2 = conn.get_oseries("testseriesillegal_chars")
+    try:
+        assert isinstance(o2, pd.Series)
+        assert o1.equals(o2)
+    finally:
+        conn.del_oseries("testseriesillegal_chars")
+
+    if conn.conn_type == "pas":
+        with pytest.raises(ValueError, match="cannot end with '_meta'"):
+            conn.add_oseries(o1, "illegal_meta", metadata=None)
+
+
 def test_update_series(request, conn):
     o1 = pd.DataFrame(
         data=1.0,
@@ -281,10 +300,28 @@ def test_empty_library(request, conn):
 
 @pytest.mark.dependency
 def test_delete(request, conn):
-    # no need to delete dictconnector (in memory)
+    # No need to delete dictconnector (in memory)
     if conn.conn_type == "arcticdb":
         pst.util.delete_arcticdb_connector(conn, libraries=["oseries"])
         pst.util.delete_arcticdb_connector(conn)
     elif conn.conn_type == "pas":
         pst.util.delete_pas_connector(conn, libraries=["oseries"])
         pst.util.delete_pas_connector(conn)
+
+
+def test_new_connector_in_occupied_dir():
+    conn1 = pst.PasConnector("my_db", "./tests/data/pas")
+    with pytest.raises(
+        ValueError, match=f"Directory '{conn1.name}/' in use by another connector type!"
+    ):
+        pst.ArcticDBConnector("my_db", "lmdb://./tests/data/pas")
+
+    pst.util.delete_pas_connector(conn1)
+
+    conn1 = pst.ArcticDBConnector("my_db", "lmdb://./tests/data/arcticdb")
+    with pytest.raises(
+        ValueError, match=f"Directory '{conn1.name}/' in use by another connector type!"
+    ):
+        pst.PasConnector("my_db", "./tests/data/arcticdb")
+
+    pst.util.delete_arcticdb_connector(conn1)

tests/test_003_pastastore.py

@@ -1,5 +1,5 @@
 # ruff: noqa: D100 D103
-import os
+from pathlib import Path
 
 import numpy as np
 import pandas as pd
@@ -10,6 +10,7 @@ from packaging.version import parse
 from pytest_dependency import depends
 
 import pastastore as pst
+from pastastore.util import SeriesUsedByModel
 
 
 @pytest.mark.dependency
@@ -30,7 +31,7 @@ def test_get_tmintmax(pstore):
     assert sttt.at["evap2", "tmax"] == pd.Timestamp("2016-11-22")
     ml = pstore.create_model("oseries1")
     ml.solve(report=False)
-    pstore.conn.add_model(ml)
+    pstore.add_model(ml)
     mltt = pstore.get_tmin_tmax("models")
     assert mltt.at["oseries1", "tmax"] == pd.Timestamp("2015-06-28")
     pstore.del_model("oseries1")
@@ -58,6 +59,8 @@ def test_properties(pstore):
     _ = pstore.oseries
     _ = pstore.stresses
     _ = pstore.models
+    _ = pstore.oseries_models
+    _ = pstore.stresses_models
 
     try:
         assert pstore.n_oseries == pstore.conn.n_oseries
@@ -71,19 +74,43 @@ def test_properties(pstore):
 def test_store_model(request, pstore):
     depends(request, [f"test_create_model[{pstore.type}]"])
     ml = pstore.create_model("oseries1")
-    pstore.conn.add_model(ml)
+    pstore.add_model(ml)
+
+
+@pytest.mark.dependency
+def test_del_oseries_used_by_model(request, pstore):
+    depends(request, [f"test_store_model[{pstore.type}]"])
+    oseries, ometa = pstore.get_oseries("oseries1", return_metadata=True)
+    with pytest.raises(SeriesUsedByModel):
+        pstore.del_oseries("oseries1")
+    pstore.del_oseries("oseries1", force=True)
+    pstore.add_oseries(oseries, "oseries1", metadata=ometa)
+    pstore.validator.set_protect_series_in_models(False)
+    pstore.del_oseries("oseries1")
+    pstore.add_oseries(oseries, "oseries1", metadata=ometa)
+    pstore.validator.set_protect_series_in_models(True)
+
+
+@pytest.mark.dependency
+def test_del_stress_used_by_model(request, pstore):
+    depends(request, [f"test_store_model[{pstore.type}]"])
+    stress, smeta = pstore.get_stress("prec1", return_metadata=True)
+    with pytest.raises(SeriesUsedByModel):
+        pstore.del_stress("prec1")
+    pstore.del_stress("prec1", force=True)
+    pstore.add_stress(stress, "prec1", kind="prec", metadata=smeta)
+    pstore.validator.set_protect_series_in_models(False)
+    pstore.del_stress("prec1")
+    pstore.add_stress(stress, "prec1", kind="prec", metadata=smeta)
+    pstore.validator.set_protect_series_in_models(True)
 
 
 @pytest.mark.dependency
 def test_model_accessor(request, pstore):
     depends(request, [f"test_store_model[{pstore.type}]"])
-    # repr
     pstore.models.__repr__()
-    # getter
     ml = pstore.models["oseries1"]
-    # setter
     pstore.models["oseries1_2"] = ml
-    # iter
     mnames = [ml.name for ml in pstore.models]
     try:
         assert len(mnames) == 2
@@ -96,19 +123,15 @@ def test_model_accessor(request, pstore):
 @pytest.mark.dependency
 def test_oseries_model_accessor(request, pstore):
     depends(request, [f"test_store_model[{pstore.type}]"])
-    # repr
     pstore.oseries_models.__repr__()
-    # get model names
     ml = pstore.models["oseries1"]
     ml_list1 = pstore.oseries_models["oseries1"]
     assert len(ml_list1) == 1
 
-    # add model
     pstore.models["oseries1_2"] = ml
     ml_list2 = pstore.oseries_models["oseries1"]
     assert len(ml_list2) == 2
 
-    # delete model
     pstore.del_models("oseries1_2")
     ml_list3 = pstore.oseries_models["oseries1"]
     assert len(ml_list3) == 1
@@ -145,7 +168,7 @@ def test_get_model(request, pstore):
             f"test_store_model_missing_series[{pstore.type}]",
         ],
     )
-    _ = pstore.conn.get_models("oseries1")
+    _ = pstore.get_models("oseries1")
 
 
 @pytest.mark.dependency
@@ -159,7 +182,7 @@ def test_del_model(request, pstore):
             f"test_get_model[{pstore.type}]",
         ],
     )
-    pstore.conn.del_models("oseries1")
+    pstore.del_models("oseries1")
 
 
 @pytest.mark.dependency
@@ -167,7 +190,7 @@ def test_create_models(pstore):
     _ = pstore.create_models_bulk(
         ["oseries1", "oseries2"], store=True, progressbar=False
     )
-    _ = pstore.conn.models
+    _ = pstore.models
     assert pstore.n_models == 2
 
 
@@ -183,7 +206,7 @@ def test_get_parameters(request, pstore):
 def test_get_signatures(request, pstore):
     depends(request, [f"test_create_models[{pstore.type}]"])
     s = pstore.get_signatures(progressbar=False)
-    assert s.shape[1] == len(ps.stats.signatures.__all__)
+    assert s.shape[0] == len(ps.stats.signatures.__all__)
 
 
 @pytest.mark.dependency
@@ -202,6 +225,13 @@ def test_solve_models_and_get_stats(request, pstore):
     assert stats.index.size == 2
 
 
+@pytest.mark.dependency
+def test_check_models(request, pstore):
+    depends(request, [f"test_solve_models_and_get_stats[{pstore.type}]"])
+    if parse(ps.__version__) >= parse("1.8.0"):
+        _ = pstore.check_models(style_output=True)
+
+
 @pytest.mark.dependency
 def test_solve_models_parallel(request, pstore):
     depends(request, [f"test_create_models[{pstore.type}]"])
@@ -232,7 +262,7 @@ def test_save_and_load_model(request, pstore):
 
 
 def test_update_ts_settings(request, pstore):
-    pstore.set_check_model_series_values(False)
+    pstore.validator.set_check_model_series_values(False)
 
     o = pstore.get_oseries("oseries2")
     ml = ps.Model(o.loc[:"2013"], name="ml_oseries2")
@@ -258,14 +288,7 @@ def test_update_ts_settings(request, pstore):
     assert ml2.stressmodels["recharge"].evap.settings["tmax"] == tmax
     assert ml2.stressmodels["prec"].stress[0].settings["tmax"] == p2.index[-1]
     pstore.del_models("ml_oseries2")
-    pstore.set_check_model_series_values(True)
-
-
-# @pytest.mark.dependency()
-# def test_model_results(request, pstore):
-#     depends(request, [f"test_create_models[{pstore.type}]",
-#                       f"test_solve_models[{pstore.type}]"])
-#     pstore.model_results(["oseries1", "oseries2"], progressbar=False)
+    pstore.validator.set_check_model_series_values(True)
 
 
 def test_oseries_distances(pstore):
@@ -291,15 +314,17 @@ def test_to_from_zip(pstore):
         store = pst.PastaStore.from_zip(zipname, conn)
         assert not store.oseries.empty
     finally:
-        os.remove(zipname)
+        Path(zipname).unlink()
 
 
 def test_load_pastastore_from_config_file(pstore):
     if pstore.type == "pas" or pstore.type == "arcticdb":
         path = (
-            pstore.conn.path if pstore.type == "pas" else pstore.conn.uri.split("//")[1]
+            pstore.conn.path
+            if pstore.type == "pas"
+            else Path(pstore.conn.uri.split("://")[-1]) / pstore.conn.name
         )
-        fname = os.path.join(path, f"{pstore.conn.name}.pastastore")
+        fname = path / f"{pstore.conn.name}.pastastore"
         pstore2 = pst.PastaStore.from_pastastore_config_file(fname)
         assert not pstore2.empty
 
@@ -331,8 +356,12 @@ def test_meta_with_name(pstore):
 
 @pytest.mark.dependency
 def test_models_metadata(request, pstore):
-    # depends(request, [f"test_create_models[{pstore.type}]"])
     pstore.create_models_bulk(["oseries1", "oseries2"], store=True, progressbar=False)
     df = pstore.models.metadata
     assert df.index.size == 2
     assert (df["n_stressmodels"] == 1).all()
+
+
+def test_pstore_validator_settings(pstore):
+    _ = pstore.validator.settings
+    _ = pstore.conn.validation_settings