making registry global

Author: eddalmond1

src/eligibility_signposting_api/logging/logs_manager.py

@@ -30,9 +30,9 @@ def wrapper(event: LambdaEvent, context: LambdaContext) -> dict[str, Any] | None
 
 
 class EnrichedJsonFormatter(JsonFormatter):
-    def add_fields(self, log_record: dict[str, Any], record: logging.LogRecord, message_dict: dict[str, Any]) -> None:
-        log_record["request_id"] = request_id_context_var.get() or "-"
-        super().add_fields(log_record, record, message_dict)
+    def add_fields(self, log_data: dict[str, Any], record: logging.LogRecord, message_dict: dict[str, Any]) -> None:
+        log_data["request_id"] = request_id_context_var.get() or "-"
+        super().add_fields(log_data, record, message_dict)
 
 
 def init_logging(quieten: Sequence[str] = ("asyncio", "botocore", "boto3", "mangum", "urllib3")) -> None:

src/eligibility_signposting_api/services/processors/derived_values/registry.py

@@ -149,14 +149,19 @@ def calculate(
         return handler.calculate(context)
 
 
-# Create a singleton instance for convenience
-_registry = DerivedValueRegistry()
+# Use a dict container for lazy singleton to avoid global statement
+_registry_container: dict[str, DerivedValueRegistry] = {}
 
 
 def get_registry() -> DerivedValueRegistry:
     """Get the global derived value registry.
 
+    Uses lazy initialization to ensure default handlers are registered
+    before the singleton is created.
+
     Returns:
         The singleton DerivedValueRegistry instance
     """
-    return _registry
+    if "instance" not in _registry_container:
+        _registry_container["instance"] = DerivedValueRegistry()
+    return _registry_container["instance"]

src/eligibility_signposting_api/services/processors/token_processor.py

@@ -9,7 +9,7 @@
 from eligibility_signposting_api.model.person import Person
 from eligibility_signposting_api.services.processors.derived_values import (
     DerivedValueContext,
-    DerivedValueRegistry,
+    get_registry,
 )
 from eligibility_signposting_api.services.processors.token_parser import ParsedToken, TokenParser
 
@@ -125,7 +125,7 @@ def get_derived_value(
         Raises:
             ValueError: If no handler is registered or attribute not found
         """
-        registry = DerivedValueRegistry()
+        registry = get_registry()
 
         function_name = parsed_token.function_name
         if not function_name: