dbus2mqtt 0.5.1__tar.gz → 0.5.2__tar.gz

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           activate-environment: true
           enable-cache: true

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/.github/workflows/deploy-docs.yml

@@ -20,7 +20,7 @@ jobs:
           git config user.name github-actions[bot]
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           activate-environment: true
           enable-cache: true

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/.github/workflows/docker-dev.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
 

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/.github/workflows/pre-commit.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           activate-environment: true
           enable-cache: true

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
           persist-credentials: false
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           activate-environment: true
           enable-cache: true

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/.github/workflows/trivy.yml

@@ -30,6 +30,6 @@ jobs:
           ignore-unfixed: true
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: 'trivy-results.sarif'

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
           - --strict
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.12
+    rev: v0.14.0
     hooks:
       - id: ruff
         args:
@@ -42,12 +42,12 @@ repos:
           - I
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.8.15
+    rev: 0.9.2
     hooks:
       - id: uv-lock
 
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.405
+    rev: v1.1.406
     hooks:
       - id: pyright
 

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbus2mqtt
-Version: 0.5.1
+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
@@ -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](https://jwnmulder.github.io/dbus2mqtt/templating/index.html)
+Jinja templating documentation can be found here: [templating](https://jwnmulder.github.io/dbus2mqtt/templating/)

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/README.md

@@ -17,7 +17,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
 
@@ -67,16 +67,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
 {
@@ -86,6 +86,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](https://jwnmulder.github.io/dbus2mqtt/templating/index.html)
+Jinja templating documentation can be found here: [templating](https://jwnmulder.github.io/dbus2mqtt/templating/)

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/docker/Dockerfile.dev

@@ -25,7 +25,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     uv sync --frozen --no-dev
 
 # Then, use a final image without uv
-FROM python:3.13-slim-bookworm@sha256:9b8102b7b3a61db24fe58f335b526173e5aeaaf7d13b2fbfb514e20f84f5e386
+FROM python:3.13-slim-bookworm@sha256:adafcc17694d715c905b4c7bebd96907a1fd5cf183395f0ebc4d3428bd22d92d
 # It is important to use the image that matches the builder, as the path to the
 # Python executable must be the same, e.g., using `python:3.12-slim-bookworm`
 # will fail.

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/docker/Dockerfile.pypi

@@ -1,4 +1,4 @@
-FROM python:3.13-slim-bookworm@sha256:9b8102b7b3a61db24fe58f335b526173e5aeaaf7d13b2fbfb514e20f84f5e386
+FROM python:3.13-slim-bookworm@sha256:adafcc17694d715c905b4c7bebd96907a1fd5cf183395f0ebc4d3428bd22d92d
 
 WORKDIR /app
 

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/docs/examples/bluez.md

@@ -40,4 +40,5 @@ Dbus methods can be invoked by sendig the JSON payload to MQTT topic `dbus2mqtt/
 
 ## References
 
-* <https://manpages.ubuntu.com/manpages/noble/man5/org.bluez>
+* <https://manpages.ubuntu.com/manpages/noble/man5/org.bluez.Adapter.5.html>
+* <https://manpages.ubuntu.com/manpages/noble/man5/org.bluez.Device.5.html>

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/docs/examples/dbus2mqtt_internal_state.yaml

@@ -39,6 +39,7 @@ flows:
         payload_type: json
         payload_template:
           now: "{{ now().isoformat() }}"
+          dbus2mqtt: " {{ dbus2mqtt }}"
           dbus_list_res: "{{ dbus_list('*') }}"
       - type: log
         level: INFO

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/docs/examples/home_assistant_media_player/mqtt_mediaplayer.yaml

@@ -21,7 +21,7 @@ media_player:
 
         current_volume_template: "{{ state_attr('sensor.mpris_media_player', 'Volume') }}"
         current_is_muted_template: "{{ state_attr('sensor.mpris_media_player', 'Volume') == 0 }}"
-        current_position_template: "{{ state_attr('sensor.mpris_media_player', 'Position') }}"
+        current_position_template: "{{ (state_attr('sensor.mpris_media_player', 'Position') / 1000000) | int }}"
 
         # title: 'xesam:title' or filename without extension from 'xesam:url'
         title_template: >-
@@ -33,7 +33,7 @@ media_player:
           {{ title }}
 
         media_content_type_template: music  # needed to show 'artist'
-        media_duration_template: "{{ (state_attr('sensor.mpris_media_player', 'Metadata') or {}).get('mpris:length', 0) }}"
+        media_duration_template: "{{ ((state_attr('sensor.mpris_media_player', 'Metadata') or {}).get('mpris:length', 0) / 1000000) | int }}"
         album_template: "{{ (state_attr('sensor.mpris_media_player', 'Metadata') or {}).get('xesam:album', '') }}"
         artist_template: >-
           {% set artist = (state_attr('sensor.mpris_media_player', 'Metadata') or {}).get('xesam:artist', '') %}
@@ -102,7 +102,7 @@ media_player:
           data:
             topic: dbus2mqtt/org.mpris.MediaPlayer2/command
             payload: >
-              { "method": "SetPosition", "args": ["{{ state_attr('sensor.mpris_media_player', 'Metadata')['mpris:trackid'] }}", {{ position | int }}] }
+              { "method": "SetPosition", "args": ["{{ state_attr('sensor.mpris_media_player', 'Metadata')['mpris:trackid'] }}", {{ (position * 1000000) | int }}] }
         set_volume:
           service: mqtt.publish
           data:

dbus2mqtt-0.5.2/docs/templating/index.md

@@ -0,0 +1,20 @@
+# Templating
+
+**dbus2mqtt** leverages Jinja to allow formatting MQTT messages, D-Bus responses or advanced configuration use-cases. If you are not familiar with Jinja based expressions, have a look at Jinjas own [Template Designer Documentation](https://jinja.palletsprojects.com/en/stable/templates/).
+
+Templating is used in these areas of dbus2mqtt:
+
+* [subscriptions](../subscriptions.md)
+* [flow actions](../flows/flow_actions.md)
+
+Besides the filters and functions Jinja provides out of the box, additional extensions are available.
+
+All filters from [jinja2-ansible-filters](https://pypi.org/project/jinja2-ansible-filters/) are included as well as the following global functions, variables and filters:
+
+| Name                | Type      | Description                                                                 |
+|---------------------|-----------|-----------------------------------------------------------------------------|
+| `now`               | function  | Returns the current date and time as a `datetime` object.                   |
+| `urldecode`         | function  | Decodes a URL-encoded string.                                               |
+| `dbus2mqtt.version` | string    | The current version of the `dbus2mqtt` package.                             |
+
+More documentation to be added, for now see the [Mediaplayer integration with Home Assistant](../examples/home_assistant_media_player.md) example for inspiration.

{dbus2mqtt-0.5.1 → dbus2mqtt-0.5.2}/src/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-0.5.1 → dbus2mqtt-0.5.2}/src/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-0.5.1 → dbus2mqtt-0.5.2}/src/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-0.5.1 → dbus2mqtt-0.5.2}/src/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.1 → dbus2mqtt-0.5.2}/tests/template/test_templating.py

@@ -1,3 +1,6 @@
+import pytest
+
+from jinja2 import TemplateError
 
 from dbus2mqtt.template.templating import TemplateEngine
 
@@ -143,3 +146,20 @@ def test_nested_list_values():
     res = templating.render_template(template, dict, context)
 
     assert res["res"]["plain_args"] == ["first-item", "second-item"]
+
+def test_strict_undefined_error_handling():
+
+    template = {"res": "{{ nonexisting_variable }}"}
+
+    templating = TemplateEngine()
+    with pytest.raises(TemplateError):
+        templating.render_template(template, dict)
+
+@pytest.mark.asyncio
+async def test_async_strict_undefined_error_handling():
+
+    template = {"res": "{{ nonexisting_variable }}"}
+
+    templating = TemplateEngine()
+    with pytest.raises(TemplateError):
+        await templating.async_render_template(template, dict)

dbus2mqtt-0.5.1/docs/templating/index.md

@@ -1,14 +0,0 @@
-# Templating
-
-**dbus2mqtt** leverages Jinja to allow formatting MQTT messages, D-Bus responses or advanced configuration use-cases. If you are not familiar with Jinja based expressions, have a look at Jinjas own [Template Designer Documentation](https://jinja.palletsprojects.com/en/stable/templates/).
-
-Besides the filters and functions Jinja provides out of the box, the following extensions are available:
-
-* [jinja2-ansible-filters](https://pypi.org/project/jinja2-ansible-filters/)
-
-More documentation to be added, for now see the [Mediaplayer integration with Home Assistant](../examples/home_assistant_media_player.md) example for inspiration.
-
-Templating is used in these areas of dbus2mqtt:
-
-* [subscriptions](../subscriptions.md)
-* [flow actions](../flows/flow_actions.md)