merge master into introduce-links-for-webserver-async-jobs

Author: bisgaard-itis

api/specs/web-server/_catalog.py

@@ -15,7 +15,7 @@
 from models_library.generics import Envelope
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.catalog._handlers import (
+from simcore_service_webserver.catalog._rest_controller import (
     ListServiceParams,
     ServicePathParams,
     _FromServiceOutputParams,

api/specs/web-server/_catalog_tags.py

@@ -10,7 +10,7 @@
 from models_library.api_schemas_webserver.catalog import CatalogServiceGet
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.catalog._tags_handlers import (
+from simcore_service_webserver.catalog._rest_tags_controller import (
     ServicePathParams,
     ServiceTagPathParams,
 )
@@ -31,8 +31,7 @@
 )
 def list_service_tags(
     _path_params: Annotated[ServicePathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -41,8 +40,7 @@ def list_service_tags(
 )
 def add_service_tag(
     _path_params: Annotated[ServiceTagPathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -51,5 +49,4 @@ def add_service_tag(
 )
 def remove_service_tag(
     _path_params: Annotated[ServiceTagPathParams, Depends()],
-):
-    ...
+): ...

services/api-server/tests/unit/pact_broker/pacts/05_licensed_items.json

@@ -127,7 +127,7 @@
               "version": "1.0.0"
             }
           ],
-          "limit": 50,
+          "limit": 20,
           "links": {
             "first": "/v0/licensed-items?offset=0",
             "last": "/v0/licensed-items?offset=0",

services/director-v2/src/simcore_service_director_v2/cli/__init__.py

@@ -26,7 +26,11 @@
 DEFAULT_OUTPUTS_PUSH_ATTEMPTS: Final[int] = 3
 DEFAULT_TASK_UPDATE_INTERVAL_S: Final[int] = 1
 
-main = typer.Typer(name=PROJECT_NAME)
+main = typer.Typer(
+    name=PROJECT_NAME,
+    pretty_exceptions_enable=False,
+    pretty_exceptions_show_locals=False,
+)
 
 _logger = logging.getLogger(__name__)
 

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/containers_long_running_tasks.py

@@ -124,6 +124,7 @@ async def runs_docker_compose_down_task(
     settings: Annotated[ApplicationSettings, Depends(get_settings)],
     shared_store: Annotated[SharedStore, Depends(get_shared_store)],
     app: Annotated[FastAPI, Depends(get_application)],
+    mounted_volumes: Annotated[MountedVolumes, Depends(get_mounted_volumes)],
 ) -> TaskId:
     assert request  # nosec
 
@@ -135,6 +136,7 @@ async def runs_docker_compose_down_task(
             app=app,
             shared_store=shared_store,
             settings=settings,
+            mounted_volumes=mounted_volumes,
         )
     except TaskAlreadyRunningError as e:
         return cast(str, e.managed_task.task_id)  # type: ignore[attr-defined] # pylint:disable=no-member

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/cli.py

@@ -1,8 +1,8 @@
 import asyncio
 import json
 import logging
+from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
-from typing import AsyncIterator
 
 import typer
 from fastapi import FastAPI
@@ -17,7 +17,11 @@
 from .modules.outputs import OutputsManager, setup_outputs
 
 log = logging.getLogger(__name__)
-main = typer.Typer(name=PROJECT_NAME)
+main = typer.Typer(
+    name=PROJECT_NAME,
+    pretty_exceptions_enable=False,
+    pretty_exceptions_show_locals=False,
+)
 
 
 main.command()(create_settings_command(settings_cls=ApplicationSettings, logger=log))

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/long_running_tasks.py

@@ -53,7 +53,10 @@
 from ..modules.mounted_fs import MountedVolumes
 from ..modules.notifications._notifications_ports import PortNotifier
 from ..modules.outputs import OutputsManager, event_propagation_disabled
-from .long_running_tasksutils import run_before_shutdown_actions
+from .long_running_tasks_utils import (
+    ensure_read_permissions_on_user_service_data,
+    run_before_shutdown_actions,
+)
 from .resource_tracking import send_service_started, send_service_stopped
 
 _logger = logging.getLogger(__name__)
@@ -237,6 +240,7 @@ async def task_runs_docker_compose_down(
     app: FastAPI,
     shared_store: SharedStore,
     settings: ApplicationSettings,
+    mounted_volumes: MountedVolumes,
 ) -> None:
     if shared_store.compose_spec is None:
         _logger.warning("No compose-spec was found")
@@ -312,6 +316,8 @@ async def _send_resource_tracking_stop(platform_status: SimcorePlatformStatus):
         await _send_resource_tracking_stop(SimcorePlatformStatus.OK)
         raise
 
+    await ensure_read_permissions_on_user_service_data(mounted_volumes)
+
     await _send_resource_tracking_stop(SimcorePlatformStatus.OK)
 
     # removing compose-file spec

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/long_running_tasksutils.py renamed to services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/long_running_tasks_utils.py

@@ -1,4 +1,7 @@
 import logging
+import os
+from datetime import timedelta
+from typing import Final
 
 from models_library.callbacks_mapping import UserServiceCommand
 from servicelib.logging_utils import log_context
@@ -9,10 +12,13 @@
     ContainerExecTimeoutError,
 )
 from ..models.shared_store import SharedStore
-from ..modules.container_utils import run_command_in_container
+from ..modules.mounted_fs import MountedVolumes
+from .container_utils import run_command_in_container
 
 _logger = logging.getLogger(__name__)
 
+_TIMEOUT_PERMISSION_CHANGES: Final[timedelta] = timedelta(minutes=5)
+
 
 async def run_before_shutdown_actions(
     shared_store: SharedStore, before_shutdown: list[UserServiceCommand]
@@ -40,3 +46,22 @@ async def run_before_shutdown_actions(
                     container_name,
                     exc_info=True,
                 )
+
+
+async def ensure_read_permissions_on_user_service_data(
+    mounted_volumes: MountedVolumes,
+) -> None:
+    # Makes sure sidecar has access to all files in the user services.
+    # The user could have removed read permissions form a file, which will cause an error.
+
+    # NOTE: command runs inside self container since the user service container might not always be running
+    self_container = os.environ["HOSTNAME"]
+    for path_to_store in (  # apply changes to otuputs and all state folders
+        *mounted_volumes.disk_state_paths_iter(),
+        mounted_volumes.disk_outputs_path,
+    ):
+        await run_command_in_container(
+            self_container,
+            command=f"chmod -R o+rX '{path_to_store}'",
+            timeout=_TIMEOUT_PERMISSION_CHANGES.total_seconds(),
+        )

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/prometheus_metrics.py

@@ -107,13 +107,13 @@ async def _update_metrics(self):
             )
             self._metrics_response = MetricsResponse.from_reply(metrics_fetch_result)
         except ContainerExecContainerNotFoundError as e:
-            _logger.info(
-                "Container %s was not found could nto recover metrics",
+            _logger.debug(
+                "Container %s was not found could not recover metrics",
                 container_name,
             )
             self._metrics_response = MetricsResponse.from_error(e)
         except Exception as e:  # pylint: disable=broad-exception-caught
-            _logger.info("Unexpected exception", exc_info=True)
+            _logger.debug("Could not recover metrics", exc_info=True)
             self._metrics_response = MetricsResponse.from_error(e)
 
     async def _task_metrics_recovery(self) -> None:

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

@@ -11,6 +11,7 @@
 from aiodocker.volumes import DockerVolume
 from async_asgi_testclient import TestClient
 from fastapi import FastAPI
+from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from simcore_service_dynamic_sidecar.core.application import AppState, create_app
 from simcore_service_dynamic_sidecar.core.docker_compose_utils import (
@@ -157,3 +158,10 @@ def port_notifier(app: FastAPI) -> PortNotifier:
         settings.DY_SIDECAR_PROJECT_ID,
         settings.DY_SIDECAR_NODE_ID,
     )
+
+
+@pytest.fixture
+def mock_ensure_read_permissions_on_user_service_data(mocker: MockerFixture) -> None:
+    mocker.patch(
+        "simcore_service_dynamic_sidecar.modules.long_running_tasks.ensure_read_permissions_on_user_service_data",
+    )