flood-adapt 1.0.1__tar.gz → 1.0.3__tar.gz

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 1.0.1
+Version: 1.0.3
 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: ====================================================

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/flood_adapt/__init__.py

@@ -1,5 +1,5 @@
 # has to be here at the start to avoid circular imports
-__version__ = "1.0.1"
+__version__ = "1.0.3"
 
 from flood_adapt import adapter, database_builder, dbs_classes, objects
 from flood_adapt.config.config import Settings

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/flood_adapt/adapter/sfincs_adapter.py

@@ -168,24 +168,7 @@ class SfincsAdapter(IHazardAdapter):
 
     def has_run(self, scenario: Scenario) -> bool:
         """Check if the model has been run."""
-        event = self.database.events.get(scenario.event)
-        if event.mode == Mode.risk:
-            sim_paths = [
-                self._get_simulation_path(scenario, sub_event=sub_event)
-                for sub_event in event.sub_events
-            ]
-            if not all(sim_path.exists() for sim_path in sim_paths):
-                # simpaths dont exist, so check if the output files are still there
-                return self.run_completed(scenario)
-            else:
-                return all(self.sfincs_completed(sim_path) for sim_path in sim_paths)
-        else:
-            if not self._get_simulation_path(scenario).exists():
-                # simpath doesnt exist, so check if the output files are still there
-                return self.run_completed(scenario)
-            else:
-                # Check if the simulation folder exists
-                return self.sfincs_completed(self._get_simulation_path(scenario))
+        return self.run_completed(scenario)
 
     def execute(self, path: Path, strict: bool = True) -> bool:
         """
@@ -513,10 +496,9 @@ class SfincsAdapter(IHazardAdapter):
         bool : True if all flood maps exist, False otherwise.
 
         """
-        any_floodmap = len(self._get_flood_map_paths(scenario)) > 0
-        all_exist = all(
-            floodmap.exists() for floodmap in self._get_flood_map_paths(scenario)
-        )
+        paths = self._get_flood_map_paths(scenario)
+        any_floodmap = len(paths) > 0
+        all_exist = all(floodmap.exists() for floodmap in paths)
         return any_floodmap and all_exist
 
     def sfincs_completed(self, sim_path: Path) -> bool:

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/flood_adapt/database_builder/database_builder.py

@@ -5,10 +5,8 @@ import math
 import os
 import re
 import shutil
-import time
 import warnings
 from enum import Enum
-from functools import wraps
 from pathlib import Path
 from typing import Optional, Union
 from urllib.request import urlretrieve
@@ -74,6 +72,7 @@ from flood_adapt.config.site import (
     StandardObjectModel,
 )
 from flood_adapt.dbs_classes.database import Database
+from flood_adapt.misc.debug_timer import debug_timer
 from flood_adapt.misc.log import FloodAdaptLogging
 from flood_adapt.misc.utils import modified_environ
 from flood_adapt.objects.events.event_set import EventSet
@@ -92,27 +91,6 @@ from flood_adapt.objects.strategies.strategies import Strategy
 logger = FloodAdaptLogging.getLogger("DatabaseBuilder")
 
 
-def debug_timer(func):
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        logger = FloodAdaptLogging.getLogger("DatabaseBuilder")  # No forced log level
-        if logger.isEnabledFor(logging.DEBUG):
-            logger.debug(f"Started '{func.__name__}'")
-            start_time = time.perf_counter()
-
-            result = func(*args, **kwargs)
-
-            end_time = time.perf_counter()
-            elapsed = end_time - start_time
-            logger.debug(f"Finished '{func.__name__}' in {elapsed:.4f} seconds")
-        else:
-            result = func(*args, **kwargs)
-
-        return result
-
-    return wrapper
-
-
 def path_check(str_path: str, config_path: Optional[Path] = None) -> str:
     """Check if the given path is absolute and return the absolute path.
 

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/flood_adapt/dbs_classes/dbs_static.py

@@ -227,6 +227,7 @@ class DbsStatic(IDbsStatic):
         """
         return self.get_fiat_model().get_property_types()
 
+    @cache_method_wrapper
     def get_hazard_models(self) -> list[IHazardAdapter]:
         """Get the hazard models from the database.
 
@@ -237,6 +238,7 @@ class DbsStatic(IDbsStatic):
         """
         return [self.get_overland_sfincs_model()]
 
+    @cache_method_wrapper
     def get_impact_models(self) -> list[IImpactAdapter]:
         """Get the impact models from the database.
 
@@ -247,6 +249,7 @@ class DbsStatic(IDbsStatic):
         """
         return [self.get_fiat_model()]
 
+    @cache_method_wrapper
     def get_overland_sfincs_model(self) -> SfincsAdapter:
         """Get the template offshore SFINCS model."""
         overland_path = (
@@ -257,6 +260,7 @@ class DbsStatic(IDbsStatic):
         with SfincsAdapter(model_root=overland_path) as overland_model:
             return overland_model
 
+    @cache_method_wrapper
     def get_offshore_sfincs_model(self) -> SfincsAdapter:
         """Get the template overland Sfincs model."""
         if self._database.site.sfincs.config.offshore_model is None:
@@ -270,6 +274,7 @@ class DbsStatic(IDbsStatic):
         with SfincsAdapter(model_root=offshore_path) as offshore_model:
             return offshore_model
 
+    @cache_method_wrapper
     def get_fiat_model(self) -> FiatAdapter:
         """Get the path to the FIAT model."""
         if self._database.site.fiat is None:

flood_adapt-1.0.3/flood_adapt/misc/debug_timer.py

@@ -0,0 +1,26 @@
+import logging
+import time
+from functools import wraps
+
+from flood_adapt.misc.log import FloodAdaptLogging
+
+
+def debug_timer(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        _logger = FloodAdaptLogging.getLogger()  # No forced log level
+        if _logger.isEnabledFor(logging.DEBUG):
+            _logger.debug(f"Started '{func.__name__}'")
+            start_time = time.perf_counter()
+
+            result = func(*args, **kwargs)
+
+            end_time = time.perf_counter()
+            elapsed = end_time - start_time
+            _logger.debug(f"Finished '{func.__name__}' in {elapsed:.4f} seconds")
+        else:
+            result = func(*args, **kwargs)
+
+        return result
+
+    return wrapper

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/flood_adapt/objects/forcing/timeseries.py

@@ -527,6 +527,14 @@ class TimeseriesFactory:
                     fill_value=fill_value,
                 )
             case ShapeType.scs:
+                if scs_file_name is None or scs_type is None:
+                    from flood_adapt.dbs_classes.database import Database
+
+                    scs_config = Database().site.sfincs.scs
+                    if scs_config is None:
+                        raise ValueError("SCS configuration not found in database.")
+                    scs_file_name = scs_file_name or scs_config.file
+                    scs_type = scs_type or scs_config.type
                 return ScsTimeseries(
                     duration=duration,
                     peak_time=peak_time,

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/flood_adapt/workflows/scenario_runner.py

@@ -17,15 +17,28 @@ class ScenarioRunner:
         self.site_info = self._database.site
         self.results_path = self._database.scenarios.output_path / self._scenario.name
 
+        self._event = None
+        self._projection = None
+        self._strategy = None
+
+        self._hazard_models = None
+        self._impact_models = None
+
     @property
     def impact_models(self):
         """Return the list of impact models."""
-        return self._database.static.get_impact_models()
+        if self._impact_models is not None:
+            return self._impact_models
+        self._impact_models = self._database.static.get_impact_models()
+        return self._impact_models
 
     @property
     def hazard_models(self):
         """Return the list of hazard models."""
-        return self._database.static.get_hazard_models()
+        if self._hazard_models is not None:
+            return self._hazard_models
+        self._hazard_models = self._database.static.get_hazard_models()
+        return self._hazard_models
 
     def _load_objects(self, scenario: Scenario) -> None:
         """Load objects from the database."""

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/flood_adapt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 1.0.1
+Version: 1.0.3
 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: ====================================================

{flood_adapt-1.0.1 → flood_adapt-1.0.3}/flood_adapt.egg-info/SOURCES.txt

@@ -99,6 +99,7 @@ flood_adapt/dbs_classes/interface/element.py
 flood_adapt/dbs_classes/interface/static.py
 flood_adapt/misc/__init__.py
 flood_adapt/misc/database_user.py
+flood_adapt/misc/debug_timer.py
 flood_adapt/misc/exceptions.py
 flood_adapt/misc/log.py
 flood_adapt/misc/path_builder.py