cleanup

Author: pcrespov

packages/models-library/src/models_library/api_schemas_catalog/_base.py

@@ -0,0 +1,9 @@
+from pydantic import BaseModel
+
+
+class CatalogInputSchema(BaseModel):
+    ...
+
+
+class CatalogOutputSchema(BaseModel):
+    ...

packages/models-library/src/models_library/api_schemas_catalog/services.py

@@ -2,7 +2,7 @@
 from typing import Any, TypeAlias
 
 from models_library.rpc_pagination import PageRpc
-from pydantic import BaseModel, ConfigDict, Field, HttpUrl, NonNegativeInt
+from pydantic import ConfigDict, Field, HttpUrl, NonNegativeInt
 from pydantic.config import JsonDict
 
 from ..boot_options import BootOptions
@@ -21,6 +21,7 @@
 from ..services_resources import ServiceResourcesDict
 from ..services_types import ServiceKey, ServiceVersion
 from ..utils.change_case import snake_to_camel
+from ._base import CatalogInputSchema, CatalogOutputSchema
 
 _EXAMPLE_FILEPICKER: dict[str, Any] = {
     "name": "File Picker",
@@ -168,7 +169,8 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
     )
 
 
-class ServiceGetV2(BaseModel):
+class ServiceGetV2(CatalogOutputSchema):
+    # Model used in catalog's rpc and rest interfaces
     key: ServiceKey
     version: ServiceVersion
 
@@ -282,7 +284,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
 ServiceResourcesGet: TypeAlias = ServiceResourcesDict
 
 
-class ServiceUpdateV2(BaseModel):
+class ServiceUpdateV2(CatalogInputSchema):
     name: str | None = None
     thumbnail: HttpUrl | None = None
     icon: HttpUrl | None = None

services/catalog/openapi.json

@@ -3,7 +3,7 @@
   "info": {
     "title": "simcore-service-catalog",
     "description": "Manages and maintains a catalog of all published components (e.g. macro-algorithms, scripts, etc)",
-    "version": "0.7.0"
+    "version": "0.8.0"
   },
   "paths": {
     "/": {

services/catalog/src/simcore_service_catalog/core/background_tasks.py

@@ -28,7 +28,7 @@
 from ..db.repositories.groups import GroupsRepository
 from ..db.repositories.projects import ProjectsRepository
 from ..db.repositories.services import ServicesRepository
-from ..models.services_db import ServiceAccessRightsAtDB, ServiceMetaDataDBGet
+from ..models.services_db import ServiceAccessRightsAtDB, ServiceMetaDataDBCreate
 from ..services import access_rights
 
 _logger = logging.getLogger(__name__)
@@ -89,7 +89,9 @@ def _by_version(t: tuple[ServiceKey, ServiceVersion]) -> Version:
 
             # set the service in the DB
             await services_repo.create_or_update_service(
-                ServiceMetaDataDBGet(**service_metadata.model_dump(), owner=owner_gid),
+                ServiceMetaDataDBCreate(
+                    **service_metadata.model_dump(exclude_unset=True), owner=owner_gid
+                ),
                 service_access_rights,
             )
 

services/catalog/src/simcore_service_catalog/db/repositories/services.py

@@ -231,7 +231,7 @@ async def create_or_update_service(
             result = await conn.execute(
                 # pylint: disable=no-value-for-parameter
                 services_meta_data.insert()
-                .values(**new_service.model_dump(by_alias=True, exclude_unset=True))
+                .values(**new_service.model_dump(exclude_unset=True))
                 .returning(*SERVICES_META_DATA_COLS)
             )
             row = result.first()