threedi-modelchecker 2.10.0.dev4__tar.gz → 2.10.2.dev0__tar.gz

{threedi_modelchecker-2.10.0.dev4 → threedi_modelchecker-2.10.2.dev0}/CHANGES.rst

@@ -2,8 +2,21 @@ Changelog of threedi-modelchecker
 =================================
 
 
-2.9.1 (unreleased)
-------------------
+2.10.2 (unreleased)
+-------------------
+
+- Rename groundwater.equilibrium_infiltration_rate_type to equilibrium_infiltration_rate_aggregation
+- Rename control_measure_location.object_id to connection_node_id
+
+
+2.10.1 (2024-08-20)
+-------------------
+
+- Add check for control_table.action_table contents
+
+
+2.10.0 (2024-08-16)
+-------------------
 
 - Adapt modelchecker to work with schema upgrades for structure control (0.224)
 

{threedi_modelchecker-2.10.0.dev4/threedi_modelchecker.egg-info → threedi_modelchecker-2.10.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.10.0.dev4
+Version: 2.10.2.dev0
 Summary: Checks validity of a 3Di schematisation
 Author-email: Nelen & Schuurmans <info@nelen-schuurmans.nl>
 License: MIT
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: Click
 Requires-Dist: GeoAlchemy2!=0.11.*,>=0.9
 Requires-Dist: SQLAlchemy>=1.4
-Requires-Dist: threedi-schema<0.225.0,>=0.224.0.dev
+Requires-Dist: threedi-schema==0.224.*
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3.10; extra == "rasterio"
 Provides-Extra: test

{threedi_modelchecker-2.10.0.dev4 → threedi_modelchecker-2.10.2.dev0}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "Click",
     "GeoAlchemy2>=0.9,!=0.11.*",
     "SQLAlchemy>=1.4",
-    "threedi-schema>=0.224.0.dev,<0.225.0"
+    "threedi-schema==0.224.*"
 ]
 
 [project.optional-dependencies]

{threedi_modelchecker-2.10.0.dev4 → threedi_modelchecker-2.10.2.dev0}/threedi_modelchecker/__init__.py

@@ -1,5 +1,5 @@
 from .model_checks import *  # NOQA
 
 # fmt: off
-__version__ = '2.10.0.dev4'
+__version__ = '2.10.2.dev0'
 # fmt: on

{threedi_modelchecker-2.10.0.dev4 → threedi_modelchecker-2.10.2.dev0}/threedi_modelchecker/checks/other.py

@@ -1,3 +1,4 @@
+import re
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from typing import List, Literal, NamedTuple
@@ -1100,3 +1101,61 @@ class TagsValidCheck(BaseCheck):
 
     def description(self) -> str:
         return f"{self.table.name}.{self.column} refers to tag ids that are not present in Tags, "
+
+
+class TableStrCheck(BaseCheck):
+    def __init__(
+        self, column, pattern, filters=None, level=CheckLevel.ERROR, error_code=0
+    ):
+        self.pattern = pattern
+        super().__init__(
+            column=column, filters=filters, level=level, error_code=error_code
+        )
+
+    def get_invalid(self, session: Session) -> List[NamedTuple]:
+        # return mock list in case the table is empty when it shouldn't be
+        invalids = []
+        for record in self.to_check(session).all():
+            if re.match(self.pattern, getattr(record, self.column.name)) is None:
+                invalids.append(record)
+        return invalids
+
+
+class ControlTableActionTableCheckDefault(TableStrCheck):
+    def __init__(self, level=CheckLevel.ERROR, error_code=0):
+        # check for action_table for action_type != set_discharge_coefficients
+        # expected format: multiple rows, separated by \n of "val,val"
+        super().__init__(
+            column=models.ControlTable.action_table,
+            pattern=r"^(-?\d+(\.\d+)?,-?\d+(\.\d+)?\n?)+$",
+            filters=models.ControlTable.action_type
+            != constants.ControlTableActionTypes.set_discharge_coefficients,
+            level=level,
+            error_code=error_code,
+        )
+
+        def description(self) -> str:
+            return (
+                f"{self.table.name}.{self.column} is not properly formatted."
+                f"Expected one or more rows of: 'number, number number'"
+            )
+
+
+class ControlTableActionTableCheckDischargeCoefficients(TableStrCheck):
+    def __init__(self, level=CheckLevel.ERROR, error_code=0):
+        # check for action_table for action_type = set_discharge_coefficients
+        # expected format: multiple rows, separated by \n of "val,val val"
+        super().__init__(
+            column=models.ControlTable.action_table,
+            pattern=r"^(-?\d+(\.\d+)?,-?\d+(\.\d+)? -?\d+(\.\d+)?\n?)+$",
+            filters=models.ControlTable.action_type
+            == constants.ControlTableActionTypes.set_discharge_coefficients,
+            level=level,
+            error_code=error_code,
+        )
+
+    def description(self) -> str:
+        return (
+            f"{self.table.name}.{self.column} is not properly formatted."
+            f"Expected one or more rows of: 'number, number'"
+        )

{threedi_modelchecker-2.10.0.dev4 → threedi_modelchecker-2.10.2.dev0}/threedi_modelchecker/config.py

@@ -1412,12 +1412,12 @@ CHECKS += [
     ),
     QueryCheck(
         error_code=406,
-        column=models.GroundWater.equilibrium_infiltration_rate_type,
+        column=models.GroundWater.equilibrium_infiltration_rate_aggregation,
         invalid=Query(models.GroundWater).filter(
-            models.GroundWater.equilibrium_infiltration_rate_type == None,
+            models.GroundWater.equilibrium_infiltration_rate_aggregation == None,
             ~is_none_or_empty(models.GroundWater.equilibrium_infiltration_rate_file),
         ),
-        message="groundwater.equilibrium_infiltration_rate_type should be defined when using an equilibrium_infiltration_rate_file.",
+        message="groundwater.equilibrium_infiltration_rate_aggregation should be defined when using an equilibrium_infiltration_rate_file.",
     ),
     QueryCheck(
         error_code=407,
@@ -2564,7 +2564,7 @@ CHECKS += [FirstTimeSeriesEqualTimestepsCheck(error_code=1206)]
 CHECKS += [
     ForeignKeyCheck(
         error_code=1220,
-        column=models.ControlMeasureLocation.object_id,
+        column=models.ControlMeasureLocation.connection_node_id,
         reference_column=models.ConnectionNode.id,
     )
 ]
@@ -2642,7 +2642,7 @@ not_null_cols = [
     models.ControlTable.target_type,
     models.ControlMeasureMap.weight,
     models.ControlMeasureMap.control_measure_location_id,
-    models.ControlMeasureLocation.object_id,
+    models.ControlMeasureLocation.connection_node_id,
 ]
 CHECKS += [
     NotNullCheck(error_code=1230 + i, column=col) for i, col in enumerate(not_null_cols)

{threedi_modelchecker-2.10.0.dev4 → threedi_modelchecker-2.10.2.dev0}/threedi_modelchecker/tests/test_checks_other.py

@@ -14,6 +14,8 @@ from threedi_modelchecker.checks.other import (
     ChannelManholeLevelCheck,
     ConnectionNodesDistance,
     ConnectionNodesLength,
+    ControlTableActionTableCheckDefault,
+    ControlTableActionTableCheckDischargeCoefficients,
     CorrectAggregationSettingsExist,
     CrossSectionLocationCheck,
     CrossSectionSameConfigurationCheck,
@@ -901,3 +903,54 @@ def test_tags_valid(session):
     assert len(check.get_invalid(session)) == 1
     factories.TagsFactory(id=2, description="bar")
     assert len(check.get_invalid(session)) == 0
+
+
+@pytest.mark.parametrize(
+    "action_table, valid",
+    [
+        ("1,2", True),
+        ("1,2\n3,4", True),
+        ("2,3\n3,4\n", True),
+        ("1.0,2", True),
+        ("1,2.1", True),
+        ("1, 2", False),
+        ("1;2", False),
+        ("1,2 3", False),
+        ("1,2,3", False),
+    ],
+)
+def test_control_table_action_table_check_default(session, action_table, valid):
+    factories.ControlTableFactory(
+        action_table=action_table,
+        action_type=constants.ControlTableActionTypes.set_capacity,
+    )
+    check = ControlTableActionTableCheckDefault()
+    assert (len(check.get_invalid(session)) == 0) == valid
+
+
+@pytest.mark.parametrize(
+    "action_table, valid",
+    [
+        ("1,2 3", True),
+        ("1,2 3\n3,4 5", True),
+        ("2,3 3\n3,4 5\n", True),
+        ("1.0,2 3", True),
+        ("1,2.1 3", True),
+        ("1,2.1 3", True),
+        ("1,2.1 3.3", True),
+        ("1,2", False),
+        ("1, 2 3", False),
+        ("1;2 3", False),
+        ("1,2,3", False),
+        ("1,2 3 4", False),
+    ],
+)
+def test_control_table_action_table_check_discharge_coefficients(
+    session, action_table, valid
+):
+    factories.ControlTableFactory(
+        action_table=action_table,
+        action_type=constants.ControlTableActionTypes.set_discharge_coefficients,
+    )
+    check = ControlTableActionTableCheckDischargeCoefficients()
+    assert (len(check.get_invalid(session)) == 0) == valid

{threedi_modelchecker-2.10.0.dev4 → threedi_modelchecker-2.10.2.dev0/threedi_modelchecker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.10.0.dev4
+Version: 2.10.2.dev0
 Summary: Checks validity of a 3Di schematisation
 Author-email: Nelen & Schuurmans <info@nelen-schuurmans.nl>
 License: MIT
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: Click
 Requires-Dist: GeoAlchemy2!=0.11.*,>=0.9
 Requires-Dist: SQLAlchemy>=1.4
-Requires-Dist: threedi-schema<0.225.0,>=0.224.0.dev
+Requires-Dist: threedi-schema==0.224.*
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3.10; extra == "rasterio"
 Provides-Extra: test

{threedi_modelchecker-2.10.0.dev4 → threedi_modelchecker-2.10.2.dev0}/threedi_modelchecker.egg-info/requires.txt

@@ -1,7 +1,7 @@
 Click
 GeoAlchemy2!=0.11.*,>=0.9
 SQLAlchemy>=1.4
-threedi-schema<0.225.0,>=0.224.0.dev
+threedi-schema==0.224.*
 
 [rasterio]
 rasterio>=1.3.10