kesy

Author: pcrespov

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

@@ -23,7 +23,7 @@ async def _first_call_on_cleanup(app: web.Application):
 
 
 async def _cancel_all_fire_and_forget_registered_tasks(app: web.Application):
-    registered_tasks: set[asyncio.Task] = app[APP_FIRE_AND_FORGET_TASKS_KEY]
+    registered_tasks = app[APP_FIRE_AND_FORGET_TASKS_KEY]
     for task in registered_tasks:
         task.cancel()
 
@@ -37,7 +37,7 @@ async def _cancel_all_fire_and_forget_registered_tasks(app: web.Application):
                 "Following observation tasks completed with an unexpected error:%s",
                 f"{bad_results}",
             )
-    except asyncio.TimeoutError:
+    except TimeoutError:
         _logger.exception(
             "Timed-out waiting more than %s secs for %s to complete. Action: Check why this is blocking",
             _MAX_WAIT_TIME_TO_CANCEL_SECONDS,

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

@@ -9,6 +9,7 @@
  See https://aiohttp.readthedocs.io/en/stable/web_advanced.html#data-sharing-aka-no-singletons-please
 """
 
+import asyncio
 from typing import Final
 
 from aiohttp import ClientSession, web
@@ -28,7 +29,9 @@
 APP_CLIENT_SESSION_KEY: Final = web.AppKey("APP_CLIENT_SESSION_KEY", ClientSession)
 
 
-APP_FIRE_AND_FORGET_TASKS_KEY: Final[str] = f"{__name__}.tasks"
+APP_FIRE_AND_FORGET_TASKS_KEY: Final = web.AppKey(
+    "APP_FIRE_AND_FORGET_TASKS_KEY", set[asyncio.Task]
+)
 
 APP_RABBITMQ_CLIENT_KEY: Final[str] = f"{__name__}.rabbit_client"
 APP_RABBITMQ_RPC_SERVER_KEY: Final[str] = f"{__name__}.rabbit_rpc_server"

services/web/server/src/simcore_service_webserver/invitations/_client.py

@@ -3,6 +3,7 @@
 import logging
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import Final
 
 from aiohttp import BasicAuth, ClientResponseError, ClientSession, web
 from aiohttp.client_exceptions import ClientError
@@ -151,15 +152,15 @@ async def generate_invitation(
 # EVENTS
 #
 
-_APP_INVITATIONS_SERVICE_API_KEY = f"{__name__}.{InvitationsServiceApi.__name__}"
+_APPKEY: Final = web.AppKey(InvitationsServiceApi.__name__, InvitationsServiceApi)
 
 
 async def invitations_service_api_cleanup_ctx(app: web.Application):
     settings = app[APP_SETTINGS_KEY].WEBSERVER_INVITATIONS
     assert settings  # nosec
     service_api = await InvitationsServiceApi.create(settings)
 
-    app[_APP_INVITATIONS_SERVICE_API_KEY] = service_api
+    app[_APPKEY] = service_api
 
     yield
 
@@ -170,6 +171,5 @@ async def invitations_service_api_cleanup_ctx(app: web.Application):
 
 
 def get_invitations_service_api(app: web.Application) -> InvitationsServiceApi:
-    assert app[_APP_INVITATIONS_SERVICE_API_KEY]  # nosec
-    service_api: InvitationsServiceApi = app[_APP_INVITATIONS_SERVICE_API_KEY]
-    return service_api
+    assert app[_APPKEY]  # nosec
+    return app[_APPKEY]