Skip to content

🎨 Remove TaskStatus consistency check #7444

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

Closed
wants to merge 4 commits into from
Closed

🎨 Remove TaskStatus consistency check #7444

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a79e44a
remove TaskStatus consistency check
bisgaard-itis Mar 28, 2025
c2b889a
add updated openapi specs
bisgaard-itis Mar 28, 2025
4e97f8f
Merge branch 'master' into remove-progress-validator
bisgaard-itis Mar 31, 2025
7f5a27f
Merge branch 'master' into remove-progress-validator
giancarloromeo Apr 2, 2025
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
2 changes: 1 addition & 1 deletion services/storage/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "simcore_service_storage",
"description": "Service that manages osparc storage backend",
"version": "0.6.0"
"version": "0.7.0"
},
"paths": {
"/v0/": {
Expand Down
22 changes: 1 addition & 21 deletions services/storage/src/simcore_service_storage/modules/celery/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from enum import StrEnum, auto
from typing import Any, Final, Protocol, Self, TypeAlias
from typing import Any, Final, Protocol, TypeAlias
from uuid import UUID

from models_library.progress_bar import ProgressReport
Expand Down Expand Up @@ -56,26 +56,6 @@ class TaskStatus(BaseModel):
def is_done(self) -> bool:
return self.task_state in _TASK_DONE

# @model_validator(mode="after") This does not work MB
def _check_consistency(self) -> Self:
value = self.progress_report.actual_value
min_value = 0.0
max_value = self.progress_report.total

valid_states = {
TaskState.PENDING: value == min_value,
TaskState.RUNNING: min_value <= value <= max_value,
TaskState.SUCCESS: value == max_value,
TaskState.ABORTED: value == max_value,
TaskState.ERROR: value == max_value,
}

if not valid_states.get(self.task_state, True):
msg = f"Inconsistent progress actual value for state={self.task_state}: {value}"
raise ValueError(msg)

return self


class TaskError(BaseModel):
exc_type: str
Expand Down
Loading