updated validation

Author: rabah-khalek

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):

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