dbus2mqtt 0.1.2__tar.gz → 0.3.0__tar.gz

dbus2mqtt-0.3.0/.github/release-drafter.yml

@@ -0,0 +1,52 @@
+name-template: 'v$RESOLVED_VERSION 🌈'
+tag-template: 'v$RESOLVED_VERSION'
+exclude-labels:
+  - dependencies
+categories:
+  - title: 🚨 Breaking changes
+    labels:
+      - breaking-change
+  - title: 🚀 Features
+    labels:
+      - feature
+      - enhancement
+  - title: 🐛 Bug Fixes
+    labels:
+      - bugfix
+  - title: 🧰 Maintenance
+    labels:
+      - chore
+      - documentation
+  - title: ⬆️ Dependency updates
+    labels:
+      - "dependencies"
+exclude-contributors:
+  - jwnmulder
+autolabeler:
+  - label: enhancement
+    branch:
+      - '/feature\/.+/'
+  - label: fix
+    branch:
+      - '/fix\/.+/'
+    title:
+      - '/fix/i'
+version-resolver:
+  major:
+    labels:
+      - major
+  minor:
+    labels:
+      - minor
+      - feature
+      - enhancement
+      - breaking-change  # minor until we are on 1.x
+  patch:
+    labels:
+      - patch
+  default: patch
+change-template: '* $TITLE (#$NUMBER)'
+template: |
+  ## Changes
+
+  $CHANGES

dbus2mqtt-0.3.0/.github/scripts/release-versions.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+import json
+import subprocess
+import sys
+
+from packaging import version
+
+
+def get_versions_from_git_tags() -> list[version.Version]:
+    result = subprocess.run(
+        ["git", "tag"],
+        capture_output=True, text=True, check=True
+    )
+    tags = result.stdout.strip().splitlines()
+    versions = [t.lstrip("v") for t in tags if t.startswith("v")]
+
+    parsed_versions = []
+    for v in versions:
+        try:
+            parsed = version.parse(v)
+            parsed_versions.append(parsed)
+        except Exception as e:
+            print(f"Error parsing version {v}: {e}")
+
+    return parsed_versions
+
+def latest_version_by_cycle(versions: list[version.Version], cycles: list[str]) -> dict[str, version.Version]:
+    res = {}
+    for cycle in cycles:
+        parsed_cycle = version.parse(cycle)
+
+        for v in versions:
+            # check if version is in cycle range
+            # cycle can be major or major.minor or major.minor.patch
+            if len(v.release) > len(parsed_cycle.release):
+                # update if version is later within cycle
+                if cycle not in cycles or v > parsed_cycle:
+                    res[cycle] = v
+    return res
+
+def main():
+    args = sys.argv[1:]
+    if not args:
+        print("Usage: release-versions.py 0.1 0.2 1.0 ...")
+        sys.exit(1)
+
+    versions = get_versions_from_git_tags()
+    cycles = latest_version_by_cycle(versions, args)
+
+    # Detect the overall latest version
+    overall_latest = max(versions) if versions else None
+
+    cycle_details = []
+    for cycle in args:
+        latest = cycles.get(cycle)
+        if latest:
+            cycle_details.append({
+                "cycle": cycle,
+                "latestVersion": latest.base_version,
+                "isLatestStable": latest == overall_latest
+            })
+
+    print(json.dumps(cycle_details))
+
+if __name__ == "__main__":
+    main()

{dbus2mqtt-0.1.2 → dbus2mqtt-0.3.0}/.github/workflows/ci.yml

@@ -24,14 +24,17 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
+          activate-environment: true
           enable-cache: true
-
-      - name: "Set up Python"
-        uses: actions/setup-python@v5
-        with:
           python-version: ${{ matrix.python-version }}
 
+      # - name: "Set up Python"
+      #   uses: actions/setup-python@v5
+      #   with:
+      #     python-version: ${{ matrix.python-version }}
+
       - name: Run tests
-        run: uv run --python ${{ matrix.python-version }} pytest
+        run: uv run pytest
+        # run: uv run --python ${{ matrix.python-version }} pytest

dbus2mqtt-0.1.2/.github/workflows/docker-latest.yml → dbus2mqtt-0.3.0/.github/workflows/docker-dev.yml

@@ -1,9 +1,12 @@
-name: Build and Push Docker latest
+name: docker-dev
 
 "on":
   push:
     branches:
       - main
+    paths-ignore:
+      - 'docs/**'
+      - '.pre-commit-config.yaml'
   workflow_dispatch:
 
 jobs:
@@ -16,14 +19,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           enable-cache: true
 
-      - name: "Set up Python"
-        uses: actions/setup-python@v5
-        with:
-          python-version-file: ".python-version"
+      # - name: "Set up Python"
+      #   uses: actions/setup-python@v5
+      #   with:
+      #     python-version-file: ".python-version"
 
       - name: Determine version from hatch
         id: version
@@ -37,7 +40,7 @@ jobs:
             jwnmulder/dbus2mqtt
             ghcr.io/jwnmulder/dbus2mqtt
           tags: |
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=dev,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
           labels: |
             org.opencontainers.image.source=https://github.com/jwnmulder/dbus2mqtt
 
@@ -66,7 +69,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./docker/Dockerfile.latest
+          file: ./docker/Dockerfile.dev
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

dbus2mqtt-0.1.2/.github/workflows/docker-publish-pypi-release.yml → dbus2mqtt-0.3.0/.github/workflows/docker-stable.yml

@@ -1,20 +1,46 @@
-name: Build and Push Docker Images for Released Versions
+name: docker-stable releases
 
 "on":
-  # push:
-  #   branches:
-  #     - main
+  push:
+    branches:
+      - main
+    paths:
+      - "docker/**"
+  release:
+    types: [published]
   workflow_dispatch:
 
 jobs:
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      versions_matrix: ${{ steps.supported_release_versions.outputs.versions_matrix }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Determine supported release versions
+        id: supported_release_versions
+        run: |
+          SUPPORTED_CYCLES=("0.1" "0.2" "0.3" "0.4" "0.5" "0.6" "0.7" "0.8" "0.9" "1.0" "2.0")
+
+          VERSIONS_JSON=$(python3 .github/scripts/release-versions.py "${SUPPORTED_CYCLES[@]}")
+
+          # Wrap the output into matrix include
+          VERSIONS_MATRIX=$(echo "$VERSIONS_JSON" | jq -c '{include: [.[] | {cycle: .cycle, version: .latestVersion, isLatestStable: .isLatestStable}]}')
+
+          echo "VERSIONS_MATRIX=$VERSIONS_MATRIX"
+          echo "versions_matrix=$VERSIONS_MATRIX" >> $GITHUB_OUTPUT
   docker:
     runs-on: ubuntu-latest
+    needs: setup
     permissions:
       packages: write
     strategy:
-      matrix:
-        version:
-          - 0.1
+      fail-fast: false
+      matrix: ${{ fromJson(needs.setup.outputs.versions_matrix) }}
 
     steps:
       - name: Checkout
@@ -28,8 +54,10 @@ jobs:
             jwnmulder/dbus2mqtt
             ghcr.io/jwnmulder/dbus2mqtt
           tags: |
+            type=raw,value=latest,enable=${{ matrix.isLatestStable }}
             type=pep440,pattern={{major}},value=${{ matrix.version }},enable=${{ !startsWith(matrix.version, '0.') }}
             type=pep440,pattern={{major}}.{{minor}},value=${{ matrix.version }}
+            type=pep440,pattern={{major}}.{{minor}}.{{patch}},value=${{ matrix.version }}
           # type=ref,event=branch
           # type=ref,event=pr
           # type=semver,pattern={{version}},value=${{ matrix.version }}

{dbus2mqtt-0.1.2 → dbus2mqtt-0.3.0}/.github/workflows/pre-commit.yml

@@ -16,12 +16,12 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
 
-      - name: "Set up Python"
-        uses: actions/setup-python@v5
-        with:
-          python-version-file: ".python-version"
+      # - name: "Set up Python"
+      #   uses: actions/setup-python@v5
+      #   with:
+      #     python-version-file: ".python-version"
 
       - name: Uv sync
         run: uv sync

{dbus2mqtt-0.1.2 → dbus2mqtt-0.3.0}/.github/workflows/publish.yml

@@ -17,14 +17,15 @@ jobs:
           persist-credentials: false
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
+          activate-environment: true
           enable-cache: true
 
-      - name: "Set up Python"
-        uses: actions/setup-python@v5
-        with:
-          python-version-file: ".python-version"
+      # - name: "Set up Python"
+      #   uses: actions/setup-python@v5
+      #   with:
+      #     python-version-file: ".python-version"
 
       - name: Build
         run: uv build

{dbus2mqtt-0.1.2 → dbus2mqtt-0.3.0}/.pre-commit-config.yaml

@@ -26,14 +26,14 @@ repos:
       - id: codespell
 
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.37.0
+    rev: v1.37.1
     hooks:
       - id: yamllint
         args:
           - --strict
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.6
+    rev: v0.11.9
     hooks:
       - id: ruff
         args:
@@ -42,11 +42,11 @@ repos:
           - I
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.6.14
+    rev: 0.7.3
     hooks:
       - id: uv-lock
 
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.399
+    rev: v1.1.400
     hooks:
       - id: pyright

dbus2mqtt-0.3.0/.python-version

@@ -0,0 +1 @@
+3.10

{dbus2mqtt-0.1.2 → dbus2mqtt-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbus2mqtt
-Version: 0.1.2
+Version: 0.3.0
 Summary: A Python tool to expose Linux D-Bus signals, methods and properties over MQTT - featuring templating, payload enrichment and Home Assistant-ready examples 
 Project-URL: Repository, https://github.com/jwnmulder/dbus2mqtt.git
 Project-URL: Issues, https://github.com/jwnmulder/dbus2mqtt/issues
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Requires-Dist: apscheduler>=3.11.0
 Requires-Dist: colorlog>=6.9.0
-Requires-Dist: dbus-next>=0.2.3
+Requires-Dist: dbus-fast>=2.44.1
 Requires-Dist: janus>=2.0.0
 Requires-Dist: jinja2-ansible-filters>=1.3.2
 Requires-Dist: jinja2>=3.1.6
@@ -51,12 +51,6 @@ This makes it easy to integrate Linux desktop services or system signals into MQ
 
 Initial testing has focused on MPRIS integration. A table of tested MPRIS players and their supported methods can be found here: [home_assistant_media_player.md](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player.md)
 
-
-TODO list
-
-* Improve error handling when deleting message with 'retain' set. WARNING:dbus2mqtt.mqtt_client:on_message: Unexpected payload, expecting json, topic=dbus2mqtt/org.mpris.MediaPlayer2/command, payload=, error=Expecting value: line 1 column 1 (char 0)
-* Property set only works the first time, need to restart after which the first set will work again
-
 ## Getting started with dbus2mqtt
 
 Create a `config.yaml` file with the contents shown below. This configuration will expose all bus properties from the `org.mpris.MediaPlayer2.Player` interface to MQTT on the `dbus2mqtt/org.mpris.MediaPlayer2/state` topic. Have a look at [docs/examples](docs/examples.md) for more examples
@@ -86,7 +80,7 @@ dbus:
               topic: dbus2mqtt/org.mpris.MediaPlayer2/state
               payload_type: json
               payload_template: |
-                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) | to_yaml }}
+                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) }}
 ```
 
 MQTT connection details can be configured in that same `config.yaml` file or via environment variables. For now create a `.env` file with the following contents.
@@ -117,6 +111,7 @@ cp docs/examples/home_assistant_media_player.yaml $HOME/.config/dbus2mqtt/config
 cp .env.example $HOME/.config/dbus2mqtt/.env
 
 # run image and automatically start on reboot
+docker pull jwnmulder/dbus2mqtt
 docker run --detach --name dbus2mqtt \
   --volume "$HOME"/.config/dbus2mqtt:"$HOME"/.config/dbus2mqtt \
   --volume /run/user:/run/user \
@@ -143,7 +138,7 @@ dbus2mqtt leverages [jsonargparse](https://jsonargparse.readthedocs.io/en/stable
 ### MQTT and D-Bus connection details
 
 ```bash
-# dbus_next configuration
+# dbus_fast configuration
 export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus
 
 # dbus2mqtt configuration
@@ -170,13 +165,15 @@ dbus:
       path: /org/mpris/MediaPlayer2
       interfaces:
         - interface: org.mpris.MediaPlayer2.Player
-          mqtt_call_method_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+          mqtt_command_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
           methods:
             - method: Pause
             - method: Play
 ```
 
-This configuration will expose 2 methods. Triggering methods can be done by publishing json messages to the `dbus2mqtt/org.mpris.MediaPlayer2/command` MQTT topic. Arguments can be passed along in `args`
+This configuration will expose 2 methods. Triggering methods can be done by publishing json messages to the `dbus2mqtt/org.mpris.MediaPlayer2/command` MQTT topic. Arguments can be passed along in `args`.
+
+Note that methods are called on **all** bus_names matching the configured pattern
 
 ```json
 {

{dbus2mqtt-0.1.2 → dbus2mqtt-0.3.0}/README.md

@@ -19,12 +19,6 @@ This makes it easy to integrate Linux desktop services or system signals into MQ
 
 Initial testing has focused on MPRIS integration. A table of tested MPRIS players and their supported methods can be found here: [home_assistant_media_player.md](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player.md)
 
-
-TODO list
-
-* Improve error handling when deleting message with 'retain' set. WARNING:dbus2mqtt.mqtt_client:on_message: Unexpected payload, expecting json, topic=dbus2mqtt/org.mpris.MediaPlayer2/command, payload=, error=Expecting value: line 1 column 1 (char 0)
-* Property set only works the first time, need to restart after which the first set will work again
-
 ## Getting started with dbus2mqtt
 
 Create a `config.yaml` file with the contents shown below. This configuration will expose all bus properties from the `org.mpris.MediaPlayer2.Player` interface to MQTT on the `dbus2mqtt/org.mpris.MediaPlayer2/state` topic. Have a look at [docs/examples](docs/examples.md) for more examples
@@ -54,7 +48,7 @@ dbus:
               topic: dbus2mqtt/org.mpris.MediaPlayer2/state
               payload_type: json
               payload_template: |
-                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) | to_yaml }}
+                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) }}
 ```
 
 MQTT connection details can be configured in that same `config.yaml` file or via environment variables. For now create a `.env` file with the following contents.
@@ -85,6 +79,7 @@ cp docs/examples/home_assistant_media_player.yaml $HOME/.config/dbus2mqtt/config
 cp .env.example $HOME/.config/dbus2mqtt/.env
 
 # run image and automatically start on reboot
+docker pull jwnmulder/dbus2mqtt
 docker run --detach --name dbus2mqtt \
   --volume "$HOME"/.config/dbus2mqtt:"$HOME"/.config/dbus2mqtt \
   --volume /run/user:/run/user \
@@ -111,7 +106,7 @@ dbus2mqtt leverages [jsonargparse](https://jsonargparse.readthedocs.io/en/stable
 ### MQTT and D-Bus connection details
 
 ```bash
-# dbus_next configuration
+# dbus_fast configuration
 export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus
 
 # dbus2mqtt configuration
@@ -138,13 +133,15 @@ dbus:
       path: /org/mpris/MediaPlayer2
       interfaces:
         - interface: org.mpris.MediaPlayer2.Player
-          mqtt_call_method_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+          mqtt_command_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
           methods:
             - method: Pause
             - method: Play
 ```
 
-This configuration will expose 2 methods. Triggering methods can be done by publishing json messages to the `dbus2mqtt/org.mpris.MediaPlayer2/command` MQTT topic. Arguments can be passed along in `args`
+This configuration will expose 2 methods. Triggering methods can be done by publishing json messages to the `dbus2mqtt/org.mpris.MediaPlayer2/command` MQTT topic. Arguments can be passed along in `args`.
+
+Note that methods are called on **all** bus_names matching the configured pattern
 
 ```json
 {

dbus2mqtt-0.1.2/docker/Dockerfile.latest → dbus2mqtt-0.3.0/docker/Dockerfile.dev

@@ -20,7 +20,7 @@ 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 .python-version 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
 

{dbus2mqtt-0.1.2 → dbus2mqtt-0.3.0}/docker/Dockerfile.pypi

@@ -7,4 +7,6 @@ ARG DBUS2MQTT_VERSION=latest
 RUN pip install --no-cache-dir dbus2mqtt=="$DBUS2MQTT_VERSION"
 
 ENTRYPOINT ["python", "-m", "dbus2mqtt"]
+
+# show help message by default
 CMD ["--help"]

dbus2mqtt-0.3.0/docs/examples/dbus2mqtt_internal_state.md

@@ -0,0 +1,13 @@
+# dbus2mqtt internal state example
+
+Execute the following command to run dbus2mqtt with the example configuration in this repository.
+
+```bash
+dbus2mqtt --config docs/examples/dbus2mqtt_internal_state.yaml
+```
+
+This will publish the dbus2mqtt's internal state to the `dbus2mqtt/state` MQTT topic every 5 seconds
+
+```json
+{"now": "2025-04-23T16:01:34.985452", "dbus_list": ["org.freedesktop.systemd1", "org.gnome.SessionManager"]}
+```

dbus2mqtt-0.3.0/docs/examples/dbus2mqtt_internal_state.yaml

@@ -0,0 +1,40 @@
+# mqtt:
+#   host:
+#   port:
+
+dbus:
+  subscriptions:
+
+    # https://manpages.ubuntu.com/manpages/lunar/man5/org.freedesktop.systemd1.5.html
+    - bus_name: org.freedesktop.systemd1
+      path: /org/freedesktop/systemd1
+      interfaces:
+        - interface: org.freedesktop.DBus.Properties
+          signals:
+            - signal: PropertiesChanged
+          methods:
+            - method: GetAll
+
+    # https://lira.no-ip.org:8443/doc/gnome-session/dbus/gnome-session.html
+    - bus_name: org.gnome.SessionManager
+      path: /org/gnome/SessionManager
+      interfaces:
+        - interface: org.freedesktop.DBus.Properties
+          signals:
+            - signal: PropertiesChanged
+          methods:
+            - method: GetAll
+
+flows:
+  - name: "publish internal state"
+    triggers:
+      - type: bus_name_added
+      - type: schedule
+        interval: {seconds: 5}
+    actions:
+      - type: mqtt_publish
+        topic: dbus2mqtt/state
+        payload_type: json
+        payload_template:
+          now: "{{ now().isoformat() }}"
+          dbus_list: "{{ dbus_list('*') }}"