fix HttpUrl type

Author: giancarloromeo

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

@@ -4,7 +4,7 @@
 from typing import Annotated, Final, TypeAlias
 
 import pydantic
-from pydantic import Field, HttpUrl, PositiveInt, StringConstraints
+from pydantic import Field, PositiveInt, StringConstraints
 from pydantic_core import core_schema
 
 from .basic_regex import (
@@ -133,6 +133,8 @@ class LongTruncatedStr(ConstrainedStr):
 
 AnyHttpUrl = Annotated[str, pydantic.AnyHttpUrl]
 
+HttpUrl = Annotated[str, pydantic.HttpUrl]
+
 # https e.g. https://techterms.com/definition/https
 class HttpSecureUrl(HttpUrl):
     allowed_schemes = {"https"}

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

@@ -1,5 +1,6 @@
-from pydantic import BaseModel, ConfigDict, Field, HttpUrl, validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
+from .basic_types import HttpUrl
 from .services_types import ServiceKey, ServiceVersion
 from .utils.common_validators import empty_str_to_none_pre_validator
 
@@ -31,6 +32,7 @@ class ServiceBaseDisplay(BaseModel):
         examples=[
             "https://user-images.githubusercontent.com/32800795/61083844-ff48fb00-a42c-11e9-8e63-fa2d709c8baf.png"
         ],
+        validate_default=True,
     )
     description: str = Field(
         ...,
@@ -52,6 +54,6 @@ class ServiceBaseDisplay(BaseModel):
         " This name is not used for version comparison but is useful for communication and documentation purposes.",
     )
 
-    _empty_is_none = validator("thumbnail", allow_reuse=True, pre=True, always=False)(
+    _empty_is_none = field_validator("thumbnail", mode="before")(
         empty_str_to_none_pre_validator
     )