separate models

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_webserver/auth.py

@@ -3,6 +3,7 @@
 
 from models_library.basic_types import IDStr
 from pydantic import BaseModel, ConfigDict, Field, HttpUrl, SecretStr
+from pydantic.alias_generators import to_camel
 
 from ..emails import LowerCaseEmailStr
 from ._base import InputSchema
@@ -60,6 +61,7 @@ class ApiKeyCreateRequest(BaseModel):
     )
 
     model_config = ConfigDict(
+        alias_generator=to_camel,
         from_attributes=True,
         json_schema_extra={
             "examples": [
@@ -86,6 +88,7 @@ class ApiKeyCreateResponse(ApiKeyCreateRequest):
     api_secret: str
 
     model_config = ConfigDict(
+        alias_generator=to_camel,
         from_attributes=True,
         json_schema_extra={
             "examples": [
@@ -122,6 +125,7 @@ class ApiKeyGet(BaseModel):
     display_name: Annotated[str, Field(..., min_length=3)]
 
     model_config = ConfigDict(
+        alias_generator=to_camel,
         from_attributes=True,
         json_schema_extra={
             "examples": [

packages/models-library/src/models_library/rpc_auth_api_keys.py

@@ -1,9 +1,19 @@
+import datetime as dt
 from typing import Annotated
 
 from models_library.basic_types import IDStr
 from pydantic import BaseModel, ConfigDict, Field
 
 
+class ApiKeyCreate(BaseModel):
+    display_name: Annotated[str, Field(..., min_length=3)]
+    expiration: dt.timedelta | None = None
+
+    model_config = ConfigDict(
+        from_attributes=True,
+    )
+
+
 class ApiKeyGet(BaseModel):
     id: IDStr
     display_name: Annotated[str, Field(..., min_length=3)]
@@ -12,14 +22,4 @@ class ApiKeyGet(BaseModel):
 
     model_config = ConfigDict(
         from_attributes=True,
-        json_schema_extra={
-            "examples": [
-                {
-                    "id": "42",
-                    "display_name": "test-api-forever",
-                    "api_key": "key",
-                    "api_secret": "secret",
-                },
-            ]
-        },
     )

services/web/server/tests/unit/with_dbs/01/test_api_keys_rpc.py

@@ -11,6 +11,7 @@
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.products import ProductName
 from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.rpc_auth_api_keys import ApiKeyCreate
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
@@ -21,7 +22,6 @@
 from simcore_postgres_database.models.users import UserRole
 from simcore_service_webserver.api_keys import _repository as repo
 from simcore_service_webserver.api_keys._models import ApiKey
-from simcore_service_webserver.api_keys._rest import ApiKeyCreateRequest
 from simcore_service_webserver.api_keys.errors import ApiKeyNotFoundError
 from simcore_service_webserver.application_settings import ApplicationSettings
 
@@ -133,7 +133,7 @@ async def test_api_keys_workflow(
         TypeAdapter(RPCMethodName).validate_python("create_api_key"),
         product_name=osparc_product_name,
         user_id=logged_user["id"],
-        api_key=ApiKeyCreateRequest(display_name=key_name, expiration=None),
+        api_key=ApiKeyCreate(display_name=key_name, expiration=None),
     )
     assert created_api_key.display_name == key_name