continue refactoring

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/api_keys/_api.py

@@ -4,7 +4,6 @@
 from typing import Final
 
 from aiohttp import web
-from models_library.api_schemas_webserver.auth import ApiKeyGet
 from models_library.products import ProductName
 from models_library.users import UserID
 from servicelib.utils_secrets import generate_token_secret_key
@@ -63,13 +62,17 @@ async def create_api_key(
 
 
 async def get_api_key(
-    app: web.Application, *, api_key_id: int, user_id: UserID, product_name: ProductName
-) -> ApiKeyGet:
+    app: web.Application,
+    *,
+    api_key_id: int,
+    user_id: UserID,
+    product_name: ProductName,
+) -> ApiKey:
     api_key = await _db.get(
         app, api_key_id=api_key_id, user_id=user_id, product_name=product_name
     )
     if api_key is not None:
-        return ApiKeyGet.model_validate(api_key) if api_key else None
+        return api_key
 
     raise ApiKeyNotFoundError(api_key_id=api_key_id)
 
@@ -81,11 +84,11 @@ async def get_or_create_api_key(
     user_id: UserID,
     product_name: ProductName,
     expiration: dt.timedelta | None = None,
-) -> ApiKeyGet:
+) -> ApiKey:
 
     api_key, api_secret = _generate_api_key_and_secret(name)
 
-    row = await _db.get_or_create(
+    return await _db.get_or_create(
         app,
         user_id=user_id,
         product_name=product_name,
@@ -94,9 +97,6 @@ async def get_or_create_api_key(
         api_key=api_key,
         api_secret=api_secret,
     )
-    return ApiKeyGet.model_construct(
-        display_name=row.display_name, api_key=row.api_key, api_secret=row.api_secret
-    )
 
 
 async def delete_api_key(

services/web/server/src/simcore_service_webserver/api_keys/_db.py

@@ -3,7 +3,6 @@
 
 import sqlalchemy as sa
 from aiohttp import web
-from models_library.api_schemas_api_server.api_keys import ApiKeyInDB
 from models_library.products import ProductName
 from models_library.users import UserID
 from simcore_postgres_database.models.api_keys import api_keys
@@ -78,7 +77,7 @@ async def get(
     api_key_id: int,
     user_id: UserID,
     product_name: ProductName,
-) -> ApiKeyInDB | None:
+) -> ApiKey | None:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         stmt = sa.select(api_keys).where(
             (api_keys.c.user_id == user_id)
@@ -88,7 +87,18 @@ async def get(
 
         result = await conn.stream(stmt)
         row = await result.first()
-        return ApiKeyInDB.model_validate(row) if row else None
+
+        return (
+            ApiKey(
+                id=row.id,
+                display_name=row.display_name,
+                expiration=row.expires_at,
+                api_key=row.api_key,
+                api_secret=row.api_secret,
+            )
+            if row
+            else None
+        )
 
 
 async def get_or_create(
@@ -101,7 +111,7 @@ async def get_or_create(
     expiration: timedelta | None,
     api_key: str,
     api_secret: str,
-) -> ApiKeyInDB:
+) -> ApiKey:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         # Implemented as "create or get"
         insert_stmt = (
@@ -127,21 +137,28 @@ async def get_or_create(
         result = await conn.stream(insert_stmt)
         row = await result.first()
         assert row  # nosec
-        return ApiKeyInDB.model_validate(row)
+
+        return ApiKey(
+            id=row.id,
+            display_name=row.display_name,
+            expiration=row.expiration,
+            api_key=row.api_key,
+            api_secret=row.api_secret,
+        )
 
 
 async def delete(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
-    api_key_id: int,
     user_id: UserID,
     product_name: ProductName,
+    api_key_id: int,
 ) -> None:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         stmt = api_keys.delete().where(
-            (api_keys.c.user_id == user_id)
-            & (api_keys.c.id == api_key_id)
+            (api_keys.c.id == api_key_id)
+            & (api_keys.c.user_id == user_id)
             & (api_keys.c.product_name == product_name)
         )
         await conn.execute(stmt)

services/web/server/src/simcore_service_webserver/api_keys/_rest.py

@@ -14,6 +14,7 @@
 from simcore_service_webserver.api_keys._exceptions_handlers import (
     handle_plugin_requests_exceptions,
 )
+from simcore_service_webserver.api_keys._models import ApiKey
 
 from .._meta import API_VTAG
 from ..login.decorators import login_required
@@ -53,13 +54,13 @@ async def list_api_keys(request: web.Request):
 async def api_key_get(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ApiKeysPathParams, request)
-    key = await _api.get_api_key(
+    api_key: ApiKey = await _api.get_api_key(
         request.app,
         api_key_id=path_params.api_key_id,
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
     )
-    return envelope_json_response(key)
+    return envelope_json_response(ApiKeyGet.model_validate(api_key))
 
 
 @routes.post(f"/{API_VTAG}/auth/api-keys", name="create_api_key")
@@ -70,7 +71,7 @@ async def create_api_key(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     new_api_key = await parse_request_body_as(ApiKeyCreate, request)
     try:
-        created_api_key = await _api.create_api_key(
+        created_api_key: ApiKey = await _api.create_api_key(
             request.app,
             display_name=new_api_key.display_name,
             expiration=new_api_key.expiration,