pyobs-fli 2.0.0.dev9__tar.gz → 2.0.0.dev10__tar.gz

{pyobs_fli-2.0.0.dev9 → pyobs_fli-2.0.0.dev10}/.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_fli-2.0.0.dev9 → pyobs_fli-2.0.0.dev10}/.github/workflows/pypi.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Set up Python
         uses: astral-sh/setup-uv@v5
         with:
-          enable-cache: true
+          enable-cache: false
           python-version: "3.13"
 
       - name: Publish

pyobs_fli-2.0.0.dev10/.github/workflows/pyrefly.yml

@@ -0,0 +1,26 @@
+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 system dependencies
+        run: sudo apt-get install -y libcfitsio-dev
+
+      - name: Install packages
+        run: uv sync --all-extras --dev
+
+      - name: Run pyrefly
+        run: uv run pyrefly check

pyobs_fli-2.0.0.dev10/.github/workflows/pytest.yml

@@ -0,0 +1,28 @@
+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 system dependencies
+        run: sudo apt-get install -y libcfitsio-dev
+
+      - name: Install packages
+        run: uv sync --all-extras --dev
+
+      - name: Run tests
+        run: uv run pytest tests
+        env:
+          CI: true

{pyobs_fli-2.0.0.dev9 → pyobs_fli-2.0.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-fli
-Version: 2.0.0.dev9
+Version: 2.0.0.dev10
 Summary: pyobs module for FLI cameras
 Author-Email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT

{pyobs_fli-2.0.0.dev9 → pyobs_fli-2.0.0.dev10}/pyobs_fli/flicamera.py

@@ -92,6 +92,7 @@ class FliCamera(FliBaseMixin, BaseCamera, ICamera, IWindow, IBinning, ICooling,
             ),
         )
         await self.comm.set_state(IBinning, BinningState(x=self._binning[0], y=self._binning[1]))
+        await self.comm.set_state(ITemperatures, TemperaturesState())
 
     async def close(self) -> None:
         """Close the module."""

{pyobs_fli-2.0.0.dev9 → pyobs_fli-2.0.0.dev10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-fli"
-version = "2.0.0.dev9"
+version = "2.0.0.dev10"
 description = "pyobs module for FLI cameras"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11"
@@ -17,6 +17,8 @@ dev = [
     "pre-commit>=4.2.0,<5",
     "ruff>=0.9.0",
     "pyrefly>=1.1.1",
+    "pytest>=8.0.0",
+    "pytest-asyncio>=0.24.0",
 ]
 
 [tool.scikit-build]
@@ -49,3 +51,6 @@ select = ["E", "F", "W", "I", "UP", "G"]
 [tool.pyrefly]
 python-version = "3.11"
 ignore-missing-imports = []
+
+[tool.pytest.ini_options]
+asyncio_mode = "strict"

pyobs_fli-2.0.0.dev10/tests/test_flicamera.py

@@ -0,0 +1,91 @@
+"""Unit tests for the non-hardware logic in FliCamera: constructor defaults, the
+window/binning setters, and the _run_blocking/_run_blocking_or_raise thread wrappers.
+
+Hardware I/O (opening, exposing, reading out) is out of scope here.
+"""
+
+import asyncio
+import threading
+from unittest.mock import AsyncMock
+
+import pytest
+from pyobs.interfaces import IBinning, IWindow
+
+from pyobs_fli import FliCamera
+
+
+def test_constructor_defaults() -> None:
+    camera = FliCamera()
+    assert camera._temp_setpoint == -20.0
+    assert camera._cooling_enabled is False
+    assert camera._window == (0, 0, 0, 0)
+    assert camera._binning == (1, 1)
+    assert camera._driver is None
+
+
+@pytest.mark.asyncio
+async def test_set_window() -> None:
+    camera = FliCamera()
+    camera.comm.set_state = AsyncMock()  # type: ignore[method-assign]
+
+    await camera.set_window(10, 20, 100, 200)
+
+    assert camera._window == (10, 20, 100, 200)
+    assert camera.comm.set_state.await_args is not None
+    interface, state = camera.comm.set_state.await_args.args
+    assert interface is IWindow
+    assert (state.x, state.y, state.width, state.height) == (10, 20, 100, 200)
+
+
+@pytest.mark.asyncio
+async def test_set_binning() -> None:
+    camera = FliCamera()
+    camera.comm.set_state = AsyncMock()  # type: ignore[method-assign]
+
+    await camera.set_binning(2, 3)
+
+    assert camera._binning == (2, 3)
+    assert camera.comm.set_state.await_args is not None
+    interface, state = camera.comm.set_state.await_args.args
+    assert interface is IBinning
+    assert (state.x, state.y) == (2, 3)
+
+
+@pytest.mark.asyncio
+async def test_run_blocking_runs_func_and_returns_true() -> None:
+    ran: list[bool] = []
+
+    def fast() -> None:
+        ran.append(True)
+
+    assert await FliCamera._run_blocking(fast) is True
+    assert ran == [True]
+
+
+@pytest.mark.asyncio
+async def test_run_blocking_times_out() -> None:
+    done = threading.Event()
+
+    def slow() -> None:
+        done.wait()
+
+    assert await FliCamera._run_blocking(slow, timeout=0.01) is False
+    done.set()
+    await asyncio.sleep(0.05)
+
+
+@pytest.mark.asyncio
+async def test_run_blocking_or_raise_returns_value() -> None:
+    camera = FliCamera()
+    assert await camera._run_blocking_or_raise(lambda: 42) == 42
+
+
+@pytest.mark.asyncio
+async def test_run_blocking_or_raise_reraises() -> None:
+    camera = FliCamera()
+
+    def boom() -> int:
+        raise ValueError("boom")
+
+    with pytest.raises(ValueError):
+        await camera._run_blocking_or_raise(boom)

pyobs_fli-2.0.0.dev10/tests/test_flifilterwheel.py

@@ -0,0 +1,79 @@
+"""Unit tests for the non-hardware logic in FliFilterWheel: filter-name normalization,
+position <-> name mapping, and set_filter position computation.
+
+Hardware I/O (moving the wheel) is mocked out.
+"""
+
+from unittest.mock import MagicMock
+
+import pytest
+from pyobs.utils import exceptions as exc
+
+from pyobs_fli import FliFilterWheel
+
+_TWO_WHEELS = [["A", "B", "C", "D", "E", "F", "G"], ["H", "I", "J"]]
+
+
+def test_constructor_single_wheel() -> None:
+    wheel = FliFilterWheel(filter_names=["A", "B", "C"])
+    assert wheel._filter_names == [["A", "B", "C"]]
+
+
+def test_constructor_two_wheels() -> None:
+    wheel = FliFilterWheel(filter_names=_TWO_WHEELS)
+    assert wheel._filter_names == _TWO_WHEELS
+
+
+@pytest.mark.parametrize(
+    ("pos", "expected"),
+    [
+        (0, "A"),
+        (1, "G"),
+        (6, "B"),
+        (7, "H"),
+        (8, "G"),
+        (14, "I"),
+    ],
+)
+def test_resolve_filter_name(pos: int, expected: str) -> None:
+    wheel = FliFilterWheel(filter_names=_TWO_WHEELS)
+    assert wheel._resolve_filter_name(pos) == expected
+
+
+@pytest.mark.asyncio
+async def test_set_filter_first_wheel() -> None:
+    wheel = FliFilterWheel(filter_names=_TWO_WHEELS)
+    wheel._driver = MagicMock()
+    wheel._driver.set_filter_pos = MagicMock()
+
+    async def fake_run(func, timeout: float = 5.0) -> None:
+        func()
+
+    wheel._run_blocking_or_raise = fake_run  # type: ignore[method-assign]
+
+    await wheel.set_filter("A")
+    wheel._driver.set_filter_pos.assert_called_once_with(0)
+    assert wheel._current_filter == "A"
+
+
+@pytest.mark.asyncio
+async def test_set_filter_second_wheel() -> None:
+    wheel = FliFilterWheel(filter_names=_TWO_WHEELS)
+    wheel._driver = MagicMock()
+    wheel._driver.set_filter_pos = MagicMock()
+
+    async def fake_run(func, timeout: float = 5.0) -> None:
+        func()
+
+    wheel._run_blocking_or_raise = fake_run  # type: ignore[method-assign]
+
+    await wheel.set_filter("H")
+    wheel._driver.set_filter_pos.assert_called_once_with(7)
+    assert wheel._current_filter == "H"
+
+
+@pytest.mark.asyncio
+async def test_set_filter_unknown_filter() -> None:
+    wheel = FliFilterWheel(filter_names=_TWO_WHEELS)
+    with pytest.raises(exc.ModuleError):
+        await wheel.set_filter("nope")

pyobs_fli-2.0.0.dev10/tests/test_import.py

@@ -0,0 +1,29 @@
+"""Smoke tests: import the drivers and instantiate them without hardware, asserting
+the interfaces they claim.
+
+The Cython extension (flidriver) is compiled from the vendored libfli C source during
+install, but device enumeration/opening only happens inside open(), so instantiation
+is safe with no FLI hardware attached.
+"""
+
+from pyobs.interfaces import IAbortable, IBinning, ICamera, ICooling, IFilters, ITemperatures, IWindow
+from pyobs.modules import Module
+
+from pyobs_fli import FliCamera, FliFilterWheel
+
+
+def test_instantiate_camera() -> None:
+    camera = FliCamera()
+    assert isinstance(camera, Module)
+    assert isinstance(camera, ICamera)
+    assert isinstance(camera, IWindow)
+    assert isinstance(camera, IBinning)
+    assert isinstance(camera, ICooling)
+    assert isinstance(camera, ITemperatures)
+    assert isinstance(camera, IAbortable)
+
+
+def test_instantiate_filter_wheel() -> None:
+    wheel = FliFilterWheel(filter_names=["A", "B", "C"])
+    assert isinstance(wheel, Module)
+    assert isinstance(wheel, IFilters)

{pyobs_fli-2.0.0.dev9 → pyobs_fli-2.0.0.dev10}/uv.lock

@@ -865,6 +865,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/7f/ec/6b120b4a86f6fadc7ddb1d7c7cdcb15bcfb332deb022ab60df51bcd4494c/influxdb_client-1.50.0-py3-none-any.whl", hash = "sha256:f172975cf7f0c95bfe74f288b31273393b164d2c58a948de55497d9956ab49be", size = 746289, upload-time = "2026-01-23T09:39:37.377Z" },
 ]
 
+[[package]]
+name = "iniconfig"
+version = "2.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" },
+]
+
 [[package]]
 name = "invoke"
 version = "3.0.3"
@@ -1437,6 +1446,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/49/e2/4e6eee633809c376c024821b91ade709cbfd040ec53939ffbcc292aa7eee/platformdirs-4.11.2-py3-none-any.whl", hash = "sha256:7f89089b6ea71bda7962953edcf784b2e2d9d285b40ad88be2bb75c6e9d82ab4", size = 23361, upload-time = "2026-08-10T15:48:04.855Z" },
 ]
 
+[[package]]
+name = "pluggy"
+version = "1.6.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" },
+]
+
 [[package]]
 name = "pre-commit"
 version = "4.6.2"
@@ -1838,6 +1856,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b4/11/97233cf23ad5411ac6f13b1d6ee3888f90ace4f974d9bf9db887aa428912/pyerfa-2.0.1.5-cp39-abi3-win_amd64.whl", hash = "sha256:66292d437dcf75925b694977aa06eb697126e7b86553e620371ed3e48b5e0ad0", size = 349410, upload-time = "2024-11-11T15:22:24.817Z" },
 ]
 
+[[package]]
+name = "pygments"
+version = "2.20.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" },
+]
+
 [[package]]
 name = "pynacl"
 version = "1.6.2"
@@ -1914,7 +1941,7 @@ wheels = [
 
 [[package]]
 name = "pyobs-fli"
-version = "2.0.0.dev9"
+version = "2.0.0.dev10"
 source = { editable = "." }
 dependencies = [
     { name = "astropy" },
@@ -1928,6 +1955,8 @@ dev = [
     { name = "black" },
     { name = "pre-commit" },
     { name = "pyrefly" },
+    { name = "pytest" },
+    { name = "pytest-asyncio" },
     { name = "ruff" },
 ]
 
@@ -1943,6 +1972,8 @@ dev = [
     { name = "black", specifier = ">=25.1.0,<27" },
     { name = "pre-commit", specifier = ">=4.2.0,<5" },
     { name = "pyrefly", specifier = ">=1.1.1" },
+    { name = "pytest", specifier = ">=8.0.0" },
+    { name = "pytest-asyncio", specifier = ">=0.24.0" },
     { name = "ruff", specifier = ">=0.9.0" },
 ]
 
@@ -1965,6 +1996,35 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/1b/1c/df3cb0a2e5591660ded7a1836cd2f29dc48c91adb1c0a3a700a96f6d09e1/pyrefly-1.2.0-py3-none-win_arm64.whl", hash = "sha256:3a90bb8df39dfbac74b1f3b2e9d7c526b8f80568884c3944d955023a73ebf61e", size = 13430873, upload-time = "2026-08-01T02:56:25.425Z" },
 ]
 
+[[package]]
+name = "pytest"
+version = "9.1.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "iniconfig" },
+    { name = "packaging" },
+    { name = "pluggy" },
+    { name = "pygments" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/e4/47/b9efed96c114afcfa3c9d3fe98a76a1d14c74a9e266d397cf6eb64be5e01/pytest-9.1.1.tar.gz", hash = "sha256:1088fbde8f2b49d95a549a195707afa7a76a3ce9bcadc26b6d71f0ffda5fe313", size = 1636369, upload-time = "2026-06-19T10:58:32.857Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/24/25/1de2678b631f5a49215c6c96fff41ba892b0a34df68d6d80292b1b48aa7f/pytest-9.1.1-py3-none-any.whl", hash = "sha256:37a86b45efb9a47a61a36449063e8e18d0cab3161329fc099eb21783169c4f0c", size = 386536, upload-time = "2026-06-19T10:58:31.347Z" },
+]
+
+[[package]]
+name = "pytest-asyncio"
+version = "1.4.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pytest" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/43/7c/d36d04db312ecf4298932ef77e6e4a9e8ad017906e24e34f0b0c361a2473/pytest_asyncio-1.4.0.tar.gz", hash = "sha256:c6c0d2259945122819f171a32ecea2c349ead889ee28176caaf492143424be42", size = 58514, upload-time = "2026-05-26T09:56:04.083Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/03/e2/08a497ef684b88559c9cc5f4ad53a37e7b99e727094a86d6ea32536d5d3c/pytest_asyncio-1.4.0-py3-none-any.whl", hash = "sha256:933ca923a23075a87fb7070c0ec272a6848489824d887c85c812670932835aa1", size = 16930, upload-time = "2026-05-26T09:56:02.576Z" },
+]
+
 [[package]]
 name = "python-dateutil"
 version = "2.9.0.post0"