updates2mqtt 1.5.0__tar.gz → 1.6.0__tar.gz

{updates2mqtt-1.5.0 → updates2mqtt-1.6.0}/PKG-INFO

@@ -1,38 +1,38 @@
 Metadata-Version: 2.4
 Name: updates2mqtt
-Version: 1.5.0
+Version: 1.6.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,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-Python: >=3.13
+Project-URL: Changelog, https://github.com/rhizomatics/updates2mqtt/blob/main/CHANGELOG.md
+Project-URL: Documentation, https://updates2mqtt.rhizomatics.org.uk
+Project-URL: Homepage, https://updates2mqtt.rhizomatics.org.uk
+Project-URL: Issues, https://github.com/rhizomatics/updates2mqtt/issues
+Project-URL: Repository, https://github.com/rhizomatics/updates2mqtt
 Description-Content-Type: text/markdown
 
 ![updates2mqtt](images/updates2mqtt-dark-256x256.png){ align=left }
@@ -42,7 +42,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 +69,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 +79,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 +99,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
 
@@ -136,17 +142,48 @@ restarter:
       - UPD2MQTT_UPDATE=AUTO
 ```
 
+This can be used in conjunction with the `UPD2MQTT_VERSION_INCLUDE` and `UPD2MQTT_VERSION_EXCLUDE` to
+limit which updates get automatically applied, for example excluding nightly builds.
+
+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           |
+| `UPD2MQTT_VERSION_INCLUDE` | Only recognize versions matching this string or regular expression                           |                 |
+| `UPD2MQTT_VERSION_EXCLUDE` | Skip update if version matches this string or regular expression                             |                 |
+
+### 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`          |
+| `updates2mqtt.version_include` | `UPD2MQTT_VERSION_INCLUDE` |
+| `updates2mqtt.version_exclude` | `UPD2MQTT_VERSION_EXCLUDE` |
+
+
+```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 +194,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 +208,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.0 → updates2mqtt-1.6.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
 
@@ -99,17 +105,48 @@ restarter:
       - UPD2MQTT_UPDATE=AUTO
 ```
 
+This can be used in conjunction with the `UPD2MQTT_VERSION_INCLUDE` and `UPD2MQTT_VERSION_EXCLUDE` to
+limit which updates get automatically applied, for example excluding nightly builds.
+
+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           |
+| `UPD2MQTT_VERSION_INCLUDE` | Only recognize versions matching this string or regular expression                           |                 |
+| `UPD2MQTT_VERSION_EXCLUDE` | Skip update if version matches this string or regular expression                             |                 |
+
+### 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`          |
+| `updates2mqtt.version_include` | `UPD2MQTT_VERSION_INCLUDE` |
+| `updates2mqtt.version_exclude` | `UPD2MQTT_VERSION_EXCLUDE` |
+
+
+```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 +157,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 +171,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.0 → updates2mqtt-1.6.0}/pyproject.toml

@@ -7,7 +7,7 @@ authors = [
 ]
 
 requires-python = ">=3.13"
-version = "1.5.0"
+version = "1.6.0"
 license="Apache-2.0"
 keywords=["mqtt", "docker", "updates", "automation","home-assistant","homeassistant","selfhosting"]
 
@@ -59,7 +59,7 @@ dev = [
     "icdiff",
     "genbadge[all]"
 ]
-mkdocs=[
+docs=[
     "mkdocs",
     "mkdocs-material",
     "mkdocs-minify-plugin",
@@ -74,10 +74,12 @@ mkdocs=[
 ]
 
 [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"]

{updates2mqtt-1.5.0 → updates2mqtt-1.6.0}/src/updates2mqtt/app.py

@@ -39,10 +39,13 @@ 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)
@@ -54,7 +57,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.common_pkg, 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)
 
@@ -123,7 +126,11 @@ class App:
                 self.publisher.publish_hass_config(discovery)
 
             self.publisher.publish_hass_state(discovery)
-            if discovery.update_policy == "Auto":
+            if (
+                discovery.update_policy == "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 +162,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 +217,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.0 → updates2mqtt-1.6.0}/src/updates2mqtt/config.py

@@ -25,7 +25,7 @@ class MqttConfig:
     password: str = f"${{oc.env:MQTT_PASS,{MISSING}}}"
     port: int = "${oc.decode:${oc.env:MQTT_PORT,1883}}"  # type: ignore[assignment]
     topic_root: str = "updates2mqtt"
-    protocol: str = "3.11"
+    protocol: str = "${oc.env:MQTT_VERSION,3.11}"
 
 
 @dataclass
@@ -47,6 +47,7 @@ class DockerConfig:
     discover_metadata: dict[str, MetadataSourceConfig] = field(
         default_factory=lambda: {"linuxserver.io": MetadataSourceConfig(enabled=True)}
     )
+    api_throttle_wait: int = 60 * 15
 
 
 @dataclass
@@ -80,12 +81,12 @@ class NodeConfig:
 
 @dataclass
 class LogConfig:
-    level: LogLevel = LogLevel.INFO
+    level: LogLevel = "${oc.decode:${oc.env:U2M_LOG_LEVEL,INFO}}"  # type: ignore[assignment] # pyright: ignore[reportAssignmentType]
 
 
 @dataclass
 class Config:
-    log: LogConfig = field(default_factory=LogConfig)
+    log: LogConfig = field(default_factory=LogConfig)  # pyright: ignore[reportArgumentType, reportCallIssue]
     node: NodeConfig = field(default_factory=NodeConfig)
     mqtt: MqttConfig = field(default_factory=MqttConfig)  # pyright: ignore[reportArgumentType, reportCallIssue]
     homeassistant: HomeAssistantConfig = field(default_factory=HomeAssistantConfig)
@@ -132,22 +133,29 @@ def load_package_info(pkginfo_file_path: Path) -> dict[str, PackageUpdateInfo]:
         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"))
+
+
 def load_app_config(conf_file_path: Path, return_invalid: bool = False) -> Config | None:
     base_cfg: DictConfig = OmegaConf.structured(Config)
     if conf_file_path.exists():
         cfg: DictConfig = typing.cast("DictConfig", OmegaConf.merge(base_cfg, OmegaConf.load(conf_file_path)))
-    else:
+    elif is_autogen_config():
         if not conf_file_path.parent.exists():
             try:
                 log.debug(f"Creating config directory {conf_file_path.parent} if not already present")
                 conf_file_path.parent.mkdir(parents=True, exist_ok=True)
             except Exception:
-                log.exception("Unable to create config directory", path=conf_file_path.parent)
+                log.warning("Unable to create config directory", path=conf_file_path.parent)
         try:
             conf_file_path.write_text(OmegaConf.to_yaml(base_cfg))
             log.info(f"Auto-generated a new config file at {conf_file_path}")
         except Exception:
-            log.exception("Unable to write config file", path=conf_file_path)
+            log.warning("Unable to write config file", path=conf_file_path)
+        cfg = base_cfg
+    else:
         cfg = base_cfg
 
     try:

{updates2mqtt-1.5.0 → updates2mqtt-1.6.0}/src/updates2mqtt/hass_formatter.py

@@ -21,7 +21,6 @@ HASS_UPDATE_SCHEMA = [
 def hass_format_config(
     discovery: Discovery,
     object_id: str,
-    node_name: str,
     state_topic: str,
     command_topic: str | None,
     force_command_topic: bool | None,
@@ -29,13 +28,8 @@ def hass_format_config(
     area: str | None = None,
     session: str | None = None,
 ) -> dict[str, Any]:
-    if device_creation:
-        # avoid duplication, since Home Assistant will concatenate device and entity name on update
-        name: str = f"{discovery.name} {discovery.source_type}"
-    else:
-        name = f"{discovery.name} {discovery.source_type} on {node_name}"
     config: dict[str, Any] = {
-        "name": name,
+        "name": discovery.title,
         "device_class": None,  # not firmware, so defaults to null
         "unique_id": object_id,
         "state_topic": state_topic,
@@ -46,7 +40,7 @@ def hass_format_config(
         "can_restart": discovery.can_restart,
         "update_policy": discovery.update_policy,
         "origin": {
-            "name": f"{node_name} updates2mqtt",
+            "name": f"{discovery.node} updates2mqtt",
             "sw_version": updates2mqtt.version,  # pyright: ignore[reportAttributeAccessIssue]
             "support_url": "https://github.com/rhizomatics/updates2mqtt/issues",
         },
@@ -57,10 +51,10 @@ def hass_format_config(
         config["icon"] = discovery.device_icon
     if device_creation:
         config["device"] = {
-            "name": f"{node_name} updates2mqtt",
+            "name": f"{discovery.node} updates2mqtt",
             "sw_version": updates2mqtt.version,  # pyright: ignore[reportAttributeAccessIssue]
             "manufacturer": "rhizomatics",
-            "identifiers": [f"{node_name}.updates2mqtt"],
+            "identifiers": [f"{discovery.node}.updates2mqtt"],
         }
         if area:
             config["device"]["suggested_area"] = area
@@ -68,20 +62,17 @@ 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["custom"] = {}
+    config["custom"][discovery.source_type] = discovery.custom
     config.update(discovery.provider.hass_config_format(discovery))
     return config
 
 
-def hass_format_state(discovery: Discovery, node_name: str, session: str, in_progress: bool = False) -> dict[str, Any]:  # noqa: ARG001
-    title: str = (
-        discovery.title_template.format(name=discovery.name, node=node_name) if discovery.title_template else discovery.name
-    )
+def hass_format_state(discovery: Discovery, session: str, in_progress: bool = False) -> dict[str, Any]:  # noqa: ARG001
     state = {
         "installed_version": discovery.current_version,
         "latest_version": discovery.latest_version,
-        "title": title,
+        "title": discovery.title,
         "in_progress": in_progress,
     }
     if discovery.release_summary: