From a4bd85c381f26472b16f0f2c4302c0365946c139 Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Mon, 19 Feb 2024 22:09:31 +0100 Subject: [PATCH 1/2] Run a model without compression --- core/src/write.jl | 2 +- python/ribasim_testmodels/ribasim_testmodels/trivial.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/write.jl b/core/src/write.jl index 0e16d2751..e2871b45c 100644 --- a/core/src/write.jl +++ b/core/src/write.jl @@ -246,7 +246,7 @@ end function write_arrow( path::AbstractString, table::NamedTuple, - compress::TranscodingStreams.Codec, + compress::Union{ZstdCompressor, Nothing}, )::Nothing # ensure DateTime is encoded in a compatible manner # https://github.com/apache/arrow-julia/issues/303 diff --git a/python/ribasim_testmodels/ribasim_testmodels/trivial.py b/python/ribasim_testmodels/ribasim_testmodels/trivial.py index 3f22685a1..74d60528b 100644 --- a/python/ribasim_testmodels/ribasim_testmodels/trivial.py +++ b/python/ribasim_testmodels/ribasim_testmodels/trivial.py @@ -121,6 +121,6 @@ def trivial_model() -> ribasim.Model: tabulated_rating_curve=rating_curve, starttime="2020-01-01 00:00:00", endtime="2021-01-01 00:00:00", - results=ribasim.Results(subgrid=True), + results=ribasim.Results(subgrid=True, compression=False), ) return model From 06172e32668f8c1954084aaa2de8e5122f8f5e3a Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Tue, 20 Feb 2024 15:35:28 +0100 Subject: [PATCH 2/2] Fix tests --- python/ribasim/ribasim/config.py | 2 +- python/ribasim/ribasim/schemas.py | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/python/ribasim/ribasim/config.py b/python/ribasim/ribasim/config.py index 22b0a0060..afc48859d 100644 --- a/python/ribasim/ribasim/config.py +++ b/python/ribasim/ribasim/config.py @@ -47,7 +47,7 @@ class Compression(str, Enum): class Results(ChildModel): outstate: str | None = None - compression: Compression = Compression.zstd + compression: bool = True compression_level: int = 6 subgrid: bool = False diff --git a/python/ribasim/ribasim/schemas.py b/python/ribasim/ribasim/schemas.py index ca4dd37bd..2cbeacbe9 100644 --- a/python/ribasim/ribasim/schemas.py +++ b/python/ribasim/ribasim/schemas.py @@ -11,21 +11,6 @@ class Config: coerce = True -class TargetLevelStaticSchema(_BaseSchema): - node_id: Series[int] = pa.Field(nullable=False) - min_level: Series[float] = pa.Field(nullable=False) - max_level: Series[float] = pa.Field(nullable=False) - priority: Series[int] = pa.Field(nullable=False) - - -class TargetLevelTimeSchema(_BaseSchema): - node_id: Series[int] = pa.Field(nullable=False) - time: Series[Timestamp] = pa.Field(nullable=False) - min_level: Series[float] = pa.Field(nullable=False) - max_level: Series[float] = pa.Field(nullable=False) - priority: Series[int] = pa.Field(nullable=False) - - class BasinProfileSchema(_BaseSchema): node_id: Series[int] = pa.Field(nullable=False) area: Series[float] = pa.Field(nullable=False) @@ -184,6 +169,21 @@ class TabulatedRatingCurveTimeSchema(_BaseSchema): flow_rate: Series[float] = pa.Field(nullable=False) +class TargetLevelStaticSchema(_BaseSchema): + node_id: Series[int] = pa.Field(nullable=False) + min_level: Series[float] = pa.Field(nullable=False) + max_level: Series[float] = pa.Field(nullable=False) + priority: Series[int] = pa.Field(nullable=False) + + +class TargetLevelTimeSchema(_BaseSchema): + node_id: Series[int] = pa.Field(nullable=False) + time: Series[Timestamp] = pa.Field(nullable=False) + min_level: Series[float] = pa.Field(nullable=False) + max_level: Series[float] = pa.Field(nullable=False) + priority: Series[int] = pa.Field(nullable=False) + + class TerminalStaticSchema(_BaseSchema): node_id: Series[int] = pa.Field(nullable=False)