eflips-depot 4.6.5__tar.gz → 4.6.6__tar.gz

{eflips_depot-4.6.5 → eflips_depot-4.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.6.5
+Version: 4.6.6
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth

{eflips_depot-4.6.5 → eflips_depot-4.6.6}/eflips/depot/api/__init__.py

@@ -266,8 +266,18 @@ def simple_consumption_simulation(
         vehicles = (
             session.query(Vehicle).filter(Vehicle.scenario_id == scenario.id).all()
         )
+
+        # Get the event count for each vbehicle in a single query using a groub_py clause
+        vehicle_event_count_q = (
+            session.query(Event.vehicle_id, sqlalchemy.func.count(Event.id))
+            .join(Vehicle)
+            .filter(Vehicle.scenario_id == scenario.id)
+            .group_by(Event.vehicle_id)
+        )
+        vehicle_event_count = dict(vehicle_event_count_q.all())
+
         for vehicle in vehicles:
-            if session.query(Event).filter(Event.vehicle_id == vehicle.id).count() == 0:
+            if vehicle.id not in vehicle_event_count.keys():
                 add_initial_standby_event(vehicle, session)
 
         # Since we are doing no_autoflush blocks later, we need to flush the session once here so that unflushed stuff

{eflips_depot-4.6.5 → eflips_depot-4.6.6}/eflips/depot/api/private/consumption.py

@@ -78,13 +78,14 @@ def add_initial_standby_event(
         but changes are not yet committed.
     """
 
-    earliest_trip = (
+    earliest_trip_q = (
         session.query(Trip)
         .join(Rotation)
         .filter(Rotation.vehicle == vehicle)
         .order_by(Trip.departure_time)
-        .first()
+        .limit(1)
     )
+    earliest_trip = earliest_trip_q.one_or_none()
     if earliest_trip is None:
         warnings.warn(
             f"No trips found for vehicle {vehicle.id}. Cannot add initial standby event.",

{eflips_depot-4.6.5 → eflips_depot-4.6.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.6.5"
+version = "4.6.6"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",