Merge pull request #1103 from cmu-delphi/validator-changes

Update validation logger

Author: krivard

_delphi_utils_python/delphi_utils/runner.py

@@ -41,7 +41,9 @@ def run_indicator_pipeline(indicator_fn:  Callable[[Params], None],
     archiver = archiver_fn(params)
     if validator:
         validation_report = validator.validate()
-        validation_report.log(get_structured_logger(params["common"].get("log_filename", None)))
+        validation_report.log(get_structured_logger(
+            name = indicator_fn.__module__,
+            filename=params["common"].get("log_filename", None)))
     if archiver and (not validator or validation_report.success()):
         archiver.archive()
 

_delphi_utils_python/delphi_utils/validator/report.py

@@ -36,6 +36,7 @@ def __init__(self, errors_to_suppress: List[ValidationFailure]):
         self.raised_errors = []
         self.raised_warnings = []
         self.unsuppressed_errors = []
+        self.summary = ""
 
     def add_raised_error(self, error):
         """Add an error to the report.
@@ -73,19 +74,21 @@ def add_raised_warning(self, warning):
         """
         self.raised_warnings.append(warning)
 
-    def summary(self):
+    def set_summary(self):
         """Represent summary of report as a string."""
         out_str = f"{self.total_checks} checks run\n"
         out_str += f"{len(self.unsuppressed_errors)} checks failed\n"
         out_str += f"{self.num_suppressed} checks suppressed\n"
         out_str += f"{len(self.raised_warnings)} warnings\n"
-        return out_str
+        self.summary = out_str
 
     def log(self, logger=None):
         """Log errors and warnings."""
         if logger is None:
             logger = get_structured_logger(__name__)
 
+        self.set_summary()
+        logger.info(self.summary)
         for error in self.unsuppressed_errors:
             logger.critical(str(error))
         for warning in self.raised_warnings:
@@ -99,7 +102,6 @@ def print_and_exit(self, logger=None, die_on_failures=True):
         die_on_failures: bool
             Whether to return non-zero status if any failures were encountered.
         """
-        print(self.summary())
         self.log(logger)
         if self.success():
             sys.exit(0)

_delphi_utils_python/tests/validator/test_report.py

@@ -40,8 +40,9 @@ def test_str(self):
         report.add_raised_warning(ImportWarning("right import"))
         report.add_raised_error(self.ERROR_1)
         report.add_raised_error(self.ERROR_2)
+        report.set_summary()
 
-        assert report.summary() ==\
+        assert report.summary ==\
             "3 checks run\n1 checks failed\n1 checks suppressed\n2 warnings\n"
 
     def test_log(self):