File tree Expand file tree Collapse file tree 4 files changed +23
-6
lines changed
packages/models-library/src/models_library
src/simcore_service_director_v2/modules/osparc_variables
web/server/src/simcore_service_webserver/api_keys Expand file tree Collapse file tree 4 files changed +23
-6
lines changed Original file line number Diff line number Diff line change 1- from pydantic import BaseModel
1+ from typing import Annotated
2+
3+ from pydantic import BaseModel , ConfigDict , Field
24
35
46class ApiKeyGet (BaseModel ):
7+ display_name : Annotated [str , Field (..., min_length = 3 )]
58 api_key : str
69 api_secret : str
10+
11+ model_config = ConfigDict (
12+ from_attributes = True ,
13+ json_schema_extra = {
14+ "examples" : [
15+ {
16+ "display_name" : "test-api-forever" ,
17+ "api_key" : "key" ,
18+ "api_secret" : "secret" ,
19+ },
20+ ]
21+ },
22+ )
Original file line number Diff line number Diff line change 44
55from aiocache import cached # type: ignore[import-untyped]
66from fastapi import FastAPI
7- from models_library .api_schemas_webserver .auth import ApiKeyGet
87from models_library .products import ProductName
8+ from models_library .rpc_auth_api_keys import ApiKeyGet
99from models_library .users import UserID
1010
1111from ._api_auth_rpc import get_or_create_api_key_and_secret
Original file line number Diff line number Diff line change 2020from asgi_lifespan import LifespanManager
2121from faker import Faker
2222from fastapi import FastAPI
23- from models_library .api_schemas_webserver .auth import ApiKeyGet
2423from models_library .products import ProductName
2524from models_library .projects import Node , NodesDict
25+ from models_library .rpc_auth_api_keys import ApiKeyGet
2626from models_library .users import UserID
2727from pytest_mock import MockerFixture
2828from pytest_simcore .helpers .monkeypatch_envs import (
@@ -347,15 +347,15 @@ async def _create(
347347 * ,
348348 product_name : ProductName ,
349349 user_id : UserID ,
350- name : str ,
350+ display_name : str ,
351351 expiration : timedelta ,
352352 ):
353353 assert app
354354 assert product_name
355355 assert user_id
356356 assert expiration is None
357357
358- fake_data .display_name = name
358+ fake_data .display_name = display_name
359359 return fake_data
360360
361361 # mocks RPC interface
Original file line number Diff line number Diff line change 22
33from aiohttp import web
44from models_library .api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
5- from models_library .api_schemas_webserver .auth import ApiKeyCreateRequest , ApiKeyGet
5+ from models_library .api_schemas_webserver .auth import ApiKeyCreateRequest
66from models_library .products import ProductName
7+ from models_library .rpc_auth_api_keys import ApiKeyGet
78from models_library .users import UserID
89from servicelib .rabbitmq import RPCRouter
910from simcore_service_webserver .api_keys import _service
You can’t perform that action at this time.
0 commit comments