revert

Author: Andrei Neagu

services/dask-sidecar/src/simcore_service_dask_sidecar/file_utils.py

@@ -12,8 +12,7 @@
 import aiofiles
 import aiofiles.tempfile
 import fsspec  # type: ignore[import-untyped]
-from common_library.pydantic_networks_extension import FileUrlLegacy
-from pydantic import ByteSize, TypeAdapter
+from pydantic import ByteSize, FileUrl, TypeAdapter
 from pydantic.networks import AnyUrl
 from servicelib.logging_utils import LogLevelInt, LogMessageStr
 from settings_library.s3 import S3Settings
@@ -146,7 +145,7 @@ async def pull_file_from_remote(
         storage_kwargs = _s3fs_settings_from_s3_settings(s3_settings)
     await _copy_file(
         src_url,
-        TypeAdapter(FileUrlLegacy).validate_python(dst_path.as_uri()),
+        TypeAdapter(FileUrl).validate_python(dst_path.as_uri()),
         src_storage_cfg=cast(dict[str, Any], storage_kwargs),
         log_publishing_cb=log_publishing_cb,
         text_prefix=f"Downloading '{src_url.path.strip('/')}':",
@@ -216,7 +215,7 @@ async def _push_file_to_remote(
         storage_kwargs = _s3fs_settings_from_s3_settings(s3_settings)
 
     await _copy_file(
-        TypeAdapter(FileUrlLegacy).validate_python(file_to_upload.as_uri()),
+        TypeAdapter(FileUrl).validate_python(file_to_upload.as_uri()),
         dst_url,
         dst_storage_cfg=cast(dict[str, Any], storage_kwargs),
         log_publishing_cb=log_publishing_cb,

services/dask-sidecar/tests/unit/test_file_utils.py

@@ -14,7 +14,7 @@
 import fsspec
 import pytest
 from faker import Faker
-from pydantic import AnyUrl, parse_obj_as
+from pydantic import AnyUrl, TypeAdapter, parse_obj_as
 from pytest_localftpserver.servers import ProcessFTPServer
 from pytest_mock.plugin import MockerFixture
 from settings_library.s3 import S3Settings
@@ -45,8 +45,8 @@ def s3_presigned_link_storage_kwargs(s3_settings: S3Settings) -> dict[str, Any]:
 
 @pytest.fixture
 def ftp_remote_file_url(ftpserver: ProcessFTPServer, faker: Faker) -> AnyUrl:
-    return parse_obj_as(
-        AnyUrl, f"{ftpserver.get_login_data(style='url')}/{faker.file_name()}"
+    return TypeAdapter(AnyUrl).validate_python(
+        f"{ftpserver.get_login_data(style='url')}/{faker.file_name()}"
     )
 
 
@@ -56,8 +56,7 @@ async def s3_presigned_link_remote_file_url(
     aiobotocore_s3_client,
     faker: Faker,
 ) -> AnyUrl:
-    return parse_obj_as(
-        AnyUrl,
+    return TypeAdapter(AnyUrl).validate_python(
         await aiobotocore_s3_client.generate_presigned_url(
             "put_object",
             Params={"Bucket": s3_settings.S3_BUCKET_NAME, "Key": faker.file_name()},
@@ -68,7 +67,9 @@ async def s3_presigned_link_remote_file_url(
 
 @pytest.fixture
 def s3_remote_file_url(s3_settings: S3Settings, faker: Faker) -> AnyUrl:
-    return parse_obj_as(AnyUrl, f"s3://{s3_settings.S3_BUCKET_NAME}{faker.file_path()}")
+    return TypeAdapter(AnyUrl).validate_python(
+        f"s3://{s3_settings.S3_BUCKET_NAME}{faker.file_path()}"
+    )
 
 
 @dataclass(frozen=True)