fix: SchedulerConfiguration

Author: cunla

scheduler/settings.py

@@ -35,15 +35,16 @@ def conf_settings():
             _QUEUES[queue_name] = QueueConfiguration(**queue_config)
 
     user_settings = getattr(settings, "SCHEDULER_CONFIG", {})
-    if isinstance(user_settings, dict):
-        if "FAKEREDIS" in user_settings:
-            logger.warning("Configuration using FAKEREDIS is deprecated. Use BROKER='fakeredis' instead")
-            user_settings["BROKER"] = Broker.FAKEREDIS if user_settings["FAKEREDIS"] else Broker.REDIS
-            user_settings.pop("FAKEREDIS")
-        for k in user_settings:
-            if k not in SCHEDULER_CONFIG.__annotations__:
-                raise ImproperlyConfigured(f"Unknown setting {k} in SCHEDULER_CONFIG")
-            setattr(SCHEDULER_CONFIG, k, user_settings[k])
+    if isinstance(user_settings, SchedulerConfiguration):
+        return
+    if "FAKEREDIS" in user_settings:
+        logger.warning("Configuration using FAKEREDIS is deprecated. Use BROKER='fakeredis' instead")
+        user_settings["BROKER"] = Broker.FAKEREDIS if user_settings["FAKEREDIS"] else Broker.REDIS
+        user_settings.pop("FAKEREDIS")
+    for k in user_settings:
+        if k not in SCHEDULER_CONFIG.__annotations__:
+            raise ImproperlyConfigured(f"Unknown setting {k} in SCHEDULER_CONFIG")
+        setattr(SCHEDULER_CONFIG, k, getattr(user_settings, k, None))
 
 
 conf_settings()

scheduler/settings_types.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from enum import Enum
-from typing import Callable, Dict, Optional, List, Tuple, Any, Self, Type
+from typing import Callable, Dict, Optional, List, Tuple, Any, Self, Type, Iterator
 
 from scheduler.timeouts import BaseDeathPenalty, UnixSignalDeathPenalty
 
@@ -36,6 +36,13 @@ class SchedulerConfiguration:
     SCHEDULER_FALLBACK_PERIOD_SECS: int = 120  # Period (secs) to wait before requiring to reacquire locks
     DEATH_PENALTY_CLASS: Type["BaseDeathPenalty"] = UnixSignalDeathPenalty
 
+    def __contains__(self, item: str) -> bool:
+        return item in self.__annotations__
+
+    def __iter__(self) -> Iterator[str]:
+        for field in self.__annotations__:
+            yield field
+
 
 @dataclass(slots=True, frozen=True, kw_only=True)
 class QueueConfiguration: