Changes to scheduler structure to allow for different ones and new merit scheduler

pyobs/cli/pyobsd.py

@@ -5,7 +5,7 @@
 import subprocess
 import sys
 import time
-from typing import Optional, List
+from typing import Optional, List, Any
 
 from ._cli import CLI
 
@@ -91,6 +91,7 @@ def __init__(
         chuid: Optional[str] = None,
         start_stop_daemon: str = "start-stop-daemon",
         verbose: bool = False,
+        **kwargs: Any,
     ):
         self._config_path = config_path
         self._run_path = run_path

pyobs/modules/robotic/mastermind.py

@@ -7,7 +7,7 @@
 from pyobs.events.taskfinished import TaskFinishedEvent
 from pyobs.events.taskstarted import TaskStartedEvent
 from pyobs.interfaces import IFitsHeaderBefore, IAutonomous
-from pyobs.robotic.task import Task
+from pyobs.robotic.task import Task, ScheduledTask
 from pyobs.utils.time import Time
 from pyobs.robotic import TaskRunner, TaskSchedule
 
@@ -96,15 +96,15 @@ async def _run_thread(self) -> None:
             now = Time.now()
 
             # find task that we want to run now
-            task: Task | None = await self._task_schedule.get_task(now)
-            if task is None or not await self._task_runner.can_run(task):
+            scheduled_task: ScheduledTask | None = await self._task_schedule.get_task(now)
+            if scheduled_task is None or not await self._task_runner.can_run(scheduled_task.task):
                 # no task found
                 await asyncio.sleep(10)
                 continue
 
             # starting too late?
-            if not task.can_start_late:
-                late_start = now - task.start
+            if not scheduled_task.task.can_start_late:
+                late_start = now - scheduled_task.start
                 if late_start > self._allowed_late_start * u.second:
                     # only warn once
                     if first_late_start_warning:
@@ -123,10 +123,10 @@ async def _run_thread(self) -> None:
             first_late_start_warning = True
 
             # task is definitely not None here
-            self._task = task
+            self._task = scheduled_task.task
 
             # ETA
-            eta = now + self._task.duration * u.second
+            eta = now + self._task.duration
 
             # send event
             await self.comm.send_event(TaskStartedEvent(name=self._task.name, id=self._task.id, eta=eta))