Merge remote-tracking branch 'upstream/master' into pr-osparc-migrate-dy-scheduler-part4

Author: Andrei Neagu

.github/prompts/refactor-aiohttp-appkey.prompt.md

@@ -0,0 +1,28 @@
+---
+mode: edit
+description: Converts string-based aiohttp app key constants to type-safe web.AppKey
+model: GPT-4.1
+---
+
+Convert all string-based app key constants to use type-safe web.AppKey.
+
+- Replace patterns like:
+  ```python
+  CONSTNAME_APPKEY: Final[str] = f"{__name__}.my_key"
+  ```
+  with:
+  ```python
+  from aiohttp import web
+  CONSTNAME_APPKEY: Final = web.AppKey("CONSTNAME", ValueType)
+  ```
+  (Replace ValueType with the actual type stored under this key.)
+
+- Update all usages:
+  - `app[CONSTNAME_APPKEY] = value`
+  - `data = app[CONSTNAME_APPKEY]` or `data = request.app[CONSTNAME_APPKEY]`
+
+- Key constant MUST be UPPERCASE
+- Key name MUST be suffixed `_APPKEY`
+- Remove any f"{__name__}..." patterns; use a simple string identifier in web.AppKey.
+- Ensure all keys are type-safe and self-documenting.
+- IF you change the original name, you MUST change all the references

.github/prompts/pydantic-annotated-fields.prompt.md renamed to .github/prompts/refactor-pydantic-annotated-fields.prompt.md

@@ -0,0 +1,70 @@
+"""update confirmation created column
+
+Revision ID: 9dddb16914a4
+Revises: 06eafd25d004
+Create Date: 2025-07-28 17:25:06.534720+00:00
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "9dddb16914a4"
+down_revision = "7e92447558e0"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Step 1: Add new column as nullable first
+    op.add_column(
+        "confirmations",
+        sa.Column(
+            "created",
+            sa.DateTime(timezone=True),
+            nullable=True,
+        ),
+    )
+
+    # Step 2: Copy data from created_at to created, assuming UTC timezone for existing data
+    op.execute(
+        "UPDATE confirmations SET created = created_at AT TIME ZONE 'UTC' WHERE created_at IS NOT NULL"
+    )
+
+    # Step 3: Make the column non-nullable with default
+    op.alter_column(
+        "confirmations",
+        "created",
+        nullable=False,
+        server_default=sa.text("now()"),
+    )
+
+    # Step 4: Drop old column
+    op.drop_column("confirmations", "created_at")
+
+
+def downgrade():
+    # Step 1: Add back the old column
+    op.add_column(
+        "confirmations",
+        sa.Column(
+            "created_at", postgresql.TIMESTAMP(), autoincrement=False, nullable=True
+        ),
+    )
+
+    # Step 2: Copy data back, converting timezone-aware to naive timestamp
+    op.execute(
+        "UPDATE confirmations SET created_at = created AT TIME ZONE 'UTC' WHERE created IS NOT NULL"
+    )
+
+    # Step 3: Make the column non-nullable
+    op.alter_column(
+        "confirmations",
+        "created_at",
+        nullable=False,
+    )
+
+    # Step 4: Drop new column
+    op.drop_column("confirmations", "created")

packages/postgres-database/src/simcore_postgres_database/migration/versions/9dddb16914a4_update_confirmation_created_column.py

@@ -1,15 +1,16 @@
-""" User's confirmations table
+"""User's confirmations table
 
-    - Keeps a list of tokens to identify an action (registration, invitation, reset, etc) authorized
-    by link to a a user in the framework
-    - These tokens have an expiration date defined by configuration
+- Keeps a list of tokens to identify an action (registration, invitation, reset, etc) authorized
+by link to a a user in the framework
+- These tokens have an expiration date defined by configuration
 
 """
+
 import enum
 
 import sqlalchemy as sa
 
-from ._common import RefActions
+from ._common import RefActions, column_created_datetime
 from .base import metadata
 from .users import users
 
@@ -47,12 +48,8 @@ class ConfirmationAction(enum.Enum):
         sa.Text,
         doc="Extra data associated to the action. SEE handlers_confirmation.py::email_confirmation",
     ),
-    sa.Column(
-        "created_at",
-        sa.DateTime(),
-        nullable=False,
-        # NOTE: that here it would be convenient to have a server_default=now()!
-        doc="Creation date of this code."
+    column_created_datetime(
+        doc="Creation date of this code. "
         "Can be used as reference to determine the expiration date. SEE ${ACTION}_CONFIRMATION_LIFETIME",
     ),
     # constraints ----------------

packages/postgres-database/src/simcore_postgres_database/models/confirmations.py

@@ -5,10 +5,10 @@
 
 from aiohttp.test_utils import TestClient
 from servicelib.aiohttp import status
-from simcore_service_webserver.login._invitations_service import create_invitation_token
-from simcore_service_webserver.login._login_repository_legacy import (
-    get_plugin_storage,
+from simcore_service_webserver.login._controller.rest._rest_dependencies import (
+    get_confirmation_service,
 )
+from simcore_service_webserver.login._invitations_service import create_invitation_token
 from simcore_service_webserver.login.constants import MSG_LOGGED_IN
 from simcore_service_webserver.security import security_service
 from yarl import URL
@@ -132,15 +132,15 @@ def __init__(
         self.confirmation = None
         self.trial_days = trial_days
         self.extra_credits_in_usd = extra_credits_in_usd
-        self.db = get_plugin_storage(self.app)
+        self.confirmation_service = get_confirmation_service(client.app)
 
     async def __aenter__(self) -> "NewInvitation":
         # creates host user
         assert self.client.app
         self.user = await super().__aenter__()
 
         self.confirmation = await create_invitation_token(
-            self.db,
+            self.client.app,
             user_id=self.user["id"],
             user_email=self.user["email"],
             tag=self.tag,
@@ -150,5 +150,11 @@ async def __aenter__(self) -> "NewInvitation":
         return self
 
     async def __aexit__(self, *args):
-        if await self.db.get_confirmation(self.confirmation):
-            await self.db.delete_confirmation(self.confirmation)
+        if self.confirmation:
+            # Try to get confirmation by filter and delete if it exists
+            confirmation = await self.confirmation_service.get_confirmation(
+                filter_dict={"code": self.confirmation["code"]}
+            )
+            if confirmation:
+                await self.confirmation_service.delete_confirmation(confirmation)
+        return await super().__aexit__(*args)

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_login.py

@@ -17,7 +17,7 @@
     update_or_insert_project_group,
 )
 from simcore_service_webserver.projects._projects_repository_legacy import (
-    APP_PROJECT_DBAPI,
+    PROJECT_DBAPI_APPKEY,
     ProjectDBAPI,
 )
 from simcore_service_webserver.projects._projects_repository_legacy_utils import (
@@ -71,7 +71,7 @@ async def create_project(
 
     project_data.update(params_override)
 
-    db: ProjectDBAPI = app[APP_PROJECT_DBAPI]
+    db: ProjectDBAPI = app[PROJECT_DBAPI_APPKEY]
 
     new_project = await db.insert_project(
         project_data,
@@ -131,7 +131,7 @@ async def create_project(
 async def delete_all_projects(app: web.Application):
     from simcore_postgres_database.webserver_models import projects
 
-    db = app[APP_PROJECT_DBAPI]
+    db = app[PROJECT_DBAPI_APPKEY]
     async with db.engine.acquire() as conn:
         query = projects.delete()
         await conn.execute(query)

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.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.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
@@ -21,17 +22,17 @@
 #
 # web.Application keys, i.e. app[APP_*_KEY]
 #
-APP_CONFIG_KEY = web.AppKey("APP_CONFIG_KEY", dict[str, object])
+APP_CONFIG_KEY: Final = web.AppKey("APP_CONFIG_KEY", dict[str, object])
 
 APP_AIOPG_ENGINE_KEY: Final[str] = f"{__name__ }.aiopg_engine"
 
-APP_CLIENT_SESSION_KEY: web.AppKey[ClientSession] = web.AppKey("APP_CLIENT_SESSION_KEY")
+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"
 
 #
 # web.Response keys, i.e. app[RSP_*_KEY]

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

@@ -1,4 +1,5 @@
 from enum import Enum
+from typing import Final
 
 from aiohttp import web
 from prometheus_client import Counter
@@ -22,8 +23,8 @@
 #
 
 
-MONITOR_SERVICE_STARTED = f"{__name__}.services_started"
-MONITOR_SERVICE_STOPPED = f"{__name__}.services_stopped"
+MONITOR_SERVICE_STARTED_APPKEY: Final = web.AppKey("MONITOR_SERVICE_STARTED", Counter)
+MONITOR_SERVICE_STOPPED_APPKEY: Final = web.AppKey("MONITOR_SERVICE_STOPPED", Counter)
 
 MONITOR_SERVICE_STARTED_LABELS: list[str] = [
     "service_key",
@@ -42,7 +43,7 @@
 def add_instrumentation(
     app: web.Application, reg: CollectorRegistry, app_name: str
 ) -> None:
-    app[MONITOR_SERVICE_STARTED] = Counter(
+    app[MONITOR_SERVICE_STARTED_APPKEY] = Counter(
         name="services_started_total",
         documentation="Counts the services started",
         labelnames=MONITOR_SERVICE_STARTED_LABELS,
@@ -51,7 +52,7 @@ def add_instrumentation(
         registry=reg,
     )
 
-    app[MONITOR_SERVICE_STOPPED] = Counter(
+    app[MONITOR_SERVICE_STOPPED_APPKEY] = Counter(
         name="services_stopped_total",
         documentation="Counts the services stopped",
         labelnames=MONITOR_SERVICE_STOPPED_LABELS,
@@ -73,7 +74,7 @@ def service_started(
     service_tag: str,
     simcore_user_agent: str,
 ) -> None:
-    app[MONITOR_SERVICE_STARTED].labels(
+    app[MONITOR_SERVICE_STARTED_APPKEY].labels(
         service_key=service_key,
         service_tag=service_tag,
         simcore_user_agent=simcore_user_agent,
@@ -88,7 +89,7 @@ def service_stopped(
     simcore_user_agent: str,
     result: ServiceResult | str,
 ) -> None:
-    app[MONITOR_SERVICE_STOPPED].labels(
+    app[MONITOR_SERVICE_STOPPED_APPKEY].labels(
         service_key=service_key,
         service_tag=service_tag,
         simcore_user_agent=simcore_user_agent,

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

@@ -27,12 +27,12 @@
 
 _logger = logging.getLogger(__name__)
 
-_PROMETHEUS_METRICS: Final[str] = f"{__name__}.prometheus_metrics"  # noqa: N816
-APP_MONITORING_NAMESPACE_KEY: Final = web.AppKey("APP_MONITORING_NAMESPACE_KEY", str)
+PROMETHEUS_METRICS_APPKEY: Final = web.AppKey("PROMETHEUS_METRICS", PrometheusMetrics)
+MONITORING_NAMESPACE_APPKEY: Final = web.AppKey("APP_MONITORING_NAMESPACE_KEY", str)
 
 
 def get_collector_registry(app: web.Application) -> CollectorRegistry:
-    metrics = app[_PROMETHEUS_METRICS]
+    metrics = app[PROMETHEUS_METRICS_APPKEY]
     assert isinstance(metrics, PrometheusMetrics)  # nosec
     return metrics.registry
 
@@ -71,7 +71,7 @@ async def middleware_handler(request: web.Request, handler: Handler):
                 with log_catch(logger=_logger, reraise=False):
                     await enter_middleware_cb(request)
 
-            metrics = request.app[_PROMETHEUS_METRICS]
+            metrics = request.app[PROMETHEUS_METRICS_APPKEY]
             assert isinstance(metrics, PrometheusMetrics)  # nosec
 
             user_agent = request.headers.get(
@@ -130,7 +130,7 @@ def setup_monitoring(
     enter_middleware_cb: EnterMiddlewareCB | None = None,
     exit_middleware_cb: ExitMiddlewareCB | None = None,
 ):
-    app[_PROMETHEUS_METRICS] = get_prometheus_metrics()
+    app[PROMETHEUS_METRICS_APPKEY] = get_prometheus_metrics()
 
     # WARNING: ensure ERROR middleware is over this one
     #