Skip to content

Commit 20f7c68

Browse files
committed
Fix structlog error
1 parent bd23175 commit 20f7c68

File tree

5 files changed

+40
-7
lines changed

5 files changed

+40
-7
lines changed

src/nomad_simulation_parsers/parsers/quantumespresso/epw/parser.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from nomad.datamodel import EntryArchive
2+
from nomad.utils import get_logger
23

34
from nomad_simulation_parsers.parsers.quantumespresso.parser import (
45
QuantumEspressoArchiveWriter,
@@ -8,9 +9,12 @@
89
from ..parser import MainfileParser
910
from .file_parser import EPWFileParser
1011

12+
LOGGER = get_logger(__name__)
1113

1214
class EPWMainfileParser(MainfileParser):
13-
pass
15+
@property
16+
def logger(self):
17+
return LOGGER
1418

1519

1620
class EPWArchiveWriter(QuantumEspressoArchiveWriter):

src/nomad_simulation_parsers/parsers/quantumespresso/parser.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from nomad.parsing import MatchingParser
1212
from nomad.parsing.file_parser import ArchiveWriter
1313
from nomad.parsing.file_parser.mapping_parser import MetainfoParser, TextParser
14+
from nomad.utils import get_logger
1415
from nomad_simulations.schema_packages.general import Program, Simulation
1516
from nomad_simulations.schema_packages.workflow import (
1617
SerialWorkflow,
@@ -24,8 +25,22 @@
2425

2526
from .file_parser import QuantumEspressoFileParser
2627

28+
LOGGER = get_logger(__name__)
29+
30+
31+
# TODO temporary fix for structlog unable to propagate logger
32+
class QuantumEspressoMetainfoParser(MetainfoParser):
33+
@property
34+
def logger(self):
35+
return LOGGER
36+
2737

2838
class MainfileParser(TextParser):
39+
# TODO temporary fix for structlog unable to propagate logger
40+
@property
41+
def logger(self):
42+
return LOGGER
43+
2944
def get_version(self, name_version: list[str]):
3045
return ' '.join(name_version[1:]).lstrip('v.')
3146

@@ -36,7 +51,7 @@ class QuantumEspressoArchiveWriter(ArchiveWriter):
3651
"""
3752

3853
schema: ModuleType = common
39-
simulation_parser = MetainfoParser()
54+
simulation_parser = QuantumEspressoMetainfoParser()
4055
mainfile_parser = MainfileParser(text_parser=QuantumEspressoFileParser())
4156

4257
def parse_program(self, archive: EntryArchive, index: int) -> None:

src/nomad_simulation_parsers/parsers/quantumespresso/phonon/parser.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from nomad.datamodel import EntryArchive
2+
from nomad.utils import get_logger
23

34
from nomad_simulation_parsers.parsers.quantumespresso.parser import (
45
QuantumEspressoArchiveWriter,
@@ -8,9 +9,12 @@
89
from ..parser import MainfileParser
910
from .file_parser import PhononFileParser
1011

12+
LOGGER = get_logger(__name__)
1113

1214
class PhononMainfileParser(MainfileParser):
13-
pass
15+
@property
16+
def logger(self):
17+
return LOGGER
1418

1519

1620
class PhononArchiveWriter(QuantumEspressoArchiveWriter):

src/nomad_simulation_parsers/parsers/quantumespresso/pwscf/parser.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from nomad.datamodel import EntryArchive
2+
from nomad.utils import get_logger
23

34
from nomad_simulation_parsers.parsers.quantumespresso.parser import (
45
QuantumEspressoArchiveWriter,
@@ -8,10 +9,14 @@
89
from ..parser import MainfileParser
910
from .file_parser import PWSCFFileParser
1011

12+
LOGGER = get_logger(__name__)
13+
1114

1215
class PWSCFMainfileParser(MainfileParser):
13-
def get_version(self, name_version: list[str]):
14-
return ' '.join(name_version[1:]).lstrip('v.')
16+
# TODO temporary fix for structlog unable to propagate logger
17+
@property
18+
def logger(self):
19+
return LOGGER
1520

1621

1722
class PWSCFArchiveWriter(QuantumEspressoArchiveWriter):

src/nomad_simulation_parsers/parsers/quantumespresso/xspectra/parser.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from nomad.datamodel import EntryArchive
2+
from nomad.utils import get_logger
23

34
from nomad_simulation_parsers.parsers.quantumespresso.parser import (
45
QuantumEspressoArchiveWriter,
@@ -8,10 +9,14 @@
89
from ..parser import MainfileParser
910
from .file_parser import XSpectraFileParser
1011

12+
LOGGER = get_logger(__name__)
1113

1214
class XspectraMainfileParser(MainfileParser):
13-
def get_version(self, name_version: list[str]):
14-
return ' '.join(name_version[1:]).lstrip('v.')
15+
# TODO temporary fix for structlog unable to propagate logger
16+
@property
17+
def logger(self):
18+
return LOGGER
19+
1520

1621

1722
class XSpectraArchiveWriter(QuantumEspressoArchiveWriter):

0 commit comments

Comments
 (0)