pyobs-core 2.0.0.dev13__tar.gz → 2.0.0.dev14__tar.gz

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-core
-Version: 2.0.0.dev13
+Version: 2.0.0.dev14
 Summary: robotic telescope software
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyobs/modules/robotic/mastermind.py

@@ -5,7 +5,8 @@ from typing import Any
 import astropy.units as u
 
 from pyobs.events import TaskFailedEvent, TaskFinishedEvent, TaskStartedEvent
-from pyobs.interfaces import FitsHeaderEntry, IAutonomous, IFitsHeaderBefore
+from pyobs.interfaces import FitsHeaderEntry, IAutonomous, IFitsHeaderBefore, IRunning
+from pyobs.interfaces.IRunning import RunningState
 from pyobs.modules import Module
 from pyobs.robotic import (
     Observation,
@@ -73,16 +74,19 @@ class Mastermind(Module, IAutonomous, IFitsHeaderBefore):
 
         # start
         self._running = True
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def start(self, **kwargs: Any) -> None:
         """Starts a service."""
         log.info("Starting robotic system...")
         self._running = True
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def stop(self, **kwargs: Any) -> None:
         """Stops a service."""
         log.info("Stopping robotic system...")
         self._running = False
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def is_running(self, **kwargs: Any) -> bool:
         """Whether a service is running."""

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyobs/modules/robotic/pointing.py

@@ -3,7 +3,8 @@ from typing import Any
 
 from astropy.coordinates import SkyCoord
 
-from pyobs.interfaces import AcquisitionResult, IAcquisition, IAutonomous, IPointingRaDec, IPointingSeries
+from pyobs.interfaces import AcquisitionResult, IAcquisition, IAutonomous, IPointingRaDec, IPointingSeries, IRunning
+from pyobs.interfaces.IRunning import RunningState
 from pyobs.modules import Module
 from pyobs.utils import exceptions as exc
 from pyobs.utils.grids.filters import GridFilter
@@ -46,6 +47,11 @@ class PointingSeries(Module, IAutonomous):
         # add thread func
         self.add_background_task(self._run_thread, False)
 
+    async def open(self) -> None:
+        """Open module."""
+        await Module.open(self)
+        await self.comm.set_state(IRunning, RunningState(running=await self.is_running()))
+
     async def start(self, **kwargs: Any) -> None:
         """Starts a service."""
         pass

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyobs/modules/robotic/scheduler.py

@@ -16,7 +16,8 @@ from pyobs.events import (
     TaskFinishedEvent,
     TaskStartedEvent,
 )
-from pyobs.interfaces import IRunnable, IStartStop
+from pyobs.interfaces import IRunnable, IRunning, IStartStop
+from pyobs.interfaces.IRunning import RunningState
 from pyobs.modules import Module
 from pyobs.robotic import (
     ObservationArchive,
@@ -106,13 +107,17 @@ class Scheduler(Module, IStartStop, IRunnable):
             await self.comm.register_event(TaskFailedEvent, self._on_task_finished)
             await self.comm.register_event(GoodWeatherEvent, self._on_good_weather)
 
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
+
     async def start(self, **kwargs: Any) -> None:
         """Start scheduler."""
         self._running = True
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def stop(self, **kwargs: Any) -> None:
         """Stop scheduler."""
         self._running = False
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def is_running(self, **kwargs: Any) -> bool:
         """Whether scheduler is running."""

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyobs/modules/utils/kiosk.py

@@ -8,7 +8,8 @@ from typing import Any
 import numpy as np
 from aiohttp import web
 
-from pyobs.interfaces import ICamera, IData, IExposureTime, IStartStop, IWindow
+from pyobs.interfaces import ICamera, IData, IExposureTime, IRunning, IStartStop, IWindow
+from pyobs.interfaces.IRunning import RunningState
 from pyobs.modules import Module
 
 log = logging.getLogger(__name__)
@@ -68,6 +69,8 @@ class Kiosk(Module, IStartStop):
         await self._site.start()
         self._is_listening = True
 
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
+
     async def close(self) -> None:
         """Close server"""
         await Module.close(self)
@@ -99,10 +102,12 @@ class Kiosk(Module, IStartStop):
     async def start(self, **kwargs: Any) -> None:
         """Start kiosk mode."""
         self._running = True
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def stop(self, **kwargs: Any) -> None:
         """Stop kiosk mode."""
         self._running = False
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def is_running(self, **kwargs: Any) -> bool:
         """Whether kiosk mode is running."""

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyobs/modules/utils/trigger.py

@@ -4,7 +4,8 @@ import logging
 from typing import Any
 
 from pyobs.events import Event
-from pyobs.interfaces import IAutonomous
+from pyobs.interfaces import IAutonomous, IRunning
+from pyobs.interfaces.IRunning import RunningState
 from pyobs.modules import Module
 from pyobs.object import get_class_from_string
 
@@ -50,13 +51,17 @@ class Trigger(Module, IAutonomous):
         for event in events:
             await self.comm.register_event(event, self._handle_event)
 
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
+
     async def start(self, **kwargs: Any) -> None:
         """Starts a service."""
         self._running = True
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def stop(self, **kwargs: Any) -> None:
         """Stops a service."""
         self._running = False
+        await self.comm.set_state(IRunning, RunningState(running=self._running))
 
     async def is_running(self, **kwargs: Any) -> bool:
         """Whether a service is running."""

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyobs/modules/weather/mockweather.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 from typing import Any
 
 from pyobs.events import BadWeatherEvent, GoodWeatherEvent
-from pyobs.interfaces import FitsHeaderEntry, IFitsHeaderBefore, IWeather, WeatherSensorReading, WeatherState
+from pyobs.interfaces import FitsHeaderEntry, IFitsHeaderBefore, IRunning, IWeather, WeatherSensorReading, WeatherState
+from pyobs.interfaces.IRunning import RunningState
 from pyobs.modules import Module
 from pyobs.modules.weather.weather import FITS_HEADERS, SENSOR_UNITS
 from pyobs.utils.enums import WeatherSensors
@@ -101,6 +102,7 @@ class MockWeather(Module, IWeather, IFitsHeaderBefore):
     async def _publish_state(self) -> None:
         is_good = True if not self._active else self._good
         await self.comm.set_state(IWeather, WeatherState(good=is_good, readings=self._get_readings()))
+        await self.comm.set_state(IRunning, RunningState(running=self._active))
 
     def _get_readings(self) -> list[WeatherSensorReading]:
         return [

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyobs/modules/weather/weather.py

@@ -7,7 +7,8 @@ from typing import Any
 import astropy.units as u
 
 from pyobs.events import BadWeatherEvent, GoodWeatherEvent
-from pyobs.interfaces import FitsHeaderEntry, IFitsHeaderBefore, IWeather, WeatherSensorReading, WeatherState
+from pyobs.interfaces import FitsHeaderEntry, IFitsHeaderBefore, IRunning, IWeather, WeatherSensorReading, WeatherState
+from pyobs.interfaces.IRunning import RunningState
 from pyobs.modules import Module
 from pyobs.modules.weather.weather_api import WeatherApi
 from pyobs.modules.weather.weather_state import WeatherStatus
@@ -82,6 +83,8 @@ class Weather(Module, IWeather, IFitsHeaderBefore):
             await self.comm.register_event(BadWeatherEvent)
             await self.comm.register_event(GoodWeatherEvent)
 
+        await self.comm.set_state(IRunning, RunningState(running=self._active))
+
     async def start(self, **kwargs: Any) -> None:
         """Starts a service."""
 
@@ -92,10 +95,12 @@ class Weather(Module, IWeather, IFitsHeaderBefore):
 
         # activate
         self._active = True
+        await self.comm.set_state(IRunning, RunningState(running=self._active))
 
     async def stop(self, **kwargs: Any) -> None:
         """Stops a service."""
         self._active = False
+        await self.comm.set_state(IRunning, RunningState(running=self._active))
 
     async def is_running(self, **kwargs: Any) -> bool:
         """Whether a service is running."""

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyobs/robotic/storage/lco/_schedulereader.py

@@ -132,7 +132,8 @@ class LcoScheduleReader(Object):
             # any changes?
             if sorted(scheduled_tasks) != sorted(self._scheduled_tasks):
                 log.info("Task list changed, found %d task(s) to run.", len(scheduled_tasks))
-                for scheduled_task in sorted(scheduled_tasks, key=lambda x: x.start):
+                sorted_tasks = sorted(scheduled_tasks, key=lambda x: x.start)
+                for scheduled_task in sorted_tasks:
                     log.info(
                         "  - %s to %s: %s (#%s)",
                         scheduled_task.start,
@@ -140,6 +141,11 @@ class LcoScheduleReader(Object):
                         scheduled_task.task.name,
                         scheduled_task.task.id,
                     )
+                if sorted_tasks:
+                    obs = sorted_tasks[0]
+                    log.info("Downloaded new schedule. Next observation is task %s at %s.", obs.task, obs.start)
+                else:
+                    log.info("Downloaded new schedule.")
 
                 # update
                 self._scheduled_tasks = scheduled_tasks

{pyobs_core-2.0.0.dev13 → pyobs_core-2.0.0.dev14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-core"
-version = "2.0.0.dev13"
+version = "2.0.0.dev14"
 description = "robotic telescope software"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11"