From 10ac8a883cbc5c17d11ac59109a90890fb782c75 Mon Sep 17 00:00:00 2001 From: clemcer <185682966+clemcer@users.noreply.github.com> Date: Sat, 29 Mar 2025 08:21:34 +0100 Subject: [PATCH] fix: NTFY_URL and NTFY_TOPIC are mandatory even though apprise is configured and fix a bug which made priority and tags mandatory --- app/load_config.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/load_config.py b/app/load_config.py index 097065f..9b3ca3c 100644 --- a/app/load_config.py +++ b/app/load_config.py @@ -74,8 +74,8 @@ class NtfyConfig(BaseConfigModel): token: Optional[SecretStr] = Field(default=None, description="Optional access token") username: Optional[str] = Field(default=None, description="Optional username") password: Optional[SecretStr] = Field(default=None, description="Optional password") - priority: Union[str, int] = Field(default=3, description="Message priority 1-5") - tags: str = Field("kite,mag", description="Comma-separated tags") + priority: Optional[Union[str, int]] = Field(default=3, description="Message priority 1-5") + tags: Optional[str] = Field("kite,mag", description="Comma-separated tags") @field_validator("priority") def validate_priority(cls, v): @@ -234,6 +234,8 @@ def load_config(path="/app/config.yaml"): env_config["containers"][c] = {} if any(ntfy_values.values()): env_config["notifications"]["ntfy"] = ntfy_values + else: + del yaml_config["notifications"]["ntfy"] if apprise_values["url"]: env_config["notifications"]["apprise"] = apprise_values for k, v in global_keywords_values.items(): @@ -244,6 +246,7 @@ def load_config(path="/app/config.yaml"): env_config["settings"][key] = value merged_config = merge_yaml_and_env(yaml_config, env_config) + print(merged_config) config = GlobalConfig.model_validate(merged_config) logging.info(f"\n ------------- CONFIG ------------- \n{config.model_dump_json(indent=2, exclude_none=True)}\n ----------------------------------")