restructuring

Author: bisgaard-itis

api/specs/web-server/_storage.py

@@ -8,9 +8,7 @@
 from uuid import UUID
 
 from fastapi import APIRouter, Query, status
-from models_library.generics import Envelope
-from models_library.projects_nodes_io import LocationID
-from models_library.storage_schemas import (
+from models_library.api_schemas_storage.rest.storage_schemas import (
     AsyncJobGet,
     AsyncJobResult,
     AsyncJobStatus,
@@ -24,6 +22,8 @@
     LinkType,
     PresignedLink,
 )
+from models_library.generics import Envelope
+from models_library.projects_nodes_io import LocationID
 from pydantic import AnyUrl, ByteSize
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.storage.schemas import DatasetMetaData, FileMetaData

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

@@ -13,9 +13,13 @@
 from boto3.s3.transfer import TransferConfig
 from botocore import exceptions as botocore_exc
 from botocore.client import Config
+from models_library.api_schemas_storage.rest.storage_schemas import (
+    ETag,
+    S3BucketName,
+    UploadedPart,
+)
 from models_library.basic_types import SHA256Str
 from models_library.bytes_iters import BytesIter, DataSize
-from models_library.storage_schemas import ETag, S3BucketName, UploadedPart
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.bytes_iters import DEFAULT_READ_CHUNK_SIZE, BytesStreamer
 from servicelib.logging_utils import log_catch, log_context

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.rest.storage_schemas 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
 

packages/aws-library/tests/test_s3_client.py

@@ -38,8 +38,11 @@
 )
 from aws_library.s3._models import MultiPartUploadLinks
 from faker import Faker
+from models_library.api_schemas_storage.rest.storage_schemas import (
+    S3BucketName,
+    UploadedPart,
+)
 from models_library.basic_types import SHA256Str
-from models_library.storage_schemas import S3BucketName, UploadedPart
 from moto.server import ThreadedMotoServer
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from pytest_benchmark.plugin import BenchmarkFixture

…ry/src/models_library/storage_schemas.py …_schemas_storage/rest/storage_schemas.pypackages/models-library/src/models_library/storage_schemas.py renamed to packages/models-library/src/models_library/api_schemas_storage/rest/storage_schemas.py packages/models-library/src/models_library/storage_schemas.py renamed to packages/models-library/src/models_library/api_schemas_storage/rest/storage_schemas.py

@@ -28,10 +28,10 @@
 )
 from pydantic.networks import AnyUrl
 
-from .basic_regex import DATCORE_DATASET_NAME_RE, S3_BUCKET_NAME_RE
-from .basic_types import SHA256Str
-from .generics import ListModel
-from .projects_nodes_io import (
+from ...basic_regex import DATCORE_DATASET_NAME_RE, S3_BUCKET_NAME_RE
+from ...basic_types import SHA256Str
+from ...generics import ListModel
+from ...projects_nodes_io import (
     LocationID,
     LocationName,
     NodeID,

…chemas_storage/data_export_async_jobs.py …as_storage/rpc/data_export_async_jobs.pypackages/models-library/src/models_library/api_schemas_storage/data_export_async_jobs.py renamed to packages/models-library/src/models_library/api_schemas_storage/rpc/data_export_async_jobs.py packages/models-library/src/models_library/api_schemas_storage/data_export_async_jobs.py renamed to packages/models-library/src/models_library/api_schemas_storage/rpc/data_export_async_jobs.py

@@ -10,7 +10,7 @@
     AsyncJobResult,
     AsyncJobStatus,
 )
-from ..api_schemas_storage.data_export_async_jobs import DataExportTaskStartInput
+from ..api_schemas_storage.rpc.data_export_async_jobs import DataExportTaskStartInput
 from ..progress_bar import ProgressReport
 from ..projects_nodes_io import LocationID
 from ..users import UserID

packages/models-library/src/models_library/api_schemas_webserver/storage.py

@@ -8,7 +8,11 @@
 import orjson
 from aws_library.s3 import MultiPartUploadLinks
 from fastapi import status
-from models_library.storage_schemas import ETag, FileUploadSchema, UploadedPart
+from models_library.api_schemas_storage.rest.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

packages/pytest-simcore/src/pytest_simcore/helpers/s3.py

@@ -12,10 +12,7 @@
 from aioresponses.core import CallbackResult
 from faker import Faker
 from models_library.api_schemas_directorv2.comp_tasks import ComputationGet
-from models_library.generics import Envelope
-from models_library.projects_pipeline import ComputationTask
-from models_library.projects_state import RunningState
-from models_library.storage_schemas import (
+from models_library.api_schemas_storage.rest.storage_schemas import (
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
     FileUploadCompleteResponse,
@@ -25,6 +22,9 @@
     LinkType,
     PresignedLink,
 )
+from models_library.generics import Envelope
+from models_library.projects_pipeline import ComputationTask
+from models_library.projects_state import RunningState
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.aiohttp import status

packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py

@@ -2,7 +2,7 @@
 
 from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobGet
 from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
-from models_library.api_schemas_storage.data_export_async_jobs import (
+from models_library.api_schemas_storage.rpc.data_export_async_jobs import (
     DataExportTaskStartInput,
 )
 from models_library.rabbitmq_basic_types import RPCMethodName