flood-adapt 0.3.1__tar.gz → 0.3.2__tar.gz

{flood_adapt-0.3.1 → flood_adapt-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 0.3.1
+Version: 0.3.2
 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>
 Project-URL: Source, https://github.com/Deltares-research/FloodAdapt
@@ -33,7 +33,6 @@ Requires-Dist: tomli<3.0,>=2.0
 Requires-Dist: tomli-w<2.0,>=1.0
 Provides-Extra: dev
 Requires-Dist: pytest<9.0,>=8.0; extra == "dev"
-Requires-Dist: pytest-timeout<3.0,>=2.0; extra == "dev"
 Requires-Dist: pytest-cov<7.0,>=6.0; extra == "dev"
 Requires-Dist: pre-commit==3.8.0; extra == "dev"
 Requires-Dist: ruff==0.5.5; extra == "dev"

{flood_adapt-0.3.1 → flood_adapt-0.3.2}/flood_adapt/__init__.py

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

{flood_adapt-0.3.1 → flood_adapt-0.3.2}/flood_adapt/config/fiat.py

@@ -198,18 +198,18 @@ class FiatModel(BaseModel):
 
     Attributes
     ----------
-    risk : RiskModel
-        Configuration of probabilistic risk runs.
+    risk : Optional[RiskModel]
+        Configuration of probabilistic risk runs. default=None
     config : FiatConfigModel
         Configuration for the FIAT model.
-    benefits : BenefitsModel
-        Configuration for running benefit calculations.
+    benefits : Optional[BenefitsModel]
+        Configuration for running benefit calculations. default=None
     """
 
-    risk: RiskModel
-
     config: FiatConfigModel
-    benefits: BenefitsModel
+
+    benefits: Optional[BenefitsModel] = None
+    risk: Optional[RiskModel] = None
 
     @staticmethod
     def read_toml(path: Path) -> "FiatModel":

{flood_adapt-0.3.1 → flood_adapt-0.3.2}/flood_adapt/config/site.py

@@ -26,8 +26,8 @@ class Site(BaseModel):
     ----------
     name : str
         Name of the site.
-    description : str, default=""
-        Description of the site.
+    description : str
+        Description of the site. Defaults to "".
     lat : float
         Latitude of the site.
     lon : float

{flood_adapt-0.3.1 → flood_adapt-0.3.2}/flood_adapt/database_builder/database_builder.py

@@ -379,6 +379,7 @@ class DatabaseBuilder:
 
     _has_roads: bool = False
     _aggregation_areas: Optional[list] = None
+    _probabilistic_set_name: Optional[str] = None
 
     def __init__(self, config: ConfigModel, overwrite: bool = True):
         self.config = config
@@ -579,19 +580,26 @@ class DatabaseBuilder:
     ### FIAT ###
     def create_fiat_model(self) -> FiatModel:
         fiat = FiatModel(
-            risk=self.create_risk_model(),
             config=self.create_fiat_config(),
             benefits=self.create_benefit_config(),
+            risk=self.create_risk_model(),
         )
         return fiat
 
-    def create_risk_model(self) -> RiskModel:
+    def create_risk_model(self) -> Optional[RiskModel]:
         # Check if return periods are provided
         if not self.config.return_periods:
-            risk = RiskModel()
-            self.logger.warning(
-                f"Return periods for risk calculations not provided. Default values of {risk.return_periods} will be used."
-            )
+            if self._probabilistic_set_name:
+                risk = RiskModel()
+                self.logger.warning(
+                    f"No return periods provided, but a probabilistic set is available. Using default return periods {risk.return_periods}."
+                )
+                return risk
+            else:
+                self.logger.warning(
+                    "No return periods provided and no probabilistic set available. Risk calculations will not be performed."
+                )
+                return None
         else:
             risk = RiskModel(return_periods=self.config.return_periods)
         return risk

{flood_adapt-0.3.1 → flood_adapt-0.3.2}/flood_adapt/dbs_classes/dbs_static.py

@@ -128,11 +128,9 @@ class DbsStatic(IDbsStatic):
         """
         # Read the map
         full_path = self._database.static_path / path
-        if full_path.is_file():
-            return gpd.read_file(full_path, engine="pyogrio").to_crs(4326)
-
-        # If the file is not found, throw an error
-        raise FileNotFoundError(f"File {full_path} not found")
+        if not full_path.is_file():
+            raise FileNotFoundError(f"File {full_path} not found")
+        return gpd.read_file(full_path, engine="pyogrio").to_crs(4326)
 
     @cache_method_wrapper
     def get_slr_scn_names(self) -> list: