Refactor scheduler interface - API and inner logic

flexmeasures/api/v3_0/sensors.py

@@ -276,7 +276,7 @@ def trigger_schedule(  # noqa: C901
 
         In this request, you can describe:
 
-        - the schedule's main  (start, unit, prior)
+        - the schedule's main features (when does it start, what unit should it report, prior to what time can we assume knowledge)
         - the flexibility model for the sensor (state and constraint variables, e.g. current state of charge of a battery, or connection capacity)
         - the flexibility context which the sensor operates in (other sensors under the same EMS which are relevant, e.g. prices)
 
@@ -450,9 +450,6 @@ def trigger_schedule(  # noqa: C901
         except ValueError as err:
             return invalid_flex_config(str(err))
 
-        # From here on, we handle IDs again, not objects
-        scheduler_kwargs.update(sensor_id=scheduler_kwargs.pop("sensor").id)
-
         job = create_scheduling_job(
             **scheduler_kwargs,
             enqueue=True,

flexmeasures/data/services/scheduling.py

@@ -29,7 +29,7 @@
 
 
 def create_scheduling_job(
-    sensor_id: int,
+    sensor: [int | Sensor],
     job_id: Optional[str] = None,
     enqueue: bool = True,
     **scheduler_kwargs,
@@ -42,11 +42,13 @@ def create_scheduling_job(
 
     As a rule of thumb, keep arguments to the job simple, and deserializable.
     """
+    # From here on, we handle IDs again, not objects
+    if isinstance(sensor, Sensor):
+        sensor = sensor.id
+
     job = Job.create(
         make_schedule,
-        kwargs=dict(
-            sensor_id=sensor_id, **scheduler_kwargs
-        ),  # TODO: we're passing sensor objects in flex_context. Passing IDs would be cleaner to avoid potential db sessions confusion.
+        kwargs=dict(sensor_id=sensor, **scheduler_kwargs),
         id=job_id,
         connection=current_app.queues["scheduling"].connection,
         ttl=int(

flexmeasures/data/tests/test_scheduling_jobs.py

@@ -35,7 +35,7 @@ def test_scheduling_a_battery(db, app, add_battery_assets, setup_test_data):
     )  # Make sure the scheduler data source isn't there
 
     job = create_scheduling_job(
-        sensor_id=battery.id,
+        sensor=battery,
         start=start,
         end=end,
         belief_time=start,
@@ -109,7 +109,7 @@ def test_assigning_custom_scheduler(db, app, add_battery_assets, is_path: bool):
     resolution = timedelta(minutes=15)
 
     job = create_scheduling_job(
-        sensor_id=battery.id,
+        sensor=battery,
         start=start,
         end=end,
         belief_time=start,

flexmeasures/data/tests/test_scheduling_jobs_fresh_db.py

@@ -38,7 +38,7 @@ def test_scheduling_a_charging_station(
     )  # Make sure the scheduler data source isn't there
 
     job = create_scheduling_job(
-        sensor_id=charging_station.id,
+        sensor=charging_station,
         start=start,
         end=end,
         belief_time=start,