move base type adapters

Author: giancarloromeo

packages/aws-library/src/aws_library/s3/_client.py

@@ -13,6 +13,7 @@
 from boto3.s3.transfer import TransferConfig
 from botocore import exceptions as botocore_exc
 from botocore.client import Config
+from common_library.pydantic_type_adapters import AnyUrlLegacyAdapter
 from models_library.api_schemas_storage import ETag, S3BucketName, UploadedPart
 from models_library.basic_types import SHA256Str
 from pydantic import AnyUrl, ByteSize, TypeAdapter
@@ -43,8 +44,8 @@
 _MAX_CONCURRENT_COPY: Final[int] = 4
 _AWS_MAX_ITEMS_PER_PAGE: Final[int] = 1000
 
-_ANY_URL_ADAPTER: Final[TypeAdapter[AnyUrl]] = TypeAdapter(AnyUrl)
-_LIST_ANY_URL_ADAPTER: Final[TypeAdapter[list[AnyUrl]]] = TypeAdapter(list[AnyUrl])
+
+ListAnyUrlTypeAdapter: Final[TypeAdapter[list[AnyUrl]]] = TypeAdapter(list[AnyUrl])
 
 
 class UploadedBytesTransferredCallback(Protocol):
@@ -263,7 +264,7 @@ async def create_single_presigned_download_link(
             Params={"Bucket": bucket, "Key": object_key},
             ExpiresIn=expiration_secs,
         )
-        return _ANY_URL_ADAPTER.validate_python(generated_link)
+        return AnyUrlLegacyAdapter.validate_python(generated_link)
 
     @s3_exception_handler(_logger)
     async def create_single_presigned_upload_link(
@@ -276,7 +277,7 @@ async def create_single_presigned_upload_link(
             Params={"Bucket": bucket, "Key": object_key},
             ExpiresIn=expiration_secs,
         )
-        return _ANY_URL_ADAPTER.validate_python(generated_link)
+        return AnyUrlLegacyAdapter.validate_python(generated_link)
 
     @s3_exception_handler(_logger)
     async def create_multipart_upload_links(
@@ -299,7 +300,7 @@ async def create_multipart_upload_links(
         # compute the number of links, based on the announced file size
         num_upload_links, chunk_size = compute_num_file_chunks(file_size)
         # now create the links
-        upload_links = _LIST_ANY_URL_ADAPTER.validate_python(
+        upload_links = ListAnyUrlTypeAdapter.validate_python(
             await asyncio.gather(
                 *(
                     self._client.generate_presigned_url(
@@ -473,6 +474,6 @@ def is_multipart(file_size: ByteSize) -> bool:
 
     @staticmethod
     def compute_s3_url(*, bucket: S3BucketName, object_key: S3ObjectKey) -> AnyUrl:
-        return _ANY_URL_ADAPTER.validate_python(
+        return AnyUrlLegacyAdapter.validate_python(
             f"s3://{bucket}/{urllib.parse.quote(object_key)}"
         )

packages/common-library/src/common_library/pydantic_networks_extension.py

@@ -1,15 +1,27 @@
 from typing import Annotated, TypeAlias
 
-from pydantic import AfterValidator, AnyHttpUrl, HttpUrl
+from pydantic import AfterValidator, AnyHttpUrl, AnyUrl, HttpUrl
 
 
 def _strip_last_slash(url: str) -> str:
     return url.rstrip("/")
 
 
+AnyUrlLegacy: TypeAlias = Annotated[
+    str,
+    AnyUrl,
+    AfterValidator(_strip_last_slash),
+]
+
 AnyHttpUrlLegacy: TypeAlias = Annotated[
-    str, AnyHttpUrl, AfterValidator(_strip_last_slash)
+    str,
+    AnyHttpUrl,
+    AfterValidator(_strip_last_slash),
 ]
 
 
-HttpUrlLegacy: TypeAlias = Annotated[str, HttpUrl, AfterValidator(_strip_last_slash)]
+HttpUrlLegacy: TypeAlias = Annotated[
+    str,
+    HttpUrl,
+    AfterValidator(_strip_last_slash),
+]

packages/common-library/src/common_library/pydantic_type_adapters.py

@@ -0,0 +1,8 @@
+from typing import Final
+
+from common_library.pydantic_networks_extension import AnyHttpUrlLegacy, AnyUrlLegacy
+from pydantic import TypeAdapter
+
+AnyUrlLegacyAdapter: Final[TypeAdapter[AnyUrlLegacy]] = TypeAdapter(AnyUrlLegacy)
+
+AnyHttpUrlLegacyAdapter: Final[TypeAdapter] = TypeAdapter(AnyHttpUrlLegacy)

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

@@ -7,12 +7,12 @@
 """
 
 from pathlib import Path
-from typing import Annotated, Final, TypeAlias
+from typing import Annotated, TypeAlias
 from uuid import UUID
 
+from common_library.pydantic_type_adapters import AnyUrlLegacyAdapter
 from models_library.basic_types import ConstrainedStr, KeyIDStr
 from pydantic import (
-    AnyUrl,
     BaseModel,
     BeforeValidator,
     ConfigDict,
@@ -45,9 +45,6 @@
 ]
 
 
-_ANY_URL_ADAPTER: Final[TypeAdapter[AnyUrl]] = TypeAdapter(AnyUrl)
-
-
 class SimcoreS3DirectoryID(ConstrainedStr):
     """
     A simcore directory has the following structure:
@@ -126,7 +123,7 @@ 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: Annotated[
-        str, BeforeValidator(lambda x: str(_ANY_URL_ADAPTER.validate_python(x)))
+        str, BeforeValidator(lambda x: str(AnyUrlLegacyAdapter.validate_python(x)))
     ] = Field(..., alias="downloadLink")
     label: str | None = Field(default=None, description="Display name")
     model_config = ConfigDict(
@@ -176,9 +173,7 @@ def legacy_enforce_str_to_int(cls, v):
             return int(v)
         return v
 
-    model_config = ConfigDict(
-        populate_by_name=True
-    )
+    model_config = ConfigDict(populate_by_name=True)
 
 
 class SimCoreFileLink(BaseFileLink):

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

@@ -1,7 +1,7 @@
 from typing import Annotated, Final, Generic, TypeAlias, TypeVar
 
+from common_library.pydantic_type_adapters import AnyHttpUrlLegacyAdapter
 from pydantic import (
-    AnyHttpUrl,
     BaseModel,
     BeforeValidator,
     ConfigDict,
@@ -15,8 +15,6 @@
 
 from .utils.common_validators import none_to_empty_list_pre_validator
 
-_ANY_HTTP_URL_ADAPTER: Final[TypeAdapter[AnyHttpUrl]] = TypeAdapter(AnyHttpUrl)
-
 # Default limit values
 #  - Using same values across all pagination entrypoints simplifies
 #    interconnecting paginated calls
@@ -101,7 +99,7 @@ class PageLinks(
     PageRefs[
         Annotated[
             str,
-            BeforeValidator(lambda x: str(_ANY_HTTP_URL_ADAPTER.validate_python(x))),
+            BeforeValidator(lambda x: str(AnyHttpUrlLegacyAdapter.validate_python(x))),
         ]
     ]
 ):

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

@@ -1,7 +1,7 @@
 from math import ceil
 from typing import Any, Protocol, TypedDict, Union, runtime_checkable
 
-from pydantic import AnyHttpUrl, TypeAdapter
+from common_library.pydantic_type_adapters import AnyHttpUrlLegacyAdapter
 
 from .rest_pagination import PageLinks, PageMetaInfoLimitOffset
 
@@ -29,7 +29,6 @@ def replace_query_params(self, **kwargs: Any) -> "_StarletteURL":
 
 
 _URLType = Union[_YarlURL, _StarletteURL]
-_ANY_HTTP_URL_ADAPTER: TypeAdapter = TypeAdapter(AnyHttpUrl)
 
 
 def _replace_query(url: _URLType, query: dict[str, Any]) -> str:
@@ -73,29 +72,29 @@ def paginate_data(
         ),
         _links=PageLinks(
             self=(
-                _ANY_HTTP_URL_ADAPTER.validate_python(
+                AnyHttpUrlLegacyAdapter.validate_python(
                     _replace_query(request_url, {"offset": offset, "limit": limit}),
                 )
             ),
-            first=_ANY_HTTP_URL_ADAPTER.validate_python(
+            first=AnyHttpUrlLegacyAdapter.validate_python(
                 _replace_query(request_url, {"offset": 0, "limit": limit})
             ),
-            prev=_ANY_HTTP_URL_ADAPTER.validate_python(
+            prev=AnyHttpUrlLegacyAdapter.validate_python(
                 _replace_query(
                     request_url, {"offset": max(offset - limit, 0), "limit": limit}
                 ),
             )
             if offset > 0
             else None,
-            next=_ANY_HTTP_URL_ADAPTER.validate_python(
+            next=AnyHttpUrlLegacyAdapter.validate_python(
                 _replace_query(
                     request_url,
                     {"offset": min(offset + limit, last_page * limit), "limit": limit},
                 ),
             )
             if offset < (last_page * limit)
             else None,
-            last=_ANY_HTTP_URL_ADAPTER.validate_python(
+            last=AnyHttpUrlLegacyAdapter.validate_python(
                 _replace_query(
                     request_url, {"offset": last_page * limit, "limit": limit}
                 ),

packages/service-library/src/servicelib/aiohttp/long_running_tasks/_server.py

@@ -5,8 +5,9 @@
 from typing import Any
 
 from aiohttp import web
+from common_library.pydantic_type_adapters import AnyHttpUrlLegacyAdapter
 from models_library.utils.json_serialization import json_dumps
-from pydantic import AnyHttpUrl, PositiveFloat, TypeAdapter
+from pydantic import PositiveFloat
 
 from ...aiohttp import status
 from ...long_running_tasks._models import TaskGet
@@ -28,8 +29,6 @@
 
 _logger = logging.getLogger(__name__)
 
-_ANY_HTTP_URL_ADAPTER: TypeAdapter[AnyHttpUrl] = TypeAdapter(AnyHttpUrl)
-
 
 def no_ops_decorator(handler: Handler):
     return handler
@@ -69,13 +68,13 @@ async def start_long_running_task(
         ip_addr, port = request_.transport.get_extra_info(
             "sockname"
         )  # https://docs.python.org/3/library/asyncio-protocol.html#asyncio.BaseTransport.get_extra_info
-        status_url = _ANY_HTTP_URL_ADAPTER.validate_python(
+        status_url = AnyHttpUrlLegacyAdapter.validate_python(
             f"http://{ip_addr}:{port}{request_.app.router['get_task_status'].url_for(task_id=task_id)}"  # NOSONAR
         )
-        result_url = _ANY_HTTP_URL_ADAPTER.validate_python(
+        result_url = AnyHttpUrlLegacyAdapter.validate_python(
             f"http://{ip_addr}:{port}{request_.app.router['get_task_result'].url_for(task_id=task_id)}"  # NOSONAR
         )
-        abort_url = _ANY_HTTP_URL_ADAPTER.validate_python(
+        abort_url = AnyHttpUrlLegacyAdapter.validate_python(
             f"http://{ip_addr}:{port}{request_.app.router['cancel_and_delete_task'].url_for(task_id=task_id)}"  # NOSONAR
         )
         task_get = TaskGet(

packages/service-library/src/servicelib/fastapi/long_running_tasks/_client.py

@@ -4,10 +4,10 @@
 import warnings
 from typing import Any, Awaitable, Callable, Final
 
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
+from common_library.pydantic_type_adapters import AnyHttpUrlLegacyAdapter
 from fastapi import FastAPI, status
 from httpx import AsyncClient, HTTPError
-from pydantic import PositiveFloat, TypeAdapter
+from pydantic import PositiveFloat
 from tenacity import RetryCallState
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
@@ -24,7 +24,6 @@
 
 DEFAULT_HTTP_REQUESTS_TIMEOUT: Final[PositiveFloat] = 15
 
-_ANY_HTTP_URL_LEGACY_ADAPTER: TypeAdapter[AnyHttpUrlLegacy] = TypeAdapter(AnyHttpUrlLegacy)
 
 logger = logging.getLogger(__name__)
 
@@ -132,7 +131,7 @@ def _client_configuration(self) -> ClientConfiguration:
         return output
 
     def _get_url(self, path: str) -> str:
-        return _ANY_HTTP_URL_LEGACY_ADAPTER.validate_python(
+        return AnyHttpUrlLegacyAdapter.validate_python(
             f"{self._base_url}{self._client_configuration.router_prefix}{path}",
         )
 

packages/settings-library/src/settings_library/ssm.py

@@ -1,17 +1,16 @@
-from typing import Annotated, Final
+from typing import Annotated
 
-from pydantic import AnyHttpUrl, BeforeValidator, Field, SecretStr, TypeAdapter
+from common_library.pydantic_type_adapters import AnyHttpUrlLegacyAdapter
+from pydantic import BeforeValidator, Field, SecretStr
 from pydantic_settings import SettingsConfigDict
 
 from .base import BaseCustomSettings
 
-_ANY_HTTP_URL_ADAPTER: Final[TypeAdapter] = TypeAdapter(AnyHttpUrl)
-
 
 class SSMSettings(BaseCustomSettings):
     SSM_ACCESS_KEY_ID: SecretStr
     SSM_ENDPOINT: Annotated[
-        str, BeforeValidator(lambda x: str(_ANY_HTTP_URL_ADAPTER.validate_python(x)))
+        str, BeforeValidator(lambda x: str(AnyHttpUrlLegacyAdapter.validate_python(x)))
     ] | None = Field(default=None, description="do not define if using standard AWS")
     SSM_REGION_NAME: str = "us-east-1"
     SSM_SECRET_ACCESS_KEY: SecretStr