updates2mqtt 1.3.4__py3-none-any.whl → 1.3.5__py3-none-any.whl

updates2mqtt/app.py

@@ -39,7 +39,8 @@ 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}, exiting")
+            log.error(f"Invalid configuration at {CONF_FILE}, edit config to fix missing or invalid values and restart")
+            log.error("Exiting app")
             sys.exit(1)
         self.cfg: Config = app_config
 

updates2mqtt/config.py

@@ -96,6 +96,10 @@ class UpdateInfoConfig:
     common_packages: dict[str, PackageUpdateInfo] = field(default_factory=lambda: {})
 
 
+class IncompleteConfigException(BaseException):
+    pass
+
+
 def load_package_info(pkginfo_file_path: Path) -> UpdateInfoConfig:
     if pkginfo_file_path.exists():
         log.debug("Loading common package update info", path=pkginfo_file_path)
@@ -107,29 +111,33 @@ def load_package_info(pkginfo_file_path: Path) -> UpdateInfoConfig:
     return typing.cast("UpdateInfoConfig", cfg)
 
 
-def load_app_config(conf_file_path: Path) -> Config | None:
-    initializing: bool = False
+def load_app_config(conf_file_path: Path, return_new: bool = False) -> Config | None:
     base_cfg = OmegaConf.structured(Config)
     if conf_file_path.exists():
         cfg = OmegaConf.merge(base_cfg, OmegaConf.load(conf_file_path))
     else:
-        initializing = True
-        try:
-            log.debug("Creating config directory if not already present", path=conf_file_path)
-            conf_file_path.parent.mkdir(parents=True, exist_ok=True)
-        except Exception:
-            log.exception("Unable to create config directory", path=conf_file_path.parent)
+        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)
         try:
             conf_file_path.write_text(OmegaConf.to_yaml(base_cfg))
+            log.info(f"Auto-generated a new config file at {conf_file_path}")
+            log.info("The config has place holders for MQTT user and password")
+            if return_new:
+                return base_cfg
+            return None
         except Exception:
             log.exception("Unable to write config file", path=conf_file_path)
         cfg = base_cfg
 
     try:
         # Validate that all required fields are present, throw exception now rather than when config first used
-        OmegaConf.to_container(cfg, throw_on_missing=not initializing)
+        OmegaConf.to_container(cfg, throw_on_missing=True)
         OmegaConf.set_readonly(cfg, True)
         return typing.cast("Config", cfg)
     except (MissingMandatoryValue, ValidationError) as e:
-        log.error("Configuration error: %s", e, path=conf_file_path)
+        log.error("Configuration error %s", e, path=conf_file_path.as_posix())
         return None

{updates2mqtt-1.3.4.dist-info → updates2mqtt-1.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: updates2mqtt
-Version: 1.3.4
+Version: 1.3.5
 Summary: System update and docker image notification and execution over MQTT
 Project-URL: Repository, https://github.com/rhizomatics/updates2mqtt
 Project-URL: Documentation, https://updates2mqtt.rhizomatics.org.uk
@@ -65,10 +65,15 @@ button in the HomeAssistant update dialog. Icons and release notes can be specif
 
 updates2mqtt prefers to be run inside a Docker container.
 
-### Manual
+### Manual - Run without installing using uv
 ```
-uv sync
-uv run updates2mqtt
+uv run --with updates2mqtt updates2mqtt
+```
+
+### Manual - Install and run with pip
+```
+pip install updates2mqtt
+python3 -m updates2mqtt
 ```
 ### Docker
 

{updates2mqtt-1.3.4.dist-info → updates2mqtt-1.3.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 updates2mqtt/__init__.py,sha256=gnmHrLOSYc-N1-c5VG46OpNpoXEybKzYhEvFMm955P8,237
 updates2mqtt/__main__.py,sha256=HBF00oH5fhS33sI_CdbxNlaUvbIzuuGxwnRYdhHqx0M,194
-updates2mqtt/app.py,sha256=dfoqIIFq0kAm0KHjtEF_RrNC9-fJBQ7Y2_8suwWBOJU,7738
-updates2mqtt/config.py,sha256=TIybHWpGAPLA1uWsZt0miwzboX1AlCNHoGO_JoGMlBo,4270
+updates2mqtt/app.py,sha256=GfssSuanHYKQxcvZCSeFX6UxN64-h1lKp1HYgUpANg0,7824
+updates2mqtt/config.py,sha256=x57wIb0KzJ09EJcRkEYsM4cS5344o6Cy0PaSfFDWMK4,4606
 updates2mqtt/hass_formatter.py,sha256=Ulfj8F0e_1QMmRuJzHsNM2WxHbz9sIkWOWjRq3kQZzs,2772
 updates2mqtt/model.py,sha256=5tWlj3appGGZjkuBeYR2lb-kXoy5mzCn4P_EJQjnwok,3676
 updates2mqtt/mqtt.py,sha256=kDpbq9jk0av6FqyZrSPtg5oQrbklI0BMMH8wxnAp0OI,12230
@@ -9,8 +9,8 @@ updates2mqtt/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 updates2mqtt/integrations/__init__.py,sha256=KmNTUxvVWvqI7rl4I0xZg7XaCmcMS2O4OSv-ClsWM4Q,109
 updates2mqtt/integrations/docker.py,sha256=OX_sXtWVgUJfRSFi_tTBib4gvP_foQI4MoeTkTeLbZc,18868
 updates2mqtt/integrations/git_utils.py,sha256=SkAp6XcvCHwaiy17t6F97kcWTjBd7RyEmfhz6M_EhP0,2196
-updates2mqtt-1.3.4.dist-info/METADATA,sha256=K96yWjB_b3rp5ErGl__gefFWvcvLSMGMMmDmNlTKQ8I,12781
-updates2mqtt-1.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-updates2mqtt-1.3.4.dist-info/entry_points.txt,sha256=Hc6NZ2dBevYSUKTJU6NOs8Mw7Vt0S-9lq5FuKb76NCc,54
-updates2mqtt-1.3.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-updates2mqtt-1.3.4.dist-info/RECORD,,
+updates2mqtt-1.3.5.dist-info/METADATA,sha256=_hRlXS3I27z_zEMDYyZw0uhm7l2ciCEIAfWDhHvSVlE,12924
+updates2mqtt-1.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+updates2mqtt-1.3.5.dist-info/entry_points.txt,sha256=Hc6NZ2dBevYSUKTJU6NOs8Mw7Vt0S-9lq5FuKb76NCc,54
+updates2mqtt-1.3.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+updates2mqtt-1.3.5.dist-info/RECORD,,