resolve conflicts and make first test run

bisgaard-itis · bisgaard-itis · commit 859e787e7865 · 2025-02-10T17:43:15.000+01:00
diff --git a/packages/aws-library/src/aws_library/s3/_client.py b/packages/aws-library/src/aws_library/s3/_client.py
@@ -13,8 +13,8 @@
 from boto3.s3.transfer import TransferConfig
 from botocore import exceptions as botocore_exc
 from botocore.client import Config
-from models_library.api_schemas_storage import ETag, S3BucketName, UploadedPart
 from models_library.basic_types import SHA256Str
+from models_library.storage_schemas import ETag, S3BucketName, UploadedPart
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.logging_utils import log_catch, log_context
 from servicelib.utils import limited_gather
diff --git a/packages/aws-library/src/aws_library/s3/_models.py b/packages/aws-library/src/aws_library/s3/_models.py
@@ -2,8 +2,8 @@
 from dataclasses import dataclass
 from typing import TypeAlias
 
-from models_library.api_schemas_storage import ETag
 from models_library.basic_types import SHA256Str
+from models_library.storage_schemas import ETag
 from pydantic import AnyUrl, BaseModel, ByteSize
 from types_aiobotocore_s3.type_defs import HeadObjectOutputTypeDef, ObjectTypeDef
 
diff --git a/packages/models-library/src/models_library/storage_schemas.py b/packages/models-library/src/models_library/storage_schemas.py
diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/s3.py b/packages/pytest-simcore/src/pytest_simcore/helpers/s3.py
@@ -8,7 +8,7 @@
 import orjson
 from aws_library.s3 import MultiPartUploadLinks
 from fastapi import status
-from models_library.api_schemas_storage import ETag, FileUploadSchema, UploadedPart
+from models_library.storage_schemas import ETag, FileUploadSchema, UploadedPart
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.utils import limited_as_completed, logged_gather
 from types_aiobotocore_s3 import S3Client
diff --git a/services/storage/src/simcore_service_storage/api/rabbitmq_rpc/_zipping.py b/services/storage/src/simcore_service_storage/api/rabbitmq_rpc/_zipping.py
@@ -6,4 +6,4 @@
 
 @router.expose()
 async def start_zipping(paths: list[str]) -> ZipTask:
-    return ZipTask(msg=f"Started zipping [ { ','.join(paths) } ]")
+    return ZipTask(msg="".join(paths))
diff --git a/services/storage/src/simcore_service_storage/api/rest/_datasets.py b/services/storage/src/simcore_service_storage/api/rest/_datasets.py
@@ -2,9 +2,9 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Request
-from models_library.api_schemas_storage import DatasetMetaDataGet, FileMetaDataGet
 from models_library.generics import Envelope
 from models_library.projects_nodes_io import LocationID
+from models_library.storage_schemas import DatasetMetaDataGet, FileMetaDataGet
 
 from ...dsm import get_dsm_provider
 from ...models import FilesMetadataDatasetQueryParams, StorageQueryParamsBase
diff --git a/services/storage/src/simcore_service_storage/api/rest/_files.py b/services/storage/src/simcore_service_storage/api/rest/_files.py
@@ -3,7 +3,9 @@
 from typing import Annotated, cast
 
 from fastapi import APIRouter, Depends, Header, HTTPException, Request
-from models_library.api_schemas_storage import (
+from models_library.generics import Envelope
+from models_library.projects_nodes_io import LocationID, StorageFileID
+from models_library.storage_schemas import (
     FileMetaDataGet,
     FileMetaDataGetv010,
     FileUploadCompleteFutureResponse,
@@ -15,8 +17,6 @@
     FileUploadSchema,
     SoftCopyBody,
 )
-from models_library.generics import Envelope
-from models_library.projects_nodes_io import LocationID, StorageFileID
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.aiohttp import status
 from yarl import URL
diff --git a/services/storage/src/simcore_service_storage/api/rest/_health.py b/services/storage/src/simcore_service_storage/api/rest/_health.py
@@ -8,9 +8,9 @@
 
 from aws_library.s3 import S3AccessError
 from fastapi import APIRouter, Request
-from models_library.api_schemas_storage import HealthCheck, S3BucketName
 from models_library.app_diagnostics import AppStatusCheck
 from models_library.generics import Envelope
+from models_library.storage_schemas import HealthCheck, S3BucketName
 from pydantic import TypeAdapter
 from servicelib.db_asyncpg_utils import check_postgres_liveness
 from servicelib.fastapi.db_asyncpg_engine import get_engine
diff --git a/services/storage/src/simcore_service_storage/api/rest/_locations.py b/services/storage/src/simcore_service_storage/api/rest/_locations.py
@@ -2,8 +2,8 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Request, status
-from models_library.api_schemas_storage import FileLocation
 from models_library.generics import Envelope
+from models_library.storage_schemas import FileLocation
 
 # Exclusive for simcore-s3 storage -----------------------
 from ...dsm import get_dsm_provider
diff --git a/services/storage/src/simcore_service_storage/api/rest/_simcore_s3.py b/services/storage/src/simcore_service_storage/api/rest/_simcore_s3.py
@@ -5,9 +5,9 @@
 from fastapi import APIRouter, Depends, FastAPI, Request
 from models_library.api_schemas_long_running_tasks.base import TaskProgress
 from models_library.api_schemas_long_running_tasks.tasks import TaskGet
-from models_library.api_schemas_storage import FileMetaDataGet, FoldersBody
 from models_library.generics import Envelope
 from models_library.projects import ProjectID
+from models_library.storage_schemas import FileMetaDataGet, FoldersBody
 from servicelib.aiohttp import status
 from servicelib.fastapi.long_running_tasks._dependencies import get_tasks_manager
 from servicelib.logging_utils import log_context
diff --git a/services/storage/src/simcore_service_storage/constants.py b/services/storage/src/simcore_service_storage/constants.py
@@ -1,7 +1,7 @@
 from typing import Final
 
 from aws_library.s3 import PRESIGNED_LINK_MAX_SIZE, S3_MAX_FILE_SIZE
-from models_library.api_schemas_storage import LinkType
+from models_library.storage_schemas import LinkType
 from pydantic import ByteSize
 
 RETRY_WAIT_SECS = 2
diff --git a/services/storage/src/simcore_service_storage/datcore_dsm.py b/services/storage/src/simcore_service_storage/datcore_dsm.py
@@ -1,14 +1,10 @@
 from dataclasses import dataclass
 
 from fastapi import FastAPI
-from models_library.api_schemas_storage import (
-    DatCoreDatasetName,
-    LinkType,
-    UploadedPart,
-)
 from models_library.basic_types import SHA256Str
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import LocationID, LocationName, StorageFileID
+from models_library.storage_schemas import DatCoreDatasetName, LinkType, UploadedPart
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize
 
diff --git a/services/storage/src/simcore_service_storage/dsm_factory.py b/services/storage/src/simcore_service_storage/dsm_factory.py
@@ -3,10 +3,10 @@
 from dataclasses import dataclass, field
 
 from fastapi import FastAPI
-from models_library.api_schemas_storage import LinkType, UploadedPart
 from models_library.basic_types import SHA256Str
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import LocationID, LocationName, StorageFileID
+from models_library.storage_schemas import LinkType, UploadedPart
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize
 
diff --git a/services/storage/src/simcore_service_storage/models.py b/services/storage/src/simcore_service_storage/models.py
@@ -6,15 +6,6 @@
 
 import arrow
 from aws_library.s3 import UploadID
-from models_library.api_schemas_storage import (
-    UNDEFINED_SIZE,
-    UNDEFINED_SIZE_TYPE,
-    DatasetMetaDataGet,
-    ETag,
-    FileMetaDataGet,
-    LinkType,
-    S3BucketName,
-)
 from models_library.basic_types import SHA256Str
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import (
@@ -28,6 +19,15 @@
     DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
     MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE,
 )
+from models_library.storage_schemas import (
+    UNDEFINED_SIZE,
+    UNDEFINED_SIZE_TYPE,
+    DatasetMetaDataGet,
+    ETag,
+    FileMetaDataGet,
+    LinkType,
+    S3BucketName,
+)
 from models_library.users import UserID
 from models_library.utils.common_validators import empty_str_to_none_pre_validator
 from pydantic import (
diff --git a/services/storage/src/simcore_service_storage/modules/datcore_adapter/datcore_adapter.py b/services/storage/src/simcore_service_storage/modules/datcore_adapter/datcore_adapter.py
@@ -5,7 +5,7 @@
 
 import httpx
 from fastapi import FastAPI
-from models_library.api_schemas_storage import DatCoreDatasetName
+from models_library.storage_schemas import DatCoreDatasetName
 from models_library.users import UserID
 from pydantic import AnyUrl, TypeAdapter
 from servicelib.fastapi.client_session import get_client_session
diff --git a/services/storage/src/simcore_service_storage/simcore_s3_dsm.py b/services/storage/src/simcore_service_storage/simcore_s3_dsm.py
@@ -18,13 +18,6 @@
     UploadID,
 )
 from fastapi import FastAPI
-from models_library.api_schemas_storage import (
-    UNDEFINED_SIZE,
-    UNDEFINED_SIZE_TYPE,
-    LinkType,
-    S3BucketName,
-    UploadedPart,
-)
 from models_library.basic_types import SHA256Str
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import (
@@ -33,6 +26,13 @@
     SimcoreS3FileID,
     StorageFileID,
 )
+from models_library.storage_schemas import (
+    UNDEFINED_SIZE,
+    UNDEFINED_SIZE_TYPE,
+    LinkType,
+    S3BucketName,
+    UploadedPart,
+)
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize, NonNegativeInt, TypeAdapter
 from servicelib.aiohttp.long_running_tasks.server import TaskProgress
diff --git a/services/storage/src/simcore_service_storage/utils/simcore_s3_dsm_utils.py b/services/storage/src/simcore_service_storage/utils/simcore_s3_dsm_utils.py
@@ -2,12 +2,12 @@
 from pathlib import Path
 
 from aws_library.s3 import S3MetaData, SimcoreS3API
-from models_library.api_schemas_storage import S3BucketName
 from models_library.projects_nodes_io import (
     SimcoreS3DirectoryID,
     SimcoreS3FileID,
     StorageFileID,
 )
+from models_library.storage_schemas import S3BucketName
 from pydantic import ByteSize, NonNegativeInt, TypeAdapter
 from servicelib.utils import ensure_ends_with
 from sqlalchemy.ext.asyncio import AsyncConnection
diff --git a/services/storage/tests/conftest.py b/services/storage/tests/conftest.py
@@ -23,7 +23,11 @@
 from faker import Faker
 from fakeredis.aioredis import FakeRedis
 from fastapi import FastAPI
-from models_library.api_schemas_storage import (
+from models_library.basic_types import SHA256Str
+from models_library.projects import ProjectID
+from models_library.projects_nodes import NodeID
+from models_library.projects_nodes_io import LocationID, SimcoreS3FileID
+from models_library.storage_schemas import (
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
     FileUploadCompleteResponse,
@@ -33,10 +37,6 @@
     LinkType,
     UploadedPart,
 )
-from models_library.basic_types import SHA256Str
-from models_library.projects import ProjectID
-from models_library.projects_nodes import NodeID
-from models_library.projects_nodes_io import LocationID, SimcoreS3FileID
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import ByteSize, TypeAdapter
diff --git a/services/storage/tests/unit/test_dsm_dsmcleaner.py b/services/storage/tests/unit/test_dsm_dsmcleaner.py
@@ -16,9 +16,9 @@
 import pytest
 from aws_library.s3 import MultiPartUploadLinks, SimcoreS3API
 from faker import Faker
-from models_library.api_schemas_storage import LinkType
 from models_library.basic_types import SHA256Str
 from models_library.projects_nodes_io import SimcoreS3DirectoryID, SimcoreS3FileID
+from models_library.storage_schemas import LinkType
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.parametrizations import byte_size_ids
diff --git a/services/storage/tests/unit/test_dsm_soft_links.py b/services/storage/tests/unit/test_dsm_soft_links.py
@@ -8,8 +8,8 @@
 
 import pytest
 from faker import Faker
-from models_library.api_schemas_storage import S3BucketName
 from models_library.projects_nodes_io import SimcoreS3FileID
+from models_library.storage_schemas import S3BucketName
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import ByteSize, TypeAdapter
diff --git a/services/storage/tests/unit/test_handlers_datasets.py b/services/storage/tests/unit/test_handlers_datasets.py
@@ -12,9 +12,9 @@
 from faker import Faker
 from fastapi import FastAPI
 from httpx import AsyncClient
-from models_library.api_schemas_storage import DatasetMetaDataGet, FileMetaDataGet
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import SimcoreS3FileID
+from models_library.storage_schemas import DatasetMetaDataGet, FileMetaDataGet
 from models_library.users import UserID
 from pydantic import ByteSize
 from pytest_mock import MockerFixture
diff --git a/services/storage/tests/unit/test_handlers_files.py b/services/storage/tests/unit/test_handlers_files.py
@@ -26,7 +26,10 @@
 from aws_library.s3._constants import MULTIPART_UPLOADS_MIN_TOTAL_SIZE
 from faker import Faker
 from fastapi import FastAPI
-from models_library.api_schemas_storage import (
+from models_library.basic_types import SHA256Str
+from models_library.projects import ProjectID
+from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
+from models_library.storage_schemas import (
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
     FileUploadCompleteResponse,
@@ -38,9 +41,6 @@
     SoftCopyBody,
     UploadedPart,
 )
-from models_library.basic_types import SHA256Str
-from models_library.projects import ProjectID
-from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import AnyUrl, ByteSize, TypeAdapter
diff --git a/services/storage/tests/unit/test_handlers_files_metadata.py b/services/storage/tests/unit/test_handlers_files_metadata.py
@@ -13,8 +13,8 @@
 import pytest
 from faker import Faker
 from fastapi import FastAPI
-from models_library.api_schemas_storage import FileMetaDataGet, SimcoreS3FileID
 from models_library.projects import ProjectID
+from models_library.storage_schemas import FileMetaDataGet, SimcoreS3FileID
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.fastapi import url_from_operation_id
diff --git a/services/storage/tests/unit/test_handlers_health.py b/services/storage/tests/unit/test_handlers_health.py
@@ -7,8 +7,8 @@
 import httpx
 import simcore_service_storage._meta
 from fastapi import FastAPI
-from models_library.api_schemas_storage import HealthCheck, S3BucketName
 from models_library.app_diagnostics import AppStatusCheck
+from models_library.storage_schemas import HealthCheck, S3BucketName
 from moto.server import ThreadedMotoServer
 from pytest_simcore.helpers.fastapi import url_from_operation_id
 from pytest_simcore.helpers.httpx_assert_checks import assert_status
diff --git a/services/storage/tests/unit/test_handlers_simcore_s3.py b/services/storage/tests/unit/test_handlers_simcore_s3.py
@@ -19,10 +19,10 @@
 from aws_library.s3 import SimcoreS3API
 from faker import Faker
 from fastapi import FastAPI
-from models_library.api_schemas_storage import FileMetaDataGet, FoldersBody
 from models_library.basic_types import SHA256Str
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, NodeIDStr, SimcoreS3FileID
+from models_library.storage_schemas import FileMetaDataGet, FoldersBody
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import ByteSize, TypeAdapter
diff --git a/services/storage/tests/unit/test_models.py b/services/storage/tests/unit/test_models.py
@@ -1,9 +1,9 @@
 import uuid
 
 import pytest
-from models_library.api_schemas_storage import S3BucketName
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID, StorageFileID
+from models_library.storage_schemas import S3BucketName
 from pydantic import TypeAdapter, ValidationError
 from simcore_service_storage.models import FileMetaData
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
diff --git a/services/storage/tests/unit/test_simcore_s3_dsm.py b/services/storage/tests/unit/test_simcore_s3_dsm.py
@@ -7,9 +7,9 @@
 
 import pytest
 from faker import Faker
-from models_library.api_schemas_storage import FileUploadSchema
 from models_library.basic_types import SHA256Str
 from models_library.projects_nodes_io import SimcoreS3FileID
+from models_library.storage_schemas import FileUploadSchema
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from simcore_service_storage.models import FileMetaData
diff --git a/services/storage/tests/unit/test_utils.py b/services/storage/tests/unit/test_utils.py
@@ -13,9 +13,9 @@
 import httpx
 import pytest
 from faker import Faker
-from models_library.api_schemas_storage import UNDEFINED_SIZE_TYPE
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
+from models_library.storage_schemas import UNDEFINED_SIZE_TYPE
 from pydantic import ByteSize, HttpUrl, TypeAdapter
 from pytest_simcore.helpers.faker_factories import DEFAULT_FAKER
 from simcore_service_storage.constants import S3_UNDEFINED_OR_EXTERNAL_MULTIPART_ID
diff --git a/services/storage/tests/unit/test_zipping.py b/services/storage/tests/unit/test_zipping.py
@@ -0,0 +1,32 @@
+from typing import Awaitable, Callable
+
+import pytest
+from fastapi import FastAPI
+from servicelib.rabbitmq import RabbitMQRPCClient
+from servicelib.rabbitmq.rpc_interfaces.storage import zipping
+from settings_library.rabbit import RabbitSettings
+
+pytest_plugins = [
+    "pytest_simcore.rabbit_service",
+]
+
+
+pytest_simcore_core_services_selection = [
+    "rabbit",
+    "postgres",
+]
+
+
+@pytest.fixture
+async def rpc_client(
+    rabbit_service: RabbitSettings,
+    initialized_app: FastAPI,
+    rabbitmq_rpc_client: Callable[[str], Awaitable[RabbitMQRPCClient]],
+) -> RabbitMQRPCClient:
+    return await rabbitmq_rpc_client("client")
+
+
+async def test_start_zipping(rpc_client: RabbitMQRPCClient):
+    _path = "the/path/to/myfile"
+    result = await zipping.start_zipping(rpc_client, paths=[_path])
+    assert "".join(result.msg) == _path
