eflips-depot 4.6.4__py3-none-any.whl → 4.6.6__py3-none-any.whl

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
@@ -794,6 +804,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:
@@ -809,8 +823,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

@@ -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/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.4.dist-info → eflips_depot-4.6.6.dist-info}/METADATA

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

{eflips_depot-4.6.4.dist-info → eflips_depot-4.6.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
 eflips/depot/__init__.py,sha256=RQ_UKNrGWA6q17TZFu86ai8pC7qCpcbmAgVKh7aImwo,1613
-eflips/depot/api/__init__.py,sha256=4WPZoYSsOgDMI-hsZrQPx_5PRjSztogZNpu3xwwAlUk,48353
+eflips/depot/api/__init__.py,sha256=4oNT-J3CB34m7cenCbx2Fi1IWFk9rfDG2-TT6EqCU64,49003
 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=vDPCogd3NPx2duCUhg_CcW9rMQWgrppfqsS4E7W9T1Y,16400
-eflips/depot/api/private/depot.py,sha256=v5Edb0sQP2QNIyBLvccVzAK9_kxCszar0cOu5ciFyrw,40780
+eflips/depot/api/private/consumption.py,sha256=FTF_E-DsbvJNWZJKQy_CPoHQpLz--pWY-inJYg8lsjM,16453
+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.4.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.6.4.dist-info/METADATA,sha256=VApUGP1NNUQLv_GLCpPCLHAyY0r629HwAv8bMtv91w4,5940
-eflips_depot-4.6.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-eflips_depot-4.6.4.dist-info/RECORD,,
+eflips_depot-4.6.6.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.6.6.dist-info/METADATA,sha256=j67zcAG9Xk9dSXsmwe0HPZbTHRTlGYnUTc__Dl-ncLs,5940
+eflips_depot-4.6.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+eflips_depot-4.6.6.dist-info/RECORD,,