models

Author: pcrespov

api/specs/web-server/_catalog.py

@@ -15,13 +15,13 @@
 from models_library.generics import Envelope
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.catalog._controller_rest import (
+from simcore_service_webserver.catalog._controller_rest_schemas import (
+    FromServiceOutputQueryParams,
     ListServiceParams,
+    ServiceInputsPathParams,
+    ServiceOutputsPathParams,
     ServicePathParams,
-    _FromServiceOutputParams,
-    _ServiceInputsPathParams,
-    _ServiceOutputsPathParams,
-    _ToServiceInputsParams,
+    ToServiceInputsQueryParams,
 )
 
 router = APIRouter(
@@ -71,7 +71,7 @@ def list_service_inputs(
     response_model=Envelope[ServiceInputGet],
 )
 def get_service_input(
-    _path: Annotated[_ServiceInputsPathParams, Depends()],
+    _path: Annotated[ServiceInputsPathParams, Depends()],
 ): ...
 
 
@@ -81,7 +81,7 @@ def get_service_input(
 )
 def get_compatible_inputs_given_source_output(
     _path: Annotated[ServicePathParams, Depends()],
-    _query: Annotated[_FromServiceOutputParams, Depends()],
+    _query: Annotated[FromServiceOutputQueryParams, Depends()],
 ): ...
 
 
@@ -99,7 +99,7 @@ def list_service_outputs(
     response_model=Envelope[list[ServiceOutputGet]],
 )
 def get_service_output(
-    _path: Annotated[_ServiceOutputsPathParams, Depends()],
+    _path: Annotated[ServiceOutputsPathParams, Depends()],
 ): ...
 
 
@@ -109,7 +109,7 @@ def get_service_output(
 )
 def get_compatible_outputs_given_target_input(
     _path: Annotated[ServicePathParams, Depends()],
-    _query: Annotated[_ToServiceInputsParams, Depends()],
+    _query: Annotated[ToServiceInputsQueryParams, Depends()],
 ): ...
 
 

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

@@ -26,6 +26,8 @@
     int, Field(ge=1, lt=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE)
 ]
 
+PageOffsetInt: TypeAlias = NonNegativeInt
+
 DEFAULT_NUMBER_OF_ITEMS_PER_PAGE: Final[PageLimitInt] = TypeAdapter(
     PageLimitInt
 ).validate_python(20)
@@ -51,15 +53,19 @@ class CursorQueryParameters(RequestParameters):
 class PageQueryParameters(RequestParameters):
     """Use as pagination options in query parameters"""
 
-    limit: PageLimitInt = Field(
-        default=TypeAdapter(PageLimitInt).validate_python(
-            DEFAULT_NUMBER_OF_ITEMS_PER_PAGE
+    limit: Annotated[
+        PageLimitInt,
+        Field(
+            default=TypeAdapter(PageLimitInt).validate_python(
+                DEFAULT_NUMBER_OF_ITEMS_PER_PAGE
+            ),
+            description="maximum number of items to return (pagination)",
         ),
-        description="maximum number of items to return (pagination)",
-    )
-    offset: NonNegativeInt = Field(
-        default=0, description="index to the first item to return (pagination)"
-    )
+    ]
+    offset: Annotated[
+        PageOffsetInt,
+        Field(default=0, description="index to the first item to return (pagination)"),
+    ]
 
 
 class PageMetaInfoLimitOffset(BaseModel):
@@ -120,8 +126,7 @@ class PageLinks(
             BeforeValidator(lambda x: str(TypeAdapter(AnyHttpUrl).validate_python(x))),
         ]
     ]
-):
-    ...
+): ...
 
 
 ItemT = TypeVar("ItemT")

services/web/server/src/simcore_service_webserver/catalog/_controller_rest.py

@@ -14,18 +14,14 @@
 from models_library.api_schemas_webserver.catalog import (
     CatalogServiceGet,
     CatalogServiceUpdate,
-    ServiceInputKey,
-    ServiceOutputKey,
 )
 from models_library.api_schemas_webserver.resource_usage import PricingPlanGet
-from models_library.rest_pagination import Page, PageQueryParameters
+from models_library.rest_pagination import Page
 from models_library.rest_pagination_utils import paginate_data
-from models_library.services import ServiceKey, ServiceVersion
 from models_library.services_resources import (
     ServiceResourcesDict,
     ServiceResourcesDictHelpers,
 )
-from pydantic import BaseModel, Field
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
     parse_request_path_parameters_as,
@@ -45,9 +41,13 @@
 )
 from ._controller_rest_schemas import (
     CatalogRequestContext,
+    FromServiceOutputQueryParams,
     ListServiceParams,
+    ServiceInputsPathParams,
+    ServiceOutputsPathParams,
     ServicePathParams,
     ServiceTagPathParams,
+    ToServiceInputsQueryParams,
 )
 
 _logger = logging.getLogger(__name__)
@@ -76,9 +76,8 @@ async def list_services_latest(request: Request):
         user_id=request_ctx.user_id,
         product_name=request_ctx.product_name,
         unit_registry=request_ctx.unit_registry,
-        page_params=PageQueryParameters.model_construct(
-            offset=query_params.offset, limit=query_params.limit
-        ),
+        offset=query_params.offset,
+        limit=query_params.limit,
     )
 
     assert page_meta.limit == query_params.limit  # nosec
@@ -174,10 +173,6 @@ async def list_service_inputs(request: Request):
     )
 
 
-class _ServiceInputsPathParams(ServicePathParams):
-    input_key: ServiceInputKey
-
-
 @routes.get(
     f"{VTAG}/catalog/services/{{service_key}}/{{service_version}}/inputs/{{input_key}}",
     name="get_service_input",
@@ -186,7 +181,7 @@ class _ServiceInputsPathParams(ServicePathParams):
 @permission_required("services.catalog.*")
 async def get_service_input(request: Request):
     ctx = CatalogRequestContext.create(request)
-    path_params = parse_request_path_parameters_as(_ServiceInputsPathParams, request)
+    path_params = parse_request_path_parameters_as(ServiceInputsPathParams, request)
 
     # Evaluate and return validated model
     response_model = await _service.get_service_input(
@@ -202,12 +197,6 @@ async def get_service_input(request: Request):
     )
 
 
-class _FromServiceOutputParams(BaseModel):
-    from_service_key: ServiceKey = Field(..., alias="fromService")
-    from_service_version: ServiceVersion = Field(..., alias="fromVersion")
-    from_output_key: ServiceOutputKey = Field(..., alias="fromOutput")
-
-
 @routes.get(
     f"{VTAG}/catalog/services/{{service_key}}/{{service_version}}/inputs:match",
     name="get_compatible_inputs_given_source_output",
@@ -217,8 +206,8 @@ class _FromServiceOutputParams(BaseModel):
 async def get_compatible_inputs_given_source_output(request: Request):
     ctx = CatalogRequestContext.create(request)
     path_params = parse_request_path_parameters_as(ServicePathParams, request)
-    query_params: _FromServiceOutputParams = parse_request_query_parameters_as(
-        _FromServiceOutputParams, request
+    query_params: FromServiceOutputQueryParams = parse_request_query_parameters_as(
+        FromServiceOutputQueryParams, request
     )
 
     # Evaluate and return validated model
@@ -257,10 +246,6 @@ async def list_service_outputs(request: Request):
     )
 
 
-class _ServiceOutputsPathParams(ServicePathParams):
-    output_key: ServiceOutputKey
-
-
 @routes.get(
     f"{VTAG}/catalog/services/{{service_key}}/{{service_version}}/outputs/{{output_key}}",
     name="get_service_output",
@@ -269,7 +254,7 @@ class _ServiceOutputsPathParams(ServicePathParams):
 @permission_required("services.catalog.*")
 async def get_service_output(request: Request):
     ctx = CatalogRequestContext.create(request)
-    path_params = parse_request_path_parameters_as(_ServiceOutputsPathParams, request)
+    path_params = parse_request_path_parameters_as(ServiceOutputsPathParams, request)
 
     # Evaluate and return validated model
     response_model = await _service.get_service_output(
@@ -285,12 +270,6 @@ async def get_service_output(request: Request):
     )
 
 
-class _ToServiceInputsParams(BaseModel):
-    to_service_key: ServiceKey = Field(..., alias="toService")
-    to_service_version: ServiceVersion = Field(..., alias="toVersion")
-    to_input_key: ServiceInputKey = Field(..., alias="toInput")
-
-
 @routes.get(
     f"{VTAG}/catalog/services/{{service_key}}/{{service_version}}/outputs:match",
     name="get_compatible_outputs_given_target_input",
@@ -305,8 +284,8 @@ async def get_compatible_outputs_given_target_input(request: Request):
     """
     ctx = CatalogRequestContext.create(request)
     path_params = parse_request_path_parameters_as(ServicePathParams, request)
-    query_params: _ToServiceInputsParams = parse_request_query_parameters_as(
-        _ToServiceInputsParams, request
+    query_params: ToServiceInputsQueryParams = parse_request_query_parameters_as(
+        ToServiceInputsQueryParams, request
     )
 
     data = await _service.get_compatible_outputs_given_target_input(

services/web/server/src/simcore_service_webserver/catalog/_controller_rest_schemas.py

@@ -21,6 +21,7 @@
 from pydantic import (
     BaseModel,
     ConfigDict,
+    Field,
     field_validator,
 )
 from servicelib.aiohttp.requests_validation import handle_validation_as_http_error
@@ -192,3 +193,23 @@ class ListServiceParams(PageQueryParameters): ...
 
 class ServiceTagPathParams(ServicePathParams):
     tag_id: IdInt
+
+
+class ServiceInputsPathParams(ServicePathParams):
+    input_key: ServiceInputKey
+
+
+class FromServiceOutputQueryParams(BaseModel):
+    from_service_key: ServiceKey = Field(..., alias="fromService")
+    from_service_version: ServiceVersion = Field(..., alias="fromVersion")
+    from_output_key: ServiceOutputKey = Field(..., alias="fromOutput")
+
+
+class ServiceOutputsPathParams(ServicePathParams):
+    output_key: ServiceOutputKey
+
+
+class ToServiceInputsQueryParams(BaseModel):
+    to_service_key: ServiceKey = Field(..., alias="toService")
+    to_service_version: ServiceVersion = Field(..., alias="toVersion")
+    to_input_key: ServiceInputKey = Field(..., alias="toInput")

services/web/server/src/simcore_service_webserver/catalog/_service.py

@@ -11,7 +11,11 @@
     ServiceOutputKey,
 )
 from models_library.products import ProductName
-from models_library.rest_pagination import PageMetaInfoLimitOffset, PageQueryParameters
+from models_library.rest_pagination import (
+    PageLimitInt,
+    PageMetaInfoLimitOffset,
+    PageOffsetInt,
+)
 from models_library.services import (
     ServiceInput,
     ServiceKey,
@@ -67,16 +71,17 @@ async def list_latest_services(
     user_id: UserID,
     product_name: ProductName,
     unit_registry: UnitRegistry,
-    page_params: PageQueryParameters,
+    limit: PageLimitInt,
+    offset: PageOffsetInt,
 ) -> tuple[list, PageMetaInfoLimitOffset]:
     # NOTE: will replace list_services
 
     page = await catalog_rpc.list_services_paginated(
         get_rabbitmq_rpc_client(app),
         product_name=product_name,
         user_id=user_id,
-        limit=page_params.limit,
-        offset=page_params.offset,
+        limit=limit,
+        offset=offset,
     )
 
     page_data = jsonable_encoder(page.data, exclude_unset=True)