pyobs-brot 2.0.0.dev14__tar.gz → 2.0.0.dev15__tar.gz

{pyobs_brot-2.0.0.dev14 → pyobs_brot-2.0.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyobs-brot
-Version: 2.0.0.dev14
+Version: 2.0.0.dev15
 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
@@ -9,4 +9,4 @@ Requires-Python: >=3.11
 Requires-Dist: astropy<8,>=7.0.1
 Requires-Dist: paho-mqtt>=2.1.0
 Requires-Dist: pybrotlib>=1.1.5
-Requires-Dist: pyobs-core<3,>=2.0.0.dev48
+Requires-Dist: pyobs-core<3,>=2.0.0.dev82

{pyobs_brot-2.0.0.dev14 → pyobs_brot-2.0.0.dev15}/pyobs_brot/brottelescope.py

@@ -56,11 +56,10 @@ class BrotBaseTelescope(
         dome: str = "None",
         **kwargs: Any,
     ):
-        BaseTelescope.__init__(
-            self,
-            **kwargs,
+        super().__init__(
             motion_status_interfaces=["ITelescope", "IFocuser"],
             wait_for_dome=None if dome == "None" else dome,
+            **kwargs,
         )
 
         self.mqtt = MQTTTransport(host, port)
@@ -70,7 +69,6 @@ class BrotBaseTelescope(
         self.focus_offset = 0.0
         self._roof = roof
 
-        FitsNamespaceMixin.__init__(self, **kwargs)
         self.add_background_task(self._update_task)
 
     @property
@@ -339,14 +337,14 @@ class BrotRaDecTelescope(BrotBaseTelescope, IOffsetsRaDec):
         await self.comm.set_state(IOffsetsRaDec, RaDecOffsetState(ra=dra, dec=ddec))
 
     async def get_fits_header_before(
-        self, namespaces: list[str] | None = None, **kwargs: Any
+        self, namespaces: list[str] | None = None, sender: str = "", **kwargs: Any
     ) -> dict[str, FitsHeaderEntry]:
         hdr = await BrotBaseTelescope.get_fits_header_before(self)
         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)
+        return self._filter_fits_namespace(hdr, sender=sender, namespaces=namespaces, **kwargs)
 
     async def add_pointing_measurement(self, **kwargs: Any) -> None:
         telemetry = self.brot.telescope._telemetry
@@ -387,14 +385,14 @@ class BrotAltAzTelescope(BrotBaseTelescope, IOffsetsAltAz, IPointingSeries):
         await self.comm.set_state(IOffsetsAltAz, AltAzOffsetState(alt=dalt, az=daz))
 
     async def get_fits_header_before(
-        self, namespaces: list[str] | None = None, **kwargs: Any
+        self, namespaces: list[str] | None = None, sender: str = "", **kwargs: Any
     ) -> dict[str, FitsHeaderEntry]:
         tel = self.brot.telescope._telemetry
         hdr = await BrotBaseTelescope.get_fits_header_before(self)
         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)
+        return self._filter_fits_namespace(hdr, sender=sender, namespaces=namespaces, **kwargs)
 
     async def add_pointing_measurement(self, **kwargs: Any) -> None:
         telemetry = self.brot.telescope._telemetry

{pyobs_brot-2.0.0.dev14 → pyobs_brot-2.0.0.dev15}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "pyobs-brot"
-version = "2.0.0.dev14"
+version = "2.0.0.dev15"
 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.dev48,<3",
+    "pyobs-core>=2.0.0.dev82,<3",
     "paho-mqtt>=2.1.0",
     "pybrotlib>=1.1.5",
 ]

{pyobs_brot-2.0.0.dev14 → pyobs_brot-2.0.0.dev15}/tests/test_brottelescope.py

@@ -21,6 +21,26 @@ def test_constructor_defaults() -> None:
     assert telescope._roof == "None"
 
 
+def test_constructor_threads_kwargs_cooperatively() -> None:
+    """Regression test for the cooperative-super()-chain fix: BrotBaseTelescope used to call
+    BaseTelescope.__init__() then a separate, redundant FitsNamespaceMixin.__init__(self,
+    **kwargs) -- BaseTelescope's own cooperative chain already reaches FitsNamespaceMixin (it's
+    the last base), so the second call re-threads the same kwargs (location, comm, ...) through
+    a chain that's now cooperative all the way to object.__init__(), which raises on any
+    leftover. This is exactly the shape deployed in pyobs-monet's telescope configs (host, name,
+    fits_headers, temperatures, comm, location, timezone all set)."""
+    telescope = BrotRaDecTelescope(
+        host="localhost",
+        name="telescope",
+        fits_headers={"TEL-FOCL": (8400.0, "Focal length")},
+        temperatures={"M1": "TEMP_M1"},
+        location={"longitude": 20.81, "latitude": -32.37, "elevation": 1798.0},
+        timezone="Africa/Johannesburg",
+    )
+    assert telescope.motion_status().name == "UNKNOWN"
+    assert telescope.temperatures == {"M1": "TEMP_M1"}
+
+
 def test_constructor_temperatures_and_roof() -> None:
     telescope = BrotRaDecTelescope(
         host="localhost",

{pyobs_brot-2.0.0.dev14 → pyobs_brot-2.0.0.dev15}/uv.lock

@@ -1935,7 +1935,7 @@ wheels = [
 
 [[package]]
 name = "pyobs-brot"
-version = "2.0.0.dev14"
+version = "2.0.0.dev15"
 source = { editable = "." }
 dependencies = [
     { name = "astropy" },
@@ -1959,7 +1959,7 @@ requires-dist = [
     { name = "astropy", specifier = ">=7.0.1,<8" },
     { name = "paho-mqtt", specifier = ">=2.1.0" },
     { name = "pybrotlib", specifier = ">=1.1.5" },
-    { name = "pyobs-core", specifier = ">=2.0.0.dev48,<3" },
+    { name = "pyobs-core", specifier = ">=2.0.0.dev82,<3" },
 ]
 
 [package.metadata.requires-dev]
@@ -1974,7 +1974,7 @@ dev = [
 
 [[package]]
 name = "pyobs-core"
-version = "2.0.0.dev72"
+version = "2.0.0.dev82"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
@@ -2006,9 +2006,9 @@ dependencies = [
     { name = "tenacity" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/d7/25/ac1a0571461eb87655374a38a4a21983db407f7239d60adce009e4ba8438/pyobs_core-2.0.0.dev72.tar.gz", hash = "sha256:b9ac8679bb9a72d1180ba60a97ad08b1878b1bc6b21158754d1f7fc7033231ee", size = 354347, upload-time = "2026-08-10T11:31:59.746Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/13/b8/e0d2a5fa390e15eebd01c86a75360e47e72823036b9e8793f73961c4e24a/pyobs_core-2.0.0.dev82.tar.gz", hash = "sha256:eb5e6510e0ba113700876db409cdce4b5d57e6df399421fc8cf174ec9e5076a8", size = 362959, upload-time = "2026-08-19T04:27:17.94Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8e/6a/570856f6149a611d7e4858e980faa1e23c5ddedda22327808f8e3eb5b413/pyobs_core-2.0.0.dev72-py3-none-any.whl", hash = "sha256:321f6b80f2fb8703e3cbf2f62cea2333cb475b1a50f58d8900176644fe6ca6b2", size = 576647, upload-time = "2026-08-10T11:31:57.813Z" },
+    { url = "https://files.pythonhosted.org/packages/81/17/83f22b85cfd9dea2c18396738d12fcd631232b2e8a111700133b037a7673/pyobs_core-2.0.0.dev82-py3-none-any.whl", hash = "sha256:b0cfe7d7a9dff89a8650ff4c01cdd3423f8ca9188aeef1d799d3e61085484bb2", size = 585768, upload-time = "2026-08-19T04:27:16.531Z" },
 ]
 
 [[package]]