flood-adapt 0.3.4__py3-none-any.whl → 0.3.5__py3-none-any.whl

flood_adapt/__init__.py

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

flood_adapt/adapter/sfincs_adapter.py

@@ -176,9 +176,7 @@ class SfincsAdapter(IHazardAdapter):
             # No need to check postprocessing for risk scenarios
             return all(self.sfincs_completed(sim_path) for sim_path in sim_paths)
         else:
-            return self.sfincs_completed(
-                self._get_simulation_path(scenario)
-            ) and self.run_completed(scenario)
+            return self.sfincs_completed(self._get_simulation_path(scenario))
 
     def execute(self, path: Path, strict: bool = True) -> bool:
         """

flood_adapt/dbs_classes/dbs_benefit.py

@@ -59,27 +59,6 @@ class DbsBenefit(DbsTemplate[Benefit]):
         if output_path.exists():
             shutil.rmtree(output_path, ignore_errors=True)
 
-    def edit(self, benefit: Benefit):
-        """Edits an already existing benefit in the database.
-
-        Parameters
-        ----------
-        benefit : Benefit
-            benefit to be edited in the database
-
-        Raises
-        ------
-        ValueError
-            Raise error if name is already in use.
-        """
-        # Check if it is possible to edit the benefit.
-        super().edit(benefit)
-
-        # Delete output if edited
-        output_path = self.output_path / benefit.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_scenario.py

@@ -58,28 +58,6 @@ class DbsScenario(DbsTemplate[Scenario]):
         if (self.output_path / name).exists():
             shutil.rmtree(self.output_path / name, ignore_errors=False)
 
-    def edit(self, scenario: Scenario):
-        """Edits an already existing scenario in the database.
-
-        Parameters
-        ----------
-        scenario : Scenario
-            scenario to be edited in the database
-
-        Raises
-        ------
-        ValueError
-            Raise error if name is already in use.
-        """
-        # Check if it is possible to edit the scenario. This then also covers checking whether the
-        # scenario is already used in a higher level object. If this is the case, it cannot be edited.
-        super().edit(scenario)
-
-        # Delete output if edited
-        output_path = self.output_path / scenario.name
-        if output_path.exists():
-            shutil.rmtree(output_path, ignore_errors=True)
-
     def check_higher_level_usage(self, name: str) -> list[str]:
         """Check if a scenario is used in a benefit.
 

flood_adapt/dbs_classes/dbs_template.py

@@ -133,30 +133,6 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
             self.input_path / object_model.name / f"{object_model.name}.toml",
         )
 
-    def edit(self, object_model: T_OBJECTMODEL):
-        """Edit an already existing object in the database.
-
-        Parameters
-        ----------
-        object_model : Object
-            object to be edited in the database
-
-        Raises
-        ------
-        ValueError
-            Raise error if name is already in use.
-        """
-        # Check if the object exists
-        if object_model.name not in self.summarize_objects()["name"]:
-            raise ValueError(
-                f"{self.display_name}: '{object_model.name}' does not exist. You cannot edit an {self.display_name.lower()} that does not exist."
-            )
-
-        # Check if it is possible to delete the object by saving with overwrite. This then
-        # also covers checking whether the object is a standard object, is already used in
-        # a higher level object. If any of these are the case, it cannot be deleted.
-        self.save(object_model, overwrite=True)
-
     def delete(self, name: str, toml_only: bool = False):
         """Delete an already existing object in the database.
 

flood_adapt/dbs_classes/interface/element.py

@@ -85,22 +85,6 @@ class AbstractDatabaseElement(ABC, Generic[T_OBJECT_MODEL]):
         """
         pass
 
-    @abstractmethod
-    def edit(self, object_model: T_OBJECT_MODEL):
-        """Edits an already existing object in the database.
-
-        Parameters
-        ----------
-        object : IObject
-            object to be edited in the database
-
-        Raises
-        ------
-        ValueError
-            Raise error if name is already in use.
-        """
-        pass
-
     @abstractmethod
     def delete(self, name: str, toml_only: bool = False):
         """Delete an already existing object in the database.

flood_adapt/flood_adapt.py

@@ -129,6 +129,8 @@ class FloodAdapt:
         ----------
         measure : Measure
             The measure object to save.
+        overwrite : bool, optional
+            Whether to overwrite an existing measure with the same name (default is False).
 
         Raises
         ------
@@ -137,21 +139,6 @@ class FloodAdapt:
         """
         self.database.measures.save(measure, overwrite=overwrite)
 
-    def edit_measure(self, measure: Measure) -> None:
-        """Edit a measure object in the database.
-
-        Parameters
-        ----------
-        measure : Measure
-            The measure object to edit.
-
-        Raises
-        ------
-        ValueError
-            If the measure object does not exist.
-        """
-        self.database.measures.edit(measure)
-
     def delete_measure(self, name: str) -> None:
         """Delete an measure from the database.
 
@@ -253,7 +240,7 @@ class FloodAdapt:
         """
         return Strategy(**attrs)
 
-    def save_strategy(self, strategy: Strategy) -> None:
+    def save_strategy(self, strategy: Strategy, overwrite: bool = False) -> None:
         """
         Save a strategy object to the database.
 
@@ -261,6 +248,8 @@ class FloodAdapt:
         ----------
         strategy : Strategy
             The strategy object to save.
+        overwrite : bool, optional
+            Whether to overwrite an existing strategy with the same name (default is False).
 
         Raises
         ------
@@ -268,7 +257,7 @@ class FloodAdapt:
             If the strategy object is not valid.
             If the strategy object already exists.
         """
-        self.database.strategies.save(strategy)
+        self.database.strategies.save(strategy, overwrite=overwrite)
 
     def delete_strategy(self, name: str) -> None:
         """
@@ -368,36 +357,22 @@ class FloodAdapt:
         """
         return EventSet(**attrs, sub_events=sub_events)
 
-    def save_event(self, event: Event) -> None:
+    def save_event(self, event: Event, overwrite: bool = False) -> None:
         """Save an event object to the database.
 
         Parameters
         ----------
         event : Event
             The event object to save.
+        overwrite : bool, optional
+            Whether to overwrite an existing event with the same name (default is False).
 
         Raises
         ------
         ValueError
             If the event object is not valid.
         """
-        self.database.events.save(event)
-
-    def edit_event(self, event: Event) -> None:
-        """Edit an event object in the database.
-
-        Parameters
-        ----------
-        event : Event
-            The event object to edit.
-
-        Raises
-        ------
-        ValueError
-            If the event object does not exist.
-            If the event is used in a scenario.
-        """
-        self.database.events.edit(event)
+        self.database.events.save(event, overwrite=overwrite)
 
     def delete_event(self, name: str) -> None:
         """Delete an event from the database.
@@ -519,35 +494,22 @@ class FloodAdapt:
         """
         return Projection(**attrs)
 
-    def save_projection(self, projection: Projection) -> None:
+    def save_projection(self, projection: Projection, overwrite: bool = False) -> None:
         """Save a projection object to the database.
 
         Parameters
         ----------
         projection : Projection
             The projection object to save.
+        overwrite : bool, optional
+            Whether to overwrite an existing projection with the same name (default is False).
 
         Raises
         ------
         ValueError
             If the projection object is not valid.
         """
-        self.database.projections.save(projection)
-
-    def edit_projection(self, projection: Projection) -> None:
-        """Edit a projection object in the database.
-
-        Parameters
-        ----------
-        projection : Projection
-            The projection object to edit.
-
-        Raises
-        ------
-        ValueError
-            If the projection object does not exist.
-        """
-        self.database.projections.edit(projection)
+        self.database.projections.save(projection, overwrite=overwrite)
 
     def delete_projection(self, name: str) -> None:
         """Delete a projection from the database.
@@ -676,13 +638,17 @@ class FloodAdapt:
         """
         return Scenario(**attrs)
 
-    def save_scenario(self, scenario: Scenario) -> tuple[bool, str]:
+    def save_scenario(
+        self, scenario: Scenario, overwrite: bool = False
+    ) -> tuple[bool, str]:
         """Save the scenario to the database.
 
         Parameters
         ----------
         scenario : Scenario
             The scenario to save.
+        overwrite : bool, optional
+            Whether to overwrite an existing scenario with the same name (default is False).
 
         Returns
         -------
@@ -692,26 +658,11 @@ class FloodAdapt:
             The error message if the scenario was not saved successfully.
         """
         try:
-            self.database.scenarios.save(scenario)
+            self.database.scenarios.save(scenario, overwrite=overwrite)
             return True, ""
         except Exception as e:
             return False, str(e)
 
-    def edit_scenario(self, scenario: Scenario) -> None:
-        """Edit a scenario object in the database.
-
-        Parameters
-        ----------
-        scenario : Scenario
-            The scenario object to edit.
-
-        Raises
-        ------
-        ValueError
-            If the scenario object does not exist.
-        """
-        self.database.scenarios.edit(scenario)
-
     def delete_scenario(self, name: str) -> None:
         """Delete a scenario from the database.
 
@@ -1137,35 +1088,22 @@ class FloodAdapt:
         """
         return Benefit(**attrs)
 
-    def save_benefit(self, benefit: Benefit) -> None:
+    def save_benefit(self, benefit: Benefit, overwrite: bool = False) -> None:
         """Save a benefit object to the database.
 
         Parameters
         ----------
         benefit : Benefit
             The benefit object to save.
+        overwrite : bool, optional
+            Whether to overwrite an existing benefit with the same name (default is False).
 
         Raises
         ------
         ValueError
             If the benefit object is not valid.
         """
-        self.database.benefits.save(benefit)
-
-    def edit_benefit(self, benefit: Benefit) -> None:
-        """Edit a benefit object in the database.
-
-        Parameters
-        ----------
-        benefit : Benefit
-            The benefit object to edit.
-
-        Raises
-        ------
-        ValueError
-            If the benefit object does not exist.
-        """
-        self.database.benefits.edit(benefit)
+        self.database.benefits.save(benefit, overwrite=overwrite)
 
     def delete_benefit(self, name: str) -> None:
         """Delete a benefit object from the database.

flood_adapt/workflows/scenario_runner.py

@@ -46,7 +46,7 @@ class ScenarioRunner:
                 self._database.static.get_overland_sfincs_model(),
             ]
             for hazard in hazard_models:
-                if not hazard.has_run(self._scenario):
+                if not hazard.run_completed(self._scenario):
                     hazard.run(self._scenario)
                 else:
                     self.logger.info(

{flood_adapt-0.3.4.dist-info → flood_adapt-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 0.3.4
+Version: 0.3.5
 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:                     GNU GENERAL PUBLIC LICENSE

{flood_adapt-0.3.4.dist-info → flood_adapt-0.3.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
-flood_adapt/__init__.py,sha256=B1IfCCd6w29N12kO6nqmtAJO9ETh2cmQKY9X9pgB6SU,596
+flood_adapt/__init__.py,sha256=9v-B0hgeyWzNkjnCYPjau7NfQ6flGZHp-kTpY5uFEpU,596
 flood_adapt/database_builder.py,sha256=eq_LAqaGpV-KJkLNBVvXjyjFRDQaBFA5ubANiuVsZWU,420
-flood_adapt/flood_adapt.py,sha256=tBfkEnxFT7510rtTbZnPoQDVkMPcqcSRioa2fRML1Co,36032
+flood_adapt/flood_adapt.py,sha256=X71dxpCHC9PhwyrR0UmxVP-zFPpoZN3gh0O3UzlucCc,35137
 flood_adapt/adapter/__init__.py,sha256=C6XBZK8x4MHe3beeKa9rPbXn0-gBHPEPnTKn14C-5gI,249
 flood_adapt/adapter/fiat_adapter.py,sha256=2SYHzmW6z5L66S1qD4AlEeCW9deLfLi_h9K7HPFCYRY,57105
-flood_adapt/adapter/sfincs_adapter.py,sha256=fHew5cmY4Ni87tIyJbqWKUsVyfTYoGVbxLtoPRy_vU0,73119
+flood_adapt/adapter/sfincs_adapter.py,sha256=9KwfVLqGWFG5A-uVc5GULf7OTSgccSV88ZwLdKrRqOM,73056
 flood_adapt/adapter/sfincs_offshore.py,sha256=BBdeCYKKDweFla05aE1Q9Fr-eXY1VzxQEfE_74lR7B8,7600
 flood_adapt/adapter/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/adapter/interface/hazard_adapter.py,sha256=1yZUNTrT3dtrD_PTJfczVkjNVB9JcQr64Y4xYRtR-sc,2758
@@ -76,16 +76,16 @@ flood_adapt/database_builder/templates/infometrics/US_NSI/without_SVI/infographi
 flood_adapt/database_builder/templates/output_layers/bin_colors.toml,sha256=OXlAdFfu3S99qrxFqn_Xu6ZIZMvk-0_LQhdsj5q_rZk,412
 flood_adapt/dbs_classes/__init__.py,sha256=_8DX6dK62U1RjRKz0zOgM0yR-kiBlBxz2dLkCWylmXc,710
 flood_adapt/dbs_classes/database.py,sha256=3OfwLxRI5Ufq01PCMSbNoJjW92tTH-xCyFEoa3DTDqw,24419
-flood_adapt/dbs_classes/dbs_benefit.py,sha256=Fzm0eCWOPFLorKkk86Qzt4Wq0ZGJTh1vwJ5I6vm-6zQ,3096
+flood_adapt/dbs_classes/dbs_benefit.py,sha256=WgLXG37mrkIUq2cp8Y2ov2FYqxoGXHKe9h-7GnQd4Sw,2502
 flood_adapt/dbs_classes/dbs_event.py,sha256=lSTEQzmar5GhpZQ0060a-NodK-epCtSAjJmWHko-uok,2233
 flood_adapt/dbs_classes/dbs_measure.py,sha256=wfVo6hUHdgqffGxvvm5zdwZ5Jed6oCJGvFqdilYlEX0,3875
 flood_adapt/dbs_classes/dbs_projection.py,sha256=GXD8HcOcbH51sV5Eqh48NU1z1WNCxbQ9yCG-soDoim0,1658
-flood_adapt/dbs_classes/dbs_scenario.py,sha256=aXyS-swmEqtuJjstfgxgZfexn5-Gb2NEEeisPH3Pwxg,5414
+flood_adapt/dbs_classes/dbs_scenario.py,sha256=NHjiRdV5dxYUtXR6FRGZ9c9Vng2-w-F1-Nn50lNbxXM,4665
 flood_adapt/dbs_classes/dbs_static.py,sha256=DuspOpQ6WLdaM8foizQ09aTG3YXAp9svrzi4RAq8Jto,9051
 flood_adapt/dbs_classes/dbs_strategy.py,sha256=4I9JiiHq3SsRV_S6l3SBOsiJEEerjRoK5v9aAX8sS9Q,5329
-flood_adapt/dbs_classes/dbs_template.py,sha256=7yGmpAiM9Tls-gBdA2rODyc-lob3US9bQsVXCOGbUvk,10891
+flood_adapt/dbs_classes/dbs_template.py,sha256=EIe9UycVvcL45r8QVWHS7hijVeiZctmrch9QU2qT38Y,9938
 flood_adapt/dbs_classes/interface/database.py,sha256=StWp_f6iGyQosAI066CmZB6O55_UWmQ2JGJPUlw49j0,3338
-flood_adapt/dbs_classes/interface/element.py,sha256=3LJFb-WLVOogsMi-EpOMwzIp2p6Mra-ZKMNU-XSwTlk,3777
+flood_adapt/dbs_classes/interface/element.py,sha256=Zwi2dNhWBdZT7LAJxlxG_YdR9tj_Hu1t_t_E0jrt9-I,3407
 flood_adapt/dbs_classes/interface/static.py,sha256=3kLaWabSWKe7h8-SiBTJlr09sO8Ykbk4NIE5mrMoCp0,1225
 flood_adapt/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/misc/database_user.py,sha256=FUCjJSDW4oF1kcmXJkhRbGcHj896OztWFfkB7-bufiM,530
@@ -131,9 +131,9 @@ flood_adapt/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 flood_adapt/workflows/benefit_runner.py,sha256=hvCCJOzqe57kWJ1wQ-8dqBNP88sah0d1LPQYmy6M57c,19980
 flood_adapt/workflows/floodmap.py,sha256=6XatakhiZDkIi82VpRDb5dWtWAs-aSho8_iaCGph1_c,2932
 flood_adapt/workflows/impacts_integrator.py,sha256=Iq8namwu90SP_BTazUsDqROqOrJk7rGEyR6nA1Q7Vho,2330
-flood_adapt/workflows/scenario_runner.py,sha256=EY87fKjyWzwHaqV__xjQvdQDRxrmUwUyAHS68LnppO4,2908
-flood_adapt-0.3.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-flood_adapt-0.3.4.dist-info/METADATA,sha256=ms0ll4mZnLxE8RkMIESSSY1h6o_KUO4SGdCh1pYq0y4,51435
-flood_adapt-0.3.4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-flood_adapt-0.3.4.dist-info/top_level.txt,sha256=JvzMi6cTcQPEThCfpgMEeVny3ghI1urSH0CCgVIqSzw,12
-flood_adapt-0.3.4.dist-info/RECORD,,
+flood_adapt/workflows/scenario_runner.py,sha256=mjiOr1_0oxJGXhwhPOstZo-pmCm1PBcKNz57bmw2htc,2914
+flood_adapt-0.3.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+flood_adapt-0.3.5.dist-info/METADATA,sha256=z3buF6fmSdsnS9xpjOkbi_KSmu1ggoMUMZUmBDjYI4Q,51435
+flood_adapt-0.3.5.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+flood_adapt-0.3.5.dist-info/top_level.txt,sha256=JvzMi6cTcQPEThCfpgMEeVny3ghI1urSH0CCgVIqSzw,12
+flood_adapt-0.3.5.dist-info/RECORD,,