🐛 catalog-api: Fixes validation errors on /services entrypoint (#7268)

Author: pcrespov

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

@@ -41,7 +41,10 @@ class ServiceBaseDisplay(BaseModel):
             validate_default=True,
         ),
     ] = None
-    icon: Annotated[HttpUrl | None, Field(description="URL to the service icon")] = None
+    icon: Annotated[
+        HttpUrl | None,
+        Field(description="URL to the service icon"),
+    ] = None
     description: Annotated[
         str,
         Field(
@@ -67,6 +70,6 @@ class ServiceBaseDisplay(BaseModel):
         ),
     ] = None
 
-    _empty_is_none = field_validator("thumbnail", mode="before")(
-        empty_str_to_none_pre_validator
-    )
+    _empty_is_none = field_validator(
+        "icon", "thumbnail", "version_display", mode="before"
+    )(empty_str_to_none_pre_validator)

packages/postgres-database/src/simcore_postgres_database/migration/versions/163b11424cb1_convert_empty_str_to_null.py

@@ -0,0 +1,52 @@
+"""enforce null
+
+Revision ID: 163b11424cb1
+Revises: a8d336ca9379
+Create Date: 2025-02-24 12:44:10.538469+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "163b11424cb1"
+down_revision = "a8d336ca9379"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+
+    # SEE https://github.com/ITISFoundation/osparc-simcore/pull/7268
+
+    op.execute(
+        sa.DDL(
+            """
+        UPDATE services_meta_data
+        SET thumbnail = NULL
+        WHERE thumbnail = '';
+        """
+        )
+    )
+    op.execute(
+        sa.DDL(
+            """
+        UPDATE services_meta_data
+        SET version_display = NULL
+        WHERE version_display = '';
+        """
+        )
+    )
+    op.execute(
+        """
+        UPDATE services_meta_data
+        SET icon = NULL
+        WHERE icon = '';
+        """
+    )
+
+
+def downgrade():
+    """
+    Nothing to be done here
+    """

services/catalog/src/simcore_service_catalog/models/services_db.py

@@ -7,7 +7,8 @@
 from models_library.services_access import ServiceGroupAccessRights
 from models_library.services_base import ServiceKeyVersion
 from models_library.services_types import ServiceKey, ServiceVersion
-from pydantic import BaseModel, ConfigDict, Field
+from models_library.utils.common_validators import empty_str_to_none_pre_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 from pydantic.config import JsonDict
 from pydantic.types import PositiveInt
 from simcore_postgres_database.models.services_compatibility import CompatiblePolicyDict
@@ -123,6 +124,10 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
 
     model_config = ConfigDict(json_schema_extra=_update_json_schema_extra)
 
+    _prevent_empty_strings_in_nullable_string_cols = field_validator(
+        "icon", "thumbnail", "version_display", mode="before"
+    )(empty_str_to_none_pre_validator)
+
 
 class ServiceMetaDataDBPatch(BaseModel):
     # ownership
@@ -159,6 +164,10 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
 
     model_config = ConfigDict(json_schema_extra=_update_json_schema_extra)
 
+    _prevent_empty_strings_in_nullable_string_cols = field_validator(
+        "icon", "thumbnail", "version_display", mode="before"
+    )(empty_str_to_none_pre_validator)
+
 
 class ReleaseDBGet(BaseModel):
     version: ServiceVersion