pyobs-brot 2.0.0.dev2__tar.gz → 2.0.0.dev5__tar.gz

{pyobs_brot-2.0.0.dev2 → pyobs_brot-2.0.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-brot
-Version: 2.0.0.dev2
+Version: 2.0.0.dev5
 Summary: pyobs module for BROTlib telescopes
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>, Lukas Melzig <lukas.melzig@stud.uni-goettingen.de>
 License-Expression: MIT
@@ -8,5 +8,5 @@ License-File: LICENSE
 Requires-Python: >=3.11
 Requires-Dist: astropy<8,>=7.0.1
 Requires-Dist: paho-mqtt>=2.1.0
-Requires-Dist: pybrotlib>=1.0.0
-Requires-Dist: pyobs-core<3,>=2.0.0.dev6
+Requires-Dist: pybrotlib>=1.1.1
+Requires-Dist: pyobs-core<3,>=2.0.0.dev20

{pyobs_brot-2.0.0.dev2 → pyobs_brot-2.0.0.dev5}/pyobs_brot/brotdome.py

@@ -9,6 +9,7 @@ from pyobs.events import RoofClosingEvent, RoofOpenedEvent
 from pyobs.interfaces import AltAzState, IDome, IPointingAltAz
 from pyobs.modules import timeout
 from pyobs.modules.roof.basedome import BaseDome
+from pyobs.utils import exceptions as exc
 from pyobs.utils.enums import MotionStatus
 
 log = logging.getLogger(__name__)
@@ -80,7 +81,7 @@ class BrotDome(BaseDome, IDome):
             return
         elif self.brot.dome.status == DomeStatus.ERROR:
             await self._error_state("Dome is in error state. Cannot open.")
-            return
+            raise exc.InitError("Dome is in error state. Cannot open.")
 
         await self._change_motion_status(MotionStatus.INITIALIZING)
 
@@ -101,7 +102,7 @@ class BrotDome(BaseDome, IDome):
                     break
                 case DomeStatus.ERROR:
                     await self._error_state()
-                    return
+                    raise exc.InitError("Dome entered error state while starting tracking.")
                 case _:
                     pass
             await asyncio.sleep(1)
@@ -114,7 +115,7 @@ class BrotDome(BaseDome, IDome):
             return
         elif self.brot.dome.status == DomeStatus.ERROR:
             await self._error_state("Dome is in error state. Cannot close/park.")
-            return
+            raise exc.ParkError("Dome is in error state. Cannot close/park.")
 
         await self._change_motion_status(MotionStatus.PARKING)
         await self.comm.send_event(RoofClosingEvent())
@@ -125,7 +126,7 @@ class BrotDome(BaseDome, IDome):
                     pass
                 case DomeStatus.ERROR:
                     await self._error_state()
-                    return
+                    raise exc.ParkError("Dome entered error state while stopping tracking.")
                 case _:
                     break
             await asyncio.sleep(1)
@@ -146,7 +147,7 @@ class BrotDome(BaseDome, IDome):
                     break
                 case DomeStatus.ERROR:
                     await self._error_state()
-                    return
+                    raise exc.ParkError("Dome entered error state while parking.")
                 case _:
                     pass
             await asyncio.sleep(1)

{pyobs_brot-2.0.0.dev2 → pyobs_brot-2.0.0.dev5}/pyobs_brot/brotroof.py

@@ -8,6 +8,7 @@ from pybrotlib.transport import MQTTTransport
 from pyobs.events import RoofClosingEvent, RoofOpenedEvent
 from pyobs.modules import timeout
 from pyobs.modules.roof.baseroof import BaseRoof
+from pyobs.utils import exceptions as exc
 from pyobs.utils.enums import MotionStatus
 
 log = logging.getLogger(__name__)
@@ -64,7 +65,7 @@ class BrotRoof(BaseRoof):
             return
         elif self.brot.roof.status == RoofStatus.ERROR:
             await self._error_state("Roof is in error state. Cannot open.")
-            return
+            raise exc.InitError("Roof is in error state. Cannot open.")
 
         await self._change_motion_status(MotionStatus.INITIALIZING)
 
@@ -83,7 +84,7 @@ class BrotRoof(BaseRoof):
             return
         elif self.brot.roof.status == RoofStatus.ERROR:
             await self._error_state("Roof is in error state. Cannot close.")
-            return
+            raise exc.ParkError("Roof is in error state. Cannot close.")
 
         await self._change_motion_status(MotionStatus.PARKING)
         await self.comm.send_event(RoofClosingEvent())

{pyobs_brot-2.0.0.dev2 → pyobs_brot-2.0.0.dev5}/pyobs_brot/brottelescope.py

@@ -9,6 +9,7 @@ from pybrotlib.transport import MQTTTransport  # type: ignore
 from pyobs.interfaces import (
     AltAzOffsetState,
     AltAzState,
+    FitsHeaderEntry,
     FocuserState,
     IFocuser,
     IOffsetsAltAz,
@@ -27,6 +28,7 @@ from pyobs.interfaces import (
 from pyobs.mixins import FitsNamespaceMixin
 from pyobs.modules import timeout
 from pyobs.modules.telescope.basetelescope import BaseTelescope
+from pyobs.utils import exceptions as exc
 from pyobs.utils.enums import MotionStatus
 from pyobs.utils.publisher import CsvPublisher
 from pyobs.utils.time import Time
@@ -185,6 +187,9 @@ class BrotBaseTelescope(
                     return
             await asyncio.sleep(1)
 
+    async def _set_tracking_rate(self, ra_rate: float, dec_rate: float) -> None:
+        raise NotImplementedError
+
     async def set_focus(self, focus: float, **kwargs: Any) -> None:
         await self._change_motion_status(MotionStatus.SLEWING, interface="IFocuser")
         await self.brot.focus.set(focus + self.focus_offset)
@@ -219,7 +224,7 @@ class BrotBaseTelescope(
                 return
             case TelescopeStatus.ERROR:
                 await self._error_state("Telescope can not be initialized, it has errors.")
-                return
+                raise exc.InitError("Telescope can not be initialized, it has errors.")
 
         log.info("Initializing telescope...")
         await self.brot.telescope.power_on()
@@ -230,7 +235,7 @@ class BrotBaseTelescope(
                     return
                 case -1.0:
                     await self._error_state("Error during powerup of telescope.")
-                    return
+                    raise exc.InitError("Error during powerup of telescope.")
                 case 0.0:
                     pass
             await asyncio.sleep(1)
@@ -245,7 +250,7 @@ class BrotBaseTelescope(
                 pass
             case TelescopeStatus.ERROR:
                 await self._error_state("Telescope can not be parked, it has errors.")
-                return
+                raise exc.ParkError("Telescope can not be parked, it has errors.")
 
         log.info("Parking telescope...")
         await self.brot.telescope.park()
@@ -256,7 +261,7 @@ class BrotBaseTelescope(
                     return
                 case -1.0:
                     await self._error_state("Error during parking of the telescope.")
-                    return
+                    raise exc.ParkError("Error during parking of the telescope.")
                 case _:
                     pass
             await asyncio.sleep(1)
@@ -305,11 +310,12 @@ class BrotRaDecTelescope(BrotBaseTelescope, IOffsetsRaDec):
 
     async def get_fits_header_before(
         self, namespaces: list[str] | None = None, **kwargs: Any
-    ) -> dict[str, tuple[Any, str]]:
+    ) -> dict[str, FitsHeaderEntry]:
         hdr = await BrotBaseTelescope.get_fits_header_before(self)
-        hdr["TEL-FOCU"] = (self.brot.focus.position, "Focus position [mm]")
-        hdr["HAOFF"] = (self.brot.telescope._telemetry.POSITION.INSTRUMENTAL.HA.OFFSET, "Hour Angle offset")
-        hdr["DECOFF"] = (self.brot.telescope._telemetry.POSITION.INSTRUMENTAL.DEC.OFFSET, "Declination offset")
+        tel = self.brot.telescope._telemetry
+        hdr["TEL-FOCU"] = FitsHeaderEntry(self.brot.focus.position, "Focus position [mm]")
+        hdr["HAOFF"] = FitsHeaderEntry(tel.POSITION.INSTRUMENTAL.HA.OFFSET, "Hour Angle offset")
+        hdr["DECOFF"] = FitsHeaderEntry(tel.POSITION.INSTRUMENTAL.DEC.OFFSET, "Declination offset")
         return self._filter_fits_namespace(hdr, namespaces=namespaces, **kwargs)
 
     async def add_pointing_measurement(self, **kwargs: Any) -> None:
@@ -352,11 +358,12 @@ class BrotAltAzTelescope(BrotBaseTelescope, IOffsetsAltAz, IPointingSeries):
 
     async def get_fits_header_before(
         self, namespaces: list[str] | None = None, **kwargs: Any
-    ) -> dict[str, tuple[Any, str]]:
+    ) -> dict[str, FitsHeaderEntry]:
+        tel = self.brot.telescope._telemetry
         hdr = await BrotBaseTelescope.get_fits_header_before(self)
-        hdr["TEL-FOCU"] = (self.brot.focus.position, "Focus position [mm]")
-        hdr["HAOFF"] = (self.brot.telescope._telemetry.POSITION.INSTRUMENTAL.HA.OFFSET, "Hour Angle offset")
-        hdr["DECOFF"] = (self.brot.telescope._telemetry.POSITION.INSTRUMENTAL.DEC.OFFSET, "Declination offset")
+        hdr["TEL-FOCU"] = FitsHeaderEntry(self.brot.focus.position, "Focus position [mm]")
+        hdr["HAOFF"] = FitsHeaderEntry(tel.POSITION.INSTRUMENTAL.HA.OFFSET, "Hour Angle offset")
+        hdr["DECOFF"] = FitsHeaderEntry(tel.POSITION.INSTRUMENTAL.DEC.OFFSET, "Declination offset")
         return self._filter_fits_namespace(hdr, namespaces=namespaces, **kwargs)
 
     async def add_pointing_measurement(self, **kwargs: Any) -> None:

{pyobs_brot-2.0.0.dev2 → pyobs_brot-2.0.0.dev5}/pyproject.toml

@@ -1,15 +1,15 @@
 [project]
 name = "pyobs-brot"
-version = "2.0.0.dev2"
+version = "2.0.0.dev5"
 description = "pyobs module for BROTlib telescopes"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }, { name = "Lukas Melzig", email = "lukas.melzig@stud.uni-goettingen.de" }]
 requires-python = ">=3.11"
 license = "MIT"
 dependencies = [
     "astropy>=7.0.1,<8",
-    "pyobs-core>=2.0.0.dev6,<3",
+    "pyobs-core>=2.0.0.dev20,<3",
     "paho-mqtt>=2.1.0",
-    "pybrotlib>=1.0.0",
+    "pybrotlib>=1.1.1",
 ]
 
 [dependency-groups]

{pyobs_brot-2.0.0.dev2 → pyobs_brot-2.0.0.dev5}/uv.lock

@@ -1521,14 +1521,14 @@ wheels = [
 
 [[package]]
 name = "pybrotlib"
-version = "1.0.0"
+version = "1.1.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiomqtt" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/18/72/bd0880c7512761e3afdd96d4eec0453cae9858c3ed7426e92d6a735ce60b/pybrotlib-1.0.0.tar.gz", hash = "sha256:958d14780d81f6b3362021aaab34be15bff41bfb7dfddb81e3164b9bee878220", size = 4968, upload-time = "2026-05-26T16:38:34.291Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b6/34/cb6cc4cee0fc7cd88df27e09535e91599a45c3090fb8ea191cb7702e49ca/pybrotlib-1.1.1.tar.gz", hash = "sha256:170b7fc0c29c3f703fb027b505f54f9b9a7778cbb7ade7a8e3e4803d0d5af660", size = 4988, upload-time = "2026-07-13T13:52:44.913Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/af/2c/f0ab674fbb5d0ae4ea8914e59adb4cdac31ada95cd91741a44c52a4479eb/pybrotlib-1.0.0-py3-none-any.whl", hash = "sha256:03363136f6062cd678953dcba61db402126d15aa39d6d6b5f11a3760adfeead1", size = 9481, upload-time = "2026-05-26T16:38:33.447Z" },
+    { url = "https://files.pythonhosted.org/packages/78/1c/eb4ec2c7523844f29057887b78741ca0f20456d81825877f6dc9a7067e30/pybrotlib-1.1.1-py3-none-any.whl", hash = "sha256:a6cde54aae0833761fecb1044bf749d79f9bdafff4ff478b894825db93b203a6", size = 9575, upload-time = "2026-07-13T13:52:43.97Z" },
 ]
 
 [[package]]
@@ -1783,7 +1783,7 @@ wheels = [
 
 [[package]]
 name = "pyobs-brot"
-version = "2.0.0.dev2"
+version = "2.0.0.dev5"
 source = { editable = "." }
 dependencies = [
     { name = "astropy" },
@@ -1804,8 +1804,8 @@ dev = [
 requires-dist = [
     { name = "astropy", specifier = ">=7.0.1,<8" },
     { name = "paho-mqtt", specifier = ">=2.1.0" },
-    { name = "pybrotlib", specifier = ">=1.0.0" },
-    { name = "pyobs-core", specifier = ">=2.0.0.dev6,<3" },
+    { name = "pybrotlib", specifier = ">=1.1.1" },
+    { name = "pyobs-core", specifier = ">=2.0.0.dev20,<3" },
 ]
 
 [package.metadata.requires-dev]
@@ -1818,7 +1818,7 @@ dev = [
 
 [[package]]
 name = "pyobs-core"
-version = "2.0.0.dev6"
+version = "2.0.0.dev20"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
@@ -1848,9 +1848,9 @@ dependencies = [
     { name = "tenacity" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ca/1f/f3ff220ff8cc908198a130f98aacb2bd0c9963befd9d0757bcff13800f84/pyobs_core-2.0.0.dev6.tar.gz", hash = "sha256:ee8f98c4299064a2383666b349cf87af98f9c3de437048e8b56dcb2817e0024b", size = 299899, upload-time = "2026-06-30T17:39:36.203Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/86/ce/29738c727e1a5ccc723365892f308b24641ff3211f2718a40beb56f62b9e/pyobs_core-2.0.0.dev20.tar.gz", hash = "sha256:aceee8391e9f16520004c2bd08da0e5c2ab3550901777410feeff9535845c8c1", size = 323624, upload-time = "2026-07-15T08:59:47.278Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/17/b6/3875a77f1206ef5d02d5ac43ae9fd90ba96be7857fe4308dfc0c599eec16/pyobs_core-2.0.0.dev6-py3-none-any.whl", hash = "sha256:542a78b069cac525cc72b9fc5fce8983629f8f0a240ff5ee722617886a8c9c13", size = 508486, upload-time = "2026-06-30T17:39:34.739Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/2e/a28066bd81ff4995502d35a4a855fa1e5b9f724c828defab67c6430a4eaf/pyobs_core-2.0.0.dev20-py3-none-any.whl", hash = "sha256:501e91bc9f2a30b216180d7a1e25ecd214fcc512f905c7b9950c2c0a1f903f23", size = 541148, upload-time = "2026-07-15T08:59:45.826Z" },
 ]
 
 [[package]]