updates2mqtt 1.5.1__py3-none-any.whl → 1.7.0__py3-none-any.whl

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/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/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