threedi-modelchecker 2.8.2.dev0__tar.gz → 2.10.0.dev0__tar.gz

{threedi_modelchecker-2.8.2.dev0 → threedi_modelchecker-2.10.0.dev0}/CHANGES.rst

@@ -2,7 +2,13 @@ Changelog of threedi-modelchecker
 =================================
 
 
-2.8.2 (unreleased)
+2.9.1 (unreleased)
+------------------
+
+- Adapt modelchecker to work with schema upgrades for structure control (0.224)
+
+
+2.9.0 (2024-08-01)
 ------------------
 
 - Adapt modelchecker to work with schema upgrades for inflow (0.223)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.8.2.dev0
+Version: 2.10.0.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.223.dev1
+Requires-Dist: threedi-schema==0.224.0.dev0
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3.10; extra == "rasterio"
 Provides-Extra: test

{threedi_modelchecker-2.8.2.dev0 → threedi_modelchecker-2.10.0.dev0}/pyproject.toml

@@ -19,7 +19,8 @@ dependencies = [
     "Click",
     "GeoAlchemy2>=0.9,!=0.11.*",
     "SQLAlchemy>=1.4",
-    "threedi-schema==0.223.dev1"
+    "threedi-schema==0.224.0.dev0"
+#    "threedi-schema@git+https://github.com/nens/threedi-schema@margriet_70_schema_300_structure_control",
 ]
 
 [project.optional-dependencies]

{threedi_modelchecker-2.8.2.dev0 → threedi_modelchecker-2.10.0.dev0}/threedi_modelchecker/__init__.py

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

{threedi_modelchecker-2.8.2.dev0 → threedi_modelchecker-2.10.0.dev0}/threedi_modelchecker/config.py

@@ -2559,88 +2559,98 @@ CHECKS += [
 ]
 CHECKS += [FirstTimeSeriesEqualTimestepsCheck(error_code=1206)]
 
-## 122x Structure controls
+## 12xx Structure controls
 
 CHECKS += [
     ForeignKeyCheck(
         error_code=1220,
-        column=models.ControlMeasureMap.object_id,
+        column=models.ControlMeasureLocation.object_id,
         reference_column=models.ConnectionNode.id,
-        filters=models.ControlMeasureMap.object_type == "v2_connection_node",
-    )
-]
-CHECKS += [
-    ForeignKeyCheck(
-        error_code=1221,
-        column=control_table.target_id,
-        reference_column=models.Channel.id,
-        filters=control_table.target_type == "v2_channel",
-    )
-    for control_table in (models.ControlMemory, models.ControlTable)
-]
-CHECKS += [
-    ForeignKeyCheck(
-        error_code=1222,
-        column=control_table.target_id,
-        reference_column=models.Pipe.id,
-        filters=control_table.target_type == "v2_pipe",
-    )
-    for control_table in (models.ControlMemory, models.ControlTable)
-]
-CHECKS += [
-    ForeignKeyCheck(
-        error_code=1223,
-        column=control_table.target_id,
-        reference_column=models.Orifice.id,
-        filters=control_table.target_type == "v2_orifice",
-    )
-    for control_table in (models.ControlMemory, models.ControlTable)
-]
-CHECKS += [
-    ForeignKeyCheck(
-        error_code=1224,
-        column=control_table.target_id,
-        reference_column=models.Culvert.id,
-        filters=control_table.target_type == "v2_culvert",
-    )
-    for control_table in (models.ControlMemory, models.ControlTable)
-]
-CHECKS += [
-    ForeignKeyCheck(
-        error_code=1225,
-        column=control_table.target_id,
-        reference_column=models.Weir.id,
-        filters=control_table.target_type == "v2_weir",
-    )
-    for control_table in (models.ControlMemory, models.ControlTable)
-]
-CHECKS += [
-    ForeignKeyCheck(
-        error_code=1226,
-        column=control_table.target_id,
-        reference_column=models.Pumpstation.id,
-        filters=control_table.target_type == "v2_pumpstation",
-    )
-    for control_table in (models.ControlMemory, models.ControlTable)
-]
+        filters=models.ControlMeasureLocation.object_type == "connection_node",
+    )
+]
+
+# 1221 - 1226
+ref_cols = [
+    models.Channel.id,
+    models.Pipe.id,
+    models.Orifice.id,
+    models.Culvert.id,
+    models.Weir.id,
+    models.Pumpstation.id,
+]
+target_types = [
+    "v2_channel",
+    "v2_pipe",
+    "v2_orifice",
+    "v2_culvert",
+    "v2_weir",
+    "v2_pumpstation",
+]
+for i, (ref_col, target_type) in enumerate(zip(ref_cols, target_types)):
+    for control_table in (models.ControlMemory, models.ControlTable):
+        CHECKS += [
+            ForeignKeyCheck(
+                error_code=1221 + i,
+                column=control_table.target_id,
+                reference_column=ref_col,
+                filters=control_table.target_type == target_type,
+            )
+        ]
+
+
 CHECKS += [
     QueryCheck(
         error_code=1227,
-        column=models.Control.id,
-        invalid=Query(models.Control).filter(
+        column=models.ControlMeasureMap.id,
+        invalid=Query(models.ControlMeasureMap).filter(
             (
-                (models.Control.control_type == "memory")
-                & models.Control.control_id.not_in(Query(models.ControlMemory.id))
+                (models.ControlMeasureMap.control_type == "memory")
+                & models.ControlMeasureMap.control_id.not_in(
+                    Query(models.ControlMemory.id)
+                )
             )
             | (
-                (models.Control.control_type == "table")
-                & models.Control.control_id.not_in(Query(models.ControlTable.id))
+                (models.ControlMeasureMap.control_type == "table")
+                & models.ControlMeasureMap.control_id.not_in(
+                    Query(models.ControlTable.id)
+                )
             )
         ),
-        message="v2_control.control_id references an id in v2_control_memory or v2_control_table, but the table it references does not contain an entry with that id.",
+        message="v2_control_measure_map.control_id references an id in memory_control or table_control, but the table it references does not contain an entry with that id.",
     )
 ]
 
+CHECKS += [
+    ForeignKeyCheck(
+        error_code=1228,
+        column=models.ControlMeasureMap.control_measure_location_id,
+        reference_column=models.ControlMeasureLocation.id,
+    )
+]
+
+# 1230 - 1242
+not_null_cols = [
+    models.ControlMemory.measure_variable,
+    models.ControlMemory.action_type,
+    models.ControlMemory.action_value_1,
+    models.ControlMemory.action_value_2,
+    models.ControlMemory.target_type,
+    models.ControlMemory.target_id,
+    models.ControlTable.action_table,
+    models.ControlTable.action_type,
+    models.ControlTable.measure_variable,
+    models.ControlTable.target_type,
+    models.ControlMeasureMap.weight,
+    models.ControlMeasureMap.control_measure_location_id,
+    models.ControlMeasureLocation.object_id,
+    models.ControlMeasureLocation.object_type,
+]
+CHECKS += [
+    NotNullCheck(error_code=1230 + i, column=col) for i, col in enumerate(not_null_cols)
+]
+
+
 ## 018x cross section parameters (continues 008x)
 vegetation_parameter_columns = [
     models.CrossSectionDefinition.vegetation_drag_coefficients,

{threedi_modelchecker-2.8.2.dev0 → threedi_modelchecker-2.10.0.dev0}/threedi_modelchecker/tests/conftest.py

@@ -20,8 +20,8 @@ def threedi_db(tmpdir_factory):
     https://factoryboy.readthedocs.io/en/latest/orms.html#managing-sessions
     """
     tmp_path = tmpdir_factory.mktemp("spatialite4")
-    tmp_sqlite = tmp_path / "empty.gpkg"
-    shutil.copyfile(data_dir / "empty.gpkg", tmp_sqlite)
+    tmp_sqlite = tmp_path / "empty.sqlite"
+    shutil.copyfile(data_dir / "empty.sqlite", tmp_sqlite)
     db = ThreediDatabase(tmp_sqlite)
     schema = ModelSchema(db)
     schema.upgrade(backup=False, upgrade_spatialite_version=False)

threedi_modelchecker-2.10.0.dev0/threedi_modelchecker/tests/data/empty.sqlite

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ff9eba57d54653c0e4d61130ba70152a0f5d0181b8658d4d367673532eba190
+size 7139328

{threedi_modelchecker-2.8.2.dev0 → threedi_modelchecker-2.10.0.dev0}/threedi_modelchecker/tests/factories.py

@@ -41,12 +41,6 @@ class ModelSettingsFactory(factory.alchemy.SQLAlchemyModelFactory):
     friction_type = constants.FrictionType.CHEZY
 
 
-class ControlGroupFactory(factory.alchemy.SQLAlchemyModelFactory):
-    class Meta:
-        model = models.ControlGroup
-        sqlalchemy_session = None
-
-
 class ConnectionNodeFactory(factory.alchemy.SQLAlchemyModelFactory):
     class Meta:
         model = models.ConnectionNode
@@ -194,24 +188,6 @@ class Lateral2DFactory(factory.alchemy.SQLAlchemyModelFactory):
     type = constants.Later2dType.SURFACE
 
 
-# class ImperviousSurfaceFactory(factory.alchemy.SQLAlchemyModelFactory):
-#     class Meta:
-#         model = models.ImperviousSurface
-#         sqlalchemy_session = None
-#
-#     surface_class = "pand"
-#     surface_inclination = "vlak"
-#     area = 0.0
-
-
-# class ImperviousSurfaceMapFactory(factory.alchemy.SQLAlchemyModelFactory):
-#     class Meta:
-#         model = models.ImperviousSurfaceMap
-#         sqlalchemy_session = None
-#
-#     percentage = 100.0
-
-
 class SurfaceParameterFactory(factory.alchemy.SQLAlchemyModelFactory):
     class Meta:
         model = models.SurfaceParameter
@@ -279,7 +255,8 @@ class ControlMemoryFactory(factory.alchemy.SQLAlchemyModelFactory):
         sqlalchemy_session = None
 
     action_type = constants.ControlTableActionTypes.set_discharge_coefficients
-    action_value = "0.0 -1.0"
+    action_value_1 = 0.0
+    action_value_2 = -1.0
     measure_variable = constants.MeasureVariables.waterlevel
     target_type = constants.StructureControlTypes.channel
     target_id = 10
@@ -289,32 +266,6 @@ class ControlMemoryFactory(factory.alchemy.SQLAlchemyModelFactory):
     lower_threshold = -1.0
 
 
-class ControlMeasureGroupFactory(factory.alchemy.SQLAlchemyModelFactory):
-    class Meta:
-        model = models.ControlMeasureGroup
-        sqlalchemy_session = None
-
-
-class ControlMeasureMapFactory(factory.alchemy.SQLAlchemyModelFactory):
-    class Meta:
-        model = models.ControlMeasureMap
-        sqlalchemy_session = None
-
-    object_type = "v2_connection_nodes"
-    object_id = 101
-    weight = 0.1
-
-
-class ControlFactory(factory.alchemy.SQLAlchemyModelFactory):
-    class Meta:
-        model = models.Control
-        sqlalchemy_session = None
-
-    start = "0"
-    end = "300"
-    measure_frequency = 10
-
-
 class CulvertFactory(factory.alchemy.SQLAlchemyModelFactory):
     class Meta:
         model = models.Culvert

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.8.2.dev0
+Version: 2.10.0.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.223.dev1
+Requires-Dist: threedi-schema==0.224.0.dev0
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3.10; extra == "rasterio"
 Provides-Extra: test

{threedi_modelchecker-2.8.2.dev0 → threedi_modelchecker-2.10.0.dev0}/threedi_modelchecker.egg-info/SOURCES.txt

@@ -38,4 +38,5 @@ threedi_modelchecker/tests/test_checks_timeseries.py
 threedi_modelchecker/tests/test_exporters.py
 threedi_modelchecker/tests/test_model_checks.py
 threedi_modelchecker/tests/data/__init__.py
-threedi_modelchecker/tests/data/empty.gpkg
+threedi_modelchecker/tests/data/empty.gpkg
+threedi_modelchecker/tests/data/empty.sqlite

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

@@ -1,7 +1,7 @@
 Click
 GeoAlchemy2!=0.11.*,>=0.9
 SQLAlchemy>=1.4
-threedi-schema==0.223.dev1
+threedi-schema==0.224.0.dev0
 
 [rasterio]
 rasterio>=1.3.10