fix imports

bisgaard-itis · bisgaard-itis · commit 5b997379c4b4 · 2025-02-11T10:47:35.000+01:00
diff --git a/api/specs/web-server/_storage.py b/api/specs/web-server/_storage.py
@@ -7,7 +7,9 @@
 from typing import TypeAlias
 
 from fastapi import APIRouter, Query, status
-from models_library.api_schemas_storage import (
+from models_library.generics import Envelope
+from models_library.projects_nodes_io import LocationID
+from models_library.storage_schemas import (
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
     FileUploadCompleteResponse,
@@ -16,8 +18,6 @@
     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
diff --git a/packages/aws-library/tests/test_s3_client.py b/packages/aws-library/tests/test_s3_client.py
@@ -29,8 +29,8 @@
 )
 from aws_library.s3._models import MultiPartUploadLinks
 from faker import Faker
-from models_library.api_schemas_storage 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
diff --git a/packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py b/packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py
@@ -12,7 +12,10 @@
 from aioresponses.core import CallbackResult
 from faker import Faker
 from models_library.api_schemas_directorv2.comp_tasks import ComputationGet
-from models_library.api_schemas_storage import (
+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 (
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
     FileUploadCompleteResponse,
@@ -22,9 +25,6 @@
     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
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/zipping.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/zipping.py
@@ -6,12 +6,12 @@
     TaskResult,
     TaskStatus,
 )
-from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
-from models_library.api_schemas_storage.zipping_tasks import (
+from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.storage_schemas import STORAGE_RPC_NAMESPACE
+from models_library.storage_schemas.zipping_tasks import (
     ZipTaskAbortOutput,
     ZipTaskStartInput,
 )
-from models_library.rabbitmq_basic_types import RPCMethodName
 from pydantic import NonNegativeInt, TypeAdapter
 
 from ... import RabbitMQRPCClient
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/_filemanager.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/_filemanager.py
@@ -2,16 +2,16 @@
 from typing import cast
 
 from aiohttp import ClientError, ClientSession
-from models_library.api_schemas_storage import (
+from models_library.generics import Envelope
+from models_library.projects_nodes_io import LocationID, LocationName
+from models_library.storage_schemas import (
     ETag,
     FileUploadCompleteFutureResponse,
     FileUploadCompleteResponse,
     FileUploadCompleteState,
     FileUploadCompletionBody,
     UploadedPart,
 )
-from models_library.generics import Envelope
-from models_library.projects_nodes_io import LocationID, LocationName
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import AnyUrl, TypeAdapter
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/file_io_utils.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/file_io_utils.py
@@ -17,8 +17,8 @@
     ClientSession,
     RequestInfo,
 )
-from models_library.api_schemas_storage import ETag, FileUploadSchema, UploadedPart
 from models_library.basic_types import IDStr, SHA256Str
+from models_library.storage_schemas import ETag, FileUploadSchema, UploadedPart
 from multidict import MultiMapping
 from pydantic import AnyUrl, NonNegativeInt
 from servicelib.aiohttp import status
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/filemanager.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/filemanager.py
@@ -5,15 +5,15 @@
 
 import aiofiles
 from aiohttp import ClientSession
-from models_library.api_schemas_storage import (
+from models_library.basic_types import IDStr, SHA256Str
+from models_library.projects_nodes_io import LocationID, LocationName, StorageFileID
+from models_library.storage_schemas import (
     ETag,
     FileMetaDataGet,
     FileUploadSchema,
     LinkType,
     UploadedPart,
 )
-from models_library.basic_types import IDStr, SHA256Str
-from models_library.projects_nodes_io import LocationID, LocationName, StorageFileID
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.file_utils import create_sha256_checksum
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/storage_client.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/storage_client.py
@@ -10,16 +10,16 @@
 from aiohttp import ClientResponse, ClientSession
 from aiohttp import client as aiohttp_client_module
 from aiohttp.client_exceptions import ClientConnectionError, ClientResponseError
-from models_library.api_schemas_storage import (
+from models_library.basic_types import SHA256Str
+from models_library.generics import Envelope
+from models_library.projects_nodes_io import LocationID, StorageFileID
+from models_library.storage_schemas import (
     FileLocationArray,
     FileMetaDataGet,
     FileUploadSchema,
     LinkType,
     PresignedLink,
 )
-from models_library.basic_types import SHA256Str
-from models_library.generics import Envelope
-from models_library.projects_nodes_io import LocationID, StorageFileID
 from models_library.users import UserID
 from pydantic import ByteSize
 from pydantic.networks import AnyUrl
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_v2/__init__.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_v2/__init__.py
@@ -1,8 +1,8 @@
 import logging
 
-from models_library.api_schemas_storage import LinkType as FileLinkType
 from models_library.projects import ProjectIDStr
 from models_library.projects_nodes_io import NodeIDStr
+from models_library.storage_schemas import LinkType as FileLinkType
 from models_library.users import UserID
 from settings_library.aws_s3_cli import AwsS3CliSettings
 from settings_library.r_clone import RCloneSettings
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_v2/nodeports_v2.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_v2/nodeports_v2.py
@@ -6,11 +6,11 @@
 from pathlib import Path
 from typing import Any
 
-from models_library.api_schemas_storage import LinkType
 from models_library.basic_types import IDStr
 from models_library.projects import ProjectIDStr
 from models_library.projects_nodes_io import NodeIDStr
 from models_library.services_types import ServicePortKey
+from models_library.storage_schemas import LinkType
 from models_library.users import UserID
 from pydantic import BaseModel, ConfigDict, Field, ValidationError
 from pydantic_core import InitErrorDetails
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_v2/port.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_v2/port.py
@@ -6,10 +6,10 @@
 from pprint import pformat
 from typing import Any
 
-from models_library.api_schemas_storage import LinkType
 from models_library.basic_types import IDStr
 from models_library.services_io import BaseServiceIOModel
 from models_library.services_types import ServicePortKey
+from models_library.storage_schemas import LinkType
 from pydantic import (
     AnyUrl,
     ConfigDict,
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_v2/port_utils.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_v2/port_utils.py
@@ -4,9 +4,9 @@
 from pathlib import Path
 from typing import Any
 
-from models_library.api_schemas_storage import FileUploadSchema, LinkType
 from models_library.basic_types import IDStr, SHA256Str
 from models_library.services_types import FileName, ServicePortKey
+from models_library.storage_schemas import FileUploadSchema, LinkType
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.progress_bar import ProgressBarData
diff --git a/packages/simcore-sdk/tests/integration/conftest.py b/packages/simcore-sdk/tests/integration/conftest.py
@@ -13,9 +13,9 @@
 import pytest
 import sqlalchemy as sa
 from aiohttp import ClientSession
-from models_library.api_schemas_storage import FileUploadSchema
 from models_library.generics import Envelope
 from models_library.projects_nodes_io import LocationID, NodeIDStr, SimcoreS3FileID
+from models_library.storage_schemas import FileUploadSchema
 from models_library.users import UserID
 from pydantic import TypeAdapter
 from pytest_simcore.helpers.faker_factories import random_project, random_user
diff --git a/packages/simcore-sdk/tests/unit/test_node_ports_common_file_io_utils.py b/packages/simcore-sdk/tests/unit/test_node_ports_common_file_io_utils.py
@@ -13,12 +13,12 @@
 from aiohttp import ClientResponse, ClientSession, TCPConnector
 from aioresponses import aioresponses
 from faker import Faker
-from models_library.api_schemas_storage import (
+from models_library.basic_types import IDStr
+from models_library.storage_schemas import (
     FileUploadLinks,
     FileUploadSchema,
     UploadedPart,
 )
-from models_library.basic_types import IDStr
 from moto.server import ThreadedMotoServer
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from pytest_mock import MockerFixture
diff --git a/packages/simcore-sdk/tests/unit/test_node_ports_v2_port.py b/packages/simcore-sdk/tests/unit/test_node_ports_v2_port.py
@@ -21,8 +21,8 @@
 from aiohttp.client import ClientSession
 from aioresponses import aioresponses as AioResponsesMock
 from faker import Faker
-from models_library.api_schemas_storage import FileMetaDataGet
 from models_library.projects_nodes_io import LocationID
+from models_library.storage_schemas import FileMetaDataGet
 from pydantic import TypeAdapter, ValidationError
 from pytest_mock.plugin import MockerFixture
 from servicelib.progress_bar import ProgressBarData
diff --git a/packages/simcore-sdk/tests/unit/test_storage_client.py b/packages/simcore-sdk/tests/unit/test_storage_client.py
@@ -12,13 +12,13 @@
 import pytest
 from aioresponses import aioresponses as AioResponsesMock
 from faker import Faker
-from models_library.api_schemas_storage import (
+from models_library.projects_nodes_io import SimcoreS3FileID
+from models_library.storage_schemas import (
     FileLocationArray,
     FileMetaDataGet,
     FileUploadSchema,
     LocationID,
 )
-from models_library.projects_nodes_io import SimcoreS3FileID
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
diff --git a/services/api-server/src/simcore_service_api_server/api/routes/files.py b/services/api-server/src/simcore_service_api_server/api/routes/files.py
@@ -10,8 +10,8 @@
 from fastapi import Header, Request, UploadFile, status
 from fastapi.exceptions import HTTPException
 from fastapi_pagination.api import create_page
-from models_library.api_schemas_storage import ETag, FileUploadCompletionBody, LinkType
 from models_library.basic_types import SHA256Str
+from models_library.storage_schemas import ETag, FileUploadCompletionBody, LinkType
 from pydantic import AnyUrl, ByteSize, PositiveInt, TypeAdapter, ValidationError
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 from simcore_sdk.node_ports_common.constants import SIMCORE_LOCATION
diff --git a/services/api-server/src/simcore_service_api_server/models/schemas/files.py b/services/api-server/src/simcore_service_api_server/models/schemas/files.py
@@ -7,9 +7,9 @@
 
 import aiofiles
 from fastapi import UploadFile
-from models_library.api_schemas_storage import ETag
 from models_library.basic_types import SHA256Str
 from models_library.projects_nodes_io import StorageFileID
+from models_library.storage_schemas import ETag
 from pydantic import (
     AnyHttpUrl,
     BaseModel,
diff --git a/services/api-server/src/simcore_service_api_server/services_http/storage.py b/services/api-server/src/simcore_service_api_server/services_http/storage.py
@@ -8,11 +8,11 @@
 
 from fastapi import FastAPI
 from fastapi.encoders import jsonable_encoder
-from models_library.api_schemas_storage import FileMetaDataArray
-from models_library.api_schemas_storage import FileMetaDataGet as StorageFileMetaData
-from models_library.api_schemas_storage import FileUploadSchema, PresignedLink
 from models_library.basic_types import SHA256Str
 from models_library.generics import Envelope
+from models_library.storage_schemas import FileMetaDataArray
+from models_library.storage_schemas import FileMetaDataGet as StorageFileMetaData
+from models_library.storage_schemas import FileUploadSchema, PresignedLink
 from pydantic import AnyUrl, PositiveInt
 from settings_library.tracing import TracingSettings
 from starlette.datastructures import URL
diff --git a/services/api-server/tests/unit/conftest.py b/services/api-server/tests/unit/conftest.py
@@ -27,12 +27,12 @@
     TaskProgress,
     TaskStatus,
 )
-from models_library.api_schemas_storage import HealthCheck
 from models_library.api_schemas_webserver.projects import ProjectGet
 from models_library.app_diagnostics import AppStatusCheck
 from models_library.generics import Envelope
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import BaseFileLink, SimcoreS3FileID
+from models_library.storage_schemas import HealthCheck
 from models_library.users import UserID
 from moto.server import ThreadedMotoServer
 from packaging.version import Version
diff --git a/services/api-server/tests/unit/test_api_files.py b/services/api-server/tests/unit/test_api_files.py
@@ -18,12 +18,8 @@
 from fastapi import status
 from fastapi.encoders import jsonable_encoder
 from httpx import AsyncClient
-from models_library.api_schemas_storage import (
-    ETag,
-    FileUploadCompletionBody,
-    UploadedPart,
-)
 from models_library.basic_types import SHA256Str
+from models_library.storage_schemas import ETag, FileUploadCompletionBody, UploadedPart
 from pydantic import TypeAdapter
 from pytest_simcore.helpers.httpx_calls_capture_models import (
     CreateRespxMockCallback,
diff --git a/services/api-server/tests/unit/test_models_schemas_files.py b/services/api-server/tests/unit/test_models_schemas_files.py
@@ -11,9 +11,9 @@
 
 import pytest
 from fastapi import UploadFile
-from models_library.api_schemas_storage import FileMetaDataGet as StorageFileMetaData
 from models_library.basic_types import SHA256Str
 from models_library.projects_nodes_io import StorageFileID
+from models_library.storage_schemas import FileMetaDataGet as StorageFileMetaData
 from pydantic import TypeAdapter, ValidationError
 from simcore_service_api_server.models.schemas.files import File
 from simcore_service_api_server.services_http.storage import to_file_api_model
diff --git a/services/director-v2/tests/unit/with_dbs/test_utils_dask.py b/services/director-v2/tests/unit/with_dbs/test_utils_dask.py
@@ -30,11 +30,11 @@
 from faker import Faker
 from fastapi import FastAPI
 from models_library.api_schemas_directorv2.services import NodeRequirements
-from models_library.api_schemas_storage import FileUploadLinks, FileUploadSchema
 from models_library.docker import to_simcore_runtime_docker_label_key
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimCoreFileLink, SimcoreS3FileID
 from models_library.services import ServiceRunID
+from models_library.storage_schemas import FileUploadLinks, FileUploadSchema
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pydantic.networks import AnyUrl
diff --git a/services/dynamic-sidecar/tests/integration/test_modules_long_running_tasks.py b/services/dynamic-sidecar/tests/integration/test_modules_long_running_tasks.py
@@ -19,9 +19,9 @@
 from botocore.client import Config
 from botocore.exceptions import ClientError
 from fastapi import FastAPI
-from models_library.api_schemas_storage import S3BucketName
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
+from models_library.storage_schemas import S3BucketName
 from models_library.users import UserID
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/service_runs_db.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/service_runs_db.py
@@ -9,7 +9,6 @@
 from models_library.api_schemas_resource_usage_tracker.credit_transactions import (
     WalletTotalCredits,
 )
-from models_library.api_schemas_storage import S3BucketName
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.resource_tracker import (
@@ -19,6 +18,7 @@
 )
 from models_library.rest_ordering import OrderBy, OrderDirection
 from models_library.services_types import ServiceRunID
+from models_library.storage_schemas import S3BucketName
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import PositiveInt
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/s3.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/s3.py
@@ -3,7 +3,7 @@
 
 from aws_library.s3 import S3NotConnectedError, SimcoreS3API
 from fastapi import FastAPI
-from models_library.api_schemas_storage import S3BucketName
+from models_library.storage_schemas import S3BucketName
 from pydantic import TypeAdapter
 from servicelib.logging_utils import log_context
 from settings_library.s3 import S3Settings
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/service_runs.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/service_runs.py
@@ -12,7 +12,6 @@
     ServiceRunGet,
     ServiceRunPage,
 )
-from models_library.api_schemas_storage import S3BucketName
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.resource_tracker import (
@@ -22,6 +21,7 @@
     ServicesAggregatedUsagesType,
 )
 from models_library.rest_ordering import OrderBy
+from models_library.storage_schemas import S3BucketName
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import AnyUrl, TypeAdapter
diff --git a/services/storage/tests/unit/test_zipping.py b/services/storage/tests/unit/test_zipping.py
@@ -5,7 +5,7 @@
 from faker import Faker
 from fastapi import FastAPI
 from models_library.api_schemas_long_running_tasks.tasks import TaskGet, TaskStatus
-from models_library.api_schemas_storage.zipping_tasks import (
+from models_library.storage_schemas.zipping_tasks import (
     ZipTaskAbortOutput,
     ZipTaskStartInput,
 )
diff --git a/services/web/server/src/simcore_service_webserver/projects/_nodes_api.py b/services/web/server/src/simcore_service_webserver/projects/_nodes_api.py
@@ -7,11 +7,11 @@
 
 from aiohttp import web
 from aiohttp.client import ClientError
-from models_library.api_schemas_storage import FileMetaDataGet
 from models_library.basic_types import KeyIDStr
 from models_library.projects import ProjectID
 from models_library.projects_nodes import Node
 from models_library.projects_nodes_io import NodeID, SimCoreFileLink
+from models_library.storage_schemas import FileMetaDataGet
 from models_library.users import UserID
 from pydantic import (
     BaseModel,
diff --git a/services/web/server/src/simcore_service_webserver/storage/_handlers.py b/services/web/server/src/simcore_service_webserver/storage/_handlers.py
diff --git a/services/web/server/src/simcore_service_webserver/storage/api.py b/services/web/server/src/simcore_service_webserver/storage/api.py
diff --git a/services/web/server/tests/unit/isolated/test_projects__nodes_api.py b/services/web/server/tests/unit/isolated/test_projects__nodes_api.py
diff --git a/services/web/server/tests/unit/with_dbs/01/test_storage.py b/services/web/server/tests/unit/with_dbs/01/test_storage.py
diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py
diff --git a/services/web/server/tests/unit/with_dbs/03/test_storage_handlers.py b/services/web/server/tests/unit/with_dbs/03/test_storage_handlers.py
