Adapt to match some name changes in threedi-schema

CHANGES.rst

@@ -4,7 +4,7 @@ Changelog of threedi-modelchecker
 2.16.1 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- Adapt to match some name changes in threedi-schema
 
 
 2.16.0 (2025-01-16)

pyproject.toml

@@ -20,7 +20,8 @@ dependencies = [
     "GeoAlchemy2>=0.9,!=0.11.*",
     "SQLAlchemy>=1.4",
     "pyproj",
-    "threedi-schema==0.230.*"
+    "threedi-schema @ https://github.com/nens/threedi-schema/archive/margriet_119_orm_class_names.zip"
+#    "threedi-schema==0.230.*"
 ]
 
 [project.optional-dependencies]

threedi_modelchecker/checks/location.py

@@ -110,14 +110,14 @@ def description(self) -> str:
         return f"{self.column_name} does not start or end at its connection node (tolerance = {self.max_distance} m)"
 
 
-class ControlMeasureMapLinestringMapLocationCheck(LinestringLocationCheck):
+class MeasureMapLinestringMapLocationCheck(LinestringLocationCheck):
     def __init__(self, control_table, filters, *args, **kwargs):
         super().__init__(
-            ref_column_start=models.ControlMeasureMap.measure_location_id,
-            ref_column_end=models.ControlMeasureMap.control_id,
-            ref_table_start=models.ControlMeasureLocation,
+            ref_column_start=models.MeasureMap.measure_location_id,
+            ref_column_end=models.MeasureMap.control_id,
+            ref_table_start=models.MeasureLocation,
             ref_table_end=control_table,
-            column=models.ControlMeasureMap.geom,
+            column=models.MeasureMap.geom,
             filters=filters,
             *args,
             **kwargs,

threedi_modelchecker/checks/other.py

@@ -963,15 +963,15 @@ def get_invalid(self, session: Session) -> List[NamedTuple]:
         return invalids
 
 
-class ControlTableActionTableCheckDefault(TableStrCheck):
+class TableControlActionTableCheckDefault(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,
+            column=models.TableControl.action_table,
             pattern=r"^(-?\d+(\.\d+)?,-?\d+(\.\d+)?\n?)+$",
-            filters=models.ControlTable.action_type
-            != constants.ControlTableActionTypes.set_discharge_coefficients,
+            filters=models.TableControl.action_type
+            != constants.TableControlActionTypes.set_discharge_coefficients,
             level=level,
             error_code=error_code,
         )
@@ -983,15 +983,15 @@ def description(self) -> str:
             )
 
 
-class ControlTableActionTableCheckDischargeCoefficients(TableStrCheck):
+class TableControlActionTableCheckDischargeCoefficients(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,
+            column=models.TableControl.action_table,
             pattern=r"^(-?\d+(\.\d+)?,-?\d+(\.\d+)? -?\d+(\.\d+)?\n?)+$",
-            filters=models.ControlTable.action_type
-            == constants.ControlTableActionTypes.set_discharge_coefficients,
+            filters=models.TableControl.action_type
+            == constants.TableControlActionTypes.set_discharge_coefficients,
             level=level,
             error_code=error_code,
         )
@@ -1006,8 +1006,8 @@ def description(self) -> str:
 class ControlHasSingleMeasureVariable(BaseCheck):
     def __init__(self, control_model, level=CheckLevel.ERROR, error_code=0):
         control_type_map = {
-            models.ControlTable: "table",
-            models.ControlMemory: "memory",
+            models.TableControl: "table",
+            models.MemoryControl: "memory",
         }
         self.control_type_name = control_type_map[control_model]
         super().__init__(
@@ -1020,17 +1020,16 @@ def get_invalid(self, session: Session) -> List[NamedTuple]:
         invalid = []
         for record in self.to_check(session):
             res = (
-                session.query(models.ControlMeasureMap)
+                session.query(models.MeasureMap)
                 .filter(
-                    models.ControlMeasureMap.control_type == self.control_type_name,
-                    models.ControlMeasureMap.control_id == record.id,
+                    models.MeasureMap.control_type == self.control_type_name,
+                    models.MeasureMap.control_id == record.id,
                 )
                 .join(
-                    models.ControlMeasureLocation,
-                    models.ControlMeasureMap.measure_location_id
-                    == models.ControlMeasureLocation.id,
+                    models.MeasureLocation,
+                    models.MeasureMap.measure_location_id == models.MeasureLocation.id,
                 )
-                .with_entities(models.ControlMeasureLocation.measure_variable)
+                .with_entities(models.MeasureLocation.measure_variable)
             ).all()
             if len(res) == 0:
                 continue