dbus2mqtt 0.5.0__tar.gz → 0.5.2__tar.gz

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

@@ -19,12 +19,13 @@ jobs:
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
 
     steps:
       - 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.0 → 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.0 → dbus2mqtt-0.5.2}/.github/workflows/docker-dev.yml

@@ -10,6 +10,7 @@ name: docker-dev
       - '.pre-commit-config.yaml'
       - 'README.md'
       - 'renovate.json'
+      - 'mkdocs.yaml'
   workflow_dispatch:
 
 jobs:
@@ -22,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.0 → 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.0 → 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.0 → dbus2mqtt-0.5.2}/.github/workflows/trivy.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.33.0
+        uses: aquasecurity/trivy-action@0.33.1
         with:
           image-ref: ghcr.io/jwnmulder/dbus2mqtt:latest
           format: 'sarif'
@@ -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.0 → 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.11
+    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.14
+    rev: 0.9.2
     hooks:
       - id: uv-lock
 
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.404
+    rev: v1.1.406
     hooks:
       - id: pyright
 

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

@@ -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 → 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](templating/index.md)
+Jinja templating documentation can be found here: [templating](https://jwnmulder.github.io/dbus2mqtt/templating/)

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

@@ -20,12 +20,12 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
     uv sync --frozen --no-install-project --no-dev
 
-ADD src/ pyproject.toml uv.lock README.md /app
+ADD src/ pyproject.toml uv.lock README.md /app/
 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.0 → 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.0 → 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.0 → 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.2/docs/examples/home_assistant_media_player/mqtt_mediaplayer.yaml

@@ -0,0 +1,123 @@
+mqtt:
+  sensor:
+    - name: MPRIS Media Player
+      state_topic: dbus2mqtt/org.mpris.MediaPlayer2/state
+      json_attributes_topic: dbus2mqtt/org.mpris.MediaPlayer2/state
+      value_template: >-
+        {% set status = value_json.PlaybackStatus %}
+        {{ {'Playing': 'playing', 'Paused': 'paused', 'Stopped': 'idle'}.get(status, 'off') }}
+
+  image:
+    - name: MPRIS Media Player MQTT image
+      image_topic: dbus2mqtt/org.mpris.MediaPlayer2/artUrlImage
+
+media_player:
+  - platform: media_player_template
+    media_players:
+      mpris_media_player:
+        device_class: receiver
+        friendly_name: MPRIS Media Player
+        value_template: "{{ states('sensor.mpris_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') / 1000000) | int }}"
+
+        # title: 'xesam:title' or filename without extension from 'xesam:url'
+        title_template: >-
+          {% set metadata = state_attr('sensor.mpris_media_player', 'Metadata') or {} %}
+          {% set title = metadata.get('xesam:title', '') %}
+          {% if not title or title == '' %}
+          {% set title = metadata.get('xesam:url', '') | regex_findall(find='([^\\/]+?)(?:\.[^.\\/]+)?$') | first | default('') %}
+          {% endif %}
+          {{ 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) / 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', '') %}
+          {% if artist is string %}
+          {% set artist = [artist] %}
+          {% endif %}
+          {{ artist | first }}
+
+        # mpris:artUrl might contain a file:// schema. In these cases we rely on images published via MQTT
+        media_image_url_template: >-
+          {% set mpris_metadata = state_attr('sensor.mpris_media_player', 'Metadata') or {} %}
+          {% set mpris_art_url = mpris_metadata.get('mpris:artUrl', '') %}
+          {% set mpris_url = mpris_metadata.get('xesam:url') %}
+
+          {% if mpris_art_url.startswith('http') %}
+            {{ mpris_art_url }}
+          {% elif mpris_art_url.startswith('file://') %}
+            http://127.0.0.1:8123{{ state_attr('image.mpris_media_player_mqtt_image', 'entity_picture') }}
+          {% else %}
+            {{
+                mpris_url | regex_replace(
+                  find='https:\/\/www\\.youtube\\.com\/watch\\?v=([^&]+).*',
+                  replace='https://img.youtube.com/vi/\\1/maxresdefault.jpg'
+                )
+            }}
+          {% endif %}
+
+        turn_off:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"method": "Quit"}
+        play:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"method": "Play"}
+        pause:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"method": "Pause"}
+        stop:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"method": "Stop"}
+        next:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"method": "Next"}
+        previous:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"method": "Previous"}
+        seek:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              { "method": "SetPosition", "args": ["{{ state_attr('sensor.mpris_media_player', 'Metadata')['mpris:trackid'] }}", {{ (position * 1000000) | int }}] }
+        set_volume:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"property": "Volume", "value": {{volume}} }
+        volume_up:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"property": "Volume", "value": {{ [1, (state_attr('sensor.mpris_media_player', 'Volume') + 0.1)] | min }} }
+        volume_down:
+          service: mqtt.publish
+          data:
+            topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+            payload: >
+              {"property": "Volume", "value": {{ [0, (state_attr('sensor.mpris_media_player', 'Volume') - 0.1)] | max }} }

dbus2mqtt-0.5.2/docs/examples/home_assistant_media_player.md

@@ -0,0 +1,82 @@
+---
+hide:
+  - toc
+---
+
+# Mediaplayer integration with Home Assistant
+
+With dbus2mqtt as a bridge between MPRIS players and Home Assistant, it becomes possible to control Linux based media players via Home Assistant.
+
+The Media Player Remote Interfacing Specification (MPRIS) is a standard for controlling Linux media players. It provides a mechanism for compliant media players discovery, basic playback and media player state control as well as a tracklist interface which is used to add context to the current item.
+
+Pre-requisites:
+
+* Home-Assistant with a working MQTT setup
+* The community Home-Assistant plugin [github.com/Sennevds/media_player.template](https://github.com/Sennevds/media_player.template)
+
+## Features
+
+* dbus subscription using `org.mpris.MediaPlayer2.*` wildcard to support multiple concurrent MRPIS players
+* Every 5 seconds, the state of the `first` known MPRIS player is published to MQTT topic `dbus2mqtt/org.mpris.MediaPlayer2/state`
+* Every MPRIS property update immediately publishes the state to MQTT topic `dbus2mqtt/org.mpris.MediaPlayer2/state`
+* Support for player commands (see below)
+
+## Setup activities
+
+* Configure the MQTT Sensor and player configuration in Home Assistant with the configuration listed below
+* Config dbus2mqtt using the supplied [home_assistant_media_player.yaml](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player.yaml)
+
+To run, execute the following commands
+
+```bash
+dbus2mqtt --config docs/examples/home_assistant_media_player.yaml
+```
+
+## Tested configurations
+
+The following MPRIS players are known to work with Home Assistant.
+
+| Application  | Play<br />Pause<br /> | Stop | Next<br />Previous | Seek<br />SetPosition | Volume | Quit | Media Info | Media Image | Notes |
+|--------------|-----------------------|------|--------------------|------|--------|------|------------|-------------|-------------------|
+| `Firefox`    | ✅ | ✅ | ✅ | ✅ |    | ❌ | ✅ | ✅ |  |
+| `VLC`        | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |    |  |
+| `Chromium`   | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ✅ | ✔️ | Images not working when Chromium is running as snap |
+| `Kodi`       | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ | ✅ | Requires Kodi plugin [MediaPlayerRemoteInterface](https://github.com/wastis/MediaPlayerRemoteInterface) |
+
+!!! note
+    More players that support MPRIS (but have not been tested) can be found here: <https://wiki.archlinux.org/title/MPRIS>
+
+## Player commands
+
+The following table lists player commands, their descriptions, and an example JSON payload for invoking them via MQTT.
+
+Dbus methods can be invoked by sendig the JSON payload to MQTT topic `dbus2mqtt/org.mpris.MediaPlayer2/command`. Method calls will be done for all matching players. The same applies to property updates.
+
+| Method<br />Property | Description                       | Example MQTT JSON Payload                           |
+|---------------|------------------------------------------|------------------------------------------------|
+| `Play`        | Starts playback                          | `#!json { "method": "Play" }`                         |
+| `Pause`       | Pauses playback                          | `#!json { "method": "Pause" }`                        |
+| `PlayPause`   | Toggles between play and pause           | `#!json { "method": "PlayPause" }`                    |
+| `Stop`        | Stops playback                           | `#!json { "method": "Stop" }`                         |
+| `Next`        | Next                                     | `#!json { "method": "Next" }`                         |
+| `Previous`    | Previous                                 | `#!json { "method": "Previous" }`                     |
+| `Seek`        | Seek forward or backward in micro seconds  | `#!json { "method": "Seek", "args": [60000000] }`   |
+| `Volume`      | Set volume (double between 0 and 1)      | `#!json { "property": "Volume", "value": 1.0 }`        |
+| `SetPosition` | Set / seek to position in micro seconds. First arguments needs to be trackid which can be determined via Metadata.mpris:trackid | `#!json { "method": "SetPosition", "args": ["/org/mpris/MediaPlayer2/firefox", 170692139] }`                         |
+| `Quit`        | Quits the media player                   | `#!json { "method": "Quit" }`                         |
+
+For an overview of MPRIS commands have a look at <https://mpris2.readthedocs.io/en/latest/interfaces.html#mpris2.MediaPlayer2>
+
+## Home Assistant configuration
+
+Besides setting up `dbus2mqtt`, Home Assistant needs to be configured as well. The configuration shown below creates the necessary components in Home Assistant for controlling MPRIS Media Players. Three components will be setup.
+
+* MQTT sensor listening on topic `dbus2mqtt/org.mpris.MediaPlayer2/state`
+* MQTT image listening on topic `dbus2mqtt/org.mpris.MediaPlayer2/artUrlImage`
+* Media Player
+
+```yaml+jinja title='config/packages/mqtt_mediaplayer.yaml'
+--8<-- "docs/examples/home_assistant_media_player/mqtt_mediaplayer.yaml"
+```
+
+Source: [mqtt_mediaplayer.yaml](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player/mqtt_mediaplayer.yaml)

dbus2mqtt-0.5.2/docs/examples/linux_desktop/notify.json

@@ -0,0 +1,13 @@
+{
+  "method": "Notify",
+  "args": [
+    "dbus2mqtt",
+    0,
+    "dialog-information",
+    "dbus2mqtt",
+    "Message from <b><i>dbus2mqtt</i></b>",
+    [],
+    {},
+    0
+  ]
+}

dbus2mqtt-0.5.2/docs/examples/linux_desktop/notify_with_actions_and_hints.json

@@ -0,0 +1,13 @@
+{
+  "method": "Notify",
+  "args": [
+    "dbus2mqtt",
+    0,
+    "dialog-information",
+    "dbus2mqtt",
+    "Message from <b><i>dbus2mqtt</i></b>",
+    ["ok", "OK", "cancel", "Cancel"],
+    { "urgency": 1, "category": "device" },
+    5000
+  ]
+}

{dbus2mqtt-0.5.0 → dbus2mqtt-0.5.2}/docs/examples/linux_desktop.md

@@ -5,8 +5,6 @@ hide:
 
 # Linux Desktop
 
-## Introduction
-
 Use dbus2mqtt to interface with your Linux desktop
 
 Pre-requisites:
@@ -29,40 +27,16 @@ uv run dbus2mqtt --config docs/examples/linux_desktop.yaml
 
 Trigger a desktop notification by sending one of the following example payloads to `dbus2mqtt/Notifications/command`
 
-Simple notification with no timeout
+Example notification with no timeout
 
 ```json
-{
-  "method": "Notify",
-  "args": [
-    "dbus2mqtt",
-    0,
-    "dialog-information",
-    "dbus2mqtt",
-    "Message from <b><i>dbus2mqtt</i></b>",
-    [],
-    {},
-    0
-  ]
-}
+--8<-- "docs/examples/linux_desktop/notify.json"
 ```
 
-Notification with actions and hints that automatically disappears after 5 seconds
+Example notification with actions and hints, that automatically disappears after 5 seconds
 
 ```json
-{
-  "method": "Notify",
-  "args": [
-    "dbus2mqtt",
-    0,
-    "dialog-information",
-    "dbus2mqtt",
-    "Message from <b><i>dbus2mqtt</i></b>",
-    ["ok", "OK", "cancel", "Cancel"],
-    { "urgency": 1, "category": "device" },
-    5000
-  ]
-}
+--8<-- "docs/examples/linux_desktop/notify_with_actions_and_hints.json"
 ```
 
 Further references:
@@ -70,7 +44,7 @@ Further references:
 * <https://specifications.freedesktop.org/notification-spec/1.3/>
 * <https://specifications.freedesktop.org/icon-naming-spec/latest/>
 
-## Gnome SessionManager
+<!-- ## Gnome SessionManager
 
 !!! note
     work in progress
@@ -79,4 +53,4 @@ The following table lists the supported commands, their descriptions, and an exa
 
 dbus methods can be invoked by sendig the JSON payload to MQTT topic `dbus2mqtt/SessionManager/command`.
 
-For an overview of commands have a look at <https://docs.flatpak.org/en/latest/portal-api-reference.html>
+For an overview of commands have a look at <https://docs.flatpak.org/en/latest/portal-api-reference.html> -->

{dbus2mqtt-0.5.0 → dbus2mqtt-0.5.2}/docs/flows/flow_triggers.md

@@ -81,16 +81,13 @@ When triggered, the following context parameters are available
   filter: "{{ payload.get('action') == 'Mute' }}"
 ```
 
-Listens for MQTT message on the configured topic. The message payload is expected to be JSON formatted
+Listens for MQTT messages on the configured topic. The message payload is expected to be JSON formatted
 
 | key | description  |
 |------|-------------|
 | topic     | topic to subscribe to, e.g. 'dbus2mqtt/org.mpris.MediaPlayer2/flow-trigger' |
 | filter    | A templated string that must evaluate to a boolean result. When False, the flow is not triggered |
 
-!!! note
-    If `topic` overlaps with `subscription[].interfaces[].mqtt_command_topic` and the JSON payload structure follows `mqtt_command_topic` layout, a dbus call will be executed as well.
-
 When triggered, the following context parameters are available
 
 | name | type | description |
@@ -112,3 +109,6 @@ flows:
         msg: |
           Flow triggered by MQTT message, payload.action={{ payload.get('action') }}
 ```
+
+!!! note
+    If `topic` overlaps with `subscription[].interfaces[].mqtt_command_topic` and the JSON payload structure follows `mqtt_command_topic` layout, a dbus call will be executed as well. Similar, warnings will be logged if a message does not match any flow or D-Bus method.

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.0 → dbus2mqtt-0.5.2}/mkdocs.yml

@@ -134,6 +134,8 @@ markdown_extensions:
   - pymdownx.snippets:
       check_paths: true
 
+  - footnotes
+
 hooks:
   - docs/hooks.py
 

{dbus2mqtt-0.5.0 → dbus2mqtt-0.5.2}/pyproject.toml

@@ -34,6 +34,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 
 requires-python = ">=3.10"
@@ -47,7 +48,6 @@ dependencies = [
     "jinja2-ansible-filters>=1.3.2",
     "jsonargparse>=4.38.0",
     "paho-mqtt>=2.1.0",
-    "pydantic>=2.11.3",
     "python-dotenv>=1.1.0",
     "pyyaml>=6.0.2",
 ]