dbus2mqtt 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

dbus2mqtt/config/__init__.py

@@ -3,9 +3,9 @@ import uuid
 import warnings
 
 from dataclasses import dataclass, field
-from typing import Annotated, Any, Literal
+from typing import Any, Literal
 
-from pydantic import Field, SecretStr
+from jsonargparse.typing import SecretStr
 
 from dbus2mqtt.template.templating import TemplateEngine
 
@@ -98,10 +98,15 @@ class FlowTriggerMqttMessageConfig:
             return template_engine.render_template(self.filter, bool, trigger_context)
         return True
 
-FlowTriggerConfig = Annotated[
-    FlowTriggerScheduleConfig | FlowTriggerDbusSignalConfig | FlowTriggerBusNameAddedConfig | FlowTriggerBusNameRemovedConfig | FlowTriggerObjectAddedConfig | FlowTriggerObjectRemovedConfig | FlowTriggerMqttMessageConfig,
-    Field(discriminator="type")
-]
+FlowTriggerConfig = (
+    FlowTriggerScheduleConfig
+    | FlowTriggerDbusSignalConfig
+    | FlowTriggerBusNameAddedConfig
+    | FlowTriggerBusNameRemovedConfig
+    | FlowTriggerObjectAddedConfig
+    | FlowTriggerObjectRemovedConfig
+    | FlowTriggerMqttMessageConfig
+)
 
 @dataclass
 class FlowActionContextSetConfig:
@@ -124,10 +129,11 @@ class FlowActionLogConfig:
     type: Literal["log"] = "log"
     level: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "INFO"
 
-FlowActionConfig = Annotated[
-    FlowActionMqttPublishConfig | FlowActionContextSetConfig | FlowActionLogConfig,
-    Field(discriminator="type")
-]
+FlowActionConfig = (
+    FlowActionMqttPublishConfig
+    | FlowActionContextSetConfig
+    | FlowActionLogConfig
+)
 
 @dataclass
 class FlowConfig:

dbus2mqtt/config/jsonarparse.py

@@ -1,32 +1,38 @@
+from typing import Any
+
 import jsonargparse
 
+from yaml import YAMLError
 
-def _custom_yaml_load(stream):
-    if isinstance(stream, str):
-        v = stream.strip()
+default_yaml_loader = jsonargparse.get_loader("yaml")
+def _custom_yaml_load(stream: str) -> Any:
 
-        # jsonargparse tries to parse yaml 1.1 boolean like values
-        # Without this, str:"{'PlaybackStatus': 'Off'}" would become dict:{'PlaybackStatus': False}
-        if v in ['on', 'On', 'off', 'Off', 'TRUE', 'FALSE', 'True', 'False']:
-            return stream
+    v = stream.strip()
 
-        # 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
-        first_line = v.splitlines()[0].strip()
-        if "#" not in first_line and ("{{" in first_line or first_line.startswith("{%")):
-            return stream
+    # jsonargparse tries to parse yaml 1.1 boolean like values
+    # Without this, str:"{'PlaybackStatus': 'Off'}" would become dict:{'PlaybackStatus': False}
+    if v in ['on', 'On', 'off', 'Off', 'TRUE', 'FALSE', 'True', 'False']:
+        return stream
 
     # Delegate to default yaml loader from jsonargparse
-    yaml_loader = jsonargparse.get_loader("yaml")
-    return yaml_loader(stream)
+    return default_yaml_loader(stream)
 
 def new_argument_parser() -> jsonargparse.ArgumentParser:
 
     # register out custom yaml loader for jsonargparse
-    jsonargparse.set_loader("yaml_custom", _custom_yaml_load)
+    jsonargparse.set_loader(
+        mode="yaml_custom",
+        loader_fn=_custom_yaml_load,
+        exceptions=(YAMLError,),
+        json_superset=True
+    )
 
     # unless specified otherwise, load config from config.yaml
-    parser = jsonargparse.ArgumentParser(default_config_files=["config.yaml"], default_env=True, env_prefix=False, parser_mode="yaml_custom")
+    parser = jsonargparse.ArgumentParser(
+        default_config_files=["config.yaml"],
+        default_env=True,
+        env_prefix=False,
+        parser_mode="yaml_custom"
+    )
 
     return parser

dbus2mqtt/dbus/dbus_client.py

@@ -686,7 +686,7 @@ class DbusClient:
             try:
                 await self._on_mqtt_msg(msg, hints)
             except Exception as e:
-                logger.warning(f"mqtt_receive_queue_processor_task: Exception {e}", exc_info=True)
+                logger.warning(f"mqtt_receive_queue_processor_task: Exception: {e}", exc_info=True)
             finally:
                 self.event_broker.mqtt_receive_queue.async_q.task_done()
 
@@ -735,7 +735,7 @@ class DbusClient:
 
                             await self.event_broker.flow_trigger_queue.async_q.put(trigger_message)
                     except Exception as e:
-                        logger.warning(f"dbus_signal_queue_processor_task: Exception {e}", exc_info=True)
+                        logger.warning(f"dbus_signal_queue_processor_task: Exception: {e}", exc_info=True)
 
     async def _handle_dbus_object_lifecycle_signal(self, message: dbus_message.Message):
 

dbus2mqtt/flow/flow_processor.py

@@ -187,7 +187,7 @@ class FlowProcessor:
                 if "was not provided by any .service files" in str(e):
                     log_level = logging.DEBUG
 
-                logger.log(log_level, f"flow_processor_task: Exception {e}", exc_info=logger.isEnabledFor(logging.DEBUG))
+                logger.log(log_level, f"flow_processor_task: Exception: {e}", exc_info=logger.isEnabledFor(logging.DEBUG))
             finally:
                 self.event_broker.flow_trigger_queue.async_q.task_done()
 

dbus2mqtt/mqtt/mqtt_client.py

@@ -84,7 +84,7 @@ class MqttClient:
                     except Exception as e:
                         # In case failing uri reads, we still publish an empty msg to avoid stale data
                         payload = None
-                        logger.warning(f"mqtt_publish_queue_processor_task: Exception {e}", exc_info=logger.isEnabledFor(logging.DEBUG))
+                        logger.warning(f"mqtt_publish_queue_processor_task: Exception: {e}", exc_info=logger.isEnabledFor(logging.DEBUG))
 
                 payload_log_msg = payload if isinstance(payload, str) else msg.payload
                 logger.debug(f"mqtt_publish_queue_processor_task: topic={msg.topic}, type={payload.__class__}, payload={payload_log_msg}")
@@ -107,7 +107,7 @@ class MqttClient:
                     first_message = False
 
             except Exception as e:
-                logger.warning(f"mqtt_publish_queue_processor_task: Exception {e}", exc_info=logger.isEnabledFor(logging.DEBUG))
+                logger.warning(f"mqtt_publish_queue_processor_task: Exception: {e}", exc_info=logger.isEnabledFor(logging.DEBUG))
             finally:
                 self.event_broker.mqtt_publish_queue.async_q.task_done()
 

dbus2mqtt/template/templating.py

@@ -1,9 +1,16 @@
 import urllib.parse
 
 from datetime import datetime
+from importlib.metadata import version
 from typing import Any, TypeVar
 
-from jinja2 import BaseLoader, StrictUndefined, TemplateError
+from jinja2 import (
+    BaseLoader,
+    StrictUndefined,
+    TemplateError,
+    TemplateRuntimeError,
+    UndefinedError,
+)
 from jinja2.nativetypes import NativeEnvironment
 from jinja2_ansible_filters import AnsibleCoreFiltersExtension
 
@@ -18,6 +25,9 @@ class TemplateEngine:
         engine_globals = {}
         engine_globals['now'] = datetime.now
         engine_globals['urldecode'] = urldecode
+        engine_globals['dbus2mqtt'] = {
+            'version': version('dbus2mqtt')
+        }
 
         engine_filters = {}
         engine_filters['urldecode'] = urldecode
@@ -69,10 +79,17 @@ class TemplateEngine:
 
         if isinstance(templatable, str):
             try:
-                return self.jinja2_env.from_string(templatable).render(**context)
+                template = self.jinja2_env.from_string(templatable)
             except TemplateError as e:
                 raise TemplateError(f"Error compiling template, template={templatable}: {e}") from e
 
+            try:
+                res = template.render(**context)
+                str(res)  # access value to trigger jinja UndefinedError
+                return res
+            except UndefinedError as e:
+                raise TemplateRuntimeError(f"Error rendering template, template={templatable}: {e}") from e
+
         elif isinstance(templatable, dict):
             res = {}
             for k, v in templatable.items():
@@ -95,10 +112,17 @@ class TemplateEngine:
 
         if isinstance(templatable, str):
             try:
-                return await self.jinja2_async_env.from_string(templatable).render_async(**context)
+                template = self.jinja2_async_env.from_string(templatable)
             except TemplateError as e:
                 raise TemplateError(f"Error compiling template, template={templatable}: {e}") from e
 
+            try:
+                res = await template.render_async(**context)
+                str(res)  # access value to trigger jinja UndefinedError
+                return res
+            except UndefinedError as e:
+                raise TemplateRuntimeError(f"Error rendering template, template={templatable}: {e}") from e
+
         elif isinstance(templatable, dict):
             res = {}
             for k, v in templatable.items():

{dbus2mqtt-0.5.0.dist-info → dbus2mqtt-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbus2mqtt
-Version: 0.5.0
+Version: 0.5.2
 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
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
 Requires-Dist: apscheduler>=3.11.0
@@ -27,7 +28,6 @@ Requires-Dist: jinja2-ansible-filters>=1.3.2
 Requires-Dist: jinja2>=3.1.6
 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: pyyaml>=6.0.2
 Description-Content-Type: text/markdown
@@ -51,7 +51,7 @@ This makes it easy to integrate Linux desktop services or system signals into MQ
 
 **dbus2mqtt** is considered stable for the use-cases it has been tested against, and is actively being developed. Documentation is continuously being improved.
 
-Initial testing has focused on MPRIS integration. A table of tested MPRIS players and their supported methods can be found on [Mediaplayer integration with Home Assistant](https://jwnmulder.github.io/dbus2mqtt/examples/home_assistant_media_player.html)
+Initial testing has focused on MPRIS integration. A table of tested MPRIS players and their supported methods can be found on [Mediaplayer integration with Home Assistant](https://jwnmulder.github.io/dbus2mqtt/examples/home_assistant_media_player/)
 
 ## Getting started with dbus2mqtt
 
@@ -101,16 +101,16 @@ python -m pip install dbus2mqtt
 dbus2mqtt --config config.yaml
 ```
 
-See [setup](https://jwnmulder.github.io/dbus2mqtt/setup.html) for more installation options and configuration details.
+See [setup](https://jwnmulder.github.io/dbus2mqtt/setup/) for more installation options and configuration details.
 
 ## Examples
 
-More dbus2mqtt examples can be found in the [examples](https://jwnmulder.github.io/dbus2mqtt/examples/index.html) section.
-The most complete one being [Mediaplayer integration with Home Assistant](https://jwnmulder.github.io/dbus2mqtt/examples/home_assistant_media_player.html)
+More dbus2mqtt examples can be found in the [examples](https://jwnmulder.github.io/dbus2mqtt/examples/) section.
+The most complete one being [Mediaplayer integration with Home Assistant](https://jwnmulder.github.io/dbus2mqtt/examples/home_assistant_media_player/)
 
 ## Exposing dbus methods, properties and signals
 
-See [subscriptions](https://jwnmulder.github.io/dbus2mqtt/subscriptions.html) for documentation on calling methods, setting properties and exposing D-Bus signals to MQTT. When configured, D-Bus methods can be invoked by publishing a message like
+See [subscriptions](https://jwnmulder.github.io/dbus2mqtt/subscriptions/) for documentation on calling methods, setting properties and exposing D-Bus signals to MQTT. When configured, D-Bus methods can be invoked by publishing a message like
 
 ```json
 {
@@ -120,6 +120,6 @@ See [subscriptions](https://jwnmulder.github.io/dbus2mqtt/subscriptions.html) fo
 
 ## Flows and Jinja based templating
 
-For more advanced use-cases, dbus2mqtt has support for flows and Jinja2 based templates. A reference of all supported flow triggers and actions can be found on [flows](https://jwnmulder.github.io/dbus2mqtt/flows/index.html)
+For more advanced use-cases, dbus2mqtt has support for flows and Jinja2 based templates. A reference of all supported flow triggers and actions can be found on [flows](https://jwnmulder.github.io/dbus2mqtt/flows/)
 
-Jinja templating documentation can be found here: [templating](templating/index.md)
+Jinja templating documentation can be found here: [templating](https://jwnmulder.github.io/dbus2mqtt/templating/)

{dbus2mqtt-0.5.0.dist-info → dbus2mqtt-0.5.2.dist-info}/RECORD

@@ -2,23 +2,23 @@ dbus2mqtt/__init__.py,sha256=VunubKEH4_lne9Ttd2YRpyXjZMIAzyD2eiJ2sfvvTFU,362
 dbus2mqtt/__main__.py,sha256=NAoa3nwgBSQI22eWzzRx61SIDThDwXmUofWWZU3_4-Q,71
 dbus2mqtt/event_broker.py,sha256=8Iw1PNpH4IxQbpcFtNvPDc8_M8kuGarN6Kvz_a2aFfc,1468
 dbus2mqtt/main.py,sha256=Kr2LRVxWcPDtNwCj8Eqz9TxtGLAVrV4q0nizKh1pLXc,4539
-dbus2mqtt/config/__init__.py,sha256=tMAQ3JyoTgm4HziFew82SbdYIHMw7sNuEHN1kh4ZixA,5953
-dbus2mqtt/config/jsonarparse.py,sha256=XK7CrMCGiHZK2tq1IqSpzJ3hdV0gCOixJq3LXUDiEjg,1298
-dbus2mqtt/dbus/dbus_client.py,sha256=PDZiscCF4imn7cxo5bDLmhQ8g9ZL-6RbGu5had1xiso,44832
+dbus2mqtt/config/__init__.py,sha256=daqVzuSxNnUNKtMoMYs73AdlkfS6goXUsxF1wnKi7y0,5894
+dbus2mqtt/config/jsonarparse.py,sha256=-wcJW-O-Coqs0uqr5VVvk9mj6DWEm45NylSLkOhCECs,1084
+dbus2mqtt/dbus/dbus_client.py,sha256=bRq9rNNWWY4uiWUYQWpgL02I9lgLGOBr5oRMR2uJHxI,44834
 dbus2mqtt/dbus/dbus_types.py,sha256=NmPD9um499e49Pk8DWH4IrIPQh1BinHYQgoXllCNiDw,777
 dbus2mqtt/dbus/dbus_util.py,sha256=NUe_9Aohcib_bU8RUa19UPFteDZ0_WsmgCbbnmTUvcY,5814
 dbus2mqtt/dbus/introspection_patches/mpris_playerctl.py,sha256=q93d_Yp93u3Y-9q0dRdKW5hrij9GK3CFqKhUWVE8uw4,5883
 dbus2mqtt/dbus/introspection_patches/mpris_vlc.py,sha256=Cf-o-05W6gUoKpcYR7n0dRi-CrbeASPTwkyEzZGnU3Y,4241
 dbus2mqtt/flow/__init__.py,sha256=tAL-CjXQHq_tGTKctIdOZ5teVKBtcJs6Astq_RdruV8,1540
-dbus2mqtt/flow/flow_processor.py,sha256=UUdnIeVKXFRTJDBHLein6riHAh7UOKPdT4mTsnAmVV8,9067
+dbus2mqtt/flow/flow_processor.py,sha256=d-M5sjuFltpR957Nsu6fCDvHKc3r5Wd_AbPvhPk4U3o,9068
 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=qvhaxtftdE7uS5Vhw-Dvhaicro4pWGtGlk254m2nEtI,8076
+dbus2mqtt/mqtt/mqtt_client.py,sha256=bH3GV1AVC5stygOOT3ZzP4yrJa27vPIeaI7BIBg2w2Q,8078
 dbus2mqtt/template/dbus_template_functions.py,sha256=oYXJ4HC1XCFGarf_tRzNGhvx2ECXDoT9J4Mz-cxqoJg,2447
-dbus2mqtt/template/templating.py,sha256=QLar09NinZO8rYGbVs9EThX-SOyTeBVCOppueU7VYdo,4483
-dbus2mqtt-0.5.0.dist-info/METADATA,sha256=n1EGYCUprF0KVqifoD1hXN0nwQZa78_qGphx14H2up8,5334
-dbus2mqtt-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbus2mqtt-0.5.0.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
-dbus2mqtt-0.5.0.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
-dbus2mqtt-0.5.0.dist-info/RECORD,,
+dbus2mqtt/template/templating.py,sha256=-y_C9Gg55gK5v9mctfTSn-0N4v9e8s7HrhL8geIGVrg,5281
+dbus2mqtt-0.5.2.dist-info/METADATA,sha256=aRN6FG81TwQl05fNPSrX7QKTSIiOT6vXZsw8ZPgEelU,5347
+dbus2mqtt-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbus2mqtt-0.5.2.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
+dbus2mqtt-0.5.2.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
+dbus2mqtt-0.5.2.dist-info/RECORD,,