serverish 2.0.3__tar.gz → 2.0.5__tar.gz

{serverish-2.0.3 → serverish-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverish
-Version: 2.0.3
+Version: 2.0.5
 Summary: helpers for server alike projects
 License-File: LICENSE
 Author: Mikołaj Kałuszyński

{serverish-2.0.3 → serverish-2.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "serverish"
-version = "2.0.3"
+version = "2.0.5"
 description = "helpers for server alike projects"
 authors = ["Mikołaj Kałuszyński", "MMME team"]
 readme = "README.md"

{serverish-2.0.3 → serverish-2.0.5}/serverish/base/exceptions.py

@@ -7,6 +7,15 @@ class MessengerNotConnected(Exception):
 class MessengerReaderStopped(Exception):
     pass
 
+class MessengerReaderConfigError(ValueError):
+    """Raised when a MsgReader is misconfigured (e.g. missing required start marker).
+
+    This is a fatal error — the same configuration will never succeed against
+    the NATS server.  The reader stops and this exception propagates out of
+    ``async for`` loops so callers fail loudly instead of retrying forever.
+    """
+    pass
+
 class MessengerReaderAlreadyOpen(RuntimeError):
     pass
 

{serverish-2.0.3 → serverish-2.0.5}/serverish/messenger/msg_callback_sub.py

@@ -42,7 +42,9 @@ class MsgCallbackSubscriber(MsgReader):
         Args:
             callback: a callback function to call on each message, may be asynchronous
             callback is called with two arguments: message dict and metadata dict,
-            and should return True to continue reading messages, False to stop
+            and may return False to stop reading messages. Any other return value
+            (including None — i.e. callbacks with no explicit return — and True)
+            keeps the subscription running.
         """
         self.callback = callback
         if asyncio.iscoroutinefunction(callback):
@@ -59,7 +61,7 @@ class MsgCallbackSubscriber(MsgReader):
         assert scb is not None or acb is not None
         assert not (scb is not None and acb is not None)
         cb = scb or acb
-        cont = True
+        cont: object = True
         log.debug(f"Entering sync interation{self}")
         async for data, meta in self:
             try:
@@ -74,7 +76,11 @@ class MsgCallbackSubscriber(MsgReader):
                 break
             except Exception as e:
                 log.exception(f'Error in callback {cb} for message {meta}{str(data):20}: {e}')
-            if not cont or self._stop_event.is_set() :
+            # Stop only on explicit False — None (the implicit "no return" value
+            # of a Python function) and any truthy value keep the subscription
+            # alive. Treating None as "stop" would silently kill any callback
+            # that doesn't bother returning anything, which is the common case.
+            if cont is False or self._stop_event.is_set():
                 break
         log.debug(f"Exiting sync interation{self}")
 

{serverish-2.0.3 → serverish-2.0.5}/serverish/messenger/msg_reader.py

@@ -12,12 +12,14 @@ from uuid import uuid4
 
 
 import nats.errors
+import nats.js.errors
 import param
 from nats.js import JetStreamContext
 from nats.js.api import DeliverPolicy, ConsumerConfig
 
 from serverish.base import wait_for_psce
-from serverish.base.exceptions import (MessengerReaderStopped, MessengerNotConnected,
+from serverish.base.exceptions import (MessengerReaderStopped, MessengerReaderConfigError,
+                                       MessengerNotConnected,
                                        MessengerReaderAlreadyOpen, MessengerRequestTimeout)
 from serverish.base.fifoset import FifoSet
 from serverish.messenger import Messenger
@@ -105,6 +107,17 @@ class MsgReader(MsgDriver):
         super().__init__(subject=subject, parent=parent,
                          deliver_policy=deliver_policy, opt_start_time=opt_start_time, consumer_cfg=consumer_cfg_defaults,
                          **kwargs)
+        # Validate deliver_policy ↔ start-marker consistency up front so
+        # callers get a clear error at construction time rather than an
+        # opaque NATS 400 error buried inside the read loop.
+        if self.deliver_policy == 'by_start_time' and self.opt_start_time is None:
+            raise ValueError(
+                "deliver_policy='by_start_time' requires opt_start_time to be set"
+            )
+        if self.deliver_policy == 'by_start_sequence' and self.consumer_cfg.get('opt_start_seq') is None:
+            raise ValueError(
+                "deliver_policy='by_start_sequence' requires opt_start_seq to be set in consumer_cfg"
+            )
         log.debug(f"Created {self}")
 
 
@@ -384,6 +397,16 @@ class MsgReader(MsgDriver):
                 st.logput(f'{e.task}-err')
                 st.error = e.error
                 self._last_error = e.error  # Track for health monitoring
+                # Fatal NATS API errors (4xx): the same request will never
+                # succeed — stop retrying immediately and surface a clear
+                # MessengerReaderConfigError to the caller.
+                if isinstance(e.error, (nats.js.errors.BadRequestError,
+                                        nats.js.errors.NotFoundError)):
+                    log.error(st.fmt(f"fatal NATS error (not retrying): {e.error}"))
+                    self._stop.set()
+                    raise MessengerReaderConfigError(
+                        f"Fatal NATS error on {self.subject}: {e.error}"
+                    ) from e.error
                 match self.error_behavior:
                     case 'RAISE':
                         log.error(st.fmt(f"raising read_next error:  {e.error}"))