fix url types

Author: giancarloromeo

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

@@ -130,8 +130,6 @@ class LongTruncatedStr(ConstrainedStr):
 IdInt: TypeAlias = PositiveInt
 PrimaryKeyInt: TypeAlias = PositiveInt
 
-AnyUrl = Annotated[str, pydantic.AnyUrl]
-
 AnyHttpUrl = Annotated[str, pydantic.AnyHttpUrl]
 
 HttpUrl = Annotated[str, pydantic.HttpUrl]

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

@@ -9,6 +9,7 @@
     BaseModel,
     ConfigDict,
     Field,
+    HttpUrl,
     Json,
     StrictBool,
     StrictFloat,
@@ -17,7 +18,7 @@
     field_validator,
 )
 
-from .basic_types import EnvVarKey, HttpUrl, KeyIDStr
+from .basic_types import EnvVarKey, KeyIDStr
 from .projects_access import AccessEnum
 from .projects_nodes_io import (
     DatCoreFileLink,
@@ -137,7 +138,7 @@ class Node(BaseModel):
         description="the node progress value (deprecated in DB, still used for API only)",
         deprecated=True,
     )
-    thumbnail: HttpUrl | None = Field(
+    thumbnail: Annotated[str, HttpUrl] | None = Field(
         default=None,
         description="url of the latest screenshot of the node",
         examples=["https://placeimg.com/171/96/tech/grayscale/?0.jpg"],

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

@@ -11,8 +11,9 @@
 from typing import Annotated, TypeAlias
 from uuid import UUID
 
-from models_library.basic_types import AnyUrl, ConstrainedStr, KeyIDStr
+from models_library.basic_types import ConstrainedStr, KeyIDStr
 from pydantic import (
+    AnyUrl,
     BaseModel,
     ConfigDict,
     Field,
@@ -122,7 +123,7 @@ class PortLink(BaseModel):
 class DownloadLink(BaseModel):
     """I/O port type to hold a generic download link to a file (e.g. S3 pre-signed link, etc)"""
 
-    download_link: AnyUrl = Field(..., alias="downloadLink")
+    download_link: Annotated[str, AnyUrl] = Field(..., alias="downloadLink")
     label: str | None = Field(default=None, description="Display name")
     model_config = ConfigDict(
         extra="forbid",

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

@@ -1,6 +1,7 @@
 from typing import Annotated, Final, Generic, TypeAlias, TypeVar
 
 from pydantic import (
+    AnyHttpUrl,
     BaseModel,
     ConfigDict,
     Field,
@@ -11,7 +12,6 @@
     field_validator,
 )
 
-from .basic_types import AnyHttpUrl
 from .utils.common_validators import none_to_empty_list_pre_validator
 
 # Default limit values
@@ -92,7 +92,7 @@ class PageRefs(BaseModel, Generic[RefT]):
     model_config = ConfigDict(extra="forbid")
 
 
-class PageLinks(PageRefs[AnyHttpUrl]):
+class PageLinks(PageRefs[Annotated[str, AnyHttpUrl]]):
     ...
 
 

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

@@ -1,6 +1,6 @@
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from typing import Annotated
+from pydantic import BaseModel, ConfigDict, Field, HttpUrl, field_validator
 
-from .basic_types import HttpUrl
 from .services_types import ServiceKey, ServiceVersion
 from .utils.common_validators import empty_str_to_none_pre_validator
 
@@ -26,7 +26,7 @@ class ServiceBaseDisplay(BaseModel):
         description="Display name: short, human readable name for the node",
         examples=["Fast Counter"],
     )
-    thumbnail: HttpUrl | None = Field(
+    thumbnail: Annotated[str, HttpUrl] | None = Field(
         None,
         description="url to the thumbnail",
         examples=[

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

@@ -1,10 +1,9 @@
 # mypy: disable-error-code=truthy-function
 from datetime import datetime
-from typing import Any
+from typing import Annotated, Any
 
-from pydantic import ConfigDict, Field
+from pydantic import ConfigDict, Field, HttpUrl
 
-from .basic_types import HttpUrl
 from .services_base import ServiceBaseDisplay
 from .services_constants import LATEST_INTEGRATION_VERSION
 from .services_enums import ServiceType
@@ -20,7 +19,7 @@
 class ServiceMetaDataEditable(ServiceBaseDisplay):
     # Overrides ServiceBaseDisplay fields to Optional for a partial update
     name: str | None  # type: ignore[assignment]
-    thumbnail: HttpUrl | None
+    thumbnail: Annotated[str, HttpUrl] | None
     description: str | None  # type: ignore[assignment]
     description_ui: bool = False
     version_display: str | None = None