pyobs-core 2.13.0__tar.gz → 2.13.2__tar.gz

{pyobs_core-2.13.0 → pyobs_core-2.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyobs-core
-Version: 2.13.0
+Version: 2.13.2
 Summary: robotic telescope software
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT

{pyobs_core-2.13.0 → pyobs_core-2.13.2}/pyobs/comm/xmpp/xmppcomm.py

@@ -65,6 +65,18 @@ def _retry_delay(attempt: int, cap: float = 30.0, base: float = 1.0) -> float:
     return random.uniform(0, min(cap, base * (2 ** min(attempt, 60))))
 
 
+def _iq_failure_reason(e: slixmpp.exceptions.IqError | slixmpp.exceptions.IqTimeout) -> str:
+    """Short description of why an IQ failed, for retry-loop warnings.
+
+    Distinguishes a server error reply (e.g. item-not-found: the pubsub node doesn't exist, so
+    the publisher never published to it) from a timeout (the server or connection is stalled).
+    Without this, both look identical in the "still failing" warnings.
+    """
+    if isinstance(e, slixmpp.exceptions.IqError):
+        return f"error: {e.condition}" + (f" ({e.text})" if e.text else "")
+    return "timeout"
+
+
 def _log_task_exception(task: asyncio.Task[Any]) -> None:
     """Retrieve and log a background task's exception, if it failed.
 
@@ -998,13 +1010,15 @@ class XmppComm(Comm):
                 try:
                     await self._safe_send(self.client.plugin["xep_0060"].subscribe, self._pubsub_service, node)
                     return
-                except (slixmpp.exceptions.IqError, slixmpp.exceptions.IqTimeout):
+                except (slixmpp.exceptions.IqError, slixmpp.exceptions.IqTimeout) as e:
                     attempt += 1
                     if attempt == 30:
                         log.warning(
-                            "Still failing to subscribe to event node %s after %d attempts, will keep retrying",
+                            "Still failing to subscribe to event node %s after %d attempts (last %s), "
+                            "will keep retrying",
                             node,
                             attempt,
+                            _iq_failure_reason(e),
                         )
                     await asyncio.sleep(_retry_delay(attempt))
         except Exception:
@@ -1364,13 +1378,15 @@ class XmppComm(Comm):
                 try:
                     await self._safe_send(self.client.plugin["xep_0060"].subscribe, self._pubsub_service, node)
                     break
-                except (slixmpp.exceptions.IqError, slixmpp.exceptions.IqTimeout):
+                except (slixmpp.exceptions.IqError, slixmpp.exceptions.IqTimeout) as e:
                     attempt += 1
                     if attempt == 30:
                         log.warning(
-                            "Still failing to subscribe to state node %s after %d attempts, will keep retrying",
+                            "Still failing to subscribe to state node %s after %d attempts (last %s), "
+                            "will keep retrying",
                             node,
                             attempt,
+                            _iq_failure_reason(e),
                         )
                     await asyncio.sleep(_retry_delay(attempt))
             else:

{pyobs_core-2.13.0 → pyobs_core-2.13.2}/pyobs/modules/camera/__init__.py

@@ -11,5 +11,16 @@ from .basevideo import BaseVideo
 from .dummycamera import DummyCamera
 from .dummyspectrograph import DummySpectrograph
 from .pipelinecamera import PipelineCamera
+from .videoframes import Frame, FrameRecord, StartSource
 
-__all__ = ["BaseCamera", "BaseVideo", "BaseSpectrograph", "DummyCamera", "DummySpectrograph", "PipelineCamera"]
+__all__ = [
+    "BaseCamera",
+    "BaseVideo",
+    "BaseSpectrograph",
+    "DummyCamera",
+    "DummySpectrograph",
+    "Frame",
+    "FrameRecord",
+    "PipelineCamera",
+    "StartSource",
+]

{pyobs_core-2.13.0 → pyobs_core-2.13.2}/pyobs/modules/camera/basevideo.py

@@ -10,7 +10,6 @@ from collections.abc import AsyncIterator, Awaitable, Callable
 from enum import StrEnum
 from typing import Any, NamedTuple
 
-import aiohttp
 import numpy as np
 import PIL.Image
 from aiohttp import web
@@ -550,8 +549,10 @@ class BaseVideo(
             last_time = time.time()
             try:
                 await response.write(b"--jpgboundary\r\nContent-type: image/jpeg\r\n\r\n" + jpeg + b"\r\n")
-            except aiohttp.client_exceptions.ClientConnectionResetError:
-                # end stream
+            except ConnectionError:
+                # client went away -- end stream. Catches more than ClientConnectionResetError:
+                # aiohttp's drain can also raise a plain ConnectionError("Connection lost"), which
+                # would otherwise escape and get logged as an error with a full traceback
                 break
 
         # return response
@@ -668,8 +669,10 @@ class BaseVideo(
                     b"Content-Type: application/octet-stream\r\n"
                     b"X-Pyobs-Frame-Meta: " + meta + b"\r\n\r\n" + frame + b"\r\n"
                 )
-            except aiohttp.client_exceptions.ClientConnectionResetError:
-                # end stream
+            except ConnectionError:
+                # client went away -- end stream. Catches more than ClientConnectionResetError:
+                # aiohttp's drain can also raise a plain ConnectionError("Connection lost"), which
+                # would otherwise escape and get logged as an error with a full traceback
                 break
 
         # return response

{pyobs_core-2.13.0 → pyobs_core-2.13.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-core"
-version = "2.13.0"
+version = "2.13.2"
 description = "robotic telescope software"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11"