From a13334f9c4611a0926c00db08d985d6f9839dcad Mon Sep 17 00:00:00 2001 From: Rabah Abdul Khalek Date: Fri, 22 Sep 2023 13:36:20 +0200 Subject: [PATCH 1/2] removed unnecessary validations --- python-client/giskard/models/base/model.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/python-client/giskard/models/base/model.py b/python-client/giskard/models/base/model.py index 1627dbdcd7..3685df075e 100644 --- a/python-client/giskard/models/base/model.py +++ b/python-client/giskard/models/base/model.py @@ -357,10 +357,6 @@ def upload(self, client: GiskardClient, project_key, validate_ds=None) -> str: """ from giskard.core.model_validation import validate_model, validate_model_loading_and_saving - validate_model(model=self, validate_ds=validate_ds) - reloaded_model = validate_model_loading_and_saving(self) - validate_model(model=reloaded_model, validate_ds=validate_ds) - reloaded_model = validate_model_loading_and_saving(self) try: validate_model(model=reloaded_model, validate_ds=validate_ds) From 5164f08ea0d5a1af16051b2a1ebdb1feae0b8db3 Mon Sep 17 00:00:00 2001 From: Rabah Abdul Khalek Date: Tue, 26 Sep 2023 11:55:18 +0200 Subject: [PATCH 2/2] updated validation --- python-client/giskard/core/model_validation.py | 6 ++++-- python-client/giskard/models/base/model.py | 9 +++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/python-client/giskard/core/model_validation.py b/python-client/giskard/core/model_validation.py index 02054dc5e6..0c6119f29f 100644 --- a/python-client/giskard/core/model_validation.py +++ b/python-client/giskard/core/model_validation.py @@ -17,14 +17,16 @@ @configured_validate_arguments -def validate_model(model: BaseModel, validate_ds: Optional[Dataset] = None): +def validate_model(model: BaseModel, validate_ds: Optional[Dataset] = None, print_validation_message: bool = True): try: _do_validate_model(model, validate_ds) except (ValueError, TypeError) as err: _track_validation_error(err, model, validate_ds) raise err - print("Your model is successfully validated.") + # TODO: switch to logger + if print_validation_message: + print("Your model is successfully validated.") def _track_validation_error(err, model, dataset): diff --git a/python-client/giskard/models/base/model.py b/python-client/giskard/models/base/model.py index 3685df075e..66de54ff54 100644 --- a/python-client/giskard/models/base/model.py +++ b/python-client/giskard/models/base/model.py @@ -357,15 +357,12 @@ def upload(self, client: GiskardClient, project_key, validate_ds=None) -> str: """ from giskard.core.model_validation import validate_model, validate_model_loading_and_saving + validate_model(model=self, validate_ds=validate_ds) + reloaded_model = validate_model_loading_and_saving(self) try: - validate_model(model=reloaded_model, validate_ds=validate_ds) + validate_model(model=reloaded_model, validate_ds=validate_ds, print_validation_message=False) except Exception as e_reloaded: - try: - validate_model(model=self, validate_ds=validate_ds) - logger.info("Original model validated successfully") - except Exception as e_loaded: - logger.exception("Failed to validate the original model", e_loaded) raise GiskardException( "An error occured while validating a deserialized version your model, please report this issue to Giskard" ) from e_reloaded