ramses-rf 0.53.5__py3-none-any.whl → 0.53.6__py3-none-any.whl

ramses_rf/dispatcher.py

@@ -270,7 +270,11 @@ def process_msg(gwy: Gateway, msg: Message) -> None:
         )
 
     except (AttributeError, LookupError, TypeError, ValueError) as err:
-        _LOGGER.exception("%s < %s(%s)", msg._pkt, err.__class__.__name__, err)
+        if getattr(gwy.config, "enforce_strict_handling", False):
+            raise
+        _LOGGER.warning(
+            "%s < %s(%s)", msg._pkt, err.__class__.__name__, err, exc_info=True
+        )
 
     else:
         logger_xxxx(msg)

ramses_rf/schemas.py

@@ -245,6 +245,7 @@ SCH_GLOBAL_SCHEMAS = vol.Schema(SCH_GLOBAL_SCHEMAS_DICT, extra=vol.PREVENT_EXTRA
 # 4/7: Gateway (parser/state) configuration
 SZ_DISABLE_DISCOVERY: Final = "disable_discovery"
 SZ_ENABLE_EAVESDROP: Final = "enable_eavesdrop"
+SZ_ENFORCE_STRICT_HANDLING: Final = "enforce_strict_handling"
 SZ_MAX_ZONES: Final = "max_zones"  # TODO: move to TCS-attr from GWY-layer
 SZ_REDUCE_PROCESSING: Final = "reduce_processing"
 SZ_USE_ALIASES: Final = "use_aliases"  # use friendly device names from known_list
@@ -253,6 +254,7 @@ SZ_USE_NATIVE_OT: Final = "use_native_ot"  # favour OT (3220s) over RAMSES
 SCH_GATEWAY_DICT = {
     vol.Optional(SZ_DISABLE_DISCOVERY, default=False): bool,
     vol.Optional(SZ_ENABLE_EAVESDROP, default=False): bool,
+    vol.Optional(SZ_ENFORCE_STRICT_HANDLING, default=False): bool,
     vol.Optional(SZ_MAX_ZONES, default=DEFAULT_MAX_ZONES): vol.All(
         int, vol.Range(min=1, max=16)
     ),  # NOTE: no default

ramses_rf/version.py

@@ -1,4 +1,4 @@
 """RAMSES RF - a RAMSES-II protocol decoder & analyser (application layer)."""
 
-__version__ = "0.53.5"
+__version__ = "0.53.6"
 VERSION = __version__

{ramses_rf-0.53.5.dist-info → ramses_rf-0.53.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.53.5
+Version: 0.53.6
 Summary: A stateful RAMSES-II protocol decoder & analyser.
 Project-URL: Homepage, https://github.com/ramses-rf/ramses_rf
 Project-URL: Bug Tracker, https://github.com/ramses-rf/ramses_rf/issues
@@ -62,11 +62,11 @@ To install the `ramses_rf` command line client:
 ```
 git clone https://github.com/ramses-rf/ramses_rf
 cd ramses_rf
-pip install -r requirements.txt
+pip install -r requirements/requirements.txt
 pip install -e .
 ```
 
-The CLI is called ``client.py`` and is included in the code root.
+The CLI is called `client.py` and is included in the code root.
 It has options to monitor and parse Ramses-II traffic to screen or a log file, and to parse a file containing Ramses-II messages to the screen.
 See the [client.py CLI wiki page](https://github.com/ramses-rf/ramses_rf/wiki/2.-The-client.py-command-line) for instructions.
 

{ramses_rf-0.53.5.dist-info → ramses_rf-0.53.6.dist-info}/RECORD

@@ -9,15 +9,15 @@ ramses_rf/__init__.py,sha256=AXsCK1Eh9FWeAI9D_zY_2KB0dqrTb9a5TNY1NvyQaDM,1271
 ramses_rf/binding_fsm.py,sha256=fuqvcc9YW-wr8SPH8zadpPqrHAvzl_eeWF-IBtlLppY,26632
 ramses_rf/const.py,sha256=L3z31CZ-xqno6oZp_h-67CB_5tDDqTwSWXsqRtsjMcs,5460
 ramses_rf/database.py,sha256=eARZ8F5lcITK6d_MfvozmMxSGNkiy1kbtAh0NOIHMoc,24066
-ramses_rf/dispatcher.py,sha256=YjEU-QrBLo9IfoEhJo2ikg_FxOaMYoWvzelr9Vi-JZ8,11398
+ramses_rf/dispatcher.py,sha256=pHNrXOLeAp6i9TUZEPNOB1AevlKkQyUfX2dkr-EzrDw,11517
 ramses_rf/entity_base.py,sha256=Lv4N3dyIRfsz_5Ztgcu4bc49UE-N4c1VuN732_HQp-g,59255
 ramses_rf/exceptions.py,sha256=mt_T7irqHSDKir6KLaf6oDglUIdrw0S40JbOrWJk5jc,3657
 ramses_rf/gateway.py,sha256=BsS3gyFcSOCLuzQ_OxgyqHTcn2wAVsEJaV6B5PbYre0,31087
 ramses_rf/helpers.py,sha256=TNk_QkpIOB3alOp1sqnA9LOzi4fuDCeapNlW3zTzNas,4250
 ramses_rf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ramses_rf/schemas.py,sha256=X1GAK3kttuLMiSCUDY2s-85fgBxPeU8xiDa6gJ1I5mY,13543
+ramses_rf/schemas.py,sha256=k0IN2OvIgNGZ9lGkFMuM81jcjUqWvdGNfaccDBwfh_8,13672
 ramses_rf/storage.py,sha256=ZFUhvgsWRCVS1_r6LL032XFEJwZVp1RAK8Nfba8nf7o,7052
-ramses_rf/version.py,sha256=HfkMfk1rLOZbqMvqEgE1o6j48RTa0l-dHJ-_7nrquYM,125
+ramses_rf/version.py,sha256=Qfhbwe6tvYg3scyTH0mknbjnE0tb-XQ19FcHCCdu8CM,125
 ramses_rf/device/__init__.py,sha256=sUbH5dhbYFXSoM_TPFRutpRutBRpup7_cQ9smPtDTy8,4858
 ramses_rf/device/base.py,sha256=Tu5I8Lj7KplfRsIBQAYjilS6YPgTyjpU8qgKugMR2Jk,18281
 ramses_rf/device/heat.py,sha256=CU6GlIgjuYD21braJ_RJlS56zP47TGXNxXnZeavfEMY,54654
@@ -42,16 +42,16 @@ ramses_tx/opentherm.py,sha256=58PXz9l5x8Ou6Fm3y-R_UnGHCYahoi2RKIDdYStUMzk,42378
 ramses_tx/packet.py,sha256=_nzuInS_WhdOI26SYvgsdDqIaDvVNguc2YDwdPOVCbU,7661
 ramses_tx/parsers.py,sha256=ALUoi21ewd_GZHvxq4051AcVwETOTgVr5feWaY7zdls,148659
 ramses_tx/protocol.py,sha256=E62vWb8qY7_SB5tb_NcywAED4d9NJJJ-1NgMaK3HG5s,33198
-ramses_tx/protocol_fsm.py,sha256=o9vLvlXor3LkPgsY1zii5P1R01GzYLf_PECDdoxtC24,27520
+ramses_tx/protocol_fsm.py,sha256=uT0jLuTsz_6zUJSvdMG200xbYQIFgqfzJ0t3l5bTTTc,27741
 ramses_tx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramses_tx/ramses.py,sha256=89EFL91zwnArefVcEVw3KoyqF92d3r3aBoJapMNAT0I,54389
-ramses_tx/schemas.py,sha256=Hrmf_q9bAZtkKJzGu6GtUO0QV_-K9i4L99EzGWR13eE,13408
-ramses_tx/transport.py,sha256=RIrcNrJwiKB_xmJLgG4Z--V2d83PLsJnLXZK-WFFgsA,76568
+ramses_tx/schemas.py,sha256=Bh877L2lmsrtq86ygQEnlbalcyRSEvfsjRnub-9P6X4,13495
+ramses_tx/transport.py,sha256=W2y6em3PQytTYnREZsm2b2-FQeZQCciY2UprBa8-PM8,77057
 ramses_tx/typed_dicts.py,sha256=w-0V5t2Q3GiNUOrRAWiW9GtSwbta_7luME6GfIb1zhI,10869
 ramses_tx/typing.py,sha256=eF2SlPWhNhEFQj6WX2AhTXiyRQVXYnFutiepllYl2rI,5042
-ramses_tx/version.py,sha256=j6vK_nd2r1udUd4SmgheUwwD64f35BfwQoHsuHcFaYs,123
-ramses_rf-0.53.5.dist-info/METADATA,sha256=m53OVOic5uCyW6ScGRSjARqKekXiTbJ4T2KLIMDe3LE,4179
-ramses_rf-0.53.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ramses_rf-0.53.5.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
-ramses_rf-0.53.5.dist-info/licenses/LICENSE,sha256=ptVutrtSMr7X-ek6LduiD8Cce4JsNn_8sR8MYlm-fvo,1086
-ramses_rf-0.53.5.dist-info/RECORD,,
+ramses_tx/version.py,sha256=wG4Me_pyFvCD82_aAFqAut5OXMh7AJllw7_gB6uBe5M,123
+ramses_rf-0.53.6.dist-info/METADATA,sha256=RDKvYo4RMR13qU0XyXjxv9HumiHUaZeXfaWQc4SlLNs,4190
+ramses_rf-0.53.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ramses_rf-0.53.6.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
+ramses_rf-0.53.6.dist-info/licenses/LICENSE,sha256=ptVutrtSMr7X-ek6LduiD8Cce4JsNn_8sR8MYlm-fvo,1086
+ramses_rf-0.53.6.dist-info/RECORD,,

ramses_tx/protocol_fsm.py

@@ -145,13 +145,20 @@ class ProtocolContext:
             # nope, was not successful, so multiplier should be incremented...
             self._multiplier = min(3, old_val + 1)
 
+            if self._cmd_tx_count < 3:
+                level = logging.DEBUG
+            elif self._cmd_tx_count == 3:
+                level = logging.INFO
+            else:
+                level = logging.WARNING
+
             if isinstance(self._state, WantEcho):
-                _LOGGER.warning(
-                    f"Timeout expired waiting for echo: {self} (delay={delay})"
+                _LOGGER.log(
+                    level, f"Timeout expired waiting for echo: {self} (delay={delay})"
                 )
             else:  # isinstance(self._state, WantRply):
-                _LOGGER.warning(
-                    f"Timeout expired waiting for reply: {self} (delay={delay})"
+                _LOGGER.log(
+                    level, f"Timeout expired waiting for reply: {self} (delay={delay})"
                 )
 
             assert isinstance(self.is_sending, bool), (

ramses_tx/schemas.py

@@ -407,6 +407,7 @@ def select_device_filter_mode(
 # 5/5: Gateway (engine) configuration
 
 SZ_DISABLE_SENDING: Final = "disable_sending"
+SZ_AUTOSTART: Final = "autostart"
 SZ_DISABLE_QOS: Final = "disable_qos"
 SZ_ENFORCE_KNOWN_LIST: Final[str] = f"enforce_{SZ_KNOWN_LIST}"
 SZ_EVOFW_FLAG: Final = "evofw_flag"
@@ -418,6 +419,7 @@ SZ_USE_REGEX: Final = "use_regex"
 
 SCH_ENGINE_DICT = {
     vol.Optional(SZ_DISABLE_SENDING, default=False): bool,
+    vol.Optional(SZ_AUTOSTART, default=False): bool,
     vol.Optional(SZ_DISABLE_QOS, default=None): vol.Any(
         None,  # None is selective QoS (e.g. QoS only for bindings, schedule, etc.)
         bool,

ramses_tx/transport.py

@@ -1278,8 +1278,9 @@ class PortTransport(_RegHackMixin, _FullTransport, _PortTransportAbstractor):  #
 
         super()._close(exc)
 
-        if self._init_task:
-            self._init_task.cancel()
+        # Use getattr because _init_task may not be set if initialization failed
+        if init_task := getattr(self, "_init_task", None):
+            init_task.cancel()
 
         if self._leaker_task:
             self._leaker_task.cancel()
@@ -1810,6 +1811,7 @@ class CallbackTransport(_FullTransport, _CallbackTransportAbstractor):
         protocol: RamsesProtocolT,
         io_writer: Callable[[str], Awaitable[None]],
         disable_sending: bool = False,
+        autostart: bool = False,
         **kwargs: Any,
     ) -> None:
         """Initialize the callback transport.
@@ -1820,6 +1822,8 @@ class CallbackTransport(_FullTransport, _CallbackTransportAbstractor):
         :type io_writer: Callable[[str], Awaitable[None]]
         :param disable_sending: Whether to disable sending, defaults to False.
         :type disable_sending: bool, optional
+        :param autostart: Whether to start reading immediately, defaults to False.
+        :type autostart: bool, optional
         """
         # Pass kwargs up the chain. _ReadTransport will extract 'loop' if present.
         # _BaseTransport will pass 'loop' to _CallbackTransportAbstractor, which consumes it.
@@ -1834,9 +1838,11 @@ class CallbackTransport(_FullTransport, _CallbackTransportAbstractor):
         # Section 6.1: Object Lifecycle Logging
         _LOGGER.info(f"CallbackTransport created with io_writer={io_writer}")
 
-        # NOTE: connection_made is NOT called here. It must be triggered
-        # externally (e.g. by the Bridge) via the protocol methods once
-        # the external connection is ready.
+        # Handshake: Notify protocol immediately (Safe: idempotent)
+        self._protocol.connection_made(self, ramses=True)
+
+        if autostart:
+            self.resume_reading()
 
     async def write_frame(self, frame: str, disable_tx_limits: bool = False) -> None:
         """Process a frame for transmission by passing it to the external writer.
@@ -1879,19 +1885,19 @@ class CallbackTransport(_FullTransport, _CallbackTransportAbstractor):
         :type dtm: str | None, optional
         """
         _LOGGER.debug(
-            f"Received frame from external source: frame='{frame}', timestamp={dtm}"
+            f"Received frame from external source: frame={repr(frame)}, timestamp={dtm}"
         )
 
-        # Section 4.2: Circuit Breaker implementation (Packet gating)
+        # Circuit Breaker implementation (Packet gating)
         if not self._reading:
             _LOGGER.debug(f"Dropping received frame (transport paused): {repr(frame)}")
             return
 
         dtm = dtm or dt_now().isoformat()
 
-        # Section 6.1: Boundary Logging (Incoming)
+        # Boundary Logging (Incoming)
         _LOGGER.debug(
-            f"Ingesting frame into transport: frame='{frame}', timestamp={dtm}"
+            f"Ingesting frame into transport: frame={repr(frame)}, timestamp={dtm}"
         )
 
         # Pass to the standard processing pipeline
@@ -1949,7 +1955,7 @@ async def transport_factory(
     extra: dict[str, Any] | None = None,
     loop: asyncio.AbstractEventLoop | None = None,
     log_all: bool = False,
-    **kwargs: Any,  # HACK: odd/misc params
+    **kwargs: Any,  # HACK: odd/misc params, inc. autostart
 ) -> RamsesTransportT:
     """Create and return a Ramses-specific async packet Transport.
 
@@ -1980,11 +1986,18 @@ async def transport_factory(
     :raises exc.TransportSourceInvalid: If the packet source is invalid or multiple sources are specified.
     """
 
+    # Extract autostart (default to False if missing), used in transport_constructor only
+    autostart = kwargs.pop("autostart", False)
+
     # If a constructor is provided, delegate entirely to it.
     if transport_constructor:
         _LOGGER.debug("transport_factory: Delegating to external transport_constructor")
         return await transport_constructor(
-            protocol, disable_sending=disable_sending, extra=extra, **kwargs
+            protocol,
+            disable_sending=disable_sending,
+            extra=extra,
+            autostart=autostart,  # <--- Pass it explicitly
+            **kwargs,
         )
 
     # kwargs are specific to a transport. The above transports have:

ramses_tx/version.py

@@ -1,4 +1,4 @@
 """RAMSES RF - a RAMSES-II protocol decoder & analyser (transport layer)."""
 
-__version__ = "0.53.5"
+__version__ = "0.53.6"
 VERSION = __version__