Re-enable validation in Ribasim python

python/ribasim/ribasim/config.py

@@ -7,7 +7,7 @@
 import pandas as pd
 import pydantic
 from geopandas import GeoDataFrame
-from pydantic import ConfigDict, Field, model_validator
+from pydantic import ConfigDict, Field, NonNegativeInt, model_validator
 from shapely.geometry import Point
 
 from ribasim.geometry import BasinAreaSchema, NodeTable
@@ -87,7 +87,7 @@ class Logging(ChildModel):
 
 
 class Node(pydantic.BaseModel):
-    node_id: int
+    node_id: NonNegativeInt
     geometry: Point
     name: str = ""
     subnetwork_id: int | None = None

python/ribasim/ribasim/geometry/node.py

@@ -16,7 +16,7 @@
 
 
 class NodeSchema(pa.SchemaModel):
-    node_id: Series[Int32]
+    node_id: Series[Int32] = pa.Field(ge=0)
     name: Series[str] = pa.Field(default="")
     node_type: Series[str] = pa.Field(default="")
     subnetwork_id: Series[pd.Int32Dtype] = pa.Field(

python/ribasim/ribasim/model.py

@@ -230,6 +230,8 @@ def _children(self):
         }
 
     def validate_model_node_field_ids(self):
+        """Check whether the node IDs of the node_type fields are valid."""
+
         raise NotImplementedError()
 
     def validate_model_node_ids(self):

python/ribasim/tests/test_model.py

@@ -7,10 +7,12 @@
 import xugrid
 from pydantic import ValidationError
 from pyproj import CRS
+from ribasim import Node
 from ribasim.config import Solver
 from ribasim.geometry.edge import NodeData
 from ribasim.input_base import esc_id
 from ribasim.model import Model
+from ribasim.nodes import pump
 from shapely import Point
 
 
@@ -65,24 +67,15 @@ def test_exclude_unset(basic):
     assert d["solver"]["saveat"] == 86400.0
 
 
-@pytest.mark.xfail(reason="Needs implementation")
+# @pytest.mark.xfail(reason="Needs implementation")
 def test_invalid_node_id(basic):
     model = basic
 
-    # Add entry with invalid node ID
-    df = model.pump.static.df._append(
-        {"flow_rate": 1, "node_id": -1, "active": True},
-        ignore_index=True,
-    )
-    # Currently can't handle mixed NaN and None in a DataFrame
-    df = df.where(pd.notna(df), None)
-    model.pump.static.df = df
-
     with pytest.raises(
         ValueError,
-        match=re.escape("Node IDs must be non-negative integers, got [-1]."),
+        match=r".* Input should be greater than or equal to 0 .*",
     ):
-        model.validate_model_node_field_ids()
+        model.pump.add(Node(-1, Point(7.0, 7.0)), [pump.Static(flow_rate=[0.5 / 3600])])
 
 
 @pytest.mark.xfail(reason="Should be reimplemented by the .add() API.")