Merge remote-tracking branch 'upstream/master' into pr-osparc-long-running-tasks-refactor-6

Author: Andrei Neagu

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/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/notifier/_notifier.py

@@ -11,7 +11,7 @@
 )
 from models_library.api_schemas_webserver.projects_nodes import NodeGet, NodeGetIdle
 from models_library.api_schemas_webserver.socketio import SocketIORoomStr
-from models_library.users import UserID
+from models_library.projects import ProjectID
 from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.services_utils import get_status_as_dict
 
@@ -23,20 +23,22 @@ def __init__(self, sio_manager: socketio.AsyncAioPikaManager):
         self._sio_manager = sio_manager
 
     async def notify_service_status(
-        self, user_id: UserID, status: NodeGet | DynamicServiceGet | NodeGetIdle
+        self, project_id: ProjectID, status: NodeGet | DynamicServiceGet | NodeGetIdle
     ) -> None:
         await self._sio_manager.emit(
             SOCKET_IO_SERVICE_STATUS_EVENT,
             data=jsonable_encoder(get_status_as_dict(status)),
-            room=SocketIORoomStr.from_user_id(user_id),
+            room=SocketIORoomStr.from_project_id(project_id),
         )
 
 
 async def notify_service_status_change(
-    app: FastAPI, user_id: UserID, status: NodeGet | DynamicServiceGet | NodeGetIdle
+    app: FastAPI,
+    project_id: ProjectID,
+    status: NodeGet | DynamicServiceGet | NodeGetIdle,
 ) -> None:
     notifier: Notifier = Notifier.get_from_app_state(app)
-    await notifier.notify_service_status(user_id=user_id, status=status)
+    await notifier.notify_service_status(project_id=project_id, status=status)
 
 
 async def lifespan(app: FastAPI) -> AsyncIterator[State]:

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/service_tracker/__init__.py

@@ -1,8 +1,8 @@
 from ._api import (
     NORMAL_RATE_POLL_INTERVAL,
     get_all_tracked_services,
+    get_project_id_for_service,
     get_tracked_service,
-    get_user_id_for_service,
     remove_tracked_service,
     set_frontend_notified_for_service,
     set_if_status_changed_for_service,
@@ -17,11 +17,11 @@
 
 __all__: tuple[str, ...] = (
     "get_all_tracked_services",
+    "get_project_id_for_service",
     "get_tracked_service",
-    "get_user_id_for_service",
-    "service_tracker_lifespan",
     "NORMAL_RATE_POLL_INTERVAL",
     "remove_tracked_service",
+    "service_tracker_lifespan",
     "set_frontend_notified_for_service",
     "set_if_status_changed_for_service",
     "set_request_as_running",

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/service_tracker/_api.py

@@ -11,12 +11,16 @@
     DynamicServiceStop,
 )
 from models_library.api_schemas_webserver.projects_nodes import NodeGet, NodeGetIdle
+from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.services_enums import ServiceState
-from models_library.users import UserID
 from servicelib.deferred_tasks import TaskUID
 
-from ._models import SchedulerServiceState, TrackedServiceModel, UserRequestedState
+from ._models import (
+    SchedulerServiceState,
+    TrackedServiceModel,
+    UserRequestedState,
+)
 from ._setup import get_tracker
 
 _logger = logging.getLogger(__name__)
@@ -242,7 +246,7 @@ async def get_all_tracked_services(app: FastAPI) -> dict[NodeID, TrackedServiceM
     return await get_tracker(app).all()
 
 
-async def get_user_id_for_service(app: FastAPI, node_id: NodeID) -> UserID | None:
-    """returns user_id for the service"""
+async def get_project_id_for_service(app: FastAPI, node_id: NodeID) -> ProjectID | None:
+    """returns project_id for the service"""
     model: TrackedServiceModel | None = await get_tracker(app).load(node_id)
-    return model.user_id if model else None
+    return model.project_id if model else None

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/status_monitor/_deferred_get_status.py

@@ -7,8 +7,8 @@
     RunningDynamicServiceDetails,
 )
 from models_library.api_schemas_webserver.projects_nodes import NodeGet, NodeGetIdle
+from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
-from models_library.users import UserID
 from servicelib.deferred_tasks import BaseDeferredHandler, TaskUID
 from servicelib.deferred_tasks._base_deferred_handler import DeferredContext
 
@@ -69,15 +69,15 @@ async def on_result(
         if await service_tracker.should_notify_frontend_for_service(
             app, node_id, status_changed=status_changed
         ):
-            user_id: UserID | None = await service_tracker.get_user_id_for_service(
-                app, node_id
+            project_id: ProjectID | None = (
+                await service_tracker.get_project_id_for_service(app, node_id)
             )
-            if user_id:
-                await notify_service_status_change(app, user_id, result)
+            if project_id:
+                await notify_service_status_change(app, project_id, result)
                 await service_tracker.set_frontend_notified_for_service(app, node_id)
             else:
                 _logger.info(
-                    "Did not find a user for '%s', skipping status delivery of: %s",
+                    "Did not find a project for '%s', skipping status delivery of: %s",
                     node_id,
                     result,
                 )

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."