Skip to content

removed unnecessary model validations upon upload #1417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 27, 2023
Merged

removed unnecessary model validations upon upload #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a13334f
removed unnecessary validations
rabah-khalek Sep 22, 2023
5164f08
updated validation
rabah-khalek Sep 26, 2023
7cbe0b8
Merge branch 'main' into model_validation
Inokinoki Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions python-client/giskard/core/model_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
9 changes: 1 addition & 8 deletions python-client/giskard/models/base/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,11 @@ 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)
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
Expand Down