From 698740613bd94747747934e56a6d5583358fae63 Mon Sep 17 00:00:00 2001 From: Rubel Date: Wed, 1 Nov 2023 16:50:10 +0100 Subject: [PATCH] Passing log info to nomad logger in pynxtools --- pynxtools/dataconverter/convert.py | 9 ++------- pynxtools/dataconverter/helpers.py | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pynxtools/dataconverter/convert.py b/pynxtools/dataconverter/convert.py index 96906cdd3..94048a785 100644 --- a/pynxtools/dataconverter/convert.py +++ b/pynxtools/dataconverter/convert.py @@ -36,7 +36,6 @@ logger = logging.getLogger(__name__) # pylint: disable=C0103 -UNDOCUMENTED = 9 logger.setLevel(logging.INFO) logger.addHandler(logging.StreamHandler(sys.stdout)) @@ -95,9 +94,6 @@ def convert(input_file: Tuple[str], nxdl_root = ET.parse(nxdl_path).getroot() - if undocumented: - logger.setLevel(UNDOCUMENTED) - template = Template() helpers.generate_template_from_nxdl(nxdl_root, template) if generate_template: @@ -129,9 +125,8 @@ def convert(input_file: Tuple[str], for path in data.undocumented.keys(): if "/@default" in path: continue - logger.log( - UNDOCUMENTED, - "The path, %s, is being written but has no documentation.", + logger.info( + "NO DOCUMENTATION: The path, %s, is being written but has no documentation.", path ) diff --git a/pynxtools/dataconverter/helpers.py b/pynxtools/dataconverter/helpers.py index 38bafc3f7..b3a37f59d 100644 --- a/pynxtools/dataconverter/helpers.py +++ b/pynxtools/dataconverter/helpers.py @@ -456,14 +456,14 @@ def ensure_all_required_fields_exist(template, data, nxdl_root, logger): opt_parent = check_for_optional_parent(path, nxdl_root) if opt_parent != "<>": if does_group_exist(opt_parent, data) and not does_group_exist(renamed_path, data): - logger.error(f"The required group, {path}, hasn't been supplied" + logger.warning(f"The required group, {path}, hasn't been supplied" f" while its optional parent, {path}, is supplied.") continue if not does_group_exist(renamed_path, data): raise ValueError(f"The required group, {path}, hasn't been supplied.") continue if not is_path_in_data_dict or data[renamed_path] is None: - logger.error(f"The data entry corresponding to {path} is required " + logger.warning(f"The data entry corresponding to {path} is required " f"and hasn't been supplied by the reader.")