fixed errors and removed unused

Author: Andrei Neagu

packages/service-library/src/servicelib/fastapi/long_running_tasks/_context_manager.py

@@ -1,7 +1,8 @@
 import asyncio
 from asyncio.log import logger
+from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
-from typing import Any, AsyncIterator, Final
+from typing import Any, Final
 
 from pydantic import PositiveFloat
 
@@ -87,7 +88,7 @@ async def periodic_task_result(
     - `status_poll_interval` optional: when waiting for a task to finish,
         how frequent should the server be queried
 
-    raises: `TaskClientResultError` if the task finished with an error instead of
+    raises: `Exception` if the task finished with an error instead of
         the expected result
     raises: `asyncio.TimeoutError` NOTE: the remote task will also be removed
     """

packages/service-library/src/servicelib/fastapi/long_running_tasks/client.py

@@ -27,7 +27,6 @@
 from yarl import URL
 
 from ...long_running_tasks._constants import DEFAULT_POLL_INTERVAL_S, HOUR
-from ...long_running_tasks._errors import TaskClientResultError
 from ...long_running_tasks._models import (
     ClientConfiguration,
     LRTask,
@@ -159,7 +158,6 @@ async def long_running_task_request(
     "ProgressCallback",
     "ProgressMessage",
     "ProgressPercent",
-    "TaskClientResultError",
     "TaskId",
     "TaskResult",
     "periodic_task_result",

packages/service-library/src/servicelib/long_running_tasks/_errors.py

@@ -46,8 +46,3 @@ class GenericClientError(BaseLongRunningError):
     msg_template: str = (
         "Unexpected error while '{action}' for '{task_id}': status={status} body={body}"
     )
-
-
-class TaskClientResultError(BaseLongRunningError):
-    code: str = "long_running_task.client.task_raised_error"
-    msg_template: str = "{message}"

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_events_utils.py

@@ -20,10 +20,7 @@
 from models_library.user_preferences import FrontendUserPreference
 from models_library.users import UserID
 from servicelib.fastapi.http_client_thin import BaseHttpClientError
-from servicelib.fastapi.long_running_tasks.client import (
-    ProgressCallback,
-    TaskClientResultError,
-)
+from servicelib.fastapi.long_running_tasks.client import ProgressCallback
 from servicelib.fastapi.long_running_tasks.server import TaskProgress
 from servicelib.logging_utils import log_context
 from servicelib.rabbitmq import RabbitMQClient
@@ -138,7 +135,7 @@ async def service_remove_containers(
         await sidecars_client.stop_service(
             scheduler_data.endpoint, progress_callback=progress_callback
         )
-    except (BaseHttpClientError, TaskClientResultError) as e:
+    except BaseHttpClientError as e:
         _logger.info(
             (
                 "Could not remove service containers for %s. "
@@ -373,7 +370,7 @@ async def attempt_pod_removal_and_data_saving(
             scheduler_data.dynamic_sidecar.were_state_and_outputs_saved = True
 
             _logger.info("dynamic-sidecar saved: state and output ports")
-        except (BaseHttpClientError, TaskClientResultError) as e:
+        except BaseHttpClientError as e:
             _logger.error(  # noqa: TRY400
                 (
                     "Could not contact dynamic-sidecar to save service "

services/dynamic-sidecar/tests/unit/test_api_rest_containers_long_running_tasks.py

@@ -30,7 +30,6 @@
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict
 from servicelib.fastapi.long_running_tasks.client import (
     Client,
-    TaskClientResultError,
     TaskId,
     periodic_task_result,
 )
@@ -46,7 +45,10 @@
 from simcore_service_dynamic_sidecar.models.shared_store import SharedStore
 from simcore_service_dynamic_sidecar.modules.inputs import enable_inputs_pulling
 from simcore_service_dynamic_sidecar.modules.outputs._context import OutputsContext
-from simcore_service_dynamic_sidecar.modules.outputs._manager import OutputsManager
+from simcore_service_dynamic_sidecar.modules.outputs._manager import (
+    OutputsManager,
+    UploadPortsFailedError,
+)
 
 FAST_STATUS_POLL: Final[float] = 0.1
 CREATE_SERVICE_CONTAINERS_TIMEOUT: Final[float] = 60
@@ -682,7 +684,7 @@ async def _test_code() -> None:
     if not mock_port_keys:
         await _test_code()
     else:
-        with pytest.raises(TaskClientResultError) as exec_info:
+        with pytest.raises(UploadPortsFailedError) as exec_info:
             await _test_code()
         assert f"the node id {missing_node_uuid} was not found" in f"{exec_info.value}"
 

services/dynamic-sidecar/tests/unit/test_api_rest_workflow_service_metrics.py

@@ -34,7 +34,6 @@
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from servicelib.fastapi.long_running_tasks.client import (
     Client,
-    TaskClientResultError,
     TaskId,
     periodic_task_result,
 )
@@ -262,7 +261,7 @@ async def test_user_services_fail_to_start(
     with_compose_down: bool,
     mock_user_services_fail_to_start: None,
 ):
-    with pytest.raises(TaskClientResultError):
+    with pytest.raises(RuntimeError):
         async with periodic_task_result(
             client=client,
             task_id=await _get_task_id_create_service_containers(
@@ -318,7 +317,7 @@ async def test_user_services_fail_to_stop_or_save_data(
     # in case of manual intervention multiple stops will be sent
     _EXPECTED_STOP_MESSAGES = 4
     for _ in range(_EXPECTED_STOP_MESSAGES):
-        with pytest.raises(TaskClientResultError):
+        with pytest.raises(RuntimeError):
             async with periodic_task_result(
                 client=client,
                 task_id=await _get_task_id_docker_compose_down(httpx_async_client),