eflips-depot 4.13.1__py3-none-any.whl → 4.13.3__py3-none-any.whl

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/api/__init__.py

@@ -32,7 +32,7 @@ from collections import OrderedDict
 from datetime import timedelta, datetime
 from enum import Enum
 from math import ceil
-from typing import Any, Dict, Optional, Union, List
+from typing import Any, Dict, Optional, Union
 
 import sqlalchemy.orm
 from eflips.model import (
@@ -51,6 +51,7 @@ from eflips.model import (
     ConsistencyWarning,
     Station,
 )
+from sqlalchemy import func
 from sqlalchemy.orm import Session
 
 import eflips.depot
@@ -59,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 (
@@ -639,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:
@@ -761,28 +752,15 @@ def init_simulation(
         .all()
     ]
 
-    first_departure_time = min(
-        [vehicle_schedule.departure for vehicle_schedule in vehicle_schedules]
-    )
-    last_arrival_time = max(
-        [vehicle_schedule.arrival for vehicle_schedule in vehicle_schedules]
-    )
-
-    # We take first arrival time as simulation start
-    total_duration = (last_arrival_time - first_departure_time).total_seconds()
-    schedule_duration_days = ceil(total_duration / (24 * 60 * 60))
-
-    if repetition_period is None and schedule_duration_days in [1, 2]:
-        repetition_period = timedelta(days=1)
-    elif repetition_period is None and schedule_duration_days in [7, 8]:
-        repetition_period = timedelta(weeks=1)
-    elif repetition_period is None:
-        raise ValueError(
-            "Could not automatically detect repetition period. Please specify manually."
-        )
+    if repetition_period is None:
+        repetition_period = schedule_duration_days(scenario)
+        if repetition_period not in (timedelta(days=1), timedelta(days=7)):
+            warnings.warn(
+                f"Non-standard schedule duration of {repetition_period}. Please make sure this is intended.",
+                UserWarning,
+            )
 
     # Now, we need to repeat the vehicle schedules
-
     vehicle_schedules = repeat_vehicle_schedules(vehicle_schedules, repetition_period)
 
     sim_start_stime, total_duration_seconds = start_and_end_times(vehicle_schedules)
@@ -1116,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(
@@ -1129,7 +1109,9 @@ def generate_depot_optimal_size(
     repetition_period: Optional[timedelta] = None,
 ) -> None:
     """
-    Generates an optimal depot layout with the smallest possible size for each depot in the scenario. Line charging areas
+    Generates an optimal depot layout with the smallest possible size for each depot in the scenario.
+
+    Line charging areas
      with given block length area preferred. The existing depot will be deleted if `delete_existing_depot` is set to True.
 
     :param scenario: Either a :class:`eflips.model.Scenario` object containing the input data for the simulation. Or
@@ -1148,7 +1130,6 @@ def generate_depot_optimal_size(
         value as in the simulation.
 
     :return: None. The depot layout will be added to the database.
-
     """
 
     logger = logging.getLogger(__name__)
@@ -1309,3 +1290,47 @@ def generate_depot_optimal_size(
                 num_shunting_slots=int(max(time_range)),
                 num_cleaning_slots=int(max(time_range)),
             )
+
+
+def schedule_duration_days(
+    scenario: Union[Scenario, int, Any], database_url: Optional[str] = None
+) -> timedelta:
+    """
+    This method calculates the duration of a given scenario in days.
+
+    This is the duration
+    between the first departure of the first day, and the last departure on the last day, rounded up to full days.
+
+    Most of the time, this is the "natural" repetition period of the scenario. We are simulating one full period, and
+    this period – continuously repeated – is what happens in reality.
+
+    This method can be used to show the user what the detected repetition period is and to auto-set the repetition
+    period if none is provided.
+
+    :param scenario: Either a :class:`eflips.model.Scenario` object containing the input data for the simulation. Or
+        an integer specifying the ID of a scenario in the database. Or any other object that has an attribute "id"
+        containing an integer pointing to a unique scenario id.
+    :param database_url: An optional database URL. Used if no database url is given by the environment variable.
+    :return: a timedelta object representing the duration in days.
+    """
+    with create_session(scenario, database_url) as (session, scenario):
+        first_departure = (
+            session.query(func.min(Trip.departure_time))
+            .filter(Trip.scenario_id == scenario.id)
+            .scalar()
+        )
+        if first_departure is None:
+            raise ValueError("No trips found in the scenario.")
+
+        last_departure = (
+            session.query(func.max(Trip.departure_time))
+            .filter(Trip.scenario_id == scenario.id)
+            .scalar()
+        )
+        if last_departure is None:
+            raise ValueError("No trips found in the scenario.")
+
+        duration = last_departure - first_departure
+        duration_days = ceil(duration.total_seconds() / (24 * 60 * 60))
+
+        return timedelta(days=duration_days)

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.1.dist-info → eflips_depot-4.13.3.dist-info}/METADATA

@@ -1,14 +1,13 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.13.1
+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.1.dist-info → eflips_depot-4.13.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-eflips/depot/__init__.py,sha256=p-oqm1LmTuIk5PRiWDyychBhwAsr-9Rw7dKmRCZ58wc,2968
-eflips/depot/api/__init__.py,sha256=0iSCRtff8Ljb8g4fUmLxqWXI_u-qTE6wv_Jj4fgTXLM,57403
+eflips/depot/__init__.py,sha256=I42xmkE7GDZfoZeSn_ey85sYGI7xyGqAt6Xd4UZpHLw,2872
+eflips/depot/api/__init__.py,sha256=I0KQ_lDAWWPaH4HJfNLPxkv2eFKai9by2WqX0AKNsP4,58571
 eflips/depot/api/defaults/default_settings.json,sha256=0eUDTw_rtLQFvthP8oJL93iRXlmAOravAg-4qqGMQAY,5375
 eflips/depot/api/private/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eflips/depot/api/private/consumption.py,sha256=nImegyhKrZlEwKTNdmAmDxjTQCvwfPgxA588e0M_F9o,27282
-eflips/depot/api/private/depot.py,sha256=uESFVBhHybDN-LzvceKHlFSfsVsBfh5gaOuTxspX6rY,44055
+eflips/depot/api/private/depot.py,sha256=NLrRBjb-wq7E3hnVAiX08IzUSVjfMV_NgRqzIx53CE0,44120
 eflips/depot/api/private/results_to_database.py,sha256=FBlZRKqAIG80tFyuf5vCGHRycWKYkm53jFxJEk9t1NA,25984
 eflips/depot/api/private/util.py,sha256=DasTkuGUhlBpY_BtTFWoxSNZU_CRyM3RqEDgO07Eks8,17990
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
@@ -36,7 +36,7 @@ eflips/depot/simulation.py,sha256=ee0qTzOzG-8ybN36ie_NJallXfC7jUaS9JZvaYFziLs,10
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
 eflips/depot/standalone.py,sha256=8O01zEXghFG9zZBu0fUD0sXvbHQ-AXw6RB5M750a_sM,22419
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.13.1.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.13.1.dist-info/METADATA,sha256=FW9SEPDE7MruN8IK-fAlC3o2Gj3EH_ZHYjmvUSIAxsA,5987
-eflips_depot-4.13.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-eflips_depot-4.13.1.dist-info/RECORD,,
+eflips_depot-4.13.3.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.13.3.dist-info/METADATA,sha256=FHoPKGqzbw6Vv25vPaFZm_4vDWXtmbvgiIHqaulg6VQ,5936
+eflips_depot-4.13.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+eflips_depot-4.13.3.dist-info/RECORD,,