diff --git a/core/src/schema.jl b/core/src/schema.jl index ac0200777..c22232704 100644 --- a/core/src/schema.jl +++ b/core/src/schema.jl @@ -8,7 +8,7 @@ @schema "ribasim.basin.profile" BasinProfile @schema "ribasim.basin.state" BasinState @schema "ribasim.basin.subgrid" BasinSubgrid -@schema "ribasim.basin.boundaryconcentration" BasinBoundaryconcentration +@schema "ribasim.basin.boundaryconcentration" BasinBoundaryConcentration @schema "ribasim.basin.concentration" BasinConcentration @schema "ribasim.terminal.static" TerminalStatic @schema "ribasim.fractionalflow.static" FractionalFlowStatic @@ -103,7 +103,7 @@ end urban_runoff::Union{Missing, Float64} end -@version BasinBoundaryconcentrationV1 begin +@version BasinBoundaryConcentrationV1 begin node_id::Int32 time::DateTime substance::String diff --git a/python/ribasim/ribasim/config.py b/python/ribasim/ribasim/config.py index c866d2a73..5ebfd7021 100644 --- a/python/ribasim/ribasim/config.py +++ b/python/ribasim/ribasim/config.py @@ -16,7 +16,7 @@ # These schemas are autogenerated from ribasim.schemas import ( - BasinBoundaryconcentrationSchema, + BasinBoundaryConcentrationSchema, BasinConcentrationSchema, BasinProfileSchema, BasinStateSchema, @@ -294,8 +294,8 @@ class Basin(MultiNodeModel): default_factory=TableModel[BasinConcentrationSchema], json_schema_extra={"sort_keys": ["node_id", "substance", "time"]}, ) - boundary_concentration: TableModel[BasinBoundaryconcentrationSchema] = Field( - default_factory=TableModel[BasinBoundaryconcentrationSchema], + boundary_concentration: TableModel[BasinBoundaryConcentrationSchema] = Field( + default_factory=TableModel[BasinBoundaryConcentrationSchema], json_schema_extra={"sort_keys": ["node_id", "substance", "time"]}, ) diff --git a/python/ribasim/ribasim/nodes/basin.py b/python/ribasim/ribasim/nodes/basin.py index ef3c1eb4b..66eba01c7 100644 --- a/python/ribasim/ribasim/nodes/basin.py +++ b/python/ribasim/ribasim/nodes/basin.py @@ -4,7 +4,7 @@ from ribasim.geometry.area import BasinAreaSchema from ribasim.input_base import TableModel from ribasim.schemas import ( - BasinBoundaryconcentrationSchema, + BasinBoundaryConcentrationSchema, BasinConcentrationSchema, BasinProfileSchema, BasinStateSchema, @@ -60,6 +60,6 @@ def __init__(self, **kwargs): super().__init__(df=GeoDataFrame(dict(**kwargs))) -class BoundaryConcentration(TableModel[BasinBoundaryconcentrationSchema]): +class BoundaryConcentration(TableModel[BasinBoundaryConcentrationSchema]): def __init__(self, **kwargs): super().__init__(df=GeoDataFrame(dict(**kwargs))) diff --git a/python/ribasim/ribasim/schemas.py b/python/ribasim/ribasim/schemas.py index cb6e30441..1a3b22631 100644 --- a/python/ribasim/ribasim/schemas.py +++ b/python/ribasim/ribasim/schemas.py @@ -11,7 +11,7 @@ class Config: coerce = True -class BasinBoundaryconcentrationSchema(_BaseSchema): +class BasinBoundaryConcentrationSchema(_BaseSchema): node_id: Series[Int32] = pa.Field(nullable=False, default=0) time: Series[Timestamp] = pa.Field(nullable=False) substance: Series[str] = pa.Field(nullable=False)