From 424a871b6ab907da114ceb87028f40c504dae556 Mon Sep 17 00:00:00 2001 From: Robert Stein Date: Thu, 22 Sep 2022 16:21:11 +0100 Subject: [PATCH 1/2] Use software version in error summary --- winterdrp/errors/__init__.py | 8 +++++--- winterdrp/paths.py | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/winterdrp/errors/__init__.py b/winterdrp/errors/__init__.py index 60b7eb1bc..47e9035e6 100644 --- a/winterdrp/errors/__init__.py +++ b/winterdrp/errors/__init__.py @@ -3,6 +3,7 @@ from datetime import datetime import logging import numpy as np +from winterdrp.paths import package_name, __version__ logger = logging.getLogger(__name__) @@ -102,11 +103,12 @@ def summarise_error_stack( is_known_error = [x.known_error_bool for x in self.reports] - summary = f"Error report summarising {len(self.reports)} errors. \n \n" \ + summary = f"Error report summarising {len(self.reports)} errors. \n" \ + f"Code version: {package_name}=={__version__} \n \n" \ f"{int(len(is_known_error) - np.sum(is_known_error))}/{len(is_known_error)} " \ - f"errors were errors not raised by winterdrp. \n" \ + f"errors were errors not raised by {package_name}. \n" \ f"The remaining {int(np.sum(is_known_error))}/{len(is_known_error)} errors were known errors " \ - f"raised by winterdrp. \n" \ + f"raised by {package_name}. \n" \ f"An additional {len(self.noncritical_reports)} non-critical errors were raised. \n" \ all_reports = self.get_all_reports() diff --git a/winterdrp/paths.py b/winterdrp/paths.py index 282d6d2a5..418adba96 100644 --- a/winterdrp/paths.py +++ b/winterdrp/paths.py @@ -6,10 +6,13 @@ import logging from collections.abc import Callable import pathlib +import importlib logger = logging.getLogger(__name__) winter_code_dir = pathlib.Path(__file__).parent.parent.resolve() +package_name = "winterdrp" +__version__ = importlib.metadata.version(package_name) base_raw_dir = os.getenv("RAW_DATA_DIR") From ebc49320bd760babd4a5fb838068dcc3cbbbe6f3 Mon Sep 17 00:00:00 2001 From: Robert Stein Date: Thu, 22 Sep 2022 16:22:20 +0100 Subject: [PATCH 2/2] Add version to processing log --- winterdrp/monitor/base_monitor.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winterdrp/monitor/base_monitor.py b/winterdrp/monitor/base_monitor.py index 8f70e7e03..24b7b20c8 100644 --- a/winterdrp/monitor/base_monitor.py +++ b/winterdrp/monitor/base_monitor.py @@ -9,7 +9,7 @@ from winterdrp.pipelines import get_pipeline, PipelineConfigError from winterdrp.errors import ErrorStack, ErrorReport from winterdrp.utils.send_email import send_gmail -from winterdrp.paths import get_output_path, raw_img_dir, raw_img_sub_dir +from winterdrp.paths import get_output_path, raw_img_dir, raw_img_sub_dir, __version__, package_name import numpy as np import logging from astropy.time import Time @@ -55,6 +55,8 @@ def __init__( raw_dir: str = raw_img_sub_dir ): + logger.info(f"Software version: {package_name}=={__version__}") + self.errorstack = ErrorStack() self.night = night self.pipeline_name = pipeline