cleanup

Author: pcrespov

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

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, TypeAlias
+from typing import Annotated, Any, TypeAlias
 
 from models_library.rpc_pagination import PageRpc
 from pydantic import BaseModel, ConfigDict, Field, HttpUrl, NonNegativeInt
@@ -24,6 +24,10 @@
 
 
 class ServiceUpdate(ServiceMetaDataEditable, ServiceAccessRights):
+
+    thumbnail: Annotated[str, HttpUrl] | None = None
+    icon: HttpUrl | None = None
+
     @staticmethod
     def _update_json_schema_extra(schema: JsonDict) -> None:
         schema.update(

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

@@ -2,34 +2,39 @@
 
 """
 
+from typing import Annotated
+
 from pydantic import BaseModel, ConfigDict, Field
 
 from .groups import GroupID
 from .utils.change_case import snake_to_camel
 
 
 class ServiceGroupAccessRights(BaseModel):
-    execute_access: bool = Field(
-        default=False,
-        description="defines whether the group can execute the service",
-    )
-    write_access: bool = Field(
-        default=False, description="defines whether the group can modify the service"
-    )
+    execute_access: Annotated[
+        bool, Field(description="defines whether the group can execute the service")
+    ] = False
+    write_access: Annotated[
+        bool, Field(description="defines whether the group can modify the service")
+    ] = False
 
 
 class ServiceGroupAccessRightsV2(BaseModel):
     execute: bool = False
     write: bool = False
 
     model_config = ConfigDict(
-        alias_generator=snake_to_camel, populate_by_name=True, extra="forbid"
+        alias_generator=snake_to_camel,
+        populate_by_name=True,
+        extra="forbid",
     )
 
 
 class ServiceAccessRights(BaseModel):
-    access_rights: dict[GroupID, ServiceGroupAccessRights] | None = Field(
-        None,
-        alias="accessRights",
-        description="service access rights per group id",
-    )
+    access_rights: Annotated[
+        dict[GroupID, ServiceGroupAccessRightsV2] | None,
+        Field(
+            alias="accessRights",
+            description="service access rights per group id",
+        ),
+    ] = None

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

@@ -2,7 +2,8 @@
 from datetime import datetime
 from typing import Annotated, Any
 
-from pydantic import AfterValidator, ConfigDict, Field, HttpUrl
+from common_library.basic_types import DEFAULT_FACTORY
+from pydantic import ConfigDict, Field, HttpUrl
 from pydantic.config import JsonDict
 
 from .services_base import ServiceBaseDisplay
@@ -20,8 +21,8 @@
 class ServiceMetaDataEditable(ServiceBaseDisplay):
     # Overrides ServiceBaseDisplay fields to Optional for a partial update
     name: str | None  # type: ignore[assignment]
-    thumbnail: Annotated[str, HttpUrl] | None = None
-    icon: Annotated[HttpUrl, AfterValidator(str)] | None = None
+    thumbnail: Annotated[str, HttpUrl] | None  # type: ignore[assignment]
+    icon: HttpUrl | None  # type: ignore[assignment]
     description: str | None  # type: ignore[assignment]
     description_ui: bool = False
     version_display: str | None = None
@@ -37,7 +38,7 @@ class ServiceMetaDataEditable(ServiceBaseDisplay):
     classifiers: list[str] | None
     quality: Annotated[
         dict[str, Any], Field(default_factory=dict, json_schema_extra={"default": {}})
-    ]
+    ] = DEFAULT_FACTORY
 
     @staticmethod
     def _update_json_schema_extra(schema: JsonDict) -> None:

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

@@ -274,6 +274,7 @@ def list_latest_services_with_history_stmt(
             latest_query.c.description,
             latest_query.c.description_ui,
             latest_query.c.thumbnail,
+            latest_query.c.icon,
             latest_query.c.version_display,
             # ownership
             latest_query.c.owner_email,
@@ -313,6 +314,7 @@ def list_latest_services_with_history_stmt(
             latest_query.c.description,
             latest_query.c.description_ui,
             latest_query.c.thumbnail,
+            latest_query.c.icon,
             latest_query.c.version_display,
             latest_query.c.classifiers,
             latest_query.c.created,

services/catalog/tests/unit/with_dbs/test_api_rest_services__list.py

@@ -56,9 +56,9 @@ async def test_list_services_with_details(
     url = URL("/v0/services").with_query({"user_id": user_id, "details": "true"})
 
     # now fake the director such that it returns half the services
-    fake_registry_service_data = ServiceMetaDataPublished.model_config[
-        "json_schema_extra"
-    ]["examples"][0]
+    fake_registry_service_data = ServiceMetaDataPublished.model_json_schema()[
+        "examples"
+    ][0]
 
     mocked_director_service_api_base.get("/services", name="list_services").respond(
         200,
@@ -262,9 +262,9 @@ async def test_list_services_that_are_deprecated(
     assert received_service.deprecated == deprecation_date
 
     # for details, the director must return the same service
-    fake_registry_service_data = ServiceMetaDataPublished.model_config[
-        "json_schema_extra"
-    ]["examples"][0]
+    fake_registry_service_data = ServiceMetaDataPublished.model_json_schema()[
+        "examples"
+    ][0]
     mocked_director_service_api_base.get("/services", name="list_services").respond(
         200,
         json={