updates2mqtt 1.4.2__tar.gz → 1.5.1__tar.gz

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/CHANGELOG.md

@@ -1,9 +1,25 @@
 # CHANGELOG
 
+## 1.5.1
+- `MQTT_VERSION` environment variable added, defaults to `3.11`
+- `U2M_AUTOGEN_CONFIG` environment variable added to control auto-generation of config files and directories
+- `U2M_LOG_LEVEL` environment variable added to set log level without config file
+- Title generation for Docker images reverts to same whether HA device set or not
+- Test added to ensure component always functions without a config file, if no env var present
+## 1.5.0
+- Target specific service on docker compose commands, where available from `com.docker.compose.service` label
+- Log level in config is now an enum, and forced to be upper case
+- Removed unnecessary latest_version fields from config message, which also saves a redundant MQTT subscription
+- Publication of `command_topic` for each discovery can now be forced with `force_command_topic` option
+- More common packages: docker:cli
+- Common packages can now match on the image ref rather than base name, for example `docker:cli`
+- Reduced log noise in INFO and increased logging detail for DEBUG
+- Common Packages now allow entries without all the values, initially `rtl_433` which lacks a logo
 ## 1.4.2
 - Replace `origin` in config MQTT message with `device` for better HomeAssistant compatibility
 - An `area` can be defined in the Home Assistant section of config and this will then be used as `suggested_area` for device
-- Icon and release note info added for Owntone and Homarr
+- Icon and release note info added for Owntone, Nextcloud, n8n, and Homarr
+- More testcases
 ## 1.4.1
 - More logging for Docker discovery on why Home Assistant doesn't show an update button
 - More test cases

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: updates2mqtt
-Version: 1.4.2
+Version: 1.5.1
 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
@@ -35,7 +35,7 @@ Requires-Dist: structlog>=25.4.0
 Requires-Dist: usingversion>=0.1.2
 Description-Content-Type: text/markdown
 
-![updates2mqtt](/images/updates2mqtt-dark-256x256.png){ align=left }
+![updates2mqtt](images/updates2mqtt-dark-256x256.png){ align=left }
 
 # updates2mqtt
 
@@ -91,15 +91,17 @@ Presently only Docker containers are supported, although others are planned, pro
 |-----------|-------------|----------------------------------------------------------------------------------------------------|
 | Docker    | Scan. Fetch | Fetch is ``docker pull`` only. Restart support only for ``docker-compose`` image based containers. |
   
-## Healthcheck
+## 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.
 
+## Healthcheck
+
 A `healthcheck.sh` script is included in the Docker image, and can be used as a Docker healthcheck, if the container environment variables are set for `MQTT_HOST`, `MQTT_PORT`, `MQTT_USER` and `MQTT_PASS`. It uses the `mosquitto-clients` Linux package which provides `mosquitto_sub` command to subscribe to topics.
 
 !!! tip
 
-    Check healthcheck is working using `docker inspect --format "{{json .State.Health }}" updates2mqtt | jq`
+    Check healthcheck is working using `docker inspect --format "{{json .State.Health }}" updates2mqtt | jq` (can omit `| jq` if you don't have jsonquery installed, but much easier to read with it)
 
 Another approach is using a restarter service directly in Docker Compose to force a restart, in this case once a day:
 

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

@@ -1,4 +1,4 @@
-![updates2mqtt](/images/updates2mqtt-dark-256x256.png){ align=left }
+![updates2mqtt](images/updates2mqtt-dark-256x256.png){ align=left }
 
 # updates2mqtt
 
@@ -54,15 +54,17 @@ Presently only Docker containers are supported, although others are planned, pro
 |-----------|-------------|----------------------------------------------------------------------------------------------------|
 | Docker    | Scan. Fetch | Fetch is ``docker pull`` only. Restart support only for ``docker-compose`` image based containers. |
   
-## Healthcheck
+## 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.
 
+## Healthcheck
+
 A `healthcheck.sh` script is included in the Docker image, and can be used as a Docker healthcheck, if the container environment variables are set for `MQTT_HOST`, `MQTT_PORT`, `MQTT_USER` and `MQTT_PASS`. It uses the `mosquitto-clients` Linux package which provides `mosquitto_sub` command to subscribe to topics.
 
 !!! tip
 
-    Check healthcheck is working using `docker inspect --format "{{json .State.Health }}" updates2mqtt | jq`
+    Check healthcheck is working using `docker inspect --format "{{json .State.Health }}" updates2mqtt | jq` (can omit `| jq` if you don't have jsonquery installed, but much easier to read with it)
 
 Another approach is using a restarter service directly in Docker Compose to force a restart, in this case once a day:
 

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/common_packages.yaml

@@ -3,7 +3,7 @@ common_packages:
     docker:
       image_name: ghcr.io/rhizomatics/updates2mqtt
     logo_url: https://avatars.githubusercontent.com/u/162821163?s=48&v=4
-    release_notes_url: https://github.com/rhizomatics/updates2mqtt/pkgs/container/updates2mqtt
+    release_notes_url: https://github.com/rhizomatics/updates2mqtt/releases
 
   frigate:
     docker:
@@ -105,4 +105,15 @@ common_packages:
     docker:
       image_name: docker.n8n.io/n8nio/n8n
     logo_url: https://avatars.githubusercontent.com/u/45487711?s=48&v=4
-    release_notes_url: https://github.com/n8n-io/n8n/releases
+    release_notes_url: https://github.com/n8n-io/n8n/releases
+
+  docker_cli:
+    docker:
+      image_name: docker:cli
+    logo_url: https://www.docker.com/app/uploads/2023/05/cli_1@2x.png
+    release_notes_url: https://github.com/docker-library/docker/commits/master/29/cli
+
+  rtl_433:
+    docker: 
+      image_name: hertzg/rtl_433
+    release_notes_url: https://github.com/merbanan/rtl_433/releases

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/conftest.py

@@ -35,7 +35,7 @@ def app_with_mocked_external_dependencies(
 
 @pytest.fixture
 def mock_discoveries(mock_provider: ReleaseProvider) -> list[Discovery]:
-    return [Discovery(mock_provider, "thing-1", "test001")]
+    return [Discovery(mock_provider, "thing-1", "test001", "testbed01", can_update=True, update_type="TestRun")]
 
 
 @pytest.fixture
@@ -71,7 +71,7 @@ def mock_provider() -> ReleaseProvider:
     provider.source_type = "unit_test"
     provider.command.return_value = True  # type: ignore[attr-defined]
     provider.resolve.return_value = Discovery(  # type: ignore[attr-defined]
-        provider, "fooey", session="test-mqtt-123", current_version="v2", latest_version="v2"
+        provider, "fooey", session="test-mqtt-123", node="node002", current_version="v2", latest_version="v2"
     )
     provider.hass_state_format.return_value = {"fixture": "test_exec"}  # type: ignore[attr-defined]
     return provider

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/docs/configuration.md

@@ -1,6 +1,26 @@
-# Configuration
+# Minimal Configuration
 
-Create file `config.yaml` in `conf` directory. If the file is not present, a default file will be generated.
+The core configuration can be supplied by environment variables, everything else will default, either to fixed values built into Updates2MQTT, or in the case of the node name, taken from the operating system.
+
+| Env Var       | Default      |
+|---------------|--------------|
+| MQTT_HOST     | localhost    |
+| MQTT_PORT     | 1883         |
+| MQTT_USER     | *NO DEFAULT* |
+| MQTT_PASSWORD | *NO DEFAULT* |
+| MQTT_VERSION  | 3.11.        |
+| U2M_LOG_LEVEL | INFO         |
+
+Startup will fail if `MQTT_USER` and `MQTT_PASSWORD` are not defined some how.
+
+The example [docker-compose.yaml](docker_compose.md) and [.env](env.md) demonstrate one way of doing this, or skip
+the `.env` file and use an `environment` section in the Compose file.
+
+# Configuration File
+
+The configuration file is optional, and only needed if you have to override the defaults.
+
+Create file `config.yaml` in `conf` directory. If the file is not present, a default file will be generated, and the parent director if necessary. If you don't want that to happen, then set `U2M_AUTOGEN_CONFIG=0`.
 
 ### Example configuration file
 

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/docs/examples/config_maximal.md

@@ -3,5 +3,5 @@
 More extensive example configuration, using all the features
 
 ``` yaml
---8<-- "examples/config.yaml.minimal"
+--8<-- "examples/config.yaml.maximal"
 ```

updates2mqtt-1.5.1/docs/examples/config_minimal.md

@@ -0,0 +1,7 @@
+# Minimal Configuration
+
+Smallest working configuration ( although the actual smallest is no file at all and using only environment variables for MQTT )
+
+``` yaml
+--8<-- "examples/config.yaml.minimal"
+```

updates2mqtt-1.5.1/docs/examples/docker_compose.md

@@ -0,0 +1,9 @@
+# Docker Compose
+
+Example Docker Compose configuration to run *updates2mqtt* as a container. This also
+requires a [.env](env.md), or alternatively adding the environment variables directly into the
+compose file.
+
+``` yaml
+--8<-- "examples/docker-compose.yaml"
+```

updates2mqtt-1.5.1/docs/examples/env.md

@@ -0,0 +1,15 @@
+# Environment File
+
+Example `.env` file for Docker Compose configuration to separately store the environment variables.
+
+``` bash
+# Example env file for docker-compose.yaml
+# Used by both the app itself and the healthcheck script
+
+# To use these, add to config.yaml like ${oc.env:MQTT_HOST}
+
+MQTT_HOST=192.168.0.1
+MQTT_PORT=1883
+MQTT_USER=my_mqtt_user
+MQTT_PASS=my_mqtt_secret
+```

updates2mqtt-1.5.1/docs/examples/index.md

@@ -0,0 +1,5 @@
+# Example Configurations
+
+Configuration files and Docker Compose files.
+
+{{ pagetree(siblings) }}

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/docs/home_assistant.md

@@ -27,12 +27,22 @@ a `suggested_area` for the device.
 
 There are 3 separate types of MQTT topic used for HomeAssisstant integration:
 
-- *Config* to support auto discovery. A topic is created per component, with a name like `homeassistant/update/dockernuc_docker_jellyfin/update/config`. This can be disabled in the config file, and the `homeassistant` topic prefix can also be configured.
-- *State* to report the current version and the latest version available, again one topic per component, like `updates2mqtt/dockernuc/docker/jellyfin`.
-- *Command* to support triggering an update. These will be created on the fly by HomeAssistant when an update is requested, and updates2mqtt subscribes to pick up the changes, so you won't typically see these if browsing MQTT topics. Only one is needed per updates2mqtt agent, with a name like `updates2mqtt/dockernuc/docker`
+- *Config* to support auto discovery. 
+    - A topic is created per component, with a name like `homeassistant/update/dockernuc_docker_jellyfin/update/config`. 
+    - This can be disabled in the config file, and the `homeassistant` topic prefix can also be configured.
+- *State* to report the current version and the latest version available
+    - One topic per component, like `updates2mqtt/dockernuc/docker/jellyfin`.
+- *Command* to support triggering an update. 
+    - These will be created on the fly by HomeAssistant when an update is requested
+    - Updates2mqtt subscribes to pick up the changes, so you won't typically see these if browsing MQTT topics. 
+    - Only one is needed per updates2mqtt agent, with a name like `updates2mqtt/dockernuc/docker`
 
 If the package supports automated update, then *Skip* and *Install* buttons will appear on the Home Assistant interface, and the package can be remotely fetched and the component restarted.
 
+If it doesn't support automated update, the `command_topic` won't be published with the configuration
+message, unless `force_command_topic` is set to `true` in the `homeassistant` configuration section,
+this will force the Home Assistant app to show the update, but with a do-nothing Update button.
+
 ## More Home Assistant information
 
 - [MQTT Integration](https://www.home-assistant.io/integrations/mqtt/)

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/docs/installation.md

@@ -4,7 +4,7 @@
 
 updates2mqtt prefers to be run inside a Docker container, though can run standalone, for example scripted via cron or systemd.
 
-The only mandatory configuration is the MQTT broker host, user name and password, which can be set by environment variable, or the config file. See [Configuration](configuration.md).
+The only mandatory configuration is the MQTT broker host, user name and password, which can be set by environment variables, or the config file. The node name will be taken from the operating system if there's no config file. See [Configuration](configuration.md) for details.
 
 ### Docker
 

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/examples/config.yaml.maximal

@@ -21,6 +21,7 @@ homeassistant:
   state_topic_suffix: state
   area: Server Room
   device_creation: true
+  force_command_topic: false
 docker:
   enabled: true
   allow_pull: true

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

@@ -7,7 +7,7 @@ authors = [
 ]
 
 requires-python = ">=3.13"
-version = "1.4.2"
+version = "1.5.1"
 license="Apache-2.0"
 keywords=["mqtt", "docker", "updates", "automation","home-assistant","homeassistant","selfhosting"]
 

{updates2mqtt-1.4.2 → updates2mqtt-1.5.1}/scripts/healthcheck.sh

@@ -2,6 +2,11 @@
 
 # MQTT Health Check Script
 # Checks if the heartbeat timestamp in MQTT payload is recent enough
+# Requires MQTT connection details to be available as environment variables
+#   - MQTT_HOST (defaults to localhost)
+#   - MQTT_PORT (defaults to 1883)
+#   - MQTT_USER (no default)
+#   - MQTT_PASS (no default)
 
 # Arguments
 MQTT_TOPIC=$1

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

@@ -14,7 +14,7 @@ import structlog
 import updates2mqtt
 from updates2mqtt.model import Discovery, ReleaseProvider
 
-from .config import Config, load_app_config, load_package_info
+from .config import Config, PackageUpdateInfo, load_app_config, load_package_info
 from .integrations.docker import DockerProvider
 from .mqtt import MqttPublisher
 
@@ -44,9 +44,9 @@ class App:
             sys.exit(1)
         self.cfg: Config = app_config
 
-        structlog.configure(wrapper_class=structlog.make_filtering_bound_logger(getattr(logging, self.cfg.log.level)))
+        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 = load_package_info(PKG_INFO_FILE)
+        self.common_pkg: dict[str, PackageUpdateInfo] = load_package_info(PKG_INFO_FILE)
 
         self.publisher = MqttPublisher(self.cfg.mqtt, self.cfg.node, self.cfg.homeassistant)
 
@@ -62,25 +62,29 @@ class App:
             "App configured",
             node=self.cfg.node.name,
             scan_interval=self.cfg.scan_interval,
+            healthcheck_topic=self.healthcheck_topic,
         )
 
     async def scan(self) -> None:
         session = uuid.uuid4().hex
         for scanner in self.scanners:
-            log.info("Cleaning topics before scan", source_type=scanner.source_type)
+            slog = log.bind(source_type=scanner.source_type, session=session)
+            slog.info("Cleaning topics before scan")
             if self.scan_count == 0:
                 await self.publisher.clean_topics(scanner, None, force=True)
             if self.stopped.is_set():
                 break
-            log.info("Scanning", source=scanner.source_type, session=session)
+            slog.info("Scanning ...")
             async with asyncio.TaskGroup() as tg:
-                async for discovery in scanner.scan(session):  # xtype: ignore[attr-defined]
+                # xtype: ignore[attr-defined]
+                async for discovery in scanner.scan(session):
                     tg.create_task(self.on_discovery(discovery), name=f"discovery-{discovery.name}")
             if self.stopped.is_set():
+                slog.debug("Breaking scan loop on stopped event")
                 break
             await self.publisher.clean_topics(scanner, session, force=False)
             self.scan_count += 1
-            log.info("Scan complete", source_type=scanner.source_type)
+            slog.info(f"Scan #{self.scan_count} complete")
         self.last_scan_timestamp = datetime.now(UTC).isoformat()
 
     async def main_loop(self) -> None:
@@ -170,13 +174,15 @@ class App:
     async def healthcheck(self) -> None:
         if not self.publisher.is_available():
             return
+        heartbeat_stamp: str = datetime.now(UTC).isoformat()
+        log.debug("Publishing health check", heartbeat_stamp=heartbeat_stamp)
         self.publisher.publish(
             topic=self.healthcheck_topic,
             payload={
                 "version": updates2mqtt.version,  # pyright: ignore[reportAttributeAccessIssue]
                 "node": self.cfg.node.name,
                 "heartbeat_raw": time.time(),
-                "heartbeat_stamp": datetime.now(UTC).isoformat(),
+                "heartbeat_stamp": heartbeat_stamp,
                 "startup_stamp": self.startup_timestamp,
                 "last_scan_stamp": self.last_scan_timestamp,
                 "scan_count": self.scan_count,
@@ -191,7 +197,7 @@ async def repeated_call(func: Callable, interval: int = 60, *args: Any, **kwargs
             await func(*args, **kwargs)
             await asyncio.sleep(interval)
         except asyncio.CancelledError:
-            log.debug("Periodic task cancelled")
+            log.debug("Periodic task cancelled", func=func)
         except Exception:
             log.exception("Periodic task failed")
 
@@ -202,6 +208,7 @@ def run() -> None:
 
     from .app import App
 
+    # pyright: ignore[reportAttributeAccessIssue]
     log.debug(f"Starting updates2mqtt v{updates2mqtt.version}")  # pyright: ignore[reportAttributeAccessIssue]
     app = App()
 

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

@@ -1,6 +1,7 @@
 import os
 import typing
 from dataclasses import dataclass, field
+from enum import StrEnum
 from pathlib import Path
 
 import structlog
@@ -9,6 +10,14 @@ from omegaconf import MISSING, DictConfig, MissingMandatoryValue, OmegaConf, Val
 log = structlog.get_logger()
 
 
+class LogLevel(StrEnum):
+    DEBUG = "DEBUG"
+    INFO = "INFO"
+    WARNING = "WARNING"
+    ERROR = "ERROR"
+    CRITICAL = "CRITICAL"
+
+
 @dataclass
 class MqttConfig:
     host: str = "${oc.env:MQTT_HOST,localhost}"
@@ -16,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
@@ -33,7 +42,8 @@ class DockerConfig:
     allow_build: bool = True
     compose_version: str = "v2"
     default_entity_picture_url: str = "https://www.docker.com/wp-content/uploads/2022/03/Moby-logo.png"
-    device_icon: str = "mdi:docker"  # Icon to show when browsing entities in Home Assistant
+    # Icon to show when browsing entities in Home Assistant
+    device_icon: str = "mdi:docker"
     discover_metadata: dict[str, MetadataSourceConfig] = field(
         default_factory=lambda: {"linuxserver.io": MetadataSourceConfig(enabled=True)}
     )
@@ -50,6 +60,7 @@ class HomeAssistantConfig:
     discovery: HomeAssistantDiscoveryConfig = field(default_factory=HomeAssistantDiscoveryConfig)
     state_topic_suffix: str = "state"
     device_creation: bool = True
+    force_command_topic: bool = False
     area: str | None = None
 
 
@@ -69,14 +80,14 @@ class NodeConfig:
 
 @dataclass
 class LogConfig:
-    level: str = "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[reportCallIssue, reportArgumentType]
+    mqtt: MqttConfig = field(default_factory=MqttConfig)  # pyright: ignore[reportArgumentType, reportCallIssue]
     homeassistant: HomeAssistantConfig = field(default_factory=HomeAssistantConfig)
     docker: DockerConfig = field(default_factory=DockerConfig)
     scan_interval: int = 60 * 60 * 3
@@ -103,33 +114,47 @@ class IncompleteConfigException(BaseException):
     pass
 
 
-def load_package_info(pkginfo_file_path: Path) -> UpdateInfoConfig:
+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)
-    OmegaConf.set_readonly(cfg, True)
-    return typing.cast("UpdateInfoConfig", cfg)
+    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"))
 
 
 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.4.2 → updates2mqtt-1.5.1}/src/updates2mqtt/hass_formatter.py

@@ -21,60 +21,58 @@ 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,
     device_creation: bool = True,
     area: str | None = None,
     session: str | None = None,
 ) -> dict[str, Any]:
     config: dict[str, Any] = {
-        "name": f"{discovery.name} {discovery.source_type} on {node_name}",
+        "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,
-        "entity_picture": discovery.entity_picture_url,
-        "icon": discovery.device_icon,
         "can_update": discovery.can_update,
         "can_build": discovery.can_build,
         "can_restart": discovery.can_restart,
         "update_policy": discovery.update_policy,
-        "latest_version_topic": state_topic,
-        "latest_version_template": "{{value_json.latest_version}}",
         "origin": {
-            "name": f"{node_name} updates2mqtt Agent",
+            "name": f"{discovery.node} updates2mqtt",
             "sw_version": updates2mqtt.version,  # pyright: ignore[reportAttributeAccessIssue]
             "support_url": "https://github.com/rhizomatics/updates2mqtt/issues",
         },
     }
+    if discovery.entity_picture_url:
+        config["entity_picture"] = discovery.entity_picture_url
+    if discovery.device_icon:
+        config["icon"] = discovery.device_icon
     if device_creation:
         config["device"] = {
-            "name": f"{node_name} updates2mqtt Agent",
+            "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
-    if command_topic:
+    if command_topic and (discovery.can_update or force_command_topic):
         config["command_topic"] = command_topic
-        config["payload_install"] = f"{discovery.source_type}|{discovery.name}|install"
+        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, 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: