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

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

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

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

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

{flood_adapt-0.3.0 → flood_adapt-0.3.1}/flood_adapt/dbs_classes/database.py

@@ -2,9 +2,8 @@ import gc
 import os
 import shutil
 import time
-from datetime import datetime
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any, Literal, Optional, Union
 
 import geopandas as gpd
 import numpy as np
@@ -566,7 +565,12 @@ class Database(IDatabase):
             gdfs[label] = gdfs[label].to_crs(4326)
         return gdfs
 
-    def get_object_list(self, object_type: str) -> dict[str, Any]:
+    def get_object_list(
+        self,
+        object_type: Literal[
+            "projections", "events", "measures", "strategies", "scenarios", "benefits"
+        ],
+    ) -> dict[str, Any]:
         """Get a dictionary with all the toml paths and last modification dates that exist in the database that correspond to object_type.
 
         Parameters
@@ -579,20 +583,23 @@ class Database(IDatabase):
         dict[str, Any]
             Includes 'path' and 'last_modification_date' info
         """
-        paths = [
-            path / f"{path.name}.toml"
-            for path in list((self.input_path / object_type).iterdir())
-        ]
-        last_modification_date = [
-            datetime.fromtimestamp(file.stat().st_mtime) for file in paths
-        ]
-
-        objects = {
-            "path": paths,
-            "last_modification_date": last_modification_date,
-        }
-
-        return objects
+        match object_type:
+            case "projections":
+                return self.projections.list_objects()
+            case "events":
+                return self.events.list_objects()
+            case "measures":
+                return self.measures.list_objects()
+            case "strategies":
+                return self.strategies.list_objects()
+            case "scenarios":
+                return self.scenarios.list_objects()
+            case "benefits":
+                return self.benefits.list_objects()
+            case _:
+                raise ValueError(
+                    f"Object type '{object_type}' is not valid. Must be one of 'projections', 'events', 'measures', 'strategies' or 'scenarios'."
+                )
 
     def has_run_hazard(self, scenario_name: str) -> None:
         """Check if there is already a simulation that has the exact same hazard component.

{flood_adapt-0.3.0 → flood_adapt-0.3.1}/flood_adapt/dbs_classes/dbs_event.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Any
 
 from flood_adapt.dbs_classes.dbs_template import DbsTemplate
 from flood_adapt.objects.events.event_factory import EventFactory
@@ -34,20 +33,6 @@ class DbsEvent(DbsTemplate[Event]):
         # Load event
         return EventFactory.load_file(event_path)
 
-    def list_objects(self) -> dict[str, list[Any]]:
-        """Return a dictionary with info on the events that currently exist in the database.
-
-        Returns
-        -------
-        dict[str, Any]
-            Includes 'name', 'description', 'path' and 'last_modification_date' info
-        """
-        events = self._get_object_list()
-        objects = [self.get(name) for name in events["name"]]
-        events["description"] = [obj.description for obj in objects]
-        events["objects"] = objects
-        return events
-
     def _check_standard_objects(self, name: str) -> bool:
         """Check if an event is a standard event.
 

{flood_adapt-0.3.0 → flood_adapt-0.3.1}/flood_adapt/dbs_classes/dbs_measure.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from typing import Any
 
 import geopandas as gpd
@@ -26,9 +27,15 @@ class DbsMeasure(DbsTemplate[Measure]):
         Measure
             measure object
         """
-        measure_path = self.input_path / name / f"{name}.toml"
-        measure = MeasureFactory.get_measure_object(measure_path)
-        return measure
+        # 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 ValueError(f"{self.display_name}: '{name}' does not exist.")
+
+        # Load and return the object
+        return MeasureFactory.get_measure_object(full_path)
 
     def list_objects(self) -> dict[str, list[Any]]:
         """Return a dictionary with info on the measures that currently exist in the database.
@@ -39,14 +46,15 @@ class DbsMeasure(DbsTemplate[Measure]):
             Includes 'name', 'description', 'path' and 'last_modification_date' info
         """
         measures = self._get_object_list()
-        objects = [MeasureFactory.get_measure_object(path) for path in measures["path"]]
+        objects = [self.get(name) for name in measures["name"]]
+
         measures["description"] = [obj.description for obj in objects]
         measures["objects"] = objects
 
         geometries = []
-        for path, obj in zip(measures["path"], objects):
+        for obj in objects:
             # If polygon is used read the polygon file
-            if obj.polygon_file:
+            if hasattr(obj, "polygon_file") and obj.polygon_file:
                 src_path = resolve_filepath(
                     object_dir=self.dir_name,
                     obj_name=obj.name,
@@ -54,7 +62,7 @@ class DbsMeasure(DbsTemplate[Measure]):
                 )
                 geometries.append(gpd.read_file(src_path))
             # If aggregation area is used read the polygon from the aggregation area name
-            elif obj.aggregation_area_name:
+            elif hasattr(obj, "aggregation_area_name") and obj.aggregation_area_name:
                 if (
                     obj.aggregation_area_type
                     not in self._database.static.get_aggregation_areas()

{flood_adapt-0.3.0 → flood_adapt-0.3.1}/flood_adapt/dbs_classes/dbs_template.py

@@ -60,10 +60,9 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
         object_list = self._get_object_list()
 
         # Load all objects
-        objects = [self._object_class.load_file(path) for path in object_list["path"]]
+        objects = [self.get(name) for name in object_list["name"]]
 
-        # From the loaded objects, get the name and description and add them to the object_list
-        object_list["name"] = [obj.name for obj in objects]
+        # From the loaded objects, get the description and add them to the object_list
         object_list["description"] = [obj.description for obj in objects]
         object_list["objects"] = objects
         return object_list
@@ -248,7 +247,7 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
         Returns
         -------
         dict[str, Any]
-            A dictionary that contains the keys: `name` to 'path' and 'last_modification_date'
+            A dictionary that contains the keys: `name` to `path` and `last_modification_date`
             Each key has a list of the corresponding values, where the index of the values corresponds to the same object.
         """
         # If the toml doesnt exist, we might be in the middle of saving a new object or could be a broken object.

{flood_adapt-0.3.0 → flood_adapt-0.3.1}/flood_adapt/objects/events/events.py

@@ -200,7 +200,7 @@ class Event(Object):
                     f"Allowed sources are: {allowed_sources}"
                 )
 
-        if Settings().validate_allowed_forcings:
+        if Settings().validate_allowed_forcings and hasattr(self, "ALLOWED_FORCINGS"):
             # Validate forcings
             for _, concrete_forcings in self.forcings.items():
                 for concrete_forcing in concrete_forcings:

{flood_adapt-0.3.0 → flood_adapt-0.3.1}/flood_adapt/objects/forcing/timeseries.py

@@ -331,15 +331,21 @@ class BlockTimeseries(SyntheticTimeseries):
             end=(REFERENCE_TIME + self.end_time.to_timedelta()),
             freq=time_step,
         )
-        ts = np.zeros((len(tt),)) + self.peak_value.value
+        if self.peak_value:
+            height_value = self.peak_value.value
+        elif self.cumulative:
+            area = self.cumulative.value
+            base = self.duration.convert(
+                us.UnitTypesTime.hours
+            )  # always expect duration in hours
+            height_value = area / base
+
+        ts = np.zeros((len(tt),)) + height_value
         return ts
 
     @model_validator(mode="after")
     def validate_attrs(self):
-        if not self.peak_value:
-            raise ValueError(
-                f"{self.__class__.__name__} must have `peak_value` specified. {self.peak_value}"
-            )
+        # either peak_value or cumulative must be set, which is already checked in the parent class: `either_value_or_cumulative`
         return self
 
 
@@ -355,17 +361,26 @@ class TriangleTimeseries(SyntheticTimeseries):
             freq=time_step,
         )
         tt_seconds = (tt - REFERENCE_TIME).total_seconds()
+        peak_time = self.peak_time.to_timedelta().total_seconds()
+        start_time = self.start_time.to_timedelta().total_seconds()
+
+        if self.peak_value:
+            height_value = self.peak_value.value
+        elif self.cumulative:
+            area = self.cumulative.value
+            base = self.duration.convert(
+                us.UnitTypesTime.hours
+            )  # always expect duration in hours
+            height_value = (2 * area) / base
 
         ascending_slope = (
-            self.peak_value.value
+            height_value
             / (self.peak_time - self.start_time).to_timedelta().total_seconds()
         )
         descending_slope = (
-            -self.peak_value.value
+            -height_value
             / (self.end_time - self.peak_time).to_timedelta().total_seconds()
         )
-        peak_time = self.peak_time.to_timedelta().total_seconds()
-        start_time = self.start_time.to_timedelta().total_seconds()
 
         ts = np.piecewise(
             tt_seconds,
@@ -373,7 +388,7 @@ class TriangleTimeseries(SyntheticTimeseries):
             [
                 lambda x: np.maximum(ascending_slope * (x - start_time), 0),
                 lambda x: np.maximum(
-                    descending_slope * (x - peak_time) + self.peak_value.value, 0
+                    descending_slope * (x - peak_time) + height_value, 0
                 ),
                 0,
             ],
@@ -382,10 +397,7 @@ class TriangleTimeseries(SyntheticTimeseries):
 
     @model_validator(mode="after")
     def validate_attrs(self):
-        if not self.peak_value:
-            raise ValueError(
-                f"{self.__class__.__name__} must have `peak_value` specified. {self.peak_value}"
-            )
+        # either peak_value or cumulative must be set, which is already checked in the parent class: `either_value_or_cumulative`
         return self
 
 
@@ -549,4 +561,4 @@ class TimeseriesFactory:
 
     @staticmethod
     def from_object(obj: SyntheticTimeseries) -> SyntheticTimeseries:
-        return TimeseriesFactory.from_args(**obj.model_dump())
+        return TimeseriesFactory.from_args(**obj.model_dump(exclude_none=True))

{flood_adapt-0.3.0 → flood_adapt-0.3.1}/flood_adapt.egg-info/PKG-INFO

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

{flood_adapt-0.3.0 → flood_adapt-0.3.1}/pyproject.toml

@@ -99,12 +99,12 @@ timeout = 600 # hard max of 10 minutes per test to avoid hanging tests
 timeout_func_only = true # only timeout the test function, not the setup/teardown
 
 ### pixi ###
+[tool.pixi.pypi-dependencies]
+flood_adapt = {path = "."}
+
 [tool.pixi.feature.dev.pypi-dependencies]
 flood_adapt = {path = ".", editable = true }
 
-[tool.pixi.feature.build.pypi-dependencies]
-flood_adapt = {path = "."}
-
 [tool.pixi.feature.py312.dependencies]
 python = "3.12.*"