dbus2mqtt 0.4.3__py3-none-any.whl → 0.4.4__py3-none-any.whl

dbus2mqtt/config/jsonarparse.py

@@ -13,7 +13,8 @@ def _custom_yaml_load(stream):
         # Anoyingly, values starting with {{ and ending with }} are working with the default yaml_loader
         # from jsonargparse. Somehow its not when we use the custom yaml loader.
         # This fixes it
-        if v.startswith("{{") or v.startswith("{%"):
+        first_line = v.splitlines()[0].strip()
+        if "#" not in first_line and ("{{" in first_line or first_line.startswith("{%")):
             return stream
 
     # Delegate to default yaml loader from jsonargparse

dbus2mqtt/mqtt/mqtt_client.py

@@ -122,21 +122,21 @@ class MqttClient:
 
     def on_message(self, client: mqtt.Client, userdata: Any, msg: mqtt.MQTTMessage):
 
-        # Skip retained messages
-        payload = msg.payload.decode()
-        if msg.retain:
-            logger.info(f"on_message: skipping msg with retain=True, topic={msg.topic}, payload={payload}")
-            return
-
         # Skip messages being sent by other dbus2mqtt clients
         if msg.properties:
             user_properties: list[tuple[str, object]] = getattr(msg.properties, "UserProperty", [])
             client_id = next((str(v) for k, v in user_properties if k == "client_id"), None)
             if client_id and client_id != self.client_id:
-                logger.info(f"on_message: skipping msg from another dbus2mqtt client, topic={msg.topic}, client_id={client_id}")
+                logger.debug(f"on_message: skipping msg from another dbus2mqtt client, topic={msg.topic}, client_id={client_id}")
             if client_id and client_id.startswith(self.client_id_prefix):
                 return
 
+        # Skip retained messages
+        payload = msg.payload.decode()
+        if msg.retain:
+            logger.info(f"on_message: skipping msg with retain=True, topic={msg.topic}, payload={payload}")
+            return
+
         try:
             json_payload = json.loads(payload) if payload else {}
             logger.debug(f"on_message: msg.topic={msg.topic}, msg.payload={json.dumps(json_payload)}")

dbus2mqtt/template/templating.py

@@ -5,6 +5,7 @@ from typing import Any, TypeVar
 
 from jinja2 import BaseLoader, StrictUndefined, TemplateError
 from jinja2.nativetypes import NativeEnvironment
+from jinja2_ansible_filters import AnsibleCoreFiltersExtension
 
 TemplateResultType = TypeVar('TemplateResultType')
 
@@ -23,14 +24,14 @@ class TemplateEngine:
 
         self.jinja2_env = NativeEnvironment(
             loader=BaseLoader(),
-            extensions=['jinja2_ansible_filters.AnsibleCoreFiltersExtension'],
+            extensions=[AnsibleCoreFiltersExtension],
             undefined=StrictUndefined,
             keep_trailing_newline=False
         )
 
         self.jinja2_async_env = NativeEnvironment(
             loader=BaseLoader(),
-            extensions=['jinja2_ansible_filters.AnsibleCoreFiltersExtension'],
+            extensions=[AnsibleCoreFiltersExtension],
             undefined=StrictUndefined,
             enable_async=True
         )

{dbus2mqtt-0.4.3.dist-info → dbus2mqtt-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbus2mqtt
-Version: 0.4.3
+Version: 0.4.4
 Summary: General purpose DBus to MQTT bridge - expose signals, methods and properties over MQTT - featuring jinja based templating, payload enrichment and MPRIS / BlueZ / Home Assistant ready examples 
 Project-URL: Documentation, https://jwnmulder.github.io/dbus2mqtt
 Project-URL: Source, https://github.com/jwnmulder/dbus2mqtt
@@ -29,7 +29,7 @@ Requires-Dist: jsonargparse>=4.38.0
 Requires-Dist: paho-mqtt>=2.1.0
 Requires-Dist: pydantic>=2.11.3
 Requires-Dist: python-dotenv>=1.1.0
-Requires-Dist: schedule>=1.2.2
+Requires-Dist: pyyaml>=6.0.2
 Description-Content-Type: text/markdown
 
 # dbus2mqtt

{dbus2mqtt-0.4.3.dist-info → dbus2mqtt-0.4.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ dbus2mqtt/__main__.py,sha256=NAoa3nwgBSQI22eWzzRx61SIDThDwXmUofWWZU3_4-Q,71
 dbus2mqtt/event_broker.py,sha256=Hp5yurhP8FkAO-y0l2grygHxR2e37ZQ7QScjcQDA2UU,1334
 dbus2mqtt/main.py,sha256=Kr2LRVxWcPDtNwCj8Eqz9TxtGLAVrV4q0nizKh1pLXc,4539
 dbus2mqtt/config/__init__.py,sha256=947_dLVt8qq7P3p15jGIy5Vf1jUUMGrh1xr_DVhZclQ,5372
-dbus2mqtt/config/jsonarparse.py,sha256=VJGFeyQJcOE6bRXlSRr3FClvN_HnmiIlEGmOgNM0oCc,1214
+dbus2mqtt/config/jsonarparse.py,sha256=XK7CrMCGiHZK2tq1IqSpzJ3hdV0gCOixJq3LXUDiEjg,1298
 dbus2mqtt/dbus/dbus_client.py,sha256=WHsmOiaJ5SY6zk-C99m83MEpycnUyGpsYmGopJJbPE8,39690
 dbus2mqtt/dbus/dbus_types.py,sha256=NmPD9um499e49Pk8DWH4IrIPQh1BinHYQgoXllCNiDw,777
 dbus2mqtt/dbus/dbus_util.py,sha256=h-1Y8Mvz9bj9X7mPZ8LghkvXDrujdJHK0__AOW373hE,697
@@ -14,11 +14,11 @@ dbus2mqtt/flow/flow_processor.py,sha256=N-btGap1wqnM4zKyulH_5KQhGi0IRlsK2cHrrnom
 dbus2mqtt/flow/actions/context_set.py,sha256=dIT39MJJVb0wuRI_ZM3ssnXYfa-iyB4o_UZD-1BZL2g,1087
 dbus2mqtt/flow/actions/log_action.py,sha256=2_-YEKkX5kvFzK6x4v-Hx3u2PEM8fip_4buMg_ij-oI,1156
 dbus2mqtt/flow/actions/mqtt_publish.py,sha256=psNkTvaR3JZwAwpM4AqiZTDnA5UQX9r4CUZ1LA7iRW4,2366
-dbus2mqtt/mqtt/mqtt_client.py,sha256=P6rxVNA2M_wxhI3RcHpvayEEmcUQGGDG6hkLmjiqY1w,6056
+dbus2mqtt/mqtt/mqtt_client.py,sha256=bVAPbjgIi8ZQZlYVLe-Mo_A6NW6oQYEw1EYMOJYoS7w,6057
 dbus2mqtt/template/dbus_template_functions.py,sha256=UEoXK2PqDKF6jR4vTFHQwq58f5APnOJr7B1_I1zW8yM,2449
-dbus2mqtt/template/templating.py,sha256=YzE6-pBoATrV7nXkgxSiLlbxgbC65-2wGiFPHgIDd9g,4470
-dbus2mqtt-0.4.3.dist-info/METADATA,sha256=XcxIrk2rZt7HWU1ch1Eqx2DzVIQgvsjpwYMZ0q6on2A,8071
-dbus2mqtt-0.4.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbus2mqtt-0.4.3.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
-dbus2mqtt-0.4.3.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
-dbus2mqtt-0.4.3.dist-info/RECORD,,
+dbus2mqtt/template/templating.py,sha256=QLar09NinZO8rYGbVs9EThX-SOyTeBVCOppueU7VYdo,4483
+dbus2mqtt-0.4.4.dist-info/METADATA,sha256=aEi1sQg8JVDc6A1_uavQC6lsQljSnIoQuxUUgwsj8bI,8069
+dbus2mqtt-0.4.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbus2mqtt-0.4.4.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
+dbus2mqtt-0.4.4.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
+dbus2mqtt-0.4.4.dist-info/RECORD,,