eflips-depot 4.6.3__py3-none-any.whl → 4.6.5__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -48,6 +48,7 @@ from eflips.model import (
     VehicleType,
     AreaType,
     ChargeType,
+    Route,
 )
 from sqlalchemy.orm import Session
 
@@ -246,7 +247,11 @@ def simple_consumption_simulation(
             session.query(Rotation)
             .filter(Rotation.scenario_id == scenario.id)
             .order_by(Rotation.id)
-            .options(sqlalchemy.orm.joinedload(Rotation.trips).joinedload(Trip.route))
+            .options(
+                sqlalchemy.orm.joinedload(Rotation.trips)
+                .joinedload(Trip.route)
+                .joinedload(Route.arrival_station)
+            )
             .options(sqlalchemy.orm.joinedload(Rotation.vehicle_type))
             .options(sqlalchemy.orm.joinedload(Rotation.vehicle))
         )
@@ -789,6 +794,10 @@ def init_simulation(
         if "None" in vehicle_types_for_depot:
             vehicle_types_for_depot.remove("None")
 
+        # In this case, all types are allowed
+        if len(vehicle_types_for_depot) == 0:
+            vehicle_types_for_depot = set([str(vt.id) for vt in scenario.vehicle_types])
+
         # If we have a vehicle count dictionary, we validate and use ir
         if vehicle_count_dict is not None and depot_id in vehicle_count_dict.keys():
             if set(vehicle_count_dict[depot_id].keys()) < vehicle_types_for_depot:
@@ -804,8 +813,11 @@ def init_simulation(
             for vehicle_type in vehicle_types_for_depot:
                 vehicle_count = 0
                 for area in depot.areas:
-                    if area.vehicle_type_id == int(vehicle_type):
-                        # TODO potential edit if we make vehicle type of an area a list
+                    if (
+                        area.vehicle_type_id == int(vehicle_type)
+                        or area.vehicle_type_id is None
+                    ):
+                        # The areas allow either one type, or all vehicle types
                         for p in area.processes:
                             if p.electric_power is not None and p.duration is None:
                                 vehicle_count += area.capacity

eflips/depot/api/private/consumption.py

@@ -1,4 +1,5 @@
 import logging
+import warnings
 from datetime import timedelta, datetime
 from math import ceil
 from typing import Tuple
@@ -7,7 +8,6 @@ from zoneinfo import ZoneInfo
 import numpy as np
 import sqlalchemy.orm
 from eflips.model import (
-    Area,
     Event,
     EventType,
     Rotation,
@@ -15,6 +15,7 @@ from eflips.model import (
     Trip,
     Station,
     ChargeType,
+    ConsistencyWarning,
 )
 
 
@@ -51,7 +52,7 @@ def initialize_vehicle(rotation: Rotation, session: sqlalchemy.orm.session.Sessi
 
 def add_initial_standby_event(
     vehicle: Vehicle, session: sqlalchemy.orm.session.Session
-):
+) -> None:
     """
     Create and add a standby event immediately before the earliest trip of the given vehicle.
 
@@ -76,25 +77,20 @@ def add_initial_standby_event(
         ``None``. A new event is added to the session for the earliest trip,
         but changes are not yet committed.
     """
-    logger = logging.getLogger(__name__)
-
-    rotation_per_vehicle = sorted(
-        vehicle.rotations, key=lambda r: r.trips[0].departure_time
-    )
-
-    # Only keep the rotations that contain trips
-    rotation_per_vehicle = [r for r in rotation_per_vehicle if len(r.trips) > 0]
-    if len(rotation_per_vehicle) == 0:
-        logger.warning(f"No trips found for vehicle {vehicle.id}.")
-        return
 
-    earliest_trip = rotation_per_vehicle[0].trips[0]
-    area = (
-        session.query(Area)
-        .filter(Area.scenario_id == vehicle.scenario_id)
-        .filter(Area.vehicle_type_id == vehicle.vehicle_type_id)
+    earliest_trip = (
+        session.query(Trip)
+        .join(Rotation)
+        .filter(Rotation.vehicle == vehicle)
+        .order_by(Trip.departure_time)
         .first()
     )
+    if earliest_trip is None:
+        warnings.warn(
+            f"No trips found for vehicle {vehicle.id}. Cannot add initial standby event.",
+            ConsistencyWarning,
+        )
+        return
 
     standby_start = earliest_trip.departure_time - timedelta(seconds=1)
     standby_event = Event(
@@ -148,15 +144,11 @@ def find_charger_occupancy(
              (shape: ``(n,)``), indicating how many charging events are active.
     """
     # Load all charging events that could be relevant
-    charging_events = (
-        session.query(Event)
-        .filter(
-            Event.event_type == EventType.CHARGING_OPPORTUNITY,
-            Event.station_id == station.id,
-            Event.time_start < time_end,
-            Event.time_end > time_start,
-        )
-        .all()
+    charging_events_q = session.query(Event).filter(
+        Event.event_type == EventType.CHARGING_OPPORTUNITY,
+        Event.station_id == station.id,
+        Event.time_start < time_end,
+        Event.time_end > time_start,
     )
 
     # We need to change the times to numpy datetime64 with implicit UTC timezone
@@ -166,7 +158,7 @@ def find_charger_occupancy(
 
     times = np.arange(time_start, time_end, resolution)
     occupancy = np.zeros_like(times, dtype=int)
-    for event in charging_events:
+    for event in charging_events_q:
         event_start = np.datetime64(
             event.time_start.astimezone(tz).replace(tzinfo=None)
         )
@@ -272,9 +264,11 @@ def attempt_opportunity_charging_event(
 
     # Sanity checks
     if previous_trip.route.arrival_station_id != next_trip.route.departure_station_id:
-        raise ValueError(
-            f"Trips {previous_trip.id} and {next_trip.id} are not consecutive."
+        warnings.warn(
+            f"Trips {previous_trip.id} and {next_trip.id} are not consecutive.",
+            ConsistencyWarning,
         )
+        return charge_start_soc
     if previous_trip.rotation_id != next_trip.rotation_id:
         raise ValueError(
             f"Trips {previous_trip.id} and {next_trip.id} are not in the same rotation."

eflips/depot/api/private/depot.py

@@ -111,7 +111,13 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
             }
         else:
             # If the vehicle type id is not set, the area is for all vehicle types
-            template["areas"][area_name]["entry_filter"] = dict()
+            scenario = depot.scenario
+            all_vehicle_type_ids = [str(vt.id) for vt in scenario.vehicle_types]
+
+            template["areas"][area_name]["entry_filter"] = {
+                "filter_names": ["vehicle_type"],
+                "vehicle_types": all_vehicle_type_ids,
+            }
 
         for process in area.processes:
             # Add process into process list

{eflips_depot-4.6.3.dist-info → eflips_depot-4.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.6.3
+Version: 4.6.5
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: eflips (>=0.1.3,<0.2.0)
-Requires-Dist: eflips-model (>=6.0.4,<7.0.0)
+Requires-Dist: eflips-model (>=6.0.6,<7.0.0)
 Requires-Dist: pandas (>=2.2.0,<3.0.0)
 Requires-Dist: scipy (>=1.14.0,<2.0.0)
 Requires-Dist: simpy (>=4.0.1,<5.0.0)

{eflips_depot-4.6.3.dist-info → eflips_depot-4.6.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
 eflips/depot/__init__.py,sha256=RQ_UKNrGWA6q17TZFu86ai8pC7qCpcbmAgVKh7aImwo,1613
-eflips/depot/api/__init__.py,sha256=Sxsqj5qIcSK-dqtE2UqaHVWEWnycU65N-pDnLuTJfeU,48244
+eflips/depot/api/__init__.py,sha256=0ifYtEwSs2LbpPINxdDsGNxdywKRicCQBETB7BpBh9Y,48631
 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=k-YYeBTvlKBAE-YSoPSiJofsz6VmazRn__Qe238mE2w,16616
-eflips/depot/api/private/depot.py,sha256=v5Edb0sQP2QNIyBLvccVzAK9_kxCszar0cOu5ciFyrw,40780
+eflips/depot/api/private/consumption.py,sha256=vDPCogd3NPx2duCUhg_CcW9rMQWgrppfqsS4E7W9T1Y,16400
+eflips/depot/api/private/depot.py,sha256=WcCcib3NSbvoL3G06I2ajT8U5L7AkDK5qe969PHq-fg,41014
 eflips/depot/api/private/results_to_database.py,sha256=Sh2VJ3k60QJ5RGkc8sw-7XbljiMe65EHeoagKIpYlHM,24585
 eflips/depot/api/private/smart_charging.py,sha256=MQ9fXdKByHAz6RSKXYcpJXDBccdJKZ2qGReCHagVCyo,13033
 eflips/depot/api/private/util.py,sha256=gk5TJZrcvtkyrqnjR3Cq-hPRGRCovhzKz3LrBDIvN0E,16799
@@ -37,7 +37,7 @@ eflips/depot/simulation.py,sha256=ee0qTzOzG-8ybN36ie_NJallXfC7jUaS9JZvaYFziLs,10
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
 eflips/depot/standalone.py,sha256=VxcTzBaB67fNJUMmjPRwKXjhqTy6oQ41Coote2LvAmk,22338
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.6.3.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.6.3.dist-info/METADATA,sha256=8mi6aRYWW1DOT4QkR5UytrBAoOK6OKHj6G3N1Ykiw00,5940
-eflips_depot-4.6.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-eflips_depot-4.6.3.dist-info/RECORD,,
+eflips_depot-4.6.5.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.6.5.dist-info/METADATA,sha256=aPK2OCraATDQr-H1kBZGqyZkj1fC0ZUBecES6EFCyoU,5940
+eflips_depot-4.6.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+eflips_depot-4.6.5.dist-info/RECORD,,