updates2mqtt 1.5.1__tar.gz → 1.7.0__tar.gz

{updates2mqtt-1.5.1 → updates2mqtt-1.7.0}/PKG-INFO

@@ -1,38 +1,39 @@
 Metadata-Version: 2.4
 Name: updates2mqtt
-Version: 1.5.1
+Version: 1.7.0
 Summary: System update and docker image notification and execution over MQTT
-Project-URL: Homepage, https://updates2mqtt.rhizomatics.org.uk
-Project-URL: Repository, https://github.com/rhizomatics/updates2mqtt
-Project-URL: Documentation, https://updates2mqtt.rhizomatics.org.uk
-Project-URL: Issues, https://github.com/rhizomatics/updates2mqtt/issues
-Project-URL: Changelog, https://github.com/rhizomatics/updates2mqtt/blob/main/CHANGELOG.md
+Keywords: mqtt,docker,oci,container,updates,automation,home-assistant,homeassistant,selfhosting
+Author: jey burrows
 Author-email: jey burrows <jrb@rhizomatics.org.uk>
 License-Expression: Apache-2.0
-License-File: LICENSE
-Keywords: automation,docker,home-assistant,homeassistant,mqtt,selfhosting,updates
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: Other/Proprietary License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.13
+Classifier: Environment :: Console
 Classifier: Topic :: Home Automation
-Classifier: Topic :: System :: Monitoring
 Classifier: Topic :: System :: Systems Administration
+Classifier: Topic :: System :: Monitoring
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Typing :: Typed
-Requires-Python: >=3.13
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: docker>=7.1.0
-Requires-Dist: hishel[httpx]>=0.1.4
-Requires-Dist: httpx>=0.28.1
-Requires-Dist: omegaconf>=2.3.0
 Requires-Dist: paho-mqtt>=2.1.0
-Requires-Dist: rich>=14.0.0
+Requires-Dist: omegaconf>=2.3.0
 Requires-Dist: structlog>=25.4.0
+Requires-Dist: rich>=14.0.0
+Requires-Dist: httpx>=0.28.1
+Requires-Dist: hishel[httpx]>=0.1.4
 Requires-Dist: usingversion>=0.1.2
+Requires-Dist: tzlocal>=5.3.1
+Requires-Python: >=3.13
+Project-URL: Homepage, https://updates2mqtt.rhizomatics.org.uk
+Project-URL: Repository, https://github.com/rhizomatics/updates2mqtt
+Project-URL: Documentation, https://updates2mqtt.rhizomatics.org.uk
+Project-URL: Issues, https://github.com/rhizomatics/updates2mqtt/issues
+Project-URL: Changelog, https://github.com/rhizomatics/updates2mqtt/blob/main/CHANGELOG.md
 Description-Content-Type: text/markdown
 
 ![updates2mqtt](images/updates2mqtt-dark-256x256.png){ align=left }
@@ -42,7 +43,7 @@ Description-Content-Type: text/markdown
 [![Rhizomatics Open Source](https://img.shields.io/badge/rhizomatics%20open%20source-lightseagreen)](https://github.com/rhizomatics)
 
 [![PyPI - Version](https://img.shields.io/pypi/v/updates2mqtt)](https://pypi.org/project/updates2mqtt/)
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/rhizomatics/supernotify)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/rhizomatics/updates2mqtt)
 [![Coverage](https://raw.githubusercontent.com/rhizomatics/updates2mqtt/refs/heads/badges/badges/coverage.svg)](https://updates2mqtt.rhizomatics.org.uk/developer/coverage/)
 ![Tests](https://raw.githubusercontent.com/rhizomatics/updates2mqtt/refs/heads/badges/badges/tests.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/rhizomatics/updates2mqtt/main.svg)](https://results.pre-commit.ci/latest/github/rhizomatics/updates2mqtt/main)
@@ -69,7 +70,7 @@ Read the release notes, and optionally click *Update* to trigger a Docker *pull*
 
 ## Description
 
-updates2mqtt perioidically checks for new versions of components being available, and publishes new version info to MQTT. HomeAssistant auto discovery is supported, so all updates can be seen in the same place as Home Assistant's own components and add-ins.
+Updates2MQTT perioidically checks for new versions of components being available, and publishes new version info to MQTT. HomeAssistant auto discovery is supported, so all updates can be seen in the same place as Home Assistant's own components and add-ins.
 
 Currently only Docker containers are supported, either via an image registry check, or a git repo for source (see [Local Builds](local_builds.md)). The design is modular, so other update sources can be added, at least for notification. The next anticipated is **apt** for Debian based systems.
 
@@ -79,8 +80,14 @@ To get started, read the [Installation](installation.md) and [Configuration](con
 
 For a quick spin, try this:
 
-```yaml
-docker run -e MQTT_USER=user1 -e MQTT_PASS=pass1 -e MQTT_HOST=192.168.1.5 ghcr.io/rhizomatics/updates2mqtt:release
+```bash
+docker run -v /var/run/docker.sock:/var/run/docker.sock -e MQTT_USER=user1 -e MQTT_PASS=user1 -e MQTT_HOST=192.168.1.5 ghcr.io/rhizomatics/updates2mqtt:release
+```
+
+or without Docker, using [uv](https://docs.astral.sh/uv/)
+
+```bash
+export MQTT_HOST=192.168.1.1;export MQTT_USER=user1;export MQTT_PASS=user1;uv run --with updates2mqtt python -m updates2mqtt
 ```
 
 ## Release Support
@@ -93,7 +100,7 @@ Presently only Docker containers are supported, although others are planned, pro
   
 ## Heartbeat
 
-A heartbeat JSON payload is optionally published periodically to a configurable MQTT topic, defaulting to `healthcheck/{node_name}/updates2mqtt`. It contains the current version of updates2mqtt, the node name, a timestamp, and some basic stats.
+A heartbeat JSON payload is optionally published periodically to a configurable MQTT topic, defaulting to `healthcheck/{node_name}/updates2mqtt`. It contains the current version of Updates2MQTT, the node name, a timestamp, and some basic stats.
 
 ## Healthcheck
 
@@ -126,7 +133,8 @@ file, or as `environment` options inside `docker-compose.yaml`.
 ### Automated updates
 
 If Docker containers should be immediately updated, without any confirmation
-or trigger, *e.g.* from the HomeAssistant update dialog, then set an environment variable `UPD2MQTT_UPDATE` in the target container to `Auto` ( it defaults to `Passive`)
+or trigger, *e.g.* from the HomeAssistant update dialog, then set an environment variable `UPD2MQTT_UPDATE` in the target container to `Auto` ( it defaults to `Passive`).  If you want it to update without publishing to MQTT and being
+visible to Home Assistant, then use `Silent`.
 
 ```yaml title="Example Compose Snippet"
 restarter:
@@ -136,17 +144,42 @@ restarter:
       - UPD2MQTT_UPDATE=AUTO
 ```
 
+Automated updates can also apply to local builds, where a `git_repo_path` has been defined - if there are remote
+commits available to pull, then a `git pull`, `docker compose build` and `docker compose up` will be executed.
+
 ### Environment Variables
 
 The following environment variables can be used to configure containers for `updates2mqtt`:
 
-| Env Var | Description | Default  |
-|---------| ------------|----------|
-| `UPD2MQTT_UPDATE`  | Update mode, either `Passive` or `Auto`. If `Auto`, updates will be installed automatically. | `Passive` |
-| `UPD2MQTT_PICTURE`  | URL to an icon to use in Home Assistant.  | Docker logo URL   |
-| `UPD2MQTT_RELNOTES` | URL to release notes for the package.  |  | 
-| `UPD2MQTT_GIT_REPO_PATH` | Relative path to a local git repo if the image is built locally.  | |
-| `UPD2MQTT_IGNORE` | If set to `True`, the container will be ignored by updates2mqtt. | False |
+| Env Var                    | Description                                                                                  | Default         |
+|----------------------------|----------------------------------------------------------------------------------------------|-----------------|
+| `UPD2MQTT_UPDATE`          | Update mode, either `Passive` or `Auto`. If `Auto`, updates will be installed automatically. | `Passive`       |
+| `UPD2MQTT_PICTURE`         | URL to an icon to use in Home Assistant.                                                     | Docker logo URL |
+| `UPD2MQTT_RELNOTES`        | URL to release notes for the package.                                                        |                 |
+| `UPD2MQTT_GIT_REPO_PATH`   | Relative path to a local git repo if the image is built locally.                             |                 |
+| `UPD2MQTT_IGNORE`          | If set to `True`, the container will be ignored by Updates2MQTT.                             | False           |
+                        |                 |
+
+### Docker Labels
+
+Alternatively, use Docker labels
+
+| Label                          | Env Var                    |
+|--------------------------------|----------------------------|
+| `updates2mqtt.update`          | `UPD2MQTT_UPDATE`          |
+| `updates2mqtt.picture`         | `UPD2MQTT_PCITURE`         |
+| `updates2mqtt.relnotes`        | `UPD2MQTT_RELNOTES`        |
+| `updates2mqtt.git_repo_path`   | `UPD2MQTT_GIT_REPO_PATH`   |
+| `updates2mqtt.ignore`          | `UPD2MQTT_IGNORE`          |
+
+
+```yaml title="Example Compose Snippet"
+restarter:
+    image: docker:cli
+    command: ["/bin/sh", "-c", "while true; do sleep 86400; docker restart mailserver; done"]
+    labels:
+        updates2mqtt.relnotes: https://component.my.com/release_notes
+```
 
 
 ## Related Projects
@@ -157,6 +190,8 @@ Other apps useful for self-hosting with the help of MQTT:
 
 Find more at [awesome-mqtt](https://github.com/rhizomatics/awesome-mqtt)
 
+For a more powerful Docker update manager, try [What's Up Docker](https://getwud.github.io/wud/)
+
 ## Development
 
 This component relies on several open source packages:
@@ -169,4 +204,4 @@ This component relies on several open source packages:
 - [httpx](https://www.python-httpx.org) for retrieving metadata
 - The Astral [uv](https://docs.astral.sh/uv/) and [ruff](https://docs.astral.sh/ruff/) tools for development and build
 - [pytest](https://docs.pytest.org/en/stable/) and supporting add-ins for automated testing
-- [usingversion](https://pypi.org/project/usingversion/) to log current version info
+- [usingversion](https://pypi.org/project/usingversion/) to log current version info

{updates2mqtt-1.5.1 → updates2mqtt-1.7.0}/README.md

@@ -5,7 +5,7 @@
 [![Rhizomatics Open Source](https://img.shields.io/badge/rhizomatics%20open%20source-lightseagreen)](https://github.com/rhizomatics)
 
 [![PyPI - Version](https://img.shields.io/pypi/v/updates2mqtt)](https://pypi.org/project/updates2mqtt/)
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/rhizomatics/supernotify)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/rhizomatics/updates2mqtt)
 [![Coverage](https://raw.githubusercontent.com/rhizomatics/updates2mqtt/refs/heads/badges/badges/coverage.svg)](https://updates2mqtt.rhizomatics.org.uk/developer/coverage/)
 ![Tests](https://raw.githubusercontent.com/rhizomatics/updates2mqtt/refs/heads/badges/badges/tests.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/rhizomatics/updates2mqtt/main.svg)](https://results.pre-commit.ci/latest/github/rhizomatics/updates2mqtt/main)
@@ -32,7 +32,7 @@ Read the release notes, and optionally click *Update* to trigger a Docker *pull*
 
 ## Description
 
-updates2mqtt perioidically checks for new versions of components being available, and publishes new version info to MQTT. HomeAssistant auto discovery is supported, so all updates can be seen in the same place as Home Assistant's own components and add-ins.
+Updates2MQTT perioidically checks for new versions of components being available, and publishes new version info to MQTT. HomeAssistant auto discovery is supported, so all updates can be seen in the same place as Home Assistant's own components and add-ins.
 
 Currently only Docker containers are supported, either via an image registry check, or a git repo for source (see [Local Builds](local_builds.md)). The design is modular, so other update sources can be added, at least for notification. The next anticipated is **apt** for Debian based systems.
 
@@ -42,8 +42,14 @@ To get started, read the [Installation](installation.md) and [Configuration](con
 
 For a quick spin, try this:
 
-```yaml
-docker run -e MQTT_USER=user1 -e MQTT_PASS=pass1 -e MQTT_HOST=192.168.1.5 ghcr.io/rhizomatics/updates2mqtt:release
+```bash
+docker run -v /var/run/docker.sock:/var/run/docker.sock -e MQTT_USER=user1 -e MQTT_PASS=user1 -e MQTT_HOST=192.168.1.5 ghcr.io/rhizomatics/updates2mqtt:release
+```
+
+or without Docker, using [uv](https://docs.astral.sh/uv/)
+
+```bash
+export MQTT_HOST=192.168.1.1;export MQTT_USER=user1;export MQTT_PASS=user1;uv run --with updates2mqtt python -m updates2mqtt
 ```
 
 ## Release Support
@@ -56,7 +62,7 @@ Presently only Docker containers are supported, although others are planned, pro
   
 ## Heartbeat
 
-A heartbeat JSON payload is optionally published periodically to a configurable MQTT topic, defaulting to `healthcheck/{node_name}/updates2mqtt`. It contains the current version of updates2mqtt, the node name, a timestamp, and some basic stats.
+A heartbeat JSON payload is optionally published periodically to a configurable MQTT topic, defaulting to `healthcheck/{node_name}/updates2mqtt`. It contains the current version of Updates2MQTT, the node name, a timestamp, and some basic stats.
 
 ## Healthcheck
 
@@ -89,7 +95,8 @@ file, or as `environment` options inside `docker-compose.yaml`.
 ### Automated updates
 
 If Docker containers should be immediately updated, without any confirmation
-or trigger, *e.g.* from the HomeAssistant update dialog, then set an environment variable `UPD2MQTT_UPDATE` in the target container to `Auto` ( it defaults to `Passive`)
+or trigger, *e.g.* from the HomeAssistant update dialog, then set an environment variable `UPD2MQTT_UPDATE` in the target container to `Auto` ( it defaults to `Passive`).  If you want it to update without publishing to MQTT and being
+visible to Home Assistant, then use `Silent`.
 
 ```yaml title="Example Compose Snippet"
 restarter:
@@ -99,17 +106,42 @@ restarter:
       - UPD2MQTT_UPDATE=AUTO
 ```
 
+Automated updates can also apply to local builds, where a `git_repo_path` has been defined - if there are remote
+commits available to pull, then a `git pull`, `docker compose build` and `docker compose up` will be executed.
+
 ### Environment Variables
 
 The following environment variables can be used to configure containers for `updates2mqtt`:
 
-| Env Var | Description | Default  |
-|---------| ------------|----------|
-| `UPD2MQTT_UPDATE`  | Update mode, either `Passive` or `Auto`. If `Auto`, updates will be installed automatically. | `Passive` |
-| `UPD2MQTT_PICTURE`  | URL to an icon to use in Home Assistant.  | Docker logo URL   |
-| `UPD2MQTT_RELNOTES` | URL to release notes for the package.  |  | 
-| `UPD2MQTT_GIT_REPO_PATH` | Relative path to a local git repo if the image is built locally.  | |
-| `UPD2MQTT_IGNORE` | If set to `True`, the container will be ignored by updates2mqtt. | False |
+| Env Var                    | Description                                                                                  | Default         |
+|----------------------------|----------------------------------------------------------------------------------------------|-----------------|
+| `UPD2MQTT_UPDATE`          | Update mode, either `Passive` or `Auto`. If `Auto`, updates will be installed automatically. | `Passive`       |
+| `UPD2MQTT_PICTURE`         | URL to an icon to use in Home Assistant.                                                     | Docker logo URL |
+| `UPD2MQTT_RELNOTES`        | URL to release notes for the package.                                                        |                 |
+| `UPD2MQTT_GIT_REPO_PATH`   | Relative path to a local git repo if the image is built locally.                             |                 |
+| `UPD2MQTT_IGNORE`          | If set to `True`, the container will be ignored by Updates2MQTT.                             | False           |
+                        |                 |
+
+### Docker Labels
+
+Alternatively, use Docker labels
+
+| Label                          | Env Var                    |
+|--------------------------------|----------------------------|
+| `updates2mqtt.update`          | `UPD2MQTT_UPDATE`          |
+| `updates2mqtt.picture`         | `UPD2MQTT_PCITURE`         |
+| `updates2mqtt.relnotes`        | `UPD2MQTT_RELNOTES`        |
+| `updates2mqtt.git_repo_path`   | `UPD2MQTT_GIT_REPO_PATH`   |
+| `updates2mqtt.ignore`          | `UPD2MQTT_IGNORE`          |
+
+
+```yaml title="Example Compose Snippet"
+restarter:
+    image: docker:cli
+    command: ["/bin/sh", "-c", "while true; do sleep 86400; docker restart mailserver; done"]
+    labels:
+        updates2mqtt.relnotes: https://component.my.com/release_notes
+```
 
 
 ## Related Projects
@@ -120,6 +152,8 @@ Other apps useful for self-hosting with the help of MQTT:
 
 Find more at [awesome-mqtt](https://github.com/rhizomatics/awesome-mqtt)
 
+For a more powerful Docker update manager, try [What's Up Docker](https://getwud.github.io/wud/)
+
 ## Development
 
 This component relies on several open source packages:
@@ -132,4 +166,4 @@ This component relies on several open source packages:
 - [httpx](https://www.python-httpx.org) for retrieving metadata
 - The Astral [uv](https://docs.astral.sh/uv/) and [ruff](https://docs.astral.sh/ruff/) tools for development and build
 - [pytest](https://docs.pytest.org/en/stable/) and supporting add-ins for automated testing
-- [usingversion](https://pypi.org/project/usingversion/) to log current version info
+- [usingversion](https://pypi.org/project/usingversion/) to log current version info

{updates2mqtt-1.5.1 → updates2mqtt-1.7.0}/pyproject.toml

@@ -7,9 +7,9 @@ authors = [
 ]
 
 requires-python = ">=3.13"
-version = "1.5.1"
+version = "1.7.0"
 license="Apache-2.0"
-keywords=["mqtt", "docker", "updates", "automation","home-assistant","homeassistant","selfhosting"]
+keywords=["mqtt", "docker", "oci","container","updates", "automation","home-assistant","homeassistant","selfhosting"]
 
 dependencies = [
   "docker>=7.1.0",
@@ -20,6 +20,7 @@ dependencies = [
   "httpx>=0.28.1",
   "hishel[httpx]>=0.1.4",
   "usingversion>=0.1.2",
+  "tzlocal>=5.3.1",
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -59,7 +60,7 @@ dev = [
     "icdiff",
     "genbadge[all]"
 ]
-mkdocs=[
+docs=[
     "mkdocs",
     "mkdocs-material",
     "mkdocs-minify-plugin",
@@ -70,14 +71,17 @@ mkdocs=[
     "pymdown-extensions",
     "mkdocs-git-revision-date-localized-plugin",
     "mkdocs-meta-descriptions-plugin",
-    "pngquant"
+    "pngquant",
+    "mkdocs-mermaid2-plugin"
 ]
 
 [build-system]
-build-backend = "hatchling.build"
-requires=[
-  "hatchling"
-]
+requires = ["uv_build>=0.9.18,<0.10.0"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-root = "src"
+module-name = "updates2mqtt"
 
 [tool.bandit]
 exclude_dirs = ["tests"]
@@ -148,7 +152,6 @@ skip-magic-trailing-comma = false
 # Like Black, automatically detect the appropriate line ending.
 line-ending = "auto"
 
-
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 testpaths = [
@@ -185,4 +188,4 @@ Homepage="https://updates2mqtt.rhizomatics.org.uk"
 Repository="https://github.com/rhizomatics/updates2mqtt"
 Documentation="https://updates2mqtt.rhizomatics.org.uk"
 Issues="https://github.com/rhizomatics/updates2mqtt/issues"
-Changelog="https://github.com/rhizomatics/updates2mqtt/blob/main/CHANGELOG.md"
+Changelog="https://github.com/rhizomatics/updates2mqtt/blob/main/CHANGELOG.md"

{updates2mqtt-1.5.1 → updates2mqtt-1.7.0}/src/updates2mqtt/app.py

@@ -14,7 +14,7 @@ import structlog
 import updates2mqtt
 from updates2mqtt.model import Discovery, ReleaseProvider
 
-from .config import Config, PackageUpdateInfo, load_app_config, load_package_info
+from .config import Config, PublishPolicy, UpdatePolicy, load_app_config
 from .integrations.docker import DockerProvider
 from .mqtt import MqttPublisher
 
@@ -39,14 +39,16 @@ class App:
         self.last_scan_timestamp: str | None = None
         app_config: Config | None = load_app_config(CONF_FILE)
         if app_config is None:
-            log.error(f"Invalid configuration at {CONF_FILE}, edit config to fix missing or invalid values and restart")
+            log.error(f"Invalid configuration at {CONF_FILE}")
+            log.error("Edit config to fix missing or invalid values and restart")
+            log.error("Alternately supply correct MQTT_HOST,MQTT_USER,MQTT_PASSWORD environment variables")
             log.error("Exiting app")
             sys.exit(1)
         self.cfg: Config = app_config
+        self.self_bounce: Event = Event()
 
         structlog.configure(wrapper_class=structlog.make_filtering_bound_logger(getattr(logging, str(self.cfg.log.level))))
         log.debug("Logging initialized", level=self.cfg.log.level)
-        self.common_pkg: dict[str, PackageUpdateInfo] = load_package_info(PKG_INFO_FILE)
 
         self.publisher = MqttPublisher(self.cfg.mqtt, self.cfg.node, self.cfg.homeassistant)
 
@@ -54,7 +56,7 @@ class App:
         self.scan_count: int = 0
         self.last_scan: str | None = None
         if self.cfg.docker.enabled:
-            self.scanners.append(DockerProvider(self.cfg.docker, self.common_pkg, self.cfg.node))
+            self.scanners.append(DockerProvider(self.cfg.docker, self.cfg.node, self.self_bounce))
         self.stopped = Event()
         self.healthcheck_topic = self.cfg.node.healthcheck.topic_template.format(node_name=self.cfg.node.name)
 
@@ -101,6 +103,7 @@ class App:
             )
 
         for scanner in self.scanners:
+            scanner.initialize()
             self.publisher.subscribe_hass_command(scanner)
 
         while not self.stopped.is_set() and self.publisher.is_available():
@@ -119,11 +122,18 @@ class App:
     async def on_discovery(self, discovery: Discovery) -> None:
         dlog = log.bind(name=discovery.name)
         try:
-            if self.cfg.homeassistant.discovery.enabled:
+            if discovery.publish_policy == PublishPolicy.HOMEASSISTANT and self.cfg.homeassistant.discovery.enabled:
+                # Switch off MQTT discovery if not Home Assistant enabled
                 self.publisher.publish_hass_config(discovery)
-
-            self.publisher.publish_hass_state(discovery)
-            if discovery.update_policy == "Auto":
+            if discovery.publish_policy in (PublishPolicy.HOMEASSISTANT):
+                self.publisher.publish_hass_state(discovery)
+            if discovery.publish_policy in (PublishPolicy.HOMEASSISTANT, PublishPolicy.MQTT):
+                self.publisher.publish_discovery(discovery)
+            if (
+                discovery.update_policy == UpdatePolicy.AUTO
+                and discovery.can_update
+                and discovery.latest_version != discovery.current_version
+            ):
                 # TODO: review auto update, trigger by version, use update interval as throttle
                 elapsed: float = (
                     time.time() - discovery.update_last_attempt if discovery.update_last_attempt is not None else -1
@@ -155,7 +165,11 @@ class App:
         log.debug("Cancellation task completed")
 
     def shutdown(self, *args, exit_code: int = 143) -> None:  # noqa: ANN002, ARG002
-        log.info("Shutting down, exit_code: %s", exit_code)
+        if self.self_bounce.is_set():
+            exit_code = 1
+            log.info("Self bouncing, overriding exit_code: %s", exit_code)
+        else:
+            log.info("Shutting down, exit_code: %s", exit_code)
         self.stopped.set()
         for scanner in self.scanners:
             scanner.stop()
@@ -206,8 +220,6 @@ def run() -> None:
     import asyncio
     import signal
 
-    from .app import App
-
     # pyright: ignore[reportAttributeAccessIssue]
     log.debug(f"Starting updates2mqtt v{updates2mqtt.version}")  # pyright: ignore[reportAttributeAccessIssue]
     app = App()

{updates2mqtt-1.5.1 → updates2mqtt-1.7.0}/src/updates2mqtt/config.py

@@ -9,6 +9,20 @@ from omegaconf import MISSING, DictConfig, MissingMandatoryValue, OmegaConf, Val
 
 log = structlog.get_logger()
 
+PKG_INFO_FILE = Path("./common_packages.yaml")
+NO_KNOWN_IMAGE = "UNKNOWN"
+
+
+class UpdatePolicy(StrEnum):
+    AUTO = "Auto"
+    PASSIVE = "Passive"
+
+
+class PublishPolicy(StrEnum):
+    HOMEASSISTANT = "HomeAssistant"
+    MQTT = "MQTT"
+    SILENT = "Silent"
+
 
 class LogLevel(StrEnum):
     DEBUG = "DEBUG"
@@ -18,6 +32,13 @@ class LogLevel(StrEnum):
     CRITICAL = "CRITICAL"
 
 
+class VersionType:
+    SHORT_SHA = "short_sha"
+    FULL_SHA = "full_sha"
+    VERSION_REVISION = "version_revision"
+    VERSION = "version"
+
+
 @dataclass
 class MqttConfig:
     host: str = "${oc.env:MQTT_HOST,localhost}"
@@ -34,6 +55,12 @@ class MetadataSourceConfig:
     cache_ttl: int = 60 * 60 * 24 * 7  # 1 week
 
 
+@dataclass
+class Selector:
+    include: list[str] | None = None
+    exclude: list[str] | None = None
+
+
 @dataclass
 class DockerConfig:
     enabled: bool = True
@@ -47,6 +74,8 @@ class DockerConfig:
     discover_metadata: dict[str, MetadataSourceConfig] = field(
         default_factory=lambda: {"linuxserver.io": MetadataSourceConfig(enabled=True)}
     )
+    default_api_backoff: int = 60 * 15
+    image_ref_select: Selector = field(default_factory=lambda: Selector())
 
 
 @dataclass
@@ -61,6 +90,7 @@ class HomeAssistantConfig:
     state_topic_suffix: str = "state"
     device_creation: bool = True
     force_command_topic: bool = False
+    extra_attributes: bool = True
     area: str | None = None
 
 
@@ -114,24 +144,6 @@ class IncompleteConfigException(BaseException):
     pass
 
 
-def load_package_info(pkginfo_file_path: Path) -> dict[str, PackageUpdateInfo]:
-    if pkginfo_file_path.exists():
-        log.debug("Loading common package update info", path=pkginfo_file_path)
-        cfg = OmegaConf.load(pkginfo_file_path)
-    else:
-        log.warn("No common package update info found", path=pkginfo_file_path)
-        cfg = OmegaConf.structured(UpdateInfoConfig)
-    try:
-        # omegaconf broken-ness on optional fields and converting to backclasses
-        pkg_conf: dict[str, PackageUpdateInfo] = {
-            pkg: PackageUpdateInfo(**pkg_cfg) for pkg, pkg_cfg in cfg.common_packages.items()
-        }
-        return pkg_conf
-    except (MissingMandatoryValue, ValidationError) as e:
-        log.error("Configuration error %s", e, path=pkginfo_file_path.as_posix())
-        raise
-
-
 def is_autogen_config() -> bool:
     env_var: str | None = os.environ.get("U2M_AUTOGEN_CONFIG")
     return not (env_var and env_var.lower() in ("no", "0", "false"))

{updates2mqtt-1.5.1 → updates2mqtt-1.7.0}/src/updates2mqtt/hass_formatter.py

@@ -23,28 +23,26 @@ def hass_format_config(
     object_id: str,
     state_topic: str,
     command_topic: str | None,
+    attrs_topic: str | None,
     force_command_topic: bool | None,
     device_creation: bool = True,
     area: str | None = None,
-    session: str | None = None,
 ) -> dict[str, Any]:
     config: dict[str, Any] = {
         "name": discovery.title,
         "device_class": None,  # not firmware, so defaults to null
         "unique_id": object_id,
         "state_topic": state_topic,
-        "source_session": session,
         "supported_features": discovery.features,
-        "can_update": discovery.can_update,
-        "can_build": discovery.can_build,
-        "can_restart": discovery.can_restart,
-        "update_policy": discovery.update_policy,
+        "default_entity_id": f"update.{discovery.node}_{discovery.provider.source_type}_{discovery.name}",
         "origin": {
             "name": f"{discovery.node} updates2mqtt",
             "sw_version": updates2mqtt.version,  # pyright: ignore[reportAttributeAccessIssue]
             "support_url": "https://github.com/rhizomatics/updates2mqtt/issues",
         },
     }
+    if attrs_topic:
+        config["json_attributes_topic"] = attrs_topic
     if discovery.entity_picture_url:
         config["entity_picture"] = discovery.entity_picture_url
     if discovery.device_icon:
@@ -62,14 +60,12 @@ def hass_format_config(
         config["command_topic"] = command_topic
         if discovery.can_update:
             config["payload_install"] = f"{discovery.source_type}|{discovery.name}|install"
-    if discovery.custom.get("git_repo_path"):
-        config["git_repo_path"] = discovery.custom["git_repo_path"]
-    config.update(discovery.provider.hass_config_format(discovery))
+
     return config
 
 
 def hass_format_state(discovery: Discovery, session: str, in_progress: bool = False) -> dict[str, Any]:  # noqa: ARG001
-    state = {
+    state: dict[str, str | dict | list | bool | None] = {
         "installed_version": discovery.current_version,
         "latest_version": discovery.latest_version,
         "title": discovery.title,
@@ -79,11 +75,5 @@ def hass_format_state(discovery: Discovery, session: str, in_progress: bool = Fa
         state["release_summary"] = discovery.release_summary
     if discovery.release_url:
         state["release_url"] = discovery.release_url
-    custom_state = discovery.provider.hass_state_format(discovery)
-    if custom_state:
-        state.update(custom_state)
-    invalid_keys = [k for k in state if k not in HASS_UPDATE_SCHEMA]
-    if invalid_keys:
-        log.warning(f"Invalid keys in state: {invalid_keys}")
-        state = {k: v for k, v in state.items() if k in HASS_UPDATE_SCHEMA}
+
     return state