bye legacy url

Author: sanderegg

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

@@ -13,7 +13,6 @@
 from boto3.s3.transfer import TransferConfig
 from botocore import exceptions as botocore_exc
 from botocore.client import Config
-from common_library.pydantic_networks_extension import AnyUrlLegacy
 from models_library.api_schemas_storage import ETag, S3BucketName, UploadedPart
 from models_library.basic_types import SHA256Str
 from pydantic import AnyUrl, ByteSize, TypeAdapter
@@ -255,7 +254,7 @@ async def create_single_presigned_download_link(
         bucket: S3BucketName,
         object_key: S3ObjectKey,
         expiration_secs: int,
-    ) -> str:
+    ) -> AnyUrl:
         # NOTE: ensure the bucket/object exists, this will raise if not
         await self._client.head_bucket(Bucket=bucket)
         await self._client.head_object(Bucket=bucket, Key=object_key)
@@ -264,20 +263,20 @@ async def create_single_presigned_download_link(
             Params={"Bucket": bucket, "Key": object_key},
             ExpiresIn=expiration_secs,
         )
-        return f"{TypeAdapter(AnyUrlLegacy).validate_python(generated_link)}"
+        return TypeAdapter(AnyUrl).validate_python(generated_link)
 
     @s3_exception_handler(_logger)
     async def create_single_presigned_upload_link(
         self, *, bucket: S3BucketName, object_key: S3ObjectKey, expiration_secs: int
-    ) -> str:
+    ) -> AnyUrl:
         # NOTE: ensure the bucket/object exists, this will raise if not
         await self._client.head_bucket(Bucket=bucket)
         generated_link = await self._client.generate_presigned_url(
             "put_object",
             Params={"Bucket": bucket, "Key": object_key},
             ExpiresIn=expiration_secs,
         )
-        return f"{TypeAdapter(AnyUrlLegacy).validate_python(generated_link)}"
+        return TypeAdapter(AnyUrl).validate_python(generated_link)
 
     @s3_exception_handler(_logger)
     async def create_multipart_upload_links(
@@ -474,6 +473,6 @@ def is_multipart(file_size: ByteSize) -> bool:
 
     @staticmethod
     def compute_s3_url(*, bucket: S3BucketName, object_key: S3ObjectKey) -> AnyUrl:
-        return TypeAdapter(AnyUrlLegacy).validate_python(
+        return TypeAdapter(AnyUrl).validate_python(
             f"s3://{bucket}/{urllib.parse.quote(object_key)}"
         )

packages/aws-library/tests/test_s3_client.py

@@ -742,7 +742,7 @@ async def test_create_single_presigned_upload_link(
     create_file_of_size: Callable[[ByteSize], Path],
     default_expiration_time_seconds: int,
     upload_to_presigned_link: Callable[
-        [Path, str, S3BucketName, S3ObjectKey], Awaitable[None]
+        [Path, AnyUrl, S3BucketName, S3ObjectKey], Awaitable[None]
     ],
 ):
     file = create_file_of_size(TypeAdapter(ByteSize).validate_python("1Mib"))
@@ -1289,20 +1289,24 @@ def test_is_multipart(file_size: ByteSize, expected_multipart: bool):
         (
             "some-bucket",
             "an/object/separate/by/slashes",
-            "s3://some-bucket/an/object/separate/by/slashes",
+            TypeAdapter(AnyUrl).validate_python(
+                "s3://some-bucket/an/object/separate/by/slashes"
+            ),
         ),
         (
             "some-bucket",
             "an/object/separate/by/slashes-?/3#$",
-            r"s3://some-bucket/an/object/separate/by/slashes-%3F/3%23%24",
+            TypeAdapter(AnyUrl).validate_python(
+                r"s3://some-bucket/an/object/separate/by/slashes-%3F/3%23%24"
+            ),
         ),
     ],
 )
 def test_compute_s3_url(
     bucket: S3BucketName, object_key: S3ObjectKey, expected_s3_url: AnyUrl
 ):
     assert (
-        str(SimcoreS3API.compute_s3_url(bucket=bucket, object_key=object_key))
+        SimcoreS3API.compute_s3_url(bucket=bucket, object_key=object_key)
         == expected_s3_url
     )