eflips-depot 4.12.1__py3-none-any.whl → 4.13.0__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -1135,13 +1135,11 @@ def generate_depot_optimal_size(
     logger = logging.getLogger(__name__)
 
     with create_session(scenario, database_url) as (session, scenario):
-        # Delete all vehicles and events, also disconnect the vehicles from the rotations
-        rotation_q = session.query(Rotation).filter(Rotation.scenario_id == scenario.id)
-        rotation_q.update({"vehicle_id": None})
-        session.query(Event).filter(Event.scenario_id == scenario.id).delete()
-        session.query(Vehicle).filter(Vehicle.scenario_id == scenario.id).delete()
+        # Delete all depot events
+        session.query(Event).filter(
+            Event.scenario_id == scenario.id, Event.area_id.isnot(None)
+        ).delete()
 
-        # Handles existing depot
         if session.query(Depot).filter(Depot.scenario_id == scenario.id).count() != 0:
             if delete_existing_depot is False:
                 raise ValueError(
@@ -1150,6 +1148,15 @@ def generate_depot_optimal_size(
 
             delete_depots(scenario, session)
 
+        outer_savepoint = session.begin_nested()
+        # Delete all vehicles and events, also disconnect the vehicles from the rotations
+        rotation_q = session.query(Rotation).filter(Rotation.scenario_id == scenario.id)
+        rotation_q.update({"vehicle_id": None})
+        session.query(Event).filter(Event.scenario_id == scenario.id).delete()
+        session.query(Vehicle).filter(Vehicle.scenario_id == scenario.id).delete()
+
+        # Handles existing depot
+
         ##### Step 0: Consumption Simulation #####
         # Run the consumption simulation for all depots
 
@@ -1189,7 +1196,7 @@ def generate_depot_optimal_size(
                 len(rotations) for vehicle_type, rotations in vehicle_type_dict.items()
             )
 
-            savepoint = session.begin_nested()
+            inner_savepoint = session.begin_nested()
             try:
                 # (Temporarily) Delete all rotations not starting or ending at the station
                 logger.debug(
@@ -1228,10 +1235,11 @@ def generate_depot_optimal_size(
                 depot_capacities_for_scenario[station] = vt_capacities_for_station
                 num_rotations_for_scenario[station] = rotation_count_depot
             finally:
-                savepoint.rollback()
+                inner_savepoint.rollback()
 
-        # Create depot using the calculated capacities
+        outer_savepoint.rollback()
 
+        # Create depot using the calculated capacities
         for depot_station, capacities in depot_capacities_for_scenario.items():
             generate_depot(
                 capacities,
@@ -1243,10 +1251,3 @@ def generate_depot_optimal_size(
                 num_shunting_slots=num_rotations_for_scenario[depot_station] // 10,
                 num_cleaning_slots=num_rotations_for_scenario[depot_station] // 10,
             )
-
-        # Delete all vehicles and events again. Only depot layout is kept
-
-        rotation_q = session.query(Rotation).filter(Rotation.scenario_id == scenario.id)
-        rotation_q.update({"vehicle_id": None})
-        session.query(Event).filter(Event.scenario_id == scenario.id).delete()
-        session.query(Vehicle).filter(Vehicle.scenario_id == scenario.id).delete()

eflips/depot/api/private/util.py

@@ -18,7 +18,8 @@ from eflips.model import (
     Depot,
     Temperatures,
 )
-from sqlalchemy import inspect, create_engine
+from eflips.model import create_engine
+from sqlalchemy import inspect
 from sqlalchemy.orm import Session
 
 from eflips.depot import SimpleTrip, Timetable as EflipsTimeTable

{eflips_depot-4.12.1.dist-info → eflips_depot-4.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.12.1
+Version: 4.13.0
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth
@@ -13,8 +13,8 @@ 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 (>8.1.0,<10.0.0)
-Requires-Dist: eflips-opt (>=0.3.3,<0.4.0)
+Requires-Dist: eflips-model (>=10.0.0,<11.0.0)
+Requires-Dist: eflips-opt (>=0.3.0,<0.4.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.12.1.dist-info → eflips_depot-4.13.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 eflips/depot/__init__.py,sha256=06GUem0JIEunIyJ0_P_MLAGfibGEnNqcPPY0OBpO2NQ,1662
-eflips/depot/api/__init__.py,sha256=t5BsJIheFF9B2732j0bbWGo0dUE7gF5cxuIveJDICIU,55170
+eflips/depot/api/__init__.py,sha256=bxxRaknhMc_9xxBATFe_bcGzZQI9sYDhYwRF5Z74B1E,55055
 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=YyC_jMDGkg8yOAiYkKzb5HboFM1P4x-GTJSfD8srdvE,43640
 eflips/depot/api/private/results_to_database.py,sha256=_qXB9046dWHek4ys669J3IojJt4xlZRkW1HxT7OTLFo,25524
-eflips/depot/api/private/util.py,sha256=rDqVuB4sllFZmNvXuDktIsFRoR9l-AWc4QM00e1Quvw,17966
+eflips/depot/api/private/util.py,sha256=DasTkuGUhlBpY_BtTFWoxSNZU_CRyM3RqEDgO07Eks8,17990
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
 eflips/depot/depot.py,sha256=pREutXtJlDxjgfwRobAy7UqTHh-tldbVWHN8DIyxs8s,106986
 eflips/depot/evaluation.py,sha256=qqXyP4jA1zFcKuWhliQ6n25ZlGl9mJV-vtXf0yu8WN8,140842
@@ -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.12.1.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.12.1.dist-info/METADATA,sha256=1txE-lc2o62p-gf7CLKUVQ4PWzDfn1-7axYKXeV1gGA,5985
-eflips_depot-4.12.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-eflips_depot-4.12.1.dist-info/RECORD,,
+eflips_depot-4.13.0.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.13.0.dist-info/METADATA,sha256=82eSbc6SK6ZRm8TyyGQTUzHdB1ELolId_gLS7BCxjTY,5987
+eflips_depot-4.13.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+eflips_depot-4.13.0.dist-info/RECORD,,