updates2mqtt 1.6.0__tar.gz → 1.7.2__tar.gz

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: updates2mqtt
-Version: 1.6.0
+Version: 1.7.2
 Summary: System update and docker image notification and execution over MQTT
-Keywords: mqtt,docker,updates,automation,home-assistant,homeassistant,selfhosting
+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
@@ -18,21 +18,22 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Typing :: Typed
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: docker>=7.1.0
 Requires-Dist: paho-mqtt>=2.1.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: hishel[httpx]>=1.1.0
 Requires-Dist: usingversion>=0.1.2
+Requires-Dist: tzlocal>=5.3.1
 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
+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 }
@@ -60,7 +61,7 @@ Description-Content-Type: text/markdown
 
 Let Home Assistant tell you about new updates to Docker images for your containers.
 
-![Example Home Assistant update page](images/ha_update_detail.png "Home Assistant Updates")
+![Example Home Assistant update page](images/ha_update_detail.png "Home Assistant Updates")![Example Home Assistant Release Notes](images/ha_release_notes.png "Home Assistant Release Notes"){width=300} 
 
 Read the release notes, and optionally click *Update* to trigger a Docker *pull* (or optionally *build*) and *update*.
 
@@ -71,7 +72,8 @@ Read the release notes, and optionally click *Update* to trigger a Docker *pull*
 
 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.
+Currently only Docker containers are supported, either via an image registry check (using either v1 Docker APIs or the OCI v2 API), or a git repo for source (see [Local Builds](local_builds.md)), with specific handling for Docker, Github Container Registry, Gitlab, Codeberg, Microsoft Container Registry and LinuxServer Registry, with adaptive behaviour to cope with most
+others.  The design is modular, so other update sources can be added, at least for notification. The next anticipated is **apt** for Debian based systems.
 
 Components can also be updated, either automatically or triggered via MQTT, for example by hitting the *Install* button in the HomeAssistant update dialog. Icons and release notes can be specified for a better HA experience. See [Home Assistant Integration](home_assistant.md) for details.
 
@@ -80,7 +82,7 @@ To get started, read the [Installation](installation.md) and [Configuration](con
 For a quick spin, try this:
 
 ```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
+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:latest
 ```
 
 or without Docker, using [uv](https://docs.astral.sh/uv/)
@@ -132,7 +134,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:
@@ -142,9 +145,6 @@ 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.
 
@@ -159,8 +159,9 @@ The following environment variables can be used to configure containers for `upd
 | `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                             |                 |
+                        |                 |
+| `UPD2MQTT_VERSION_POLICY` | Change how version derived from container label or image hash, `Version`,`Digest`,`Version_Digest` with default of `Auto`|
+| `UPD2MQTT_REGISTRY_TOKEN` | Access token for authentication to container distribution API, as alternative to making a call to `token` service |
 
 ### Docker Labels
 
@@ -173,8 +174,9 @@ Alternatively, use Docker labels
 | `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` |
+| `updates2mqtt.version_policy`  | `UPD2MQTT_VERSION_POLICY`  |
+| `updates2mqtt.registry_token`  | `UPD2MQTT_REGISTRY_TOKEN`  |
+
 
 
 ```yaml title="Example Compose Snippet"
@@ -204,7 +206,7 @@ This component relies on several open source packages:
 - [Eclipse Paho](https://eclipse.dev/paho/files/paho.mqtt.python/html/client.html) MQTT client
 - [OmegaConf](https://omegaconf.readthedocs.io) for configuration and validation
 - [structlog](https://www.structlog.org/en/stable/) for structured logging and [rich](https://rich.readthedocs.io/en/stable/) for better exception reporting
-- [hishel](https://hishel.com/1.0/) for caching metadata
+- [hishel](https://hishel.com/) for caching metadata
 - [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

{updates2mqtt-1.6.0 → updates2mqtt-1.7.2}/README.md

@@ -23,7 +23,7 @@
 
 Let Home Assistant tell you about new updates to Docker images for your containers.
 
-![Example Home Assistant update page](images/ha_update_detail.png "Home Assistant Updates")
+![Example Home Assistant update page](images/ha_update_detail.png "Home Assistant Updates")![Example Home Assistant Release Notes](images/ha_release_notes.png "Home Assistant Release Notes"){width=300} 
 
 Read the release notes, and optionally click *Update* to trigger a Docker *pull* (or optionally *build*) and *update*.
 
@@ -34,7 +34,8 @@ Read the release notes, and optionally click *Update* to trigger a Docker *pull*
 
 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.
+Currently only Docker containers are supported, either via an image registry check (using either v1 Docker APIs or the OCI v2 API), or a git repo for source (see [Local Builds](local_builds.md)), with specific handling for Docker, Github Container Registry, Gitlab, Codeberg, Microsoft Container Registry and LinuxServer Registry, with adaptive behaviour to cope with most
+others.  The design is modular, so other update sources can be added, at least for notification. The next anticipated is **apt** for Debian based systems.
 
 Components can also be updated, either automatically or triggered via MQTT, for example by hitting the *Install* button in the HomeAssistant update dialog. Icons and release notes can be specified for a better HA experience. See [Home Assistant Integration](home_assistant.md) for details.
 
@@ -43,7 +44,7 @@ To get started, read the [Installation](installation.md) and [Configuration](con
 For a quick spin, try this:
 
 ```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
+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:latest
 ```
 
 or without Docker, using [uv](https://docs.astral.sh/uv/)
@@ -95,7 +96,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:
@@ -105,9 +107,6 @@ 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.
 
@@ -122,8 +121,9 @@ The following environment variables can be used to configure containers for `upd
 | `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                             |                 |
+                        |                 |
+| `UPD2MQTT_VERSION_POLICY` | Change how version derived from container label or image hash, `Version`,`Digest`,`Version_Digest` with default of `Auto`|
+| `UPD2MQTT_REGISTRY_TOKEN` | Access token for authentication to container distribution API, as alternative to making a call to `token` service |
 
 ### Docker Labels
 
@@ -136,8 +136,9 @@ Alternatively, use Docker labels
 | `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` |
+| `updates2mqtt.version_policy`  | `UPD2MQTT_VERSION_POLICY`  |
+| `updates2mqtt.registry_token`  | `UPD2MQTT_REGISTRY_TOKEN`  |
+
 
 
 ```yaml title="Example Compose Snippet"
@@ -167,7 +168,7 @@ This component relies on several open source packages:
 - [Eclipse Paho](https://eclipse.dev/paho/files/paho.mqtt.python/html/client.html) MQTT client
 - [OmegaConf](https://omegaconf.readthedocs.io) for configuration and validation
 - [structlog](https://www.structlog.org/en/stable/) for structured logging and [rich](https://rich.readthedocs.io/en/stable/) for better exception reporting
-- [hishel](https://hishel.com/1.0/) for caching metadata
+- [hishel](https://hishel.com/) for caching metadata
 - [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

{updates2mqtt-1.6.0 → updates2mqtt-1.7.2}/pyproject.toml

@@ -7,9 +7,9 @@ authors = [
 ]
 
 requires-python = ">=3.13"
-version = "1.6.0"
+version = "1.7.2"
 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",
@@ -18,8 +18,9 @@ dependencies = [
   "structlog>=25.4.0",
   "rich>=14.0.0",
   "httpx>=0.28.1",
-  "hishel[httpx]>=0.1.4",
+  "hishel[httpx]>=1.1.0",
   "usingversion>=0.1.2",
+  "tzlocal>=5.3.1",
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -34,11 +35,12 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Typing :: Typed",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.13"
+    "Programming Language :: Python :: 3.14"
 ]
 
 [project.scripts]
 updates2mqtt = "updates2mqtt.app:run"
+cli = "updates2mqtt.cli:main"
 
 [tool.uv]
 compile-bytecode = true
@@ -53,6 +55,7 @@ dev = [
     "pytest-asyncio>=1.2.0",
     "pytest-cov>=7.0.0",
     "pytest-httpx",
+    "pytest-xdist",
     "pytest-mqtt>=0.6.0",
     "pytest-subprocess>=1.5.3",
     "coverage",
@@ -70,7 +73,8 @@ docs=[
     "pymdown-extensions",
     "mkdocs-git-revision-date-localized-plugin",
     "mkdocs-meta-descriptions-plugin",
-    "pngquant"
+    "pngquant",
+    "mkdocs-mermaid2-plugin"
 ]
 
 [build-system]
@@ -150,7 +154,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 = [
@@ -187,4 +190,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.6.0 → updates2mqtt-1.7.2}/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
 
@@ -49,7 +49,6 @@ class App:
 
         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)
 
@@ -57,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.self_bounce))
+            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)
 
@@ -104,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():
@@ -122,12 +122,15 @@ 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.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 == "Auto"
+                discovery.update_policy == UpdatePolicy.AUTO
                 and discovery.can_update
                 and discovery.latest_version != discovery.current_version
             ):

updates2mqtt-1.7.2/src/updates2mqtt/cli.py

@@ -0,0 +1,150 @@
+from typing import TYPE_CHECKING
+
+import structlog
+from omegaconf import DictConfig, OmegaConf
+from rich import print_json
+
+from updates2mqtt.config import DockerConfig, NodeConfig, RegistryConfig
+from updates2mqtt.helpers import Throttler
+from updates2mqtt.integrations.docker import DockerProvider
+from updates2mqtt.integrations.docker_enrich import (
+    REGISTRIES,
+    ContainerDistributionAPIVersionLookup,
+    DockerImageInfo,
+    fetch_url,
+)
+from updates2mqtt.model import Discovery
+
+if TYPE_CHECKING:
+    from httpx import Response
+
+log = structlog.get_logger()
+
+
+"""
+Super simple CLI
+
+python updates2mqtt.cli container=frigate
+
+python updates2mqtt.cli container=frigate api=docker_client log_level=DEBUG
+
+ython3 updates2mqtt/cli.py blob=ghcr.io/homarr-labs/homarr@sha256:af79a3339de5ed8ef7f5a0186ff3deb86f40b213ba75249291f2f68aef082a25 | jq '.config.Labels'
+
+python3 updates2mqtt/cli.py manifest=ghcr.io/blakeblackshear/frigate:stable
+
+python3 updates2mqtt/cli.py blob=ghcr.io/blakeblackshear/frigate@sha256:ef8d56a7d50b545af176e950ce328aec7f0b7bc5baebdca189fe661d97924980
+
+python3 updates2mqtt/cli.py manifest=ghcr.io/blakeblackshear/frigate@sha256:c68fd78fd3237c9ba81b5aa927f17b54f46705990f43b4b5d5596cfbbb626af4
+"""  # noqa: E501
+
+OCI_MANIFEST_TYPES: list[str] = [
+    "application/vnd.oci.image.manifest.v1+json",
+    "application/vnd.oci.image.index.v1+json",
+    "application/vnd.oci.descriptor.v1+json",
+    "application/vnd.oci.empty.v1+json",
+]
+
+OCI_CONFIG_TYPES: list[str] = [
+    "application/vnd.oci.image.config.v1+json",
+]
+
+OCI_LAYER_TYPES: list[str] = [
+    "application/vnd.oci.image.layer.v1.tar",
+    "application/vnd.oci.image.layer.v1.tar+gzip",
+    "application/vnd.oci.image.layer.v1.tar+zstd",
+]
+
+OCI_NONDISTRIBUTABLE_LAYER_TYPES: list[str] = [
+    "application/vnd.oci.image.layer.nondistributable.v1.tar",
+    "application/vnd.oci.image.layer.nondistributable.v1.tar+gzip",
+    "application/vnd.oci.image.layer.nondistributable.v1.tar+zstd",
+]
+
+# Docker Compatibility MIME Types
+DOCKER_MANIFEST_TYPES: list[str] = [
+    "application/vnd.docker.distribution.manifest.v2+json",
+    "application/vnd.docker.distribution.manifest.list.v2+json",
+    "application/vnd.docker.distribution.manifest.v1+json",
+    "application/vnd.docker.distribution.manifest.v1+prettyjws",
+]
+
+DOCKER_CONFIG_TYPES: list[str] = [
+    "application/vnd.docker.container.image.v1+json",
+]
+
+DOCKER_LAYER_TYPES: list[str] = [
+    "application/vnd.docker.image.rootfs.diff.tar.gzip",
+    "application/vnd.docker.image.rootfs.foreign.diff.tar.gzip",
+]
+
+# Combined constants
+ALL_MANIFEST_TYPES: list[str] = OCI_MANIFEST_TYPES + DOCKER_MANIFEST_TYPES
+ALL_CONFIG_TYPES: list[str] = OCI_CONFIG_TYPES + DOCKER_CONFIG_TYPES
+ALL_LAYER_TYPES: list[str] = OCI_LAYER_TYPES + OCI_NONDISTRIBUTABLE_LAYER_TYPES + DOCKER_LAYER_TYPES
+
+# All content types that might be returned by the API
+ALL_OCI_MEDIA_TYPES: list[str] = (
+    ALL_MANIFEST_TYPES
+    + ALL_CONFIG_TYPES
+    + ALL_LAYER_TYPES
+    + ["application/octet-stream", "application/json"]  # Error responses
+)
+
+
+def dump_url(doc_type: str, img_ref: str) -> None:
+    lookup = ContainerDistributionAPIVersionLookup(Throttler(), RegistryConfig())
+    img_info = DockerImageInfo(img_ref)
+    if not img_info.index_name or not img_info.name:
+        log.error("Unable to parse %ss", img_ref)
+        return
+
+    api_host: str | None = REGISTRIES.get(img_info.index_name, (img_info.index_name, img_info.index_name))[1]
+
+    if doc_type == "blob":
+        if not img_info.pinned_digest:
+            log.warning("No digest found in %s", img_ref)
+            return
+        url: str = f"https://{api_host}/v2/{img_info.name}/blobs/{img_info.pinned_digest}"
+    elif doc_type == "manifest":
+        if not img_info.tag_or_digest:
+            log.warning("No tag or digest found in %s", img_ref)
+            return
+        url = f"https://{api_host}/v2/{img_info.name}/manifests/{img_info.tag_or_digest}"
+    else:
+        return
+
+    token: str | None = lookup.fetch_token(img_info.index_name, img_info.name)
+
+    response: Response | None = fetch_url(url, bearer_token=token, follow_redirects=True, response_type=ALL_OCI_MEDIA_TYPES)
+    if response:
+        log.debug(f"{response.status_code}: {url}")
+        log.debug("HEADERS")
+        for k, v in response.headers.items():
+            log.debug(f"{k}: {v}")
+        log.debug("CONTENTS")
+        print_json(response.text)
+
+
+def main() -> None:
+    # will be a proper cli someday
+    cli_conf: DictConfig = OmegaConf.from_cli()
+    structlog.configure(wrapper_class=structlog.make_filtering_bound_logger(cli_conf.get("log_level", "WARNING")))
+
+    if cli_conf.get("blob"):
+        dump_url("blob", cli_conf.get("blob"))
+    elif cli_conf.get("manifest"):
+        dump_url("manifest", cli_conf.get("manifest"))
+
+    else:
+        docker_scanner = DockerProvider(
+            DockerConfig(registry=RegistryConfig(api=cli_conf.get("api", "OCI_V2"))), NodeConfig(), None
+        )
+        discovery: Discovery | None = docker_scanner.rescan(
+            Discovery(docker_scanner, cli_conf.get("container", "frigate"), "cli", "manual")
+        )
+        if discovery:
+            log.info(discovery.as_dict())
+
+
+if __name__ == "__main__":
+    main()

{updates2mqtt-1.6.0 → updates2mqtt-1.7.2}/src/updates2mqtt/config.py

@@ -9,6 +9,23 @@ from omegaconf import MISSING, DictConfig, MissingMandatoryValue, OmegaConf, Val
 
 log = structlog.get_logger()
 
+PKG_INFO_FILE = Path("./common_packages.yaml")
+UNKNOWN_VERSION = "UNKNOWN"
+VERSION_RE = r"[vVr]?[0-9]+(\.[0-9]+)*"
+# source: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+SEMVER_RE = r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"  # noqa: E501
+
+
+class UpdatePolicy(StrEnum):
+    AUTO = "Auto"
+    PASSIVE = "Passive"
+
+
+class PublishPolicy(StrEnum):
+    HOMEASSISTANT = "HomeAssistant"
+    MQTT = "MQTT"
+    SILENT = "Silent"
+
 
 class LogLevel(StrEnum):
     DEBUG = "DEBUG"
@@ -18,6 +35,28 @@ class LogLevel(StrEnum):
     CRITICAL = "CRITICAL"
 
 
+class RegistryAPI(StrEnum):
+    OCI_V2 = "OCI_V2"
+    OCI_V2_MINIMAL = "OCI_V2"
+    DOCKER_CLIENT = "DOCKER_CLIENT"
+    DISABLED = "DISABLED"
+
+
+class VersionType:
+    SHORT_SHA = "short_sha"
+    FULL_SHA = "full_sha"
+    VERSION_REVISION = "version_revision"
+    VERSION = "version"
+
+
+@dataclass
+class RegistryConfig:
+    api: RegistryAPI = RegistryAPI.OCI_V2
+    mutable_cache_ttl: int | None = None  # default to server cache hint
+    immutable_cache_ttl: int | None = 7776000  # 90 days
+    token_cache_ttl: int | None = None  # default to server cache hint
+
+
 @dataclass
 class MqttConfig:
     host: str = "${oc.env:MQTT_HOST,localhost}"
@@ -34,6 +73,19 @@ class MetadataSourceConfig:
     cache_ttl: int = 60 * 60 * 24 * 7  # 1 week
 
 
+@dataclass
+class Selector:
+    include: list[str] | None = None
+    exclude: list[str] | None = None
+
+
+class VersionPolicy(StrEnum):
+    AUTO = "AUTO"
+    VERSION = "VERSION"
+    DIGEST = "DIGEST"
+    VERSION_DIGEST = "VERSION_DIGEST"
+
+
 @dataclass
 class DockerConfig:
     enabled: bool = True
@@ -47,7 +99,12 @@ class DockerConfig:
     discover_metadata: dict[str, MetadataSourceConfig] = field(
         default_factory=lambda: {"linuxserver.io": MetadataSourceConfig(enabled=True)}
     )
-    api_throttle_wait: int = 60 * 15
+    registry: RegistryConfig = field(default_factory=lambda: RegistryConfig())
+    default_api_backoff: int = 60 * 15
+    image_ref_select: Selector = field(default_factory=lambda: Selector())
+    version_select: Selector = field(default_factory=lambda: Selector())
+    version_policy: VersionPolicy = VersionPolicy.AUTO
+    registry_select: Selector = field(default_factory=lambda: Selector())
 
 
 @dataclass
@@ -62,6 +119,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
 
 
@@ -96,7 +154,7 @@ class Config:
 
 @dataclass
 class DockerPackageUpdateInfo:
-    image_name: str = MISSING
+    image_name: str = MISSING  # untagged image ref
 
 
 @dataclass
@@ -104,6 +162,7 @@ class PackageUpdateInfo:
     docker: DockerPackageUpdateInfo | None = field(default_factory=DockerPackageUpdateInfo)
     logo_url: str | None = None
     release_notes_url: str | None = None
+    source_repo_url: str | None = None
 
 
 @dataclass
@@ -115,24 +174,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"))