eflips-depot 4.13.2__tar.gz → 4.13.3__tar.gz

{eflips_depot-4.13.2 → eflips_depot-4.13.3}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.13.2
+Version: 4.13.3
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth
 Author-email: enrico.lauth@tu-berlin.de
-Requires-Python: >=3.10,<3.14
+Requires-Python: >=3.11,<3.14
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{eflips_depot-4.13.2 → eflips_depot-4.13.3}/eflips/depot/__init__.py

@@ -95,8 +95,3 @@ class UnstableSimulationException(Exception):
             f"The following blocks/rotations require a new vehicle. This suggests an unstable "
             f" simulation result, where a repeated schedule might require more vehicles: {trip_names}"
         )
-
-
-class MultipleErrors(Exception):
-    def __init__(self, errors):
-        self.errors = errors

{eflips_depot-4.13.2 → eflips_depot-4.13.3}/eflips/depot/api/__init__.py

@@ -60,7 +60,6 @@ from eflips.depot import (
     SimulationHost,
     UnstableSimulationException,
     DelayedTripException,
-    MultipleErrors,
 )
 from eflips.depot.api.private.consumption import ConsumptionResult
 from eflips.depot.api.private.consumption import (
@@ -640,29 +639,20 @@ def simulate_scenario(
         try:
             add_evaluation_to_database(scenario, ev, session)
 
-        except MultipleErrors as e:
-            if e.errors:
-                for error in e.errors:
-                    if (
-                        isinstance(error, DelayedTripException)
-                        and not ignore_delayed_trips
-                    ):
-                        logger.error(
-                            "There are delayed trips in the simulation. "
-                            "Please check the input data and try again."
-                        )
-                        raise error
-                    if (
-                        isinstance(error, UnstableSimulationException)
-                        and not ignore_unstable_simulation
-                    ):
-                        logger.error(
-                            "Simulation became unstable. "
-                            "Please check the input data and try again."
-                        )
-                        raise error
-
-                    logger.warning("An error occurred during the simulation: %s", error)
+        except* DelayedTripException as delay_exp:
+            if not ignore_delayed_trips:
+                logger.error(
+                    "There are delayed trips in the simulation. "
+                    "Please check the input data and try again."
+                )
+                raise delay_exp
+        except* UnstableSimulationException as unstable_exp:
+            if not ignore_unstable_simulation:
+                logger.error(
+                    "The simulation became unstable. "
+                    "Please check the input data and try again."
+                )
+                raise unstable_exp
 
         match smart_charging_strategy:
             case SmartChargingStrategy.NONE:
@@ -1104,7 +1094,9 @@ def add_evaluation_to_database(
             errors.append(unstable_exp)
 
         if len(errors) > 0:
-            raise MultipleErrors(errors)
+            raise ExceptionGroup(
+                "Simulation is either unstable or including delayed blocks", errors
+            )
 
 
 def generate_depot_optimal_size(

{eflips_depot-4.13.2 → eflips_depot-4.13.3}/eflips/depot/api/private/depot.py

@@ -27,6 +27,8 @@ from eflips.model import (
 from sqlalchemy import or_
 from sqlalchemy.orm import Session
 
+from eflips.depot import UnstableSimulationException, DelayedTripException
+
 
 class MissingVehicleDimensionError(ValueError):
     pass
@@ -1091,14 +1093,15 @@ def depot_smallest_possible_size(
 
                 except MissingVehicleDimensionError as e:
                     raise e
-                except Exception as e:
+                except UnstableSimulationException as e:
                     # This change is made after Unstable exception and delay exceptions are introduced
-                    if (
-                        "which suggests the fleet or the infrastructure might not be enough for the full electrification. Please add charging interfaces or increase charging power ."
-                        in repr(e)
-                    ):
-                        logger.debug(f"Depot is too small.")
-                        continue
+                    logger.debug(
+                        f"Results are unstable, suggesting depot is too small."
+                    )
+                    continue
+                except DelayedTripException as e:
+                    logger.debug(f"Trips are delayed, suggesting depot is too small.")
+                    continue
                 finally:
                     inner_savepoint.rollback()
             savepoint.rollback()

{eflips_depot-4.13.2 → eflips_depot-4.13.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.13.2"
+version = "4.13.3"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",
@@ -12,7 +12,7 @@ repository = "https://github.com/mpm-tu-berlin/eflips-depot"
 packages = [{ include = "eflips/depot" }]
 
 [tool.poetry.dependencies]
-python = ">=3.10, <3.14"
+python = ">=3.11, <3.14"
 simpy = "^4.0.1"
 tqdm = "^4.67.0"