Merge pull request crs4#65 from kikkomep/enhancement/settings-initialisation

enhancement: avoid overriding `__init__` of the `ValidationSettings` dataclass

Author: kikkomep

rocrate_validator/cli/commands/validate.py

@@ -278,7 +278,6 @@ def validate(ctx,
             "requirement_severity": requirement_severity,
             "requirement_severity_only": requirement_severity_only,
             "enable_profile_inheritance": not disable_profile_inheritance,
-            "verbose": verbose,
             "rocrate_uri": rocrate_uri,
             "abort_on_first": fail_fast
         }
@@ -348,14 +347,14 @@ def validate(ctx,
         for profile in profile_identifier:
             # Set the selected profile
             validation_settings["profile_identifier"] = profile
-            validation_settings["profile_autodetected"] = autodetection
             logger.debug("Profile selected for validation: %s", validation_settings["profile_identifier"])
             logger.debug("Profile autodetected: %s", autodetection)
 
             # Compute the profile statistics
             profile_stats = __compute_profile_stats__(validation_settings)
 
-            report_layout = ValidationReportLayout(console, validation_settings, profile_stats, None)
+            report_layout = ValidationReportLayout(console, validation_settings,
+                                                   profile_stats, None, profile_autodetected=autodetection)
 
             # Validate RO-Crate against the profile and get the validation result
             result: ValidationResult = None
@@ -513,11 +512,13 @@ def update(self, event: Event):
 
 class ValidationReportLayout(Layout):
 
-    def __init__(self, console: Console, validation_settings: dict, profile_stats: dict, result: ValidationResult):
+    def __init__(self, console: Console, validation_settings: dict,
+                 profile_stats: dict, result: ValidationResult, profile_autodetected: bool = False):
         super().__init__()
         self.console = console
         self.validation_settings = validation_settings
         self.profile_stats = profile_stats
+        self.profile_autodetected = profile_autodetected
         self.result = result
         self.__layout = None
         self._validation_checks_progress = None
@@ -566,7 +567,7 @@ def __init_layout__(self):
                 f"\n[bold cyan]RO-Crate:[/bold cyan] [bold]{URI(settings['rocrate_uri']).uri}[/bold]"
                 "\n[bold cyan]Target Profile:[/bold cyan][bold magenta] "
                 f"{settings['profile_identifier']}[/bold magenta] "
-                f"{'[italic](autodetected)[/italic]' if settings['profile_autodetected'] else ''}"
+                f"{'[italic](autodetected)[/italic]' if self.profile_autodetected else ''}"
                 f"\n[bold cyan]Validation Severity:[/bold cyan] "
                 f"[bold {severity_color}]{settings['requirement_severity']}[/bold {severity_color}]",
                 style="white", align="left"),

rocrate_validator/models.py

@@ -1576,20 +1576,10 @@ class ValidationSettings:
     #: Flag to disable the check for duplicates
     disable_check_for_duplicates: bool = False
 
-    def __init__(self, **kwargs):
-        for key, value in kwargs.items():
-            setattr(self, key, value)
-
+    def __post_init__(self):
         # if requirement_severity is a str, convert to Severity
-        severity = getattr(self, "requirement_severity")
-        if isinstance(severity, str):
-            setattr(self, "requirement_severity", Severity[severity])
-
-        # parse and set the rocrate URI
-        self._rocrate_uri = None
-        if "rocrate_uri" in kwargs:
-            self.rocrate_uri = kwargs["rocrate_uri"]
-        logger.debug("Validating RO-Crate: %s", self.rocrate_uri)
+        if isinstance(self.requirement_severity, str):
+            self.requirement_severity = Severity[self.requirement_severity]
 
     def to_dict(self):
         """

tests/unit/test_validation_settings.py

@@ -22,14 +22,12 @@ def test_validation_settings_parse_dict():
         "rocrate_uri": "/path/to/data",
         "profiles_path": "/path/to/profiles",
         "requirement_severity": "RECOMMENDED",
-        "allow_infos": True,
         "enable_profile_inheritance": False,
     }
     settings = ValidationSettings.parse(settings_dict)
     assert str(settings.rocrate_uri) == "/path/to/data"
     assert settings.profiles_path == "/path/to/profiles"
     assert settings.requirement_severity == Severity.RECOMMENDED
-    assert settings.allow_infos is True
     assert settings.enable_profile_inheritance is False
 
 
@@ -38,7 +36,6 @@ def test_validation_settings_parse_object():
         rocrate_uri="/path/to/data",
         profiles_path="/path/to/profiles",
         requirement_severity=Severity.RECOMMENDED,
-        allow_infos=True,
         enable_profile_inheritance=False
     )
     settings = ValidationSettings.parse(existing_settings)
@@ -58,7 +55,6 @@ def test_validation_settings_to_dict():
         rocrate_uri="/path/to/data",
         profiles_path="/path/to/profiles",
         requirement_severity=Severity.RECOMMENDED,
-        allow_infos=True,
         enable_profile_inheritance=False
     )
     settings_dict = settings.to_dict()
@@ -91,11 +87,6 @@ def test_validation_settings_requirement_severity():
     assert settings.requirement_severity == Severity.RECOMMENDED
 
 
-def test_validation_settings_allow_infos():
-    settings = ValidationSettings(allow_infos=True)
-    assert settings.allow_infos is True
-
-
 def test_validation_settings_abort_on_first():
     settings = ValidationSettings(abort_on_first=True)
     assert settings.abort_on_first is True