Merge branch 'master' into is5646/use-project-nodes-table-instead-of-workbench

Author: giancarloromeo

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

@@ -118,7 +118,7 @@ def handle_aiohttp_web_http_error(
     exception.content_type = MIMETYPE_APPLICATION_JSON
     if exception.reason:
         exception.set_status(
-            exception.status, safe_status_message(message=exception.reason)
+            exception.status, reason=safe_status_message(message=exception.reason)
         )
 
     if not exception.text or not is_enveloped_from_text(exception.text):
@@ -165,7 +165,7 @@ def _handle_aiohttp_web_http_successful(
     exception.content_type = MIMETYPE_APPLICATION_JSON
     if exception.reason:
         exception.set_status(
-            exception.status, safe_status_message(message=exception.reason)
+            exception.status, reason=safe_status_message(message=exception.reason)
         )
 
     if exception.text and not is_enveloped_from_text(exception.text):

services/director-v2/src/simcore_service_director_v2/api/routes/computations.py

@@ -58,7 +58,6 @@
     ProjectNotFoundError,
     WalletNotEnoughCreditsError,
 )
-from ...models.comp_pipelines import CompPipelineAtDB
 from ...models.comp_runs import CompRunsAtDB, ProjectMetadataDict, RunMetadataDict
 from ...models.comp_tasks import CompTaskAtDB
 from ...modules.catalog import CatalogClient
@@ -537,10 +536,8 @@ async def stop_computation(
         # check the project exists
         await project_repo.get_project(project_id)
         # get the project pipeline
-        pipeline_at_db: CompPipelineAtDB = await comp_pipelines_repo.get_pipeline(
-            project_id
-        )
-        pipeline_dag: nx.DiGraph = pipeline_at_db.get_graph()
+        pipeline_at_db = await comp_pipelines_repo.get_pipeline(project_id)
+        pipeline_dag = pipeline_at_db.get_graph()
         # get the project task states
         tasks: list[CompTaskAtDB] = await comp_tasks_repo.list_tasks(project_id)
         # create the complete DAG graph

services/director-v2/src/simcore_service_director_v2/utils/dags.py

@@ -43,7 +43,7 @@ def create_complete_dag(workbench: NodesDict) -> nx.DiGraph:
         )
         if node.input_nodes:
             for input_node_id in node.input_nodes:
-                predecessor_node = workbench.get(NodeIDStr(input_node_id))
+                predecessor_node = workbench.get(f"{input_node_id}")
                 assert (
                     predecessor_node
                 ), f"Node {input_node_id} not found in workbench"  # nosec
@@ -99,19 +99,18 @@ async def get_node_io_payload_cb(node_id: NodeID) -> dict[str, Any]:
         return result
 
     computed_hash = await compute_node_hash(node_id, get_node_io_payload_cb)
-    if computed_hash != node["run_hash"]:
-        return True
-    return False
+    return bool(computed_hash != node["run_hash"])
 
 
 async def _compute_node_dependencies_state(graph_data, node_id) -> set[NodeID]:
     node = graph_data[f"{node_id}"]
     # check if the previous node is outdated or waits for dependencies... in which case this one has to wait
     non_computed_dependencies: set[NodeID] = set()
     for input_port in node.get("inputs", {}).values():
-        if isinstance(input_port, PortLink):
-            if _node_needs_computation(graph_data, input_port.node_uuid):
-                non_computed_dependencies.add(input_port.node_uuid)
+        if isinstance(input_port, PortLink) and _node_needs_computation(
+            graph_data, input_port.node_uuid
+        ):
+            non_computed_dependencies.add(input_port.node_uuid)
     # all good. ready
     return non_computed_dependencies
 
@@ -192,14 +191,14 @@ def compute_pipeline_started_timestamp(
     if not pipeline_dag.nodes:
         return None
     node_id_to_comp_task: dict[NodeIDStr, CompTaskAtDB] = {
-        NodeIDStr(f"{task.node_id}"): task for task in comp_tasks
+        f"{task.node_id}": task for task in comp_tasks
     }
-    TOMORROW = arrow.utcnow().shift(days=1).datetime
+    tomorrow = arrow.utcnow().shift(days=1).datetime
     pipeline_started_at: datetime.datetime | None = min(
-        node_id_to_comp_task[node_id].start or TOMORROW
+        node_id_to_comp_task[node_id].start or tomorrow
         for node_id in pipeline_dag.nodes
     )
-    if pipeline_started_at == TOMORROW:
+    if pipeline_started_at == tomorrow:
         pipeline_started_at = None
     return pipeline_started_at
 
@@ -210,13 +209,13 @@ def compute_pipeline_stopped_timestamp(
     if not pipeline_dag.nodes:
         return None
     node_id_to_comp_task: dict[NodeIDStr, CompTaskAtDB] = {
-        NodeIDStr(f"{task.node_id}"): task for task in comp_tasks
+        f"{task.node_id}": task for task in comp_tasks
     }
-    TOMORROW = arrow.utcnow().shift(days=1).datetime
+    tomorrow = arrow.utcnow().shift(days=1).datetime
     pipeline_stopped_at: datetime.datetime | None = max(
-        node_id_to_comp_task[node_id].end or TOMORROW for node_id in pipeline_dag.nodes
+        node_id_to_comp_task[node_id].end or tomorrow for node_id in pipeline_dag.nodes
     )
-    if pipeline_stopped_at == TOMORROW:
+    if pipeline_stopped_at == tomorrow:
         pipeline_stopped_at = None
     return pipeline_stopped_at
 
@@ -231,15 +230,15 @@ async def compute_pipeline_details(
 
     # NOTE: the latest progress is available in comp_tasks only
     node_id_to_comp_task: dict[NodeIDStr, CompTaskAtDB] = {
-        NodeIDStr(f"{task.node_id}"): task for task in comp_tasks
+        f"{task.node_id}": task for task in comp_tasks
     }
     pipeline_progress = None
     if len(pipeline_dag.nodes) > 0:
-
         pipeline_progress = sum(
             (node_id_to_comp_task[node_id].progress or 0) / len(pipeline_dag.nodes)
             for node_id in pipeline_dag.nodes
-            if node_id_to_comp_task[node_id].progress is not None
+            if node_id in node_id_to_comp_task
+            and node_id_to_comp_task[node_id].progress is not None
         )
         pipeline_progress = max(0.0, min(pipeline_progress, 1.0))
 
@@ -250,10 +249,15 @@ async def compute_pipeline_details(
             node_id: NodeState(
                 modified=node_data.get(kNODE_MODIFIED_STATE, False),
                 dependencies=node_data.get(kNODE_DEPENDENCIES_TO_COMPUTE, set()),
-                current_status=node_id_to_comp_task[node_id].state,
+                current_status=(
+                    node_id_to_comp_task[node_id].state
+                    if node_id in node_id_to_comp_task
+                    else RunningState.UNKNOWN
+                ),
                 progress=(
                     node_id_to_comp_task[node_id].progress
-                    if node_id_to_comp_task[node_id].progress is not None
+                    if node_id in node_id_to_comp_task
+                    and node_id_to_comp_task[node_id].progress is not None
                     else None
                 ),
             )
@@ -265,12 +269,13 @@ async def compute_pipeline_details(
 
 def find_computational_node_cycles(dag: nx.DiGraph) -> list[list[str]]:
     """returns a list of nodes part of a cycle and computational, which is currently forbidden."""
-    computational_node_cycles = []
+
     list_potential_cycles = nx.algorithms.cycles.simple_cycles(dag)
-    for cycle in list_potential_cycles:
+    return [
+        deepcopy(cycle)
+        for cycle in list_potential_cycles
         if any(
             dag.nodes[node_id]["node_class"] is NodeClass.COMPUTATIONAL
             for node_id in cycle
-        ):
-            computational_node_cycles.append(deepcopy(cycle))
-    return computational_node_cycles
+        )
+    ]

services/director-v2/tests/unit/test_utils_dags.py

@@ -390,13 +390,6 @@ def pipeline_test_params(
     list_comp_tasks: list[CompTaskAtDB],
     expected_pipeline_details_output: PipelineDetails,
 ) -> PipelineDetailsTestParams:
-    # check the inputs make sense
-    assert len(set(dag_adjacency)) == len(node_keys) == len(list_comp_tasks)
-    assert dag_adjacency.keys() == node_keys.keys()
-    assert len(
-        {t.node_id for t in list_comp_tasks}.intersection(node_keys.keys())
-    ) == len(set(dag_adjacency))
-
     # resolve the naming
     node_name_to_uuid_map = {}
     resolved_dag_adjacency: dict[str, list[str]] = {}
@@ -596,3 +589,95 @@ async def test_compute_pipeline_details(
         received_details.model_dump()
         == pipeline_test_params.expected_pipeline_details.model_dump()
     )
+
+
+@pytest.mark.parametrize(
+    "dag_adjacency, node_keys, list_comp_tasks, expected_pipeline_details_output",
+    [
+        pytest.param(
+            {"node_1": ["node_2", "node_3"], "node_2": ["node_3"], "node_3": []},
+            {
+                "node_1": {
+                    "key": "simcore/services/comp/fake",
+                    "node_class": NodeClass.COMPUTATIONAL,
+                    "state": RunningState.NOT_STARTED,
+                    "outputs": None,
+                },
+                "node_2": {
+                    "key": "simcore/services/comp/fake",
+                    "node_class": NodeClass.COMPUTATIONAL,
+                    "state": RunningState.NOT_STARTED,
+                    "outputs": None,
+                },
+                "node_3": {
+                    "key": "simcore/services/comp/fake",
+                    "node_class": NodeClass.COMPUTATIONAL,
+                    "state": RunningState.NOT_STARTED,
+                    "outputs": None,
+                },
+            },
+            [
+                # NOTE: we use construct here to be able to use non uuid names to simplify test setup
+                CompTaskAtDB.model_construct(
+                    project_id=uuid4(),
+                    node_id="node_1",
+                    schema=NodeSchema(inputs={}, outputs={}),
+                    inputs=None,
+                    image=Image(name="simcore/services/comp/fake", tag="1.3.4"),
+                    state=RunningState.NOT_STARTED,
+                    internal_id=2,
+                    node_class=NodeClass.COMPUTATIONAL,
+                    created=datetime.datetime.now(tz=datetime.UTC),
+                    modified=datetime.datetime.now(tz=datetime.UTC),
+                    last_heartbeat=None,
+                ),
+                CompTaskAtDB.model_construct(
+                    project_id=uuid4(),
+                    node_id="node_2",
+                    schema=NodeSchema(inputs={}, outputs={}),
+                    inputs=None,
+                    image=Image(name="simcore/services/comp/fake", tag="1.3.4"),
+                    state=RunningState.NOT_STARTED,
+                    internal_id=3,
+                    node_class=NodeClass.COMPUTATIONAL,
+                    created=datetime.datetime.now(tz=datetime.UTC),
+                    modified=datetime.datetime.now(tz=datetime.UTC),
+                    last_heartbeat=None,
+                ),
+            ],
+            PipelineDetails.model_construct(
+                adjacency_list={
+                    "node_1": ["node_2", "node_3"],
+                    "node_2": ["node_3"],
+                    "node_3": [],
+                },
+                progress=0.0,
+                node_states={
+                    "node_1": NodeState(modified=True, progress=None),
+                    "node_2": NodeState(modified=True, progress=None),
+                    "node_3": NodeState(
+                        modified=True,
+                        progress=None,
+                        current_status=RunningState.UNKNOWN,
+                    ),
+                },
+            ),
+            id="dag with missing tasks (node 3 is missing, so it is not skipped in the pipeline details)",
+        )
+    ],
+)
+@pytest.mark.acceptance_test(
+    "For https://github.com/ITISFoundation/osparc-simcore/issues/8172"
+)
+async def test_compute_pipeline_details_with_missing_tasks(
+    pipeline_test_params: PipelineDetailsTestParams,
+):
+    received_details = await compute_pipeline_details(
+        pipeline_test_params.complete_dag,
+        pipeline_test_params.pipeline_dag,
+        pipeline_test_params.comp_tasks,
+    )
+    assert (
+        received_details.model_dump()
+        == pipeline_test_params.expected_pipeline_details.model_dump()
+    )

services/web/server/src/simcore_service_webserver/api_keys/_service.py

@@ -77,7 +77,9 @@ async def get_api_key(
     if api_key is not None:
         return api_key
 
-    raise ApiKeyNotFoundError(api_key_id=api_key_id)
+    raise ApiKeyNotFoundError(
+        api_key_id=api_key_id, product_name=product_name, user_id=user_id
+    )
 
 
 async def list_api_keys(

services/web/server/src/simcore_service_webserver/api_keys/errors.py

@@ -1,13 +1,14 @@
 from ..errors import WebServerBaseError
 
 
-class ApiKeysValueError(WebServerBaseError, ValueError):
-    ...
+class ApiKeysValueError(WebServerBaseError, ValueError): ...
 
 
 class ApiKeyDuplicatedDisplayNameError(ApiKeysValueError):
-    msg_template = "API Key with display name '{display_name}' already exists. {reason}"
+    msg_template = (
+        "API Key with display name '{display_name}' already exists: {details}"
+    )
 
 
 class ApiKeyNotFoundError(ApiKeysValueError):
-    msg_template = "API Key with ID '{api_key_id}' not found. {reason}"
+    msg_template = "API Key with ID '{api_key_id}' not found: {details}"

services/web/server/src/simcore_service_webserver/director_v2/_client_base.py

@@ -4,6 +4,7 @@
 import aiohttp
 from aiohttp import ClientSession, ClientTimeout, web
 from servicelib.aiohttp import status
+from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from tenacity import retry
 from tenacity.before_sleep import before_sleep_log
 from tenacity.stop import stop_after_attempt
@@ -36,13 +37,14 @@
 
 
 def _get_exception_from(
-    status_code: int, on_error: _StatusToExceptionMapping | None, reason: str, url: URL
+    status_code: int, on_error: _StatusToExceptionMapping | None, details: str, url: URL
 ):
     if on_error and status_code in on_error:
-        exc, exc_ctx = on_error[status_code]
-        return exc(**exc_ctx, status=status_code, reason=reason)
+        exc_cls, exc_ctx = on_error[status_code]
+        return exc_cls(**exc_ctx, status=status_code, details=details)
+
     # default
-    return DirectorV2ServiceError(status=status_code, reason=reason, url=url)
+    return DirectorV2ServiceError(status=status_code, details=details, url=url)
 
 
 @retry(**DEFAULT_RETRY_POLICY)
@@ -61,13 +63,13 @@ async def _make_request(
     ) as response:
         payload: dict[str, Any] | list[dict[str, Any]] | None | str = (
             await response.json()
-            if response.content_type == "application/json"
+            if response.content_type == MIMETYPE_APPLICATION_JSON
             else await response.text()
         )
 
         if response.status != expected_status.status_code:
             raise _get_exception_from(
-                response.status, on_error, reason=f"{payload}", url=url
+                response.status, on_error, details=f"{payload}", url=url
             )
         return payload
 
@@ -99,13 +101,13 @@ async def request_director_v2(
     except TimeoutError as err:
         raise DirectorV2ServiceError(
             status=status.HTTP_503_SERVICE_UNAVAILABLE,
-            reason=f"request to director-v2 timed-out: {err}",
+            details=f"request to director-v2 timed-out: {err}",
             url=url,
         ) from err
 
     except aiohttp.ClientError as err:
         raise DirectorV2ServiceError(
             status=status.HTTP_503_SERVICE_UNAVAILABLE,
-            reason=f"request to director-v2 service unexpected error {err}",
+            details=f"request to director-v2 service unexpected error {err}",
             url=url,
         ) from err

services/web/server/src/simcore_service_webserver/director_v2/_controller/_rest_exceptions.py

@@ -95,7 +95,7 @@ async def _handler_director_service_error_as_503_or_4xx(
     WalletNotEnoughCreditsError: HttpErrorInfo(
         status.HTTP_402_PAYMENT_REQUIRED,
         user_message(
-            "Your wallet does not have sufficient credits to run this computation. {reason}",
+            "Your wallet does not have sufficient credits to run this computation: {details}",
             _version=1,
         ),
     ),

services/web/server/src/simcore_service_webserver/director_v2/_controller/rest.py

@@ -95,7 +95,7 @@ async def start_computation(request: web.Request) -> web.Response:
         now = datetime.now(UTC)
         if now - created_at > timedelta(minutes=5):
             raise web.HTTPBadRequest(
-                reason=(
+                text=(
                     "This client generated collection is not new, "
                     "it was created more than 5 minutes ago. "
                     "Therefore, the client is probably wrongly generating it."

services/web/server/src/simcore_service_webserver/director_v2/exceptions.py

@@ -8,12 +8,12 @@
 class DirectorV2ServiceError(WebServerBaseError, RuntimeError):
     """Basic exception for errors raised by director-v2"""
 
-    msg_template = "Unexpected error: director-v2 returned '{status}', reason '{reason}' after calling '{url}'"
+    msg_template = "Unexpected error: director-v2 returned '{status}', details '{details}' after calling '{url}'"
 
-    def __init__(self, *, status: int, reason: str, **ctx: Any) -> None:
+    def __init__(self, *, status: int, details: str, **ctx: Any) -> None:
         super().__init__(**ctx)
         self.status = status
-        self.reason = reason
+        self.details = details
 
 
 class ComputationNotFoundError(DirectorV2ServiceError):