pyobs-aravis 2.0.0.dev5__tar.gz → 2.0.0.dev7__tar.gz

{pyobs_aravis-2.0.0.dev5 → pyobs_aravis-2.0.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-aravis
-Version: 2.0.0.dev5
+Version: 2.0.0.dev7
 Summary: pyobs module for Aravis cameras
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT

{pyobs_aravis-2.0.0.dev5 → pyobs_aravis-2.0.0.dev7}/pyobs_aravis/araviscamera.py

@@ -1,6 +1,8 @@
 import asyncio
 import logging
+import threading
 import time
+from collections.abc import Callable
 from typing import Any
 
 import numpy.typing as npt
@@ -9,6 +11,11 @@ from pyobs.modules.camera import BaseVideo
 
 log = logging.getLogger(__name__)
 
+# aravis/GLib calls are blocking and are made directly on the event loop thread (see _run_blocking).
+# If the camera has gone unresponsive, they can hang indefinitely, so we bound them with a timeout
+# rather than let a single dead camera freeze the whole module.
+_SDK_CALL_TIMEOUT = 5.0
+
 
 class AravisCamera(BaseVideo, IExposureTime):
     """A pyobs module for Aravis cameras."""
@@ -32,7 +39,7 @@ class AravisCamera(BaseVideo, IExposureTime):
         BaseVideo.__init__(self, **kwargs)
         from . import aravis
 
-        self._device_name = device
+        self._camera_device_name = device
         self._camera: aravis.Camera | None = None
         self._settings: dict[str, Any] = {} if settings is None else settings
         self._camera_lock = asyncio.Lock()
@@ -51,7 +58,7 @@ class AravisCamera(BaseVideo, IExposureTime):
         await BaseVideo.open(self)
 
         ids: list[str] = aravis.get_device_ids()  # type: ignore[assignment]
-        if self._device_name not in ids:
+        if self._camera_device_name not in ids:
             raise ValueError("Could not find given device name in list of available cameras.")
 
         await self.activate_camera()
@@ -59,15 +66,14 @@ class AravisCamera(BaseVideo, IExposureTime):
     async def close(self) -> None:
         """Close the module."""
         await BaseVideo.close(self)
-        async with self._camera_lock:
-            self._close_camera()
+        await self._deactivate_camera()
 
     def _open_camera(self) -> None:
         """Open camera."""
         from . import aravis
 
-        log.info("Connecting to camera %s...", self._device_name)
-        self._camera = aravis.Camera(self._device_name)  # type: ignore[assignment]
+        log.info("Connecting to camera %s...", self._camera_device_name)
+        self._camera = aravis.Camera(self._camera_device_name)  # type: ignore[assignment]
         log.info("Connected.")
 
         for key, value in self._settings.items():
@@ -80,19 +86,52 @@ class AravisCamera(BaseVideo, IExposureTime):
         """Close camera."""
         if self._camera is not None:
             log.info("Closing camera...")
-            self._camera.stop_acquisition()  # type: ignore[union-attr]
-            self._camera.shutdown()  # type: ignore[union-attr]
+            try:
+                self._camera.stop_acquisition()  # type: ignore[union-attr]
+                self._camera.shutdown()  # type: ignore[union-attr]
+            except Exception:
+                log.exception("Error closing camera.")
         self._camera = None
 
+    @staticmethod
+    async def _run_blocking(func: Callable[[], None], timeout: float = _SDK_CALL_TIMEOUT) -> bool:
+        """Run a blocking aravis/GLib call in a daemon thread, so a hung call can't freeze the module.
+
+        A plain executor isn't used here, since its worker threads are non-daemon and Python joins
+        them on interpreter shutdown -- a hung call would then just move the freeze to process exit.
+
+        Returns:
+            True if func completed within timeout, False if it's still running in the background.
+        """
+        loop = asyncio.get_running_loop()
+        future: asyncio.Future[None] = loop.create_future()
+
+        def _wrapper() -> None:
+            try:
+                func()
+            finally:
+                loop.call_soon_threadsafe(future.set_result, None)
+
+        threading.Thread(target=_wrapper, daemon=True).start()
+        try:
+            await asyncio.wait_for(future, timeout=timeout)
+            return True
+        except TimeoutError:
+            return False
+
     async def _activate_camera(self) -> None:
         """Open camera on activation."""
         async with self._camera_lock:
-            self._open_camera()
+            if not await self._run_blocking(self._open_camera):
+                log.error("Timed out connecting to camera after %.1fs.", _SDK_CALL_TIMEOUT)
+                self._camera = None
 
     async def _deactivate_camera(self) -> None:
         """Close camera on deactivation."""
         async with self._camera_lock:
-            self._close_camera()
+            if not await self._run_blocking(self._close_camera):
+                log.error("Timed out closing camera after %.1fs, abandoning cleanup.", _SDK_CALL_TIMEOUT)
+                self._camera = None
 
     async def _capture(self) -> None:
         """Take new images in loop."""

{pyobs_aravis-2.0.0.dev5 → pyobs_aravis-2.0.0.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-aravis"
-version = "2.0.0.dev5"
+version = "2.0.0.dev7"
 description = "pyobs module for Aravis cameras"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11,<3.14"

{pyobs_aravis-2.0.0.dev5 → pyobs_aravis-2.0.0.dev7}/uv.lock

@@ -1770,7 +1770,7 @@ wheels = [
 
 [[package]]
 name = "pyobs-aravis"
-version = "2.0.0.dev5"
+version = "2.0.0.dev7"
 source = { editable = "." }
 dependencies = [
     { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" },