fix config strings -> enums in ntfy config

Author: cdzombak

config.py

@@ -99,44 +99,28 @@ def config_from_file(
     )
     if not isinstance(cfg.notifier.debounce_threshold_s, (int, float)):
         raise ConfigValidationError("notifier.debounce_threshold_s must be a number")
-    cfg.notifier.default_priority = ntfy_cfg_dict.get(
+    default_priority_str = ntfy_cfg_dict.get(
         "default_priority", cfg.notifier.default_priority
     )
-    if not isinstance(cfg.notifier.default_priority, str):
-        raise ConfigValidationError("notifier.default_priority must be a string")
-    if cfg.notifier.default_priority not in NtfyPriority.all_values():
-        raise ConfigValidationError(
-            "invalid notifier.default_priority "
-            f"'{cfg.notifier.default_priority}' "
-            "(see https://docs.ntfy.sh/publish/#message-priority)"
-        )
+    if default_priority_str:
+        cfg.notifier.default_priority = NtfyPriority.from_str(default_priority_str)
     cfg.notifier.priorities = ntfy_cfg_dict.get("priorities", cfg.notifier.priorities)
     for k, v in cfg.notifier.priorities.items():
         if not isinstance(k, str) or not isinstance(v, str):
             raise ConfigValidationError(
                 "notifier.priorities must be a dict of str -> str"
             )
-        if v not in NtfyPriority.all_values():
-            raise ConfigValidationError(
-                "invalid notifier.priorities value "
-                f"'{v}' for key '{k}' "
-                "(see https://docs.ntfy.sh/publish/#message-priority)"
-            )
+        cfg.notifier.priorities[k] = NtfyPriority.from_str(v)
     cfg.notifier.req_timeout_s = ntfy_cfg_dict.get(
         "req_timeout_s", cfg.notifier.req_timeout_s
     )
     if not isinstance(cfg.notifier.req_timeout_s, (int, float)):
         raise ConfigValidationError("notifier.req_timeout_s must be a number")
-    cfg.notifier.image_method = ntfy_cfg_dict.get(
+    image_method_str = ntfy_cfg_dict.get(
         "image_method", cfg.notifier.image_method
     )
-    if cfg.notifier.image_method is not None:
-        if not isinstance(cfg.notifier.image_method, str):
-            raise ConfigValidationError("notifier.image_method must be a string")
-        if cfg.notifier.image_method not in ImageAttachMethod.all_values():
-            raise ConfigValidationError(
-                f"notifier.image_method must be one of: {ImageAttachMethod.all_values()}"
-            )
+    if image_method_str:
+        cfg.notifier.image_method = ImageAttachMethod.from_str(image_method_str)
     cfg.notifier.images_cc_dir = ntfy_cfg_dict.get(
         "images_cc_dir", cfg.notifier.images_cc_dir
     )

ntfy.py

@@ -20,8 +20,11 @@ class ImageAttachMethod(Enum):
     CLICK = "click"
 
     @staticmethod
-    def all_values() -> set:
-        return {e.value for e in ImageAttachMethod}
+    def from_str(method: str) -> "ImageAttachMethod":
+        return {
+            ImageAttachMethod.ATTACH.value.lower(): ImageAttachMethod.ATTACH,
+            ImageAttachMethod.CLICK.value.lower(): ImageAttachMethod.CLICK,
+        }[method.lower()]
 
 
 class NtfyPriority(Enum):
@@ -41,9 +44,25 @@ class NtfyPriority(Enum):
     def all_values() -> set:
         return {e.value for e in NtfyPriority}
 
+    @staticmethod
+    def from_str(pri: str) -> "NtfyPriority":
+        return {
+            NtfyPriority.N_1.value.lower(): NtfyPriority.N_1,
+            NtfyPriority.MIN.value.lower(): NtfyPriority.MIN,
+            NtfyPriority.N_2.value.lower(): NtfyPriority.N_2,
+            NtfyPriority.LOW.value.lower(): NtfyPriority.LOW,
+            NtfyPriority.N_3.value.lower(): NtfyPriority.N_3,
+            NtfyPriority.DEFAULT.value.lower(): NtfyPriority.DEFAULT,
+            NtfyPriority.N_4.value.lower(): NtfyPriority.N_4,
+            NtfyPriority.HIGH.value.lower(): NtfyPriority.HIGH,
+            NtfyPriority.N_5.value.lower(): NtfyPriority.N_5,
+            NtfyPriority.MAX.value.lower(): NtfyPriority.MAX,
+            NtfyPriority.URGENT.value.lower(): NtfyPriority.URGENT,
+        }[pri.lower()]
+
 
-NOTIF_PRIORITY_UNMUTED: Final = NtfyPriority.DEFAULT
-NOTIF_PRIORITY_MUTED: Final = NtfyPriority.MIN
+NOTIF_PRIORITY_UNMUTED: Final = NtfyPriority.DEFAULT.value
+NOTIF_PRIORITY_MUTED: Final = NtfyPriority.MIN.value
 
 
 @dataclasses.dataclass(frozen=True)
@@ -73,7 +92,7 @@ class NtfyConfig:
     token: Optional[str] = None
     debounce_threshold_s: float = 60.0
     default_priority: NtfyPriority = NtfyPriority.DEFAULT
-    priorities: Dict[str, str] = dataclasses.field(default_factory=lambda: {})
+    priorities: Dict[str, NtfyPriority] = dataclasses.field(default_factory=lambda: {})
     req_timeout_s: float = 10.0
     image_method: Optional[ImageAttachMethod] = None
     images_cc_dir: Optional[str] = None
@@ -193,7 +212,7 @@ def _prep_ntfy_headers(self, n: Notification) -> Dict[str, str]:
             headers["Priority"] = self._config.priorities.get(
                 n.classification,
                 self._config.default_priority,
-            )
+            ).value
         elif isinstance(n, FeedbackNotification):
             if n.type == FeedbackType.MUTED:
                 headers["Priority"] = NOTIF_PRIORITY_MUTED