flood-adapt 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

flood_adapt/__init__.py

@@ -1,11 +1,12 @@
 # has to be here at the start to avoid circular imports
-__version__ = "1.0.4"
+
+__version__ = "1.0.6"
 
 from flood_adapt import adapter, database_builder, dbs_classes, objects
 from flood_adapt.config.config import Settings
 from flood_adapt.config.site import Site
 from flood_adapt.flood_adapt import FloodAdapt
-from flood_adapt.misc.exceptions import ComponentError, DatabaseError, FloodAdaptError
+from flood_adapt.misc.exceptions import DatabaseError, FloodAdaptError
 from flood_adapt.misc.log import FloodAdaptLogging
 from flood_adapt.objects.forcing import unit_system
 
@@ -21,7 +22,6 @@ __all__ = [
     "database_builder",
     "FloodAdaptError",
     "DatabaseError",
-    "ComponentError",
 ]
 
 FloodAdaptLogging()  # Initialize logging once for the entire package

flood_adapt/adapter/fiat_adapter.py

@@ -205,7 +205,7 @@ class FiatAdapter(IImpactAdapter):
         self.close_files()
         if self.model_root.exists():
             logger.info(f"Deleting {self.model_root}")
-            shutil.rmtree(self.model_root)
+            shutil.rmtree(self.model_root, ignore_errors=True)
 
     def fiat_completed(self) -> bool:
         """Check if fiat has run as expected.
@@ -353,7 +353,7 @@ class FiatAdapter(IImpactAdapter):
                             os.remove(os.path.join(subdir, file))
 
                     if not os.listdir(subdir):
-                        os.rmdir(subdir)
+                        shutil.rmtree(subdir, ignore_errors=True)
 
             if strict:
                 raise RuntimeError(f"FIAT model failed to run in {path}.")
@@ -1574,5 +1574,5 @@ class FiatAdapter(IImpactAdapter):
         )
         if simulation_path.exists():
             self.close_files()
-            shutil.rmtree(simulation_path)
+            shutil.rmtree(simulation_path, ignore_errors=True)
             logger.info(f"Deleted Delft-FIAT simulation folder: {simulation_path}")

flood_adapt/adapter/sfincs_adapter.py

@@ -212,7 +212,7 @@ class SfincsAdapter(IHazardAdapter):
                             os.remove(os.path.join(subdir, file))
 
                     if not os.listdir(subdir):
-                        os.rmdir(subdir)
+                        shutil.rmtree(subdir, ignore_errors=True)
 
             if strict:
                 raise RuntimeError(f"SFINCS model failed to run in {path}.")
@@ -828,7 +828,7 @@ class SfincsAdapter(IHazardAdapter):
 
         if sim_path.parent.exists() and not any(sim_path.parent.iterdir()):
             # Remove the parent directory `simulations` if it is empty
-            sim_path.parent.rmdir()
+            shutil.rmtree(sim_path.parent, ignore_errors=True)
 
     def _run_risk_scenario(self, scenario: Scenario):
         """Run the whole workflow for a risk scenario.
@@ -1304,10 +1304,14 @@ class SfincsAdapter(IHazardAdapter):
             )
             return
 
+        model_rivers = self._read_river_locations()
+        if model_rivers.empty:
+            logger.warning(
+                "Cannot add discharge forcing: No rivers defined in the sfincs model."
+            )
+            return
         logger.info(f"Setting discharge forcing for river: {discharge.river.name}")
-
         time_frame = self.get_model_time()
-        model_rivers = self._read_river_locations()
 
         # Check that the river is defined in the model and that the coordinates match
         river_loc = shapely.Point(
@@ -1705,17 +1709,22 @@ class SfincsAdapter(IHazardAdapter):
 
     def _read_river_locations(self) -> gpd.GeoDataFrame:
         path = self.get_model_root() / "sfincs.src"
-
-        with open(path) as f:
-            lines = f.readlines()
+        lines = []
+        if path.exists():
+            with open(path) as f:
+                lines = f.readlines()
         coords = [(float(line.split()[0]), float(line.split()[1])) for line in lines]
         points = [shapely.Point(coord) for coord in coords]
 
         return gpd.GeoDataFrame({"geometry": points}, crs=self._model.crs)
 
     def _read_waterlevel_boundary_locations(self) -> gpd.GeoDataFrame:
-        with open(self.get_model_root() / "sfincs.bnd") as f:
-            lines = f.readlines()
+        path = self.get_model_root() / "sfincs.bnd"
+        lines = []
+        if path.exists():
+            with open(path) as f:
+                lines = f.readlines()
+
         coords = [(float(line.split()[0]), float(line.split()[1])) for line in lines]
         points = [shapely.Point(coord) for coord in coords]
 

flood_adapt/adapter/sfincs_offshore.py

@@ -97,7 +97,7 @@ class OffshoreSfincsHandler(IOffshoreSfincsHandler, DatabaseUser):
         sim_path = self._get_simulation_path()
         # SfincsAdapter.write() doesnt write the bca file apparently so we need to copy the template
         if sim_path.exists():
-            shutil.rmtree(sim_path)
+            shutil.rmtree(sim_path, ignore_errors=True)
 
         with SfincsAdapter(model_root=self.template_path) as _offshore_model:
             # Load objects, set root & write template model

flood_adapt/dbs_classes/database.py

@@ -1,7 +1,6 @@
 import gc
 import os
 import shutil
-import time
 from pathlib import Path
 from typing import Any, Literal, Optional, Union
 
@@ -11,6 +10,8 @@ import pandas as pd
 import xarray as xr
 from geopandas import GeoDataFrame
 
+from flood_adapt.adapter.fiat_adapter import FiatAdapter
+from flood_adapt.adapter.sfincs_adapter import SfincsAdapter
 from flood_adapt.config.hazard import SlrScenariosModel
 from flood_adapt.config.impacts import FloodmapType
 from flood_adapt.config.site import Site
@@ -22,7 +23,7 @@ from flood_adapt.dbs_classes.dbs_scenario import DbsScenario
 from flood_adapt.dbs_classes.dbs_static import DbsStatic
 from flood_adapt.dbs_classes.dbs_strategy import DbsStrategy
 from flood_adapt.dbs_classes.interface.database import IDatabase
-from flood_adapt.misc.exceptions import DatabaseError
+from flood_adapt.misc.exceptions import ConfigError, DatabaseError
 from flood_adapt.misc.log import FloodAdaptLogging
 from flood_adapt.misc.path_builder import (
     TopLevelDir,
@@ -140,8 +141,6 @@ class Database(IDatabase):
 
     def shutdown(self):
         """Explicitly shut down the singleton and clear all references."""
-        import gc
-
         self._instance = None
         self._init_done = False
 
@@ -191,7 +190,7 @@ class Database(IDatabase):
             SLR scenarios configuration model with the file path set to the static path.
         """
         if self.site.sfincs.slr_scenarios is None:
-            raise DatabaseError("No SLR scenarios defined in the site configuration.")
+            raise ConfigError("No SLR scenarios defined in the site configuration.")
         slr = self.site.sfincs.slr_scenarios
         slr.file = str(self.static_path / slr.file)
         return slr
@@ -234,7 +233,7 @@ class Database(IDatabase):
             if _type == FloodmapType.water_level:
                 paths = [base_dir / "max_water_level_map.nc"]
             elif _type == FloodmapType.water_depth:
-                paths = [base_dir / f"FloodMap_{self.name}.tif"]
+                paths = [base_dir / f"FloodMap_{scenario_name}.tif"]
         elif mode == Mode.risk:
             if _type == FloodmapType.water_level:
                 paths = list(base_dir.glob("RP_*_maps.nc"))
@@ -577,20 +576,13 @@ class Database(IDatabase):
             for dir in os.listdir(self.scenarios.output_path)
         ]
 
-        def _call_garbage_collector(func, path, exc_info, retries=5, delay=0.1):
-            """Retry deletion up to 5 times if the file is locked."""
-            for attempt in range(retries):
-                gc.collect()
-                time.sleep(delay)
-                try:
-                    func(path)  # Retry deletion
-                    return  # Exit if successful
-                except Exception as e:
-                    print(
-                        f"Attempt {attempt + 1}/{retries} failed to delete {path}: {e}"
-                    )
-
-            print(f"Giving up on deleting {path} after {retries} attempts.")
+        # Init model instances outside the loop
+        overland = self.static.get_overland_sfincs_model()
+        fiat = self.static.get_fiat_model()
+        if self.site.sfincs.config.offshore_model is not None:
+            offshore = self.static.get_offshore_sfincs_model()
+        else:
+            offshore = None
 
         for _dir in output_scenarios:
             # Delete if: input was deleted or corrupted output due to unfinished run
@@ -598,12 +590,18 @@ class Database(IDatabase):
                 path.name for path in input_scenarios
             ] or not finished_file_exists(_dir):
                 logger.info(f"Cleaning up corrupted outputs of scenario: {_dir.name}.")
-                shutil.rmtree(_dir, onerror=_call_garbage_collector)
+                shutil.rmtree(_dir, ignore_errors=True)
             # If the scenario is finished, delete the simulation folders depending on `save_simulation`
             elif finished_file_exists(_dir):
-                self._delete_simulations(_dir.name)
+                self._delete_simulations(_dir.name, overland, fiat, offshore)
 
-    def _delete_simulations(self, scenario_name: str) -> None:
+    def _delete_simulations(
+        self,
+        scenario_name: str,
+        overland: SfincsAdapter,
+        fiat: FiatAdapter,
+        offshore: Optional[SfincsAdapter],
+    ) -> None:
         """Delete all simulation folders for a given scenario.
 
         Parameters
@@ -617,7 +615,6 @@ class Database(IDatabase):
 
         if not self.site.sfincs.config.save_simulation:
             # Delete SFINCS overland
-            overland = self.static.get_overland_sfincs_model()
             if sub_events:
                 for sub_event in sub_events:
                     overland._delete_simulation_folder(scn, sub_event=sub_event)
@@ -625,8 +622,7 @@ class Database(IDatabase):
                 overland._delete_simulation_folder(scn)
 
             # Delete SFINCS offshore
-            if self.site.sfincs.config.offshore_model:
-                offshore = self.static.get_offshore_sfincs_model()
+            if self.site.sfincs.config.offshore_model and offshore is not None:
                 if sub_events:
                     for sub_event in sub_events:
                         sim_path = offshore._get_simulation_path_offshore(
@@ -639,7 +635,7 @@ class Database(IDatabase):
                             sim_path.parent.iterdir()
                         ):
                             # Remove the parent directory `simulations` if it is empty
-                            sim_path.parent.rmdir()
+                            shutil.rmtree(sim_path.parent, ignore_errors=True)
                 else:
                     sim_path = offshore._get_simulation_path_offshore(scn)
                     if sim_path.exists():
@@ -648,9 +644,8 @@ class Database(IDatabase):
 
                     if sim_path.parent.exists() and not any(sim_path.parent.iterdir()):
                         # Remove the parent directory `simulations` if it is empty
-                        sim_path.parent.rmdir()
+                        shutil.rmtree(sim_path.parent, ignore_errors=True)
 
         if not self.site.fiat.config.save_simulation:
             # Delete FIAT
-            fiat = self.static.get_fiat_model()
             fiat._delete_simulation_folder(scn)

flood_adapt/dbs_classes/dbs_benefit.py

@@ -1,5 +1,3 @@
-import shutil
-
 from flood_adapt.dbs_classes.dbs_template import DbsTemplate
 from flood_adapt.misc.exceptions import DatabaseError
 from flood_adapt.workflows.benefit_runner import Benefit, BenefitRunner
@@ -37,30 +35,6 @@ class DbsBenefit(DbsTemplate[Benefit]):
         # Save the benefit
         super().save(object_model, overwrite=overwrite)
 
-    def delete(self, name: str, toml_only: bool = False):
-        """Delete an already existing benefit in the database.
-
-        Parameters
-        ----------
-        name : str
-            name of the benefit
-        toml_only : bool, optional
-            whether to only delete the toml file or the entire folder. If the folder is empty after deleting the toml,
-            it will always be deleted. By default False
-
-        Raises
-        ------
-        DatabaseError
-            Raise error if benefit has already model output
-        """
-        # First delete the benefit
-        super().delete(name, toml_only=toml_only)
-
-        # Delete output if edited
-        output_path = self.output_path / name
-        if output_path.exists():
-            shutil.rmtree(output_path, ignore_errors=True)
-
     def get_runner(self, name: str) -> BenefitRunner:
         return BenefitRunner(self._database, self.get(name))
 

flood_adapt/dbs_classes/dbs_event.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
 from flood_adapt.dbs_classes.dbs_template import DbsTemplate
-from flood_adapt.misc.exceptions import DatabaseError
+from flood_adapt.misc.exceptions import DoesNotExistError
 from flood_adapt.objects.events.event_factory import EventFactory
 from flood_adapt.objects.events.event_set import EventSet
 from flood_adapt.objects.events.events import Event
@@ -31,7 +31,7 @@ class DbsEvent(DbsTemplate[Event]):
 
         # Check if the object exists
         if not Path(event_path).is_file():
-            raise DatabaseError(f"{self.display_name} '{name}' does not exist.")
+            raise DoesNotExistError(name, self.display_name)
 
         # Load event
         return EventFactory.load_file(event_path, load_all=load_all)

flood_adapt/dbs_classes/dbs_measure.py

@@ -4,7 +4,7 @@ from typing import Any
 import geopandas as gpd
 
 from flood_adapt.dbs_classes.dbs_template import DbsTemplate
-from flood_adapt.misc.exceptions import DatabaseError
+from flood_adapt.misc.exceptions import DatabaseError, DoesNotExistError
 from flood_adapt.misc.utils import resolve_filepath
 from flood_adapt.objects.measures.measure_factory import MeasureFactory
 from flood_adapt.objects.measures.measures import Measure
@@ -34,7 +34,7 @@ class DbsMeasure(DbsTemplate[Measure]):
 
         # Check if the object exists
         if not Path(full_path).is_file():
-            raise DatabaseError(f"{self.display_name}: '{name}' does not exist.")
+            raise DoesNotExistError(name, self.display_name)
 
         # Load and return the object
         return MeasureFactory.get_measure_object(full_path)

flood_adapt/dbs_classes/dbs_scenario.py

@@ -1,4 +1,3 @@
-import shutil
 from typing import Any
 
 from flood_adapt.dbs_classes.dbs_template import DbsTemplate
@@ -36,29 +35,6 @@ class DbsScenario(DbsTemplate[Scenario]):
 
         return scenarios
 
-    def delete(self, name: str, toml_only: bool = False):
-        """Delete an already existing scenario in the database.
-
-        Parameters
-        ----------
-        name : str
-            name of the scenario to be deleted
-        toml_only : bool, optional
-            whether to only delete the toml file or the entire folder. If the folder is empty after deleting the toml,
-            it will always be deleted. By default False
-
-        Raises
-        ------
-        DatabaseError
-            Raise error if scenario to be deleted is already in use.
-        """
-        # First delete the scenario
-        super().delete(name, toml_only)
-
-        # Then delete the results
-        if (self.output_path / name).exists():
-            shutil.rmtree(self.output_path / name, ignore_errors=False)
-
     def check_higher_level_usage(self, name: str) -> list[str]:
         """Check if a scenario is used in a benefit.
 

flood_adapt/dbs_classes/dbs_static.py

@@ -12,7 +12,7 @@ from flood_adapt.adapter.sfincs_adapter import SfincsAdapter
 from flood_adapt.config.config import Settings
 from flood_adapt.dbs_classes.interface.database import IDatabase
 from flood_adapt.dbs_classes.interface.static import IDbsStatic
-from flood_adapt.misc.exceptions import DatabaseError
+from flood_adapt.misc.exceptions import ConfigError, DatabaseError
 
 
 def cache_method_wrapper(func: Callable) -> Callable:
@@ -260,7 +260,7 @@ class DbsStatic(IDbsStatic):
     def get_offshore_sfincs_model(self) -> SfincsAdapter:
         """Get the template overland Sfincs model."""
         if self._database.site.sfincs.config.offshore_model is None:
-            raise DatabaseError("No offshore model defined in the site configuration.")
+            raise ConfigError("No offshore model defined in the site configuration.")
 
         offshore_path = (
             self._database.static_path
@@ -273,7 +273,7 @@ class DbsStatic(IDbsStatic):
     def get_fiat_model(self) -> FiatAdapter:
         """Get the path to the FIAT model."""
         if self._database.site.fiat is None:
-            raise DatabaseError("No FIAT model defined in the site configuration.")
+            raise ConfigError("No FIAT model defined in the site configuration.")
         template_path = self._database.static_path / "templates" / "fiat"
         with FiatAdapter(
             model_root=template_path,
@@ -287,7 +287,7 @@ class DbsStatic(IDbsStatic):
     @cache_method_wrapper
     def get_cyclone_track_database(self) -> CycloneTrackDatabase:
         if self._database.site.sfincs.cyclone_track_database is None:
-            raise DatabaseError(
+            raise ConfigError(
                 "No cyclone track database defined in the site configuration."
             )
         database_file = str(

flood_adapt/dbs_classes/dbs_strategy.py

@@ -1,7 +1,7 @@
 from itertools import combinations
 
 from flood_adapt.dbs_classes.dbs_template import DbsTemplate
-from flood_adapt.misc.exceptions import DatabaseError
+from flood_adapt.misc.exceptions import AlreadyExistsError, DatabaseError
 from flood_adapt.objects.measures.measures import MeasureType
 from flood_adapt.objects.strategies.strategies import Strategy
 
@@ -49,9 +49,7 @@ class DbsStrategy(DbsTemplate[Strategy]):
         if overwrite and object_exists:
             self.delete(object_model.name, toml_only=True)
         elif not overwrite and object_exists:
-            raise DatabaseError(
-                f"'{object_model.name}' name is already used by another {self.display_name}. Choose a different name"
-            )
+            raise AlreadyExistsError(object_model.name, self.display_name)
 
         # Check if any measures overlap
         self._check_overlapping_measures(object_model.measures)

flood_adapt/dbs_classes/dbs_template.py

@@ -8,7 +8,13 @@ import tomli_w
 
 from flood_adapt.dbs_classes.interface.database import IDatabase
 from flood_adapt.dbs_classes.interface.element import AbstractDatabaseElement
-from flood_adapt.misc.exceptions import DatabaseError
+from flood_adapt.misc.exceptions import (
+    AlreadyExistsError,
+    DatabaseError,
+    DoesNotExistError,
+    IsStandardObjectError,
+    IsUsedInError,
+)
 from flood_adapt.objects.object_model import Object
 
 T_OBJECTMODEL = TypeVar("T_OBJECTMODEL", bound=Object)
@@ -41,13 +47,18 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
         -------
         Object
             object of the type of the specified object model
+
+        Raises
+        ------
+        DoesNotExistError
+            Raise error if the object does not exist.
         """
         # Make the full path to the object
         full_path = self.input_path / name / f"{name}.toml"
 
         # Check if the object exists
         if not Path(full_path).is_file():
-            raise DatabaseError(f"{self.display_name}: '{name}' does not exist.")
+            raise DoesNotExistError(name, self.display_name)
 
         # Load and return the object
         return self._object_class.load_file(full_path)
@@ -74,6 +85,15 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
             name of the new measure
         new_description : str
             description of the new measure
+
+        Raises
+        ------
+        AlreadyExistsError
+            Raise error if an object with the new name already exists.
+        IsStandardObjectError
+            Raise error if an object with the new name is a standard object.
+        DatabaseError
+            Raise error if the saving of the object fails.
         """
         copy_object = self.get(old_name)
         copy_object.name = new_name
@@ -123,8 +143,14 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
 
         Raises
         ------
+        AlreadyExistsError
+            Raise error if object to be saved already exists.
+        IsStandardObjectError
+            Raise error if object to be overwritten is a standard object.
+        IsUsedInError
+            Raise error if object to be overwritten is already in use.
         DatabaseError
-            Raise error if name is already in use.
+            Raise error if the overwriting of the object fails.
         """
         self._validate_to_save(object_model, overwrite=overwrite)
 
@@ -138,7 +164,7 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
         )
 
     def delete(self, name: str, toml_only: bool = False):
-        """Delete an already existing object in the database.
+        """Delete an already existing object as well as its outputs from the database.
 
         Parameters
         ----------
@@ -150,34 +176,50 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
 
         Raises
         ------
-        DatabaseError
+        IsStandardObjectError
+            Raise error if object to be deleted is a standard object.
+        IsUsedInError
             Raise error if object to be deleted is already in use.
+        DoesNotExistError
+            Raise error if object to be deleted does not exist.
+        DatabaseError
+            Raise error if the deletion of the object fails.
         """
         # Check if the object is a standard object. If it is, raise an error
         if self._check_standard_objects(name):
-            raise DatabaseError(
-                f"'{name}' cannot be deleted/modified since it is a standard {self.display_name}."
-            )
+            raise IsStandardObjectError(name, self.display_name)
 
         # Check if object is used in a higher level object. If it is, raise an error
         if used_in := self.check_higher_level_usage(name):
-            raise DatabaseError(
-                f"{self.display_name}: '{name}' cannot be deleted/modified since it is already used in the {self._higher_lvl_object.capitalize()}(s): {', '.join(used_in)}"
+            raise IsUsedInError(
+                name, self.display_name, self._higher_lvl_object, used_in
             )
 
-        # Once all checks are passed, delete the object
+        # Check if the object exists
         toml_path = self.input_path / name / f"{name}.toml"
-        if toml_only:
-            # Only delete the toml file
-            toml_path.unlink(missing_ok=True)
-            # If the folder is empty, delete the folder
-            if not list(toml_path.parent.iterdir()):
-                toml_path.parent.rmdir()
-        else:
-            # Delete the entire folder
-            shutil.rmtree(toml_path.parent, ignore_errors=True)
-            if (self.output_path / name).exists():
-                shutil.rmtree(self.output_path / name, ignore_errors=True)
+        if not toml_path.exists():
+            raise DoesNotExistError(name, self.display_name)
+
+        # Once all checks are passed, delete the object
+        toml_path.unlink(missing_ok=True)
+
+        # Delete the entire folder
+        if not list(toml_path.parent.iterdir()):
+            shutil.rmtree(toml_path.parent)
+        elif not toml_only:
+            try:
+                shutil.rmtree(toml_path.parent)
+            except OSError as e:
+                raise DatabaseError(f"Failed to delete `{name}` due to: {e}") from e
+
+        # Delete output
+        if (self.output_path / name).exists():
+            try:
+                shutil.rmtree(self.output_path / name)
+            except OSError as e:
+                raise DatabaseError(
+                    f"Failed to delete output of `{name}` due to: {e}"
+                ) from e
 
     def _check_standard_objects(self, name: str) -> bool:
         """Check if an object is a standard object.
@@ -275,6 +317,4 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
         if overwrite and object_exists:
             self.delete(object_model.name, toml_only=True)
         elif not overwrite and object_exists:
-            raise DatabaseError(
-                f"'{object_model.name}' name is already used by another {self.display_name.lower()}. Choose a different name"
-            )
+            raise AlreadyExistsError(object_model.name, self.display_name)

flood_adapt/misc/exceptions.py

@@ -10,13 +10,50 @@ class DatabaseError(FloodAdaptError):
     pass
 
 
-class ComponentError(FloodAdaptError):
-    """Base class for exceptions raised in any component/object related files."""
+class IsStandardObjectError(DatabaseError):
+    """Raised when an operation is attempted on a standard object."""
 
-    pass
+    def __init__(
+        self,
+        name: str,
+        object_type: str,
+    ):
+        msg = f"The {object_type} '{name}' is a standard object and cannot be modified or deleted."
+        super().__init__(msg)
 
 
-class WorkflowError(FloodAdaptError):
-    """Base class for exceptions raised in any workflow related files."""
+class AlreadyExistsError(DatabaseError):
+    """Raised when an attempt is made to create an object that already exists."""
 
-    pass
+    def __init__(
+        self,
+        name: str,
+        object_type: str,
+    ):
+        msg = f"The {object_type} '{name}' already exists."
+        super().__init__(msg)
+
+
+class DoesNotExistError(DatabaseError):
+    """Raised when an attempt is made to access an object that does not exist."""
+
+    def __init__(self, name: str, object_type: str):
+        msg = f"The {object_type} '{name}' does not exist."
+        super().__init__(msg)
+
+
+class IsUsedInError(DatabaseError):
+    """Raised when an attempt is made to delete or modify an object that is in use / referenced by another object."""
+
+    def __init__(
+        self, name: str, object_type: str, used_in_type: str, used_in: list[str]
+    ):
+        msg = f"The {object_type} '{name}' cannot be deleted/modified since it is already used in the {used_in_type}(s): {', '.join(used_in)}"
+        super().__init__(msg)
+
+
+class ConfigError(DatabaseError):
+    """Raised when optional configuration, usually in the site, is missing or invalid."""
+
+    def __init__(self, message: str):
+        super().__init__(message)

{flood_adapt-1.0.4.dist-info → flood_adapt-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 1.0.4
+Version: 1.0.6
 Summary: A software package support system which can be used to assess the benefits and costs of flood resilience measures
 Author-email: Gundula Winter <Gundula.Winter@deltares.nl>, Panos Athanasiou <Panos.Athanasiou@deltares.nl>, Frederique de Groen <Frederique.deGroen@deltares.nl>, Tim de Wilde <Tim.deWilde@deltares.nl>, Julian Hofer <Julian.Hofer@deltares.nl>, Daley Adrichem <Daley.Adrichem@deltares.nl>, Luuk Blom <Luuk.Blom@deltares.nl>
 License: ====================================================
@@ -712,18 +712,16 @@ Requires-Dist: cht-cyclones==1.0.3
 Requires-Dist: cht-meteo==0.3.1
 Requires-Dist: cht-observations==0.2.1
 Requires-Dist: cht-tide==0.1.1
-Requires-Dist: dask==2024.11.2
-Requires-Dist: numba_celltree==0.2.2
 Requires-Dist: fiat-toolbox==0.1.20
 Requires-Dist: fiona<2.0,>=1.0
 Requires-Dist: geojson<4.0,>=3.0
 Requires-Dist: geopandas<2.0,>=1.0
-Requires-Dist: hydromt-fiat==0.5.5
-Requires-Dist: hydromt-sfincs==1.2.0
+Requires-Dist: hydromt-fiat<1.0,>=0.5.5
+Requires-Dist: hydromt-sfincs[quadtree]<2.0,>=1.2.2
 Requires-Dist: numpy<2.0,>=1.0
 Requires-Dist: numpy-financial<2.0,>=1.0
 Requires-Dist: pandas<3.0,>=2.0
-Requires-Dist: plotly<7.0,>=6.0
+Requires-Dist: plotly<6.3,>=6.0
 Requires-Dist: pydantic<3.0,>=2.0
 Requires-Dist: pydantic-settings<3.0,>=2.0
 Requires-Dist: pyogrio<1.0

{flood_adapt-1.0.4.dist-info → flood_adapt-1.0.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
-flood_adapt/__init__.py,sha256=ckRctoVnY8-iqM2cbEkPXTPdOKjZJNDKeBolOYFa81s,818
+flood_adapt/__init__.py,sha256=th2A3Ub_atS7QHg1y2SxGCiECW7BKlWrXZX7fuHd4M8,781
 flood_adapt/flood_adapt.py,sha256=g-OpS0spvi-puwQFhvsfu_vvduozTPXk9DU2ay9ypgs,38698
 flood_adapt/adapter/__init__.py,sha256=vnF8NCkEVX-N-gtGS-J_A1H1YYAjihWjJZFyYGwcp8Q,180
-flood_adapt/adapter/fiat_adapter.py,sha256=kqZsAEo4YToLtaKTwATAGgmp5-FWQffZLbAItuLx104,60010
-flood_adapt/adapter/sfincs_adapter.py,sha256=mvW1cW8NNr2fnhZW0Ffzg9gDuheSrhTvYI0Y0AkLCNA,78499
-flood_adapt/adapter/sfincs_offshore.py,sha256=MjSPTrFPuOI2VqHeaBobS_OCozgnJST05nR49lq7cPs,7639
+flood_adapt/adapter/fiat_adapter.py,sha256=s6M-_bwr4NUWLZvlc619BUmnA_z-DNMggVcnlG-jrqM,60075
+flood_adapt/adapter/sfincs_adapter.py,sha256=QIfD_7UnciN4MdminT5BRDEKCyubJBGf8RsSOd2hs9s,78864
+flood_adapt/adapter/sfincs_offshore.py,sha256=DkqGwx0Fx4dojY1YH8tW3MUS4Omgd5DC6QINEsTP0Uk,7659
 flood_adapt/adapter/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/adapter/interface/hazard_adapter.py,sha256=S2NIUAMSRgxC_E-tZRJ2qIP06U1zEVdn-MnvMTrn86s,2828
 flood_adapt/adapter/interface/impact_adapter.py,sha256=WK_r0KBBR-Z6Yiys0dqtOVbFIsqEjr3aWBuZkb9zN5Y,1428
@@ -76,22 +76,22 @@ flood_adapt/database_builder/templates/infometrics/US_NSI/without_SVI/infographi
 flood_adapt/database_builder/templates/infometrics/US_NSI/without_SVI/infographic_metrics_config_risk.toml,sha256=VLO7NRWTPzYRj3jYDb_mImPTppSm8Lh1ajCdNPuyc4U,2045
 flood_adapt/database_builder/templates/output_layers/bin_colors.toml,sha256=yN3_h2IimOyjtfhZ-ZoWyNa-2cAeFRNlbvaNTLhEMfA,417
 flood_adapt/dbs_classes/__init__.py,sha256=J-a6BEkjDhuUzzRKuAn_AtTg_D9wNIsmY3BnVTiC2JA,731
-flood_adapt/dbs_classes/database.py,sha256=xtdV-tqfJ26lTtp-K7fC1PhaSUFY_qfcfyIYh0gIp9Q,23583
-flood_adapt/dbs_classes/dbs_benefit.py,sha256=BbEdx3_sNzqPu4T3AUwiDdf9OnbEtIb-sQui-dYpgLU,2671
-flood_adapt/dbs_classes/dbs_event.py,sha256=7fxlJFih5qrKuqpBlcQ1mYOHCfWyLJytEuu5JkBDNrc,1885
-flood_adapt/dbs_classes/dbs_measure.py,sha256=nEmq1kinc4l5d4LIxguzuXvCVYrWvFxX8maak8wIggw,4087
+flood_adapt/dbs_classes/database.py,sha256=oR0aC2HRsGGe0pwFrPtPAzXxfv_lqtTdjY9UrS9wwtU,23409
+flood_adapt/dbs_classes/dbs_benefit.py,sha256=ayEYz8ga49HLdYuUsDWZOuZnpRnBpTuyhvfe2IyWAKI,1825
+flood_adapt/dbs_classes/dbs_event.py,sha256=ak3kHan6L1EfC8agDLKiCe8gaY5leOmj_qUBsI61q9A,1869
+flood_adapt/dbs_classes/dbs_measure.py,sha256=vVs-LtnHJN7eSGIFUglJdpbtfq_QI_Ftkv4lh5mfnNM,4085
 flood_adapt/dbs_classes/dbs_projection.py,sha256=lyiU_ctP2ixK28RKnBN6mVJbOuaDsWCj1y6-MHlyi_k,1078
-flood_adapt/dbs_classes/dbs_scenario.py,sha256=hUvfGHw2LKmTFz2QeRijmTaalFrYap0gPK5QkNzuZfQ,4833
-flood_adapt/dbs_classes/dbs_static.py,sha256=0q72yCe03L4ibPVikQjuOjSdwgP66DQMbio3zj8UJlw,10550
-flood_adapt/dbs_classes/dbs_strategy.py,sha256=Pin0SXukdIdNwDBuM0XtqNsWUpM-gMoYy-ZfYNIs9Hw,4928
-flood_adapt/dbs_classes/dbs_template.py,sha256=CTjDijAWjbs3u9wwFKigAfVlDZnduTtYDTFD_b78m4w,10384
+flood_adapt/dbs_classes/dbs_scenario.py,sha256=LHWx3Dr1XR47bPyPRkR70h3VcT0f0MVgB-R8V_G_O04,3993
+flood_adapt/dbs_classes/dbs_static.py,sha256=KPKjz7xyzjn6yqVvfEHlzW7Wnqi_DmSkFhC9l4hEAr4,10557
+flood_adapt/dbs_classes/dbs_strategy.py,sha256=qiEObHZeYL93GmdjSiGQls1ZmxdMZPkRkwzHgmoYwyE,4856
+flood_adapt/dbs_classes/dbs_template.py,sha256=b2x2sWNYTnaWU8Plgp51PFPrZGEv2kRRn9JBAgYhLbI,11578
 flood_adapt/dbs_classes/interface/database.py,sha256=kPHsmreB-vHaFD_FRXbP06tVs7pGxt4Rucim6aEqiKg,2550
 flood_adapt/dbs_classes/interface/element.py,sha256=XN3SjfEiAa4oZ61XJNnHkfKQu5Da42EH8PEkfosIJ9w,3528
 flood_adapt/dbs_classes/interface/static.py,sha256=amChHlParELA4vFMUn_kL1fx6z7fCFW-hJXBo7PGtbY,1588
 flood_adapt/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/misc/database_user.py,sha256=4PnXMNA0poQWWGc9FbmYAfJh5PhTMI3xzlCaIuP5wn4,546
 flood_adapt/misc/debug_timer.py,sha256=TUXsJSX62P66AQrf7rqpmd95EZECJVWGT7pHpuxNG0I,743
-flood_adapt/misc/exceptions.py,sha256=xLT1QnbjClftzYaxX5XdvVAkoI0q1CAsWJX901GB9JM,513
+flood_adapt/misc/exceptions.py,sha256=66lD9OlAfGadhbMN2t2C03KofzU_zOoVHnuEeDtSc0w,1827
 flood_adapt/misc/log.py,sha256=aK5uJch8p3a4Js4f79tO5AM9yZvNlGPjHYPsY5EuWbc,6898
 flood_adapt/misc/path_builder.py,sha256=sLhvk3tq-QzI3fFjdzckpBYYZeuGyHBbuI0R98Tqud8,1396
 flood_adapt/misc/utils.py,sha256=-wOWgbDqswwGVYJARKfq-3L7DIs4OIHfrze5g3-qapU,5588
@@ -134,8 +134,8 @@ flood_adapt/objects/strategies/strategies.py,sha256=Jw-WJDCamL9p_7VEir3AdmYPMVAi
 flood_adapt/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/workflows/benefit_runner.py,sha256=VtYt0sHFymNyErpzOtuN55cKJGVm5hT2a_Qzprg6T88,21786
 flood_adapt/workflows/scenario_runner.py,sha256=9_Y6GmMYhYoTRkBUIlju0eBy6DosGf4Zl2tgu1QEubI,4119
-flood_adapt-1.0.4.dist-info/LICENSE,sha256=Ui5E03pQ0EVKxvKA54lTPA1xrtgA2HMGLQai95eOzoE,36321
-flood_adapt-1.0.4.dist-info/METADATA,sha256=Eb02xNPlDolOPVGRx6g8RvqI8CTiH2YS2KCbUK3_qvg,53259
-flood_adapt-1.0.4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-flood_adapt-1.0.4.dist-info/top_level.txt,sha256=JvzMi6cTcQPEThCfpgMEeVny3ghI1urSH0CCgVIqSzw,12
-flood_adapt-1.0.4.dist-info/RECORD,,
+flood_adapt-1.0.6.dist-info/LICENSE,sha256=Ui5E03pQ0EVKxvKA54lTPA1xrtgA2HMGLQai95eOzoE,36321
+flood_adapt-1.0.6.dist-info/METADATA,sha256=FvbH5BpNMV_cXv23oWzPC2APQvSzPmGBwQKZjyBIFGY,53209
+flood_adapt-1.0.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+flood_adapt-1.0.6.dist-info/top_level.txt,sha256=JvzMi6cTcQPEThCfpgMEeVny3ghI1urSH0CCgVIqSzw,12
+flood_adapt-1.0.6.dist-info/RECORD,,