Fix structlog issue

Author: ladinesa

src/nomad_simulation_parsers/parsers/fhiaims/out_parser.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Optional, Union
+from typing import Any
 
 import numpy as np
 import pint
@@ -19,7 +19,7 @@
 
 
 # TODO move this to general utils
-def str_to_unit(val_in: str) -> Optional[pint.Unit]:
+def str_to_unit(val_in: str) -> pint.Unit | None:
     """
     Convert string to pint.Unit
     """
@@ -33,7 +33,7 @@ def str_to_unit(val_in: str) -> Optional[pint.Unit]:
 
 
 # TODO merge with str_to_scf_convergence
-def str_to_energy_components(val_in: str) -> dict[str, Union[float, pint.Quantity]]:
+def str_to_energy_components(val_in: str) -> dict[str, float | pint.Quantity]:
     """
     Parse key, value pairs of energy components from string
     """
@@ -52,7 +52,7 @@ def str_to_energy_components(val_in: str) -> dict[str, Union[float, pint.Quantit
     return res
 
 
-def str_to_scf_convergence(val_in: str) -> dict[str, Union[float, pint.Quantity]]:
+def str_to_scf_convergence(val_in: str) -> dict[str, float | pint.Quantity]:
     """
     Parse key, value pairs of scf convergence parameters.
     """
@@ -225,7 +225,7 @@ def str_to_gw_eigs(val_in: str) -> dict[str, np.ndarray]:
     return res
 
 
-def str_to_gw_scf(val_in: str) -> dict[str, Union[float, pint.Quantity]]:
+def str_to_gw_scf(val_in: str) -> dict[str, float | pint.Quantity]:
     """
     Parse GW results
     """
@@ -240,7 +240,7 @@ def str_to_gw_scf(val_in: str) -> dict[str, Union[float, pint.Quantity]]:
     return data
 
 
-def str_to_md_calculation_info(val_in: str) -> dict[str, Union[float, pint.Quantity]]:
+def str_to_md_calculation_info(val_in: str) -> dict[str, float | pint.Quantity]:
     """
     Parse molecular dynamics parameters
     """
@@ -264,7 +264,7 @@ def str_to_md_calculation_info(val_in: str) -> dict[str, Union[float, pint.Quant
     return res
 
 
-def str_to_quantity(val_in: str) -> Union[float, pint.Quantity, None]:
+def str_to_quantity(val_in: str) -> float | pint.Quantity | None:
     val = val_in.split()
     n = 2
     if len(val) == 1:

src/nomad_simulation_parsers/parsers/fhiaims/parser.py

@@ -40,6 +40,7 @@
 from nomad_simulation_parsers.parsers.utils.general import (
     remove_mapping_annotations,
     search_files,
+    with_logger,
 )
 from nomad_simulation_parsers.schema_packages import fhiaims
 
@@ -48,9 +49,9 @@
 LOGGER = get_logger(__name__)
 
 
+# TODO temporary fix for structlog unable to propagate logger
+@with_logger(logger=LOGGER)
 class FHIAimsOutMappingParser(TextMappingParser):
-    # TODO temporary fix for structlog unable to propagate logger
-    logger = LOGGER
 
     _gw_flag_map = {
         'gw': 'G0W0',

src/nomad_simulation_parsers/parsers/utils/general.py

@@ -1,8 +1,9 @@
 import functools
 import os
 import re
+from collections.abc import Callable
 from glob import glob
-from typing import TYPE_CHECKING, Any, Callable, Union
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
     from structlog.stdlib import (
@@ -59,7 +60,7 @@ def remove_mapping_annotations(property: Section, max_depth: int = 5) -> None:
             using the same section as parent.
     """
 
-    def _remove(property: Union[Section, SubSection], depth: int = 0):
+    def _remove(property: Section | SubSection, depth: int = 0):
         if depth > max_depth:
             return
 
@@ -88,6 +89,20 @@ def _remove(property: Union[Section, SubSection], depth: int = 0):
     _remove(property)
 
 
+def with_logger(
+    cls=None,
+    logger: 'BoundLogger' = get_logger(__name__)
+):
+    def add_logger(cls):
+        def add(cls):
+            setattr(cls, 'logger', property(lambda self: logger))
+            return cls
+
+        return add(cls)
+
+    return add_logger(cls) if cls else add_logger
+
+
 def log(
     function: Callable = None,
     logger: 'BoundLogger' = get_logger(__name__),