pyobs-core 2.0.0.dev40__tar.gz → 2.0.0.dev42__tar.gz

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/PKG-INFO

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

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/application.py

@@ -193,12 +193,14 @@ class Application:
         # (module.py), never meant to match a filename -- each child module is already
         # correctly distinguished via execute()/BackgroundTask.
         if not isinstance(self._module, MultiModule):
-            config_stem = Path(self._config).stem
+            config_stem = Path(self._config).stem.lstrip("_")
             if self._module.name != config_stem:
-                raise ValueError(
-                    f"Config file stem ({config_stem!r}) does not match module's own name "
-                    f"({self._module.name!r}). Rename the config file or fix the module's "
-                    f"comm configuration so they match."
+                log.warning(
+                    "Config file stem (%s) does not match module's own name "
+                    "(%s). Rename the config file or fix the module's "
+                    "comm configuration so they match.",
+                    config_stem,
+                    self._module.name,
                 )
 
     def run(self) -> None:

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/comm/comm.py

@@ -535,10 +535,10 @@ class Comm:
         safe for peers to discover.
 
         Called by Module once it transitions to READY. Transports that announce a module to peers
-        independently of RPC dispatch (e.g. XmppComm's XMPP presence, which drives other modules'
-        peer-discovery reaction) hold that announcement back until this fires, so peers never read
-        capabilities that are still mid-publish. Transports without such an announcement (e.g.
-        LocalComm) don't need to override this.
+        independently of RPC dispatch (e.g. XmppComm's XMPP presence, or LocalComm's direct
+        ModuleOpenedEvent dispatch to already-connected peers) hold that announcement back until
+        this fires, so peers never read capabilities that are still mid-publish. Transports without
+        such an announcement don't need to override this.
         """
         await self._mark_ready()
 

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/comm/local/localcomm.py

@@ -5,7 +5,7 @@ from typing import Any
 
 from pyobs.comm import Comm
 from pyobs.comm.comm import PresenceCallback
-from pyobs.events import Event
+from pyobs.events import Event, ModuleOpenedEvent
 from pyobs.interfaces import Interface
 from pyobs.utils.enums import ModuleState
 
@@ -26,6 +26,7 @@ class LocalComm(Comm):
         self._capabilities: dict[type[Interface], Any] = {}  # interface -> Capabilities object
         self._presence: tuple[ModuleState, str] = (ModuleState.READY, "")
         self._presence_callbacks: dict[str, list[PresenceCallback]] = {}
+        self._ready = False
 
     @property
     def name(self) -> str:
@@ -158,3 +159,15 @@ class LocalComm(Comm):
             callback(*remote._presence)
         except KeyError:
             pass
+
+    async def _mark_ready(self) -> None:
+        """Announce this module to already-connected peers, mirroring XmppComm's presence-based
+        discovery (_got_online sending ModuleOpenedEvent) -- without this, a module that joins the
+        LocalNetwork after a peer has already started is invisible to that peer's ModuleOpenedEvent
+        handlers until the peer restarts (see #677). Guarded so a later re-READY doesn't re-announce."""
+        if self._ready:
+            return
+        self._ready = True
+        for client in self._network.get_clients():
+            if client is not self:
+                client._send_event_to_module(ModuleOpenedEvent(), self._name)

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/modules/camera/basecamera.py

@@ -464,8 +464,11 @@ class BaseCamera(
             await asyncio.sleep(0.1)
 
     async def _abort_weather(self, event: Event, sender: str, **kwargs: Any) -> bool:
-        """Abort on bad weather."""
-        await self.abort()
+        """Abort on bad weather, unless the shutter is closed (dark/bias) -- those don't
+        expose anything to the weather, and image_type is fixed for a whole sequence, so
+        this also lets an in-progress dark/bias sequence run to completion undisturbed."""
+        if self._image_type not in (ImageType.BIAS, ImageType.DARK):
+            await self.abort()
         return True
 
     @staticmethod

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/modules/flatfield/flatfield.py

@@ -106,14 +106,6 @@ class FlatField(Module, IFlatField, IBinning, IFilters):
         """Open module"""
         await Module.open(self)
 
-        # check telescope, camera, and filters
-        if (
-            not await self.has_proxy(self._telescope, ITelescope)
-            or not await self.has_proxy(self._camera, ICamera)
-            or not await self.has_proxy(self._filter_wheel, IFilters)
-        ):
-            log.warning("Either telescope, camera or filters do not exist or are not of correct type at the moment.")
-
         # subscribe to events
         if self._comm:
             await self.comm.register_event(BadWeatherEvent, self._abort_weather)
@@ -121,8 +113,10 @@ class FlatField(Module, IFlatField, IBinning, IFilters):
 
         # publish initial states
         await self.comm.set_state(IBinning, BinningState(x=self._binning[0], y=self._binning[1]))
-        if self._filter is not None:
-            await self.comm.set_state(IFilters, FilterState(filter=self._filter))
+        # publish even with no filter selected yet, so the pubsub node exists for anything that
+        # subscribes to it (see IMotion below) -- otherwise, since nothing sets self._filter until
+        # set_filter() is called, this node would never be created on a fresh start
+        await self.comm.set_state(IFilters, FilterState(filter=self._filter or ""))
         await self.comm.set_state(IReady, ReadyState(ready=True))
         # IFilters extends IMotion, but FlatField isn't itself a moving device -- publish a
         # static state so the pubsub node exists for anything that subscribes to it

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/modules/flatfield/scheduler.py

@@ -68,14 +68,6 @@ class FlatFieldScheduler(Module, IRunnable):
             count=count,
         )
 
-    async def open(self) -> None:
-        """Open module"""
-        await Module.open(self)
-
-        # check flat field
-        if not await self.has_proxy(self._flatfield, IFlatField):
-            log.warning("Flatfield module does not exist or is not of correct type at the moment.")
-
     @timeout(7200)
     async def run(self, **kwargs: Any) -> None:
         """Perform flat-fielding

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/modules/focus/focusseries.py

@@ -95,10 +95,6 @@ class AutoFocusSeries(Module, CameraSettingsMixin, IAutoFocus):
         await self.comm.register_event(FocusFoundEvent)
         await self.comm.register_event(BadWeatherEvent, self._on_bad_weather)
 
-        # check focuser and camera
-        if not await self.has_proxy(self._focuser, IFocuser) or not await self.has_proxy(self._camera, IData):
-            log.warning("Either camera or focuser do not exist or are not of correct type at the moment.")
-
         # publish initial states
         await self.comm.set_state(IAutoFocus, AutoFocusState())
         await self.comm.set_state(IRunning, RunningState(running=False))

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/modules/pointing/_base.py

@@ -57,17 +57,5 @@ class BasePointing(Module, PipelineMixin, metaclass=ABCMeta):
                 exc.RemoteError, 3, timespan=600, module=telescope, callback=self._default_remote_error_callback
             )
 
-    async def open(self) -> None:
-        """Open module."""
-        await Module.open(self)
-
-        # check telescope
-        if not await self.has_proxy(self._telescope, ITelescope):
-            log.warning("Given telescope does not exist or is not of correct type at the moment.")
-
-        # check camera
-        if not await self.has_proxy(self._camera, ICamera):
-            log.warning("Given camera does not exist or is not of correct type at the moment.")
-
 
 __all__ = ["BasePointing"]

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyobs/modules/pointing/acquisition.py

@@ -99,12 +99,6 @@ class Acquisition(BasePointing, CameraSettingsMixin, IAcquisition):
         """Open module"""
         await Module.open(self)
 
-        # check telescope and camera
-        if not await self.has_proxy(self._telescope, ITelescope):
-            log.warning("Telescope does not exist or is not of correct type at the moment.")
-        if not await self.has_proxy(self._camera, ICamera):
-            log.warning("Camera does not exist or is not of correct type at the moment.")
-
         # publish initial states
         await self.comm.set_state(IAcquisition, AcquisitionState())
         await self.comm.set_state(IRunning, RunningState(running=False))

{pyobs_core-2.0.0.dev40 → pyobs_core-2.0.0.dev42}/pyproject.toml

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