pyobs-core 2.0.0.dev13__py3-none-any.whl → 2.0.0.dev14__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → pyobs_core-2.0.0.dev14.dist-info}/METADATA

@@ -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.dist-info → pyobs_core-2.0.0.dev14.dist-info}/RECORD

@@ -229,9 +229,9 @@ pyobs/modules/pointing/guidingstatistics/pixeloffset.py,sha256=wG7wN_1JxzGg46sGW
 pyobs/modules/pointing/guidingstatistics/skyoffsets.py,sha256=Rp9OFA969rZnRVbIHm1rasmPWI1SBtQ3nP6DzNg3Epk,1289
 pyobs/modules/pointing/guidingstatistics/uptime.py,sha256=JA5DsXbdAJYK0NRvFUeUd120BN_1FQqSBqVM39E05AM,2025
 pyobs/modules/robotic/__init__.py,sha256=awLUDoOQpmANpI_0Gnvgb-2w3L2yLIMSpCnUXkPvza0,296
-pyobs/modules/robotic/mastermind.py,sha256=5FJ8pM5DZiTyqd5Wt5m-3E_YHOglPaeeNLxt6Mex6Go,7438
-pyobs/modules/robotic/pointing.py,sha256=67QqvHs5CTTxsc0qyAwPEfcO4Jw9I_maVsXVFrupTA4,4132
-pyobs/modules/robotic/scheduler.py,sha256=o9CxKQom3BOd6J--yrmpjRAcuvs9hwtR4jh1fWwpzx0,13494
+pyobs/modules/robotic/mastermind.py,sha256=7gq4I60fjkuo5wJjCZ49Bs3BGqNNvLNDzwENOqTOxmY,7742
+pyobs/modules/robotic/pointing.py,sha256=d5MzGGaMtvnHDWeLIzknst9Wa-Y5D4n5anwj8DgpM4U,4378
+pyobs/modules/robotic/scheduler.py,sha256=4L3UdIod33elkPnIA2BmkQoPJAN34pJeuYeszwiK14Q,13799
 pyobs/modules/robotic/scriptrunner.py,sha256=8vwu8xS8oqQfWGhsog_nr2Vo0DEs-87QaL7JnFfkeJI,1565
 pyobs/modules/roof/__init__.py,sha256=lARN3N3iqY_nb41Jaq6lE3UKhXuUvAnFeUqSq5HMQX4,209
 pyobs/modules/roof/basedome.py,sha256=Ew3M6ZREsTl_KflukZFFwdN6DqvkRICCIEjkSOGUNkI,1372
@@ -247,14 +247,14 @@ pyobs/modules/utils/autonomouswarning.py,sha256=tUtWAkODcZXSnNwWmSvbYkRafBIMQQBY
 pyobs/modules/utils/dummymode.py,sha256=IUfTRHHp02HOltqFRmvWkpoOZlHgXoAqkXC15pLIsJM,2998
 pyobs/modules/utils/fluentlogger.py,sha256=pS1Ej3NRMZQi7698zYkS0PN6s0k--b-10g_wyPdtRGQ,1686
 pyobs/modules/utils/httpfilecache.py,sha256=KHeMBjF204dv_0YFOfpRRhdOYbWMzE1Iw87chdHpUgA,3385
-pyobs/modules/utils/kiosk.py,sha256=bHaW0O_ppG0pXxD3iAcXVUvtaCvCReFXLOoKXXI30hA,5049
+pyobs/modules/utils/kiosk.py,sha256=Wi0GLTcB-Bwj5dDPu6fOhMP-tdCgMmNHqyGra7XNxTI,5354
 pyobs/modules/utils/matrix.py,sha256=Byaz1FlcXFkgkshNGvite0PulLQGwRkHN0-WbnNh6fs,6079
 pyobs/modules/utils/stellarium.py,sha256=F3BVkslP9NpmFy0v3VsZo9wiGMTJtLWkpoO-OXAsdQw,4042
 pyobs/modules/utils/telegram.py,sha256=eAB2FUWq4GeyH6yPdgZrDQIb5CSkkxCzs-46dbwJPAc,23371
-pyobs/modules/utils/trigger.py,sha256=EZ30d4CnEuRLQRCmPlJnTyrv3mm_4q5k752ceFaSqbM,2984
+pyobs/modules/utils/trigger.py,sha256=hk3z7PSgeaZsLiqxA7rIYz7URF5to8OUFo0n83JCzl8,3289
 pyobs/modules/weather/__init__.py,sha256=itI0SMrt2jQiK7uw5ZxoQ1UX5SOi-gVcPzGmMFHSku0,169
-pyobs/modules/weather/mockweather.py,sha256=EzyM_zNAoLmfCwG2TgRVPoCbAyCeLyxesuID0KdnlsE,4941
-pyobs/modules/weather/weather.py,sha256=QmIMOKLmuCaWQtbLqsgrDhNpIaEuR2vm6MsgnSqUGJU,7794
+pyobs/modules/weather/mockweather.py,sha256=VDwIm4RlgOcl5Hby6uRuv0EL9RB22b3cm1jTqmBqxJI,5082
+pyobs/modules/weather/weather.py,sha256=2a2i928yzZeCyLnNryZPaTqjfEO8a4WrbCV--aV1_TY,8096
 pyobs/modules/weather/weather_api.py,sha256=OfvboDXajCMydTLFz3_s4Sl7CNBWe3IluebWh_ARMXU,1217
 pyobs/modules/weather/weather_state.py,sha256=XzZiN-aM4yg-HEVeM3XmQXUshlG97Wr0Ka1vmL31vPw,736
 pyobs/robotic/__init__.py,sha256=A0jlO6KelDFObBo74_qM9lXX952kYeoj-Z47D0XiIOQ,441
@@ -325,7 +325,7 @@ pyobs/robotic/storage/filesystem/observationarchive.py,sha256=woy6n9ih4gI9Aw2zEx
 pyobs/robotic/storage/filesystem/taskarchive.py,sha256=vxhUJcbxKyaIj7G3XNCYwuTcrNJj0va8x0y7_WsyHIY,2214
 pyobs/robotic/storage/lco/__init__.py,sha256=VuniJ4vxDUFCWQrrGMDnnzNZlGbGYc6NPfMRQqkp2eA,241
 pyobs/robotic/storage/lco/_portal.py,sha256=9gV1WTMpadsi0crNa6kp1JpLZG6Dlv-hWrmRTUcKMu4,11300
-pyobs/robotic/storage/lco/_schedulereader.py,sha256=JxB5o8vGYRdRRpQR8_wGbaIfLgIuQ-Tw22Y7VXCq5ro,6797
+pyobs/robotic/storage/lco/_schedulereader.py,sha256=GXVBkCBiTQvJDAv4IxTZAk1z4tWPd3p0nlllDASRIF0,7108
 pyobs/robotic/storage/lco/_schedulewriter.py,sha256=54ZX07uiXu03ous0VNV7IakVQKC4CbgVzXFryabeYeo,3928
 pyobs/robotic/storage/lco/configdb.py,sha256=uwdMR27IelX7TcTUhALDQoB4bMYiLrfrkB348ztr7ys,4098
 pyobs/robotic/storage/lco/mockobservationarchive.py,sha256=F6zxpcUJWEBOAR_OY2LvzZQv3QTS8CFn86QElPYZGg0,5249
@@ -428,8 +428,8 @@ pyobs/vfs/vfs.py,sha256=buHTmO6VUjSypkEMVxY8rDKrpMz65AY2OE2hGEsQsLI,10780
 pyobs/vfs/filelists/__init__.py,sha256=NaTGFjLGh043j_F7kWEx_cXaII7t3CbYguRk2g5hEqw,111
 pyobs/vfs/filelists/filelist.py,sha256=kCco_5G2gLH-nxWik-wcs6lGuc_-3LeeyR9L4_srf30,201
 pyobs/vfs/filelists/testing.py,sha256=M8f2BULdjRCc7JFOKhAH7Kwre_uVQC0xLcv9xGTfNFw,425
-pyobs_core-2.0.0.dev13.dist-info/METADATA,sha256=9g0HqWa2Dn5sXBkXKm5dMoyx0vQZAdHCWwAaH-0UrCA,1990
-pyobs_core-2.0.0.dev13.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-pyobs_core-2.0.0.dev13.dist-info/entry_points.txt,sha256=0ceIn3dTDwWdGdJ5VdTvYim7vKkdTe6aqqpoaG065UY,109
-pyobs_core-2.0.0.dev13.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
-pyobs_core-2.0.0.dev13.dist-info/RECORD,,
+pyobs_core-2.0.0.dev14.dist-info/METADATA,sha256=I17f95bcD9MmNEea_FjdmNHerUEORK4I8cnjGQMbUnc,1990
+pyobs_core-2.0.0.dev14.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+pyobs_core-2.0.0.dev14.dist-info/entry_points.txt,sha256=0ceIn3dTDwWdGdJ5VdTvYim7vKkdTe6aqqpoaG065UY,109
+pyobs_core-2.0.0.dev14.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
+pyobs_core-2.0.0.dev14.dist-info/RECORD,,