Merge branch 'master' into is340/support-center-new-role

Author: pcrespov

packages/dask-task-models-library/src/dask_task_models_library/plugins/task_life_cycle_worker_plugin.py

@@ -34,6 +34,7 @@ def transition(
     ):
         _logger.info("Task '%s' transition from %s to %s", key, start, finish)
         assert self._worker  # nosec
+        assert isinstance(self._worker, Worker)  # nosec
         self._worker.log_event(
             TASK_LIFE_CYCLE_EVENT.format(key=key),
             TaskLifeCycleState.from_worker_task_state(

packages/pytest-simcore/src/pytest_simcore/pydantic_models.py

@@ -97,7 +97,6 @@ def _is_model_cls(obj) -> bool:
     assert inspect.ismodule(module)
 
     for model_name, model_cls in inspect.getmembers(module, _is_model_cls):
-
         yield from iter_model_examples_in_class(model_cls, model_name)
 
 
@@ -172,7 +171,7 @@ def model_cls_examples(model_cls: type[BaseModel]) -> dict[str, dict[str, Any]]:
     """
     warnings.warn(
         "The 'model_cls_examples' fixture is deprecated and will be removed in a future version. "
-        "Please use 'iter_model_example_in_class' or 'iter_model_examples_in_module' as an alternative.",
+        "Please use 'iter_model_examples_in_class' or 'iter_model_examples_in_module' as an alternative.",
         DeprecationWarning,
         stacklevel=2,
     )

services/director-v2/src/simcore_service_director_v2/core/settings.py

@@ -99,6 +99,14 @@ class ComputationalBackendSettings(BaseCustomSettings):
         ),
     ] = datetime.timedelta(minutes=10)
 
+    COMPUTATIONAL_BACKEND_MAX_WAITING_FOR_RETRIEVING_RESULTS: Annotated[
+        datetime.timedelta,
+        Field(
+            description="maximum time the computational scheduler waits until retrieving results from the computational backend is failed"
+            "(default to seconds, or see https://pydantic-docs.helpmanual.io/usage/types/#datetime-types for string formatting)."
+        ),
+    ] = datetime.timedelta(minutes=10)
+
     @cached_property
     def default_cluster(self) -> BaseCluster:
         return BaseCluster(

services/director-v2/src/simcore_service_director_v2/models/comp_run_snapshot_tasks.py

@@ -1,12 +1,21 @@
+from contextlib import suppress
 from datetime import datetime
 from typing import Annotated, Any
 
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_state import RunningState
 from models_library.resource_tracker import HardwareInfo
-from pydantic import BaseModel, BeforeValidator, ConfigDict, PositiveInt
+from pydantic import (
+    BaseModel,
+    BeforeValidator,
+    ConfigDict,
+    PositiveInt,
+    field_validator,
+)
+from simcore_postgres_database.models.comp_pipeline import StateType
 
+from ..utils.db import DB_TO_RUNNING_STATE
 from .comp_tasks import BaseCompTaskAtDB, Image
 
 
@@ -100,3 +109,15 @@ class CompRunSnapshotTaskDBGet(BaseModel):
     started_at: datetime | None
     ended_at: datetime | None
     iteration: PositiveInt
+
+    @field_validator("state", mode="before")
+    @classmethod
+    def convert_result_from_state_type_enum_if_needed(cls, v):
+        if isinstance(v, str):
+            # try to convert to a StateType, if it fails the validations will continue
+            # and pydantic will try to convert it to a RunninState later on
+            with suppress(ValueError):
+                v = StateType(v)
+        if isinstance(v, StateType):
+            return RunningState(DB_TO_RUNNING_STATE[StateType(v)])
+        return v