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

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")
@@ -38,9 +39,11 @@ def test_get_tmintmax(pstore):
 
 @pytest.mark.dependency
 def test_search(pstore):
-    results = pstore.search("oseries", "OSER", case_sensitive=False)
+    results = pstore.search("OSER", libname="oseries", case_sensitive=False)
     assert len(results) == 3
     assert len(set(results) - {"oseries1", "oseries2", "oseries3"}) == 0
+    results = pstore.search("oser", libname=None, case_sensitive=True)
+    assert len(results["oseries"]) == 3
 
 
 @pytest.mark.dependency
@@ -58,6 +61,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 +76,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 +125,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 +170,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 +184,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 +192,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 +208,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 +227,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 +264,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 +290,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 +316,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 +358,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

tests/test_005_maps_plots.py

@@ -63,6 +63,18 @@ def test_map_models(request, pstore):
     plt.close(ax.figure)
 
 
+@pytest.mark.dependency
+def test_map_signatures(request, pstore):
+    ax = pstore.maps.signature("mean_annual_maximum")
+    plt.close(ax.figure)
+
+
+@pytest.mark.dependency
+def test_map_modelparam(request, pstore):
+    ax = pstore.maps.modelparam("recharge_A")
+    plt.close(ax.figure)
+
+
 @pytest.mark.dependency
 def test_map_model(request, pstore):
     depends(request, [f"test_map_models[{pstore.type}]"])

tests/test_006_benchmark.py

@@ -128,7 +128,7 @@ def test_benchmark_write_model_arcticdb(benchmark):
 
 
 def write_model_nocheckts(conn, ml):
-    conn.set_check_model_series_values(False)
+    conn.validator.set_check_model_series_values(False)
     conn.add_model(ml, overwrite=True)
 
 

tests/test_007_hpdextension.py

@@ -1,10 +1,31 @@
 # ruff: noqa: D100 D103
 import pytest
 from pandas import Timestamp
+from pandas.testing import assert_series_equal
+from pastas.timeseries_utils import timestep_weighted_resample
 
 import pastastore as pst
 
 
+def create_test_zip():
+    from pastastore.extensions import activate_hydropandas_extension
+
+    activate_hydropandas_extension()
+    pstore = pst.PastaStore()
+    pstore.hpd.download_bro_gmw(
+        extent=(117_850, 118_180, 439_550, 439_900),
+        tmin="2022-01-01",
+        tmax="2022-01-02",
+    )
+    pstore.hpd.download_knmi_precipitation(
+        stns=[260], meteo_var="RH", tmin="2022-01-01", tmax="2022-01-31"
+    )
+    pstore.hpd.download_knmi_evaporation(
+        stns=[260], tmin="2022-01-01", tmax="2022-01-31"
+    )
+    pstore.to_zip("tests/data/test_hpd_update.zip", overwrite=True)
+
+
 @pytest.mark.pastas150
 def test_hpd_download_from_bro():
     from pastastore.extensions import activate_hydropandas_extension
@@ -12,12 +33,14 @@ def test_hpd_download_from_bro():
     activate_hydropandas_extension()
     pstore = pst.PastaStore()
     pstore.hpd.download_bro_gmw(
-        extent=(117850, 118180, 439550, 439900), tmin="2022-01-01", tmax="2022-01-02"
+        extent=(117_850, 118_180, 439_550, 439_900),
+        tmin="2022-01-01",
+        tmax="2022-01-02",
     )
     assert pstore.n_oseries == 3
 
 
-@pytest.mark.xfail(reason="KNMI is being flaky, so allow this test to xfail/xpass.")
+# @pytest.mark.xfail(reason="KNMI is being flaky, so allow this test to xfail/xpass.")
 @pytest.mark.pastas150
 def test_hpd_download_precipitation_from_knmi():
     from pastastore.extensions import activate_hydropandas_extension
@@ -30,7 +53,7 @@ def test_hpd_download_precipitation_from_knmi():
     assert pstore.n_stresses == 1
 
 
-@pytest.mark.xfail(reason="KNMI is being flaky, so allow this test to xfail/xpass.")
+# @pytest.mark.xfail(reason="KNMI is being flaky, so allow this test to xfail/xpass.")
 @pytest.mark.pastas150
 def test_hpd_download_evaporation_from_knmi():
     from pastastore.extensions import activate_hydropandas_extension
@@ -56,9 +79,11 @@ def test_update_oseries():
     assert tmintmax.loc["GMW000000036327_1", "tmax"] >= Timestamp("2022-02-27")
 
 
-@pytest.mark.xfail(reason="KNMI is being flaky, so allow this test to xfail/xpass.")
+# @pytest.mark.xfail(reason="KNMI is being flaky, so allow this test to xfail/xpass.")
 @pytest.mark.pastas150
 def test_update_stresses():
+    import hydropandas as hpd
+
     from pastastore.extensions import activate_hydropandas_extension
 
     activate_hydropandas_extension()
@@ -66,10 +91,23 @@ def test_update_stresses():
     pstore = pst.PastaStore.from_zip("tests/data/test_hpd_update.zip")
     pstore.hpd.update_knmi_meteo(tmax="2022-02-28", normalize_datetime_index=True)
     tmintmax = pstore.get_tmin_tmax("stresses")
-    assert (tmintmax["tmax"] >= Timestamp("2024-02-27")).all()
+    assert (tmintmax["tmax"] >= Timestamp("2022-02-27")).all()
+
+    # check if result is equal to hydropandas result after resampling
+    oc = hpd.read_knmi(
+        stns=[260], meteo_vars=["RH", "EV24"], starts="2022-01-01", ends="2022-02-28"
+    )
+    for i in range(2):
+        o = oc.obs.iloc[i].squeeze("columns") * 1e3
+        resampled_result = (timestep_weighted_resample(o, o.index.normalize())).dropna()
+        assert_series_equal(
+            pstore.get_stress(pstore.stresses_names[i]).squeeze(),
+            resampled_result,
+            check_names=False,
+        )
 
 
-@pytest.mark.xfail(reason="KNMI is being flaky, so allow this test to xfail/xpass.")
+# @pytest.mark.xfail(reason="KNMI is being flaky, so allow this test to xfail/xpass.")
 @pytest.mark.pastas150
 def test_nearest_stresses():
     from pastastore.extensions import activate_hydropandas_extension
@@ -80,8 +118,8 @@ def test_nearest_stresses():
     pstore.hpd.download_nearest_knmi_precipitation(
         "GMW000000036319_1", tmin="2024-01-01", tmax="2024-01-31"
     )
-    assert "RD_GROOT-AMMERS" in pstore.stresses_names
+    assert "RD_GROOT-AMMERS_434" in pstore.stresses_names
     pstore.hpd.download_nearest_knmi_evaporation(
         "GMW000000036319_1", tmin="2024-01-01", tmax="2024-01-31"
     )
-    assert "EV24_CABAUW-MAST" in pstore.stresses_names
+    assert "EV24_CABAUW-MAST_348" in pstore.stresses_names