Merge pull request #1184 from cmu-delphi/validator-dry-run

Improve validator dry run functionality

Author: korlaxxalrok

_delphi_utils_python/delphi_utils/validator/report.py

@@ -7,7 +7,9 @@
 class ValidationReport:
     """Class for reporting the results of validation."""
 
-    def __init__(self, errors_to_suppress: List[ValidationFailure], data_source: str = ""):
+    # pylint: disable=R0902
+    def __init__(self, errors_to_suppress: List[ValidationFailure],
+                 data_source: str = "", dry_run: bool = False):
         """Initialize a ValidationReport.
 
         Parameters
@@ -41,6 +43,8 @@ def __init__(self, errors_to_suppress: List[ValidationFailure], data_source: str
         self.raised_errors = []
         self.raised_warnings = []
         self.unsuppressed_errors = []
+        self.dry_run = dry_run
+    # pylint: enable=R0902
 
     def add_raised_error(self, error):
         """Add an error to the report.
@@ -120,4 +124,4 @@ def print_and_exit(self, logger=None, die_on_failures=True):
 
     def success(self):
         """Determine if the report corresponds to a successful validation run."""
-        return len(self.unsuppressed_errors) == 0
+        return len(self.unsuppressed_errors) == 0 or self.dry_run

_delphi_utils_python/delphi_utils/validator/run.py

@@ -16,11 +16,14 @@ def run_module():
                         " status irrespective of the number of failures")
     args = parser.parse_args()
     params = read_params()
+    assert "validation" in params
+    dry_run_param = params["validation"]["common"].get("dry_run", False)
+    params["validation"]["common"]["dry_run"] = args.dry_run or dry_run_param
     validator = Validator(params)
     validator.validate().print_and_exit(
         get_structured_logger(__name__,
                               params["common"].get("log_filename", None)),
-        not args.dry_run)
+        not (args.dry_run or dry_run_param))
 
 
 def validator_from_params(params):

_delphi_utils_python/delphi_utils/validator/validate.py

@@ -39,6 +39,7 @@ def __init__(self, params):
         self.time_window = TimeWindow.from_params(validation_params["common"]["end_date"],
                                                   validation_params["common"]["span_length"])
         self.data_source = validation_params["common"].get("data_source", "")
+        self.dry_run = validation_params["common"].get("dry_run", False)
 
         self.static_validation = StaticValidator(validation_params)
         self.dynamic_validation = DynamicValidator(validation_params)
@@ -53,7 +54,7 @@ def validate(self):
         Returns:
             - ValidationReport collating the validation outcomes
         """
-        report = ValidationReport(self.suppressed_errors, self.data_source)
+        report = ValidationReport(self.suppressed_errors, self.data_source, self.dry_run)
         frames_list = load_all_files(self.export_dir, self.time_window.start_date,
                                      self.time_window.end_date)
         self.static_validation.validate(frames_list, report)