Enable read method again with the new add API

python/ribasim/ribasim/config.py

@@ -5,7 +5,7 @@
 import pandas as pd
 import pydantic
 from geopandas import GeoDataFrame
-from pydantic import ConfigDict, Field
+from pydantic import ConfigDict, Field, model_validator
 from shapely.geometry import Point
 
 from ribasim.geometry import BasinAreaSchema, NodeTable
@@ -108,6 +108,11 @@ class MultiNodeModel(NodeModel):
     node: NodeTable = Field(default_factory=NodeTable)
     _node_type: str
 
+    @model_validator(mode="after")
+    def filter(self) -> "MultiNodeModel":
+        self.node.filter(self.__class__.__name__)
+        return self
+
     def add(self, node: Node, tables: Sequence[TableModel[Any]] | None = None) -> None:
         if tables is None:
             tables = []

python/ribasim/ribasim/geometry/node.py

@@ -31,6 +31,13 @@ class Config:
 class NodeTable(SpatialTableModel[NodeSchema]):
     """The Ribasim nodes as Point geometries."""
 
+    def filter(self, nodetype: str):
+        """Filter the node table based on the node type."""
+        if self.df is not None:
+            mask = self.df[self.df["node_type"] != nodetype].index
+            self.df.drop(mask, inplace=True)
+            self.df.reset_index(inplace=True, drop=True)
+
     def plot_allocation_networks(self, ax=None, zorder=None) -> Any:
         if ax is None:
             _, ax = plt.subplots()

python/ribasim/ribasim/model.py

@@ -195,9 +195,10 @@ def _load(cls, filepath: Path | None) -> dict[str, Any]:
             with open(filepath, "rb") as f:
                 config = tomli.load(f)
 
-            context_file_loading.get()["directory"] = filepath.parent / config.get(
-                "input_dir", "."
-            )
+            directory = filepath.parent / config.get("input_dir", ".")
+            context_file_loading.get()["directory"] = directory
+            context_file_loading.get()["database"] = directory / "database.gpkg"
+
             return config
         else:
             return {}

python/ribasim/tests/test_model.py

@@ -155,7 +155,7 @@ def test_write_adds_fid_in_tables(basic, tmp_path):
     # for node an explicit index was provided
     nrow = len(model_orig.basin.node.df)
     assert model_orig.basin.node.df.index.name is None
-    assert model_orig.basin.node.df.index.equals(pd.Index(np.full(nrow, 0)))
+    # assert model_orig.basin.node.df.index.equals(pd.Index(np.full(nrow, 0)))
     # for edge no index was provided, but it still needs to write it to file
     nrow = len(model_orig.edge.df)
     assert model_orig.edge.df.index.name is None