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

{pyobs_brot-2.0.0.dev13 → pyobs_brot-2.0.0.dev15}/.github/dependabot.yml

@@ -6,5 +6,10 @@ updates:
       interval: "weekly"
       day: "tuesday"
     target-branch: "develop"
+    groups:
+      patch-and-minor:
+        update-types:
+          - "minor"
+          - "patch"
     labels:
       - "dependencies"

pyobs_brot-2.0.0.dev15/.github/workflows/pyrefly.yml

@@ -0,0 +1,23 @@
+name: pyrefly
+on: push
+
+jobs:
+  pyrefly:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+          python-version: "3.13"
+
+      - name: Install packages
+        run: uv sync --all-extras --dev
+
+      - name: Run pyrefly
+        run: uv run pyrefly check

pyobs_brot-2.0.0.dev15/.github/workflows/pytest.yml

@@ -0,0 +1,25 @@
+name: PyTest
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+          python-version: "3.13"
+
+      - name: Install packages
+        run: uv sync --all-extras --dev
+
+      - name: Run tests
+        run: uv run pytest tests
+        env:
+          CI: true

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pyobs-brot
-Version: 2.0.0.dev13
+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.dev20
+Requires-Dist: pyobs-core<3,>=2.0.0.dev82

{pyobs_brot-2.0.0.dev13 → pyobs_brot-2.0.0.dev15}/pyobs_brot/brotdome.py

@@ -76,6 +76,10 @@ class BrotDome(BaseDome, IDome):
 
     @timeout(300)
     async def init(self, **kwargs: Any) -> None:
+        # weather?
+        if not self.is_weather_good():
+            raise exc.InitError("Weather seems to be bad.")
+
         log.info("Opening roof")
         if self.brot.dome.shutter == DomeShutterStatus.OPEN:
             return

{pyobs_brot-2.0.0.dev13 → pyobs_brot-2.0.0.dev15}/pyobs_brot/brotroof.py

@@ -60,6 +60,10 @@ class BrotRoof(BaseRoof):
 
     @timeout(300)
     async def init(self, **kwargs: Any) -> None:
+        # weather?
+        if not self.is_weather_good():
+            raise exc.InitError("Weather seems to be bad.")
+
         log.info("Opening roof")
         if self.brot.roof.status == RoofStatus.OPEN:
             return

{pyobs_brot-2.0.0.dev13 → 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
@@ -242,6 +240,10 @@ class BrotBaseTelescope(
 
     @timeout(120)
     async def init(self, **kwargs: Any) -> None:
+        # weather?
+        if not self.is_weather_good():
+            raise exc.InitError("Weather seems to be bad.")
+
         match self.brot.telescope.status:
             case TelescopeStatus.PARKED:
                 pass
@@ -328,21 +330,21 @@ class BrotRaDecTelescope(BrotBaseTelescope, IOffsetsRaDec):
         await self.brot.telescope.set_offset_dec(ddec * 3600)
         MAX_TARGET_DISTANCE = 2.0 / 3600.0
         while (
-            self.brot.telescope._telemetry.POSITION.INSTRUMENTAL.HA.TARGETDISTANCE < MAX_TARGET_DISTANCE
-            and self.brot.telescope._telemetry.POSITION.INSTRUMENTAL.DEC.TARGETDISTANCE < MAX_TARGET_DISTANCE
+            self.brot.telescope._telemetry.POSITION.INSTRUMENTAL.HA.TARGETDISTANCE > MAX_TARGET_DISTANCE
+            or self.brot.telescope._telemetry.POSITION.INSTRUMENTAL.DEC.TARGETDISTANCE > MAX_TARGET_DISTANCE
         ):
             await asyncio.sleep(0.1)
         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
@@ -383,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.dev13 → pyobs_brot-2.0.0.dev15}/pyproject.toml

@@ -1,23 +1,25 @@
 [project]
 name = "pyobs-brot"
-version = "2.0.0.dev13"
+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.dev20,<3",
+    "pyobs-core>=2.0.0.dev82,<3",
     "paho-mqtt>=2.1.0",
     "pybrotlib>=1.1.5",
 ]
 
 [dependency-groups]
 dev = [
-    "black>=23.7.0,<24",
+    "black>=23.7.0,<27",
     "ruff>=0.9.0",
     "pyrefly>=1.1.1",
     "pre-commit>=3.3.3,<5",
+    "pytest>=8.0.0",
+    "pytest-asyncio>=0.24.0",
 ]
 
 [build-system]
@@ -37,3 +39,6 @@ select = ["E", "F", "W", "I", "UP", "G"]
 
 [tool.pyrefly]
 python-version = "3.11"
+
+[tool.pytest.ini_options]
+asyncio_mode = "strict"

pyobs_brot-2.0.0.dev15/specs/index.md

@@ -0,0 +1,17 @@
+# Design/planning docs
+
+This repo has no `specs/` structure of its own. Design docs, implementation plans, and ADRs that
+concern `pyobs-brot` — including ones actually implemented here — live in `pyobs-core`'s `specs/`
+tree instead (`specs/design/`, `specs/plans/`, `specs/adrs/`), each tagged with a `Repos:` line
+naming every repo it concerns. See `pyobs-core/CLAUDE.md`'s "Cross-repo docs" section.
+
+Relevant so far:
+
+- `pyobs-core/specs/plans/ejabberd-throughput-benchmarking.md` — XMPP/ejabberd throughput
+  benchmarking, including a production incident investigation involving `BrotDome`/
+  `BrotRaDecTelescope` on `pyobs-iag50` (disco#info capability fetches silently timing out after a
+  few modules restart together) and the `pybrotlib` `MQTTTransport.run()` event-loop-starvation fix
+  found along the way.
+- `pyobs-core/specs/plans/enforce-state-publishing.md` — the state-publishing convention every
+  `Module` follows; `BrotRaDecTelescope`'s `ITemperatures` state had the same gap this doc's
+  convention exists to catch (2026-07-27 addendum).

pyobs_brot-2.0.0.dev15/tests/test_brotroof.py

@@ -0,0 +1,34 @@
+"""Unit tests for the roof-status -> motion-status mapping in BrotRoof.
+
+The BROT/MQTT backend is mocked out; only the state mapping is exercised.
+"""
+
+from unittest.mock import MagicMock
+
+import pytest
+from pybrotlib.components.roof import RoofStatus
+from pyobs.utils.enums import MotionStatus
+
+from pyobs_brot import BrotRoof
+
+
+@pytest.mark.parametrize(
+    ("status", "expected"),
+    [
+        (RoofStatus.ERROR, MotionStatus.ERROR),
+        (RoofStatus.CLOSED, MotionStatus.PARKED),
+        (RoofStatus.OPENING, MotionStatus.INITIALIZING),
+        (RoofStatus.CLOSING, MotionStatus.PARKING),
+        (RoofStatus.OPEN, MotionStatus.POSITIONED),
+        (RoofStatus.STOPPED, MotionStatus.IDLE),
+    ],
+)
+@pytest.mark.asyncio
+async def test_update_status_mapping(status: RoofStatus, expected: MotionStatus) -> None:
+    roof = BrotRoof(host="localhost", name="roof")
+    roof.brot.roof = MagicMock()
+    roof.brot.roof.status = status
+
+    await roof._update_status()
+
+    assert roof.motion_status() == expected

pyobs_brot-2.0.0.dev15/tests/test_brottelescope.py

@@ -0,0 +1,129 @@
+"""Unit tests for the non-hardware logic in the BROT telescope drivers: constructor
+state, focus-offset composition, and the RA/Dec offset scaling + convergence wait.
+
+The BROT/MQTT backend (self.brot) is mocked out; hardware I/O itself is out of scope.
+"""
+
+from types import SimpleNamespace
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+from pyobs.interfaces import IFocuser, IOffsetsRaDec
+
+from pyobs_brot import BrotRaDecTelescope
+
+
+def test_constructor_defaults() -> None:
+    telescope = BrotRaDecTelescope(host="localhost", name="telescope")
+    assert telescope.temperatures == {}
+    assert telescope.focus_offset == 0.0
+    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",
+        name="telescope",
+        temperatures={"ccd": "T1"},
+        roof="some-roof",
+    )
+    assert telescope.temperatures == {"ccd": "T1"}
+    assert telescope._roof == "some-roof"
+
+
+@pytest.mark.asyncio
+async def test_set_focus_offset_composes_and_publishes() -> None:
+    telescope = BrotRaDecTelescope(host="localhost", name="telescope")
+    telescope.brot.focus = MagicMock()
+    telescope.brot.focus.position = 10.0
+    telescope.brot.focus.set = AsyncMock()
+    telescope._wait_for_focus = AsyncMock()  # type: ignore[method-assign]
+    telescope.comm.set_state = AsyncMock()  # type: ignore[method-assign]
+
+    await telescope.set_focus_offset(0.25)
+
+    # the hardware call adds the offset onto the current position...
+    telescope.brot.focus.set.assert_awaited_once_with(10.25)
+    assert telescope.focus_offset == 0.25
+
+    # ...and the published focus subtracts the offset back out of the new position
+    assert telescope.comm.set_state.await_args is not None
+    interface, state = telescope.comm.set_state.await_args.args
+    assert interface is IFocuser
+    assert (state.focus, state.focus_offset) == (9.75, 0.25)
+
+
+def _telemetry(ha_dist: float, dec_dist: float) -> Any:
+    return SimpleNamespace(
+        POSITION=SimpleNamespace(
+            INSTRUMENTAL=SimpleNamespace(
+                HA=SimpleNamespace(TARGETDISTANCE=ha_dist),
+                DEC=SimpleNamespace(TARGETDISTANCE=dec_dist),
+            )
+        )
+    )
+
+
+@pytest.mark.asyncio
+async def test_set_offsets_radec_sends_scaled_and_sign_flipped_offsets() -> None:
+    telescope = BrotRaDecTelescope(host="localhost", name="telescope")
+    telescope.brot.telescope.set_offset_ha = AsyncMock()  # type: ignore[method-assign]
+    telescope.brot.telescope.set_offset_dec = AsyncMock()  # type: ignore[method-assign]
+    telescope.brot.telescope._telemetry = _telemetry(0.0, 0.0)  # already converged
+    telescope.comm.set_state = AsyncMock()  # type: ignore[method-assign]
+
+    await telescope.set_offsets_radec(0.001, 0.002)
+
+    # HA is sign-flipped (RA east is HA west) and both are scaled deg -> arcsec
+    telescope.brot.telescope.set_offset_ha.assert_awaited_once_with(-3.6)
+    telescope.brot.telescope.set_offset_dec.assert_awaited_once_with(7.2)
+    assert telescope.comm.set_state.await_args is not None
+    interface, state = telescope.comm.set_state.await_args.args
+    assert interface is IOffsetsRaDec
+    assert (state.ra, state.dec) == (0.001, 0.002)
+
+
+@pytest.mark.asyncio
+async def test_set_offsets_radec_waits_until_both_axes_converge(monkeypatch: pytest.MonkeyPatch) -> None:
+    telescope = BrotRaDecTelescope(host="localhost", name="telescope")
+    telescope.brot.telescope.set_offset_ha = AsyncMock()  # type: ignore[method-assign]
+    telescope.brot.telescope.set_offset_dec = AsyncMock()  # type: ignore[method-assign]
+    telescope.comm.set_state = AsyncMock()  # type: ignore[method-assign]
+
+    # still slewing for two polls (HA, then DEC, still off-target), converged on the third
+    readings = [(1.0, 1.0), (1.0, 0.0), (0.0, 0.0)]
+    telescope.brot.telescope._telemetry = _telemetry(*readings[0])
+
+    sleep_calls = 0
+
+    async def fake_sleep(_seconds: float) -> None:
+        nonlocal sleep_calls
+        sleep_calls += 1
+        telescope.brot.telescope._telemetry = _telemetry(*readings[sleep_calls])
+
+    monkeypatch.setattr("pyobs_brot.brottelescope.asyncio.sleep", fake_sleep)
+
+    await telescope.set_offsets_radec(0.001, 0.002)
+
+    assert sleep_calls == 2

pyobs_brot-2.0.0.dev15/tests/test_import.py

@@ -0,0 +1,49 @@
+"""Smoke tests: import every public module and instantiate each driver class without
+hardware, asserting the interfaces they claim.
+
+pybrotlib is a pure-Python MQTT client that connects at connect() time, not at
+construction, so instantiation is safe with no broker running.
+"""
+
+from pyobs.interfaces import (
+    IDome,
+    IFocuser,
+    IOffsetsAltAz,
+    IOffsetsRaDec,
+    IPointingAltAz,
+    IPointingRaDec,
+    IRoof,
+    ITemperatures,
+)
+from pyobs.modules import Module
+
+from pyobs_brot import BrotDome, BrotRaDecTelescope, BrotRoof
+from pyobs_brot.brottelescope import BrotAltAzTelescope
+
+
+def test_instantiate_dome() -> None:
+    dome = BrotDome(host="localhost", name="dome")
+    assert isinstance(dome, Module)
+    assert isinstance(dome, IDome)
+
+
+def test_instantiate_roof() -> None:
+    roof = BrotRoof(host="localhost", name="roof")
+    assert isinstance(roof, Module)
+    assert isinstance(roof, IRoof)
+
+
+def test_instantiate_radec_telescope() -> None:
+    telescope = BrotRaDecTelescope(host="localhost", name="telescope")
+    assert isinstance(telescope, Module)
+    assert isinstance(telescope, IFocuser)
+    assert isinstance(telescope, ITemperatures)
+    assert isinstance(telescope, IPointingRaDec)
+    assert isinstance(telescope, IPointingAltAz)
+    assert isinstance(telescope, IOffsetsRaDec)
+
+
+def test_instantiate_altaz_telescope() -> None:
+    telescope = BrotAltAzTelescope(host="localhost", name="telescope")
+    assert isinstance(telescope, Module)
+    assert isinstance(telescope, IOffsetsAltAz)