bad merge

Author: sanderegg

packages/models-library/src/models_library/storage_schemas.py

@@ -12,8 +12,6 @@
 from typing import Annotated, Any, Literal, Self, TypeAlias
 from uuid import UUID
 
-from models_library.projects import ProjectID
-from models_library.users import UserID
 from pydantic import (
     BaseModel,
     ByteSize,
@@ -30,13 +28,15 @@
 from .basic_regex import DATCORE_DATASET_NAME_RE, S3_BUCKET_NAME_RE
 from .basic_types import SHA256Str
 from .generics import ListModel
+from .projects import ProjectID
 from .projects_nodes_io import (
     LocationID,
     LocationName,
     NodeID,
     SimcoreS3FileID,
     StorageFileID,
 )
+from .users import UserID
 
 ETag: TypeAlias = str
 

services/storage/src/simcore_service_storage/api/rest/_paths.py

@@ -4,7 +4,7 @@
 
 from fastapi import APIRouter, Depends
 from fastapi_pagination import LimitOffsetPage, LimitOffsetParams, create_page
-from models_library.api_schemas_storage import PathMetaDataGet
+from models_library.storage_schemas import PathMetaDataGet
 from models_library.users import UserID
 
 from ...dsm_factory import BaseDataManager

services/storage/tests/unit/test_handlers_paths.py

@@ -12,9 +12,9 @@
 import httpx
 from fastapi import FastAPI
 from fastapi_pagination import LimitOffsetPage
-from models_library.api_schemas_storage import FileMetaDataGet, PathMetaDataGet
 from models_library.projects import ProjectAtDB
 from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
+from models_library.storage_schemas import FileMetaDataGet, PathMetaDataGet
 from models_library.users import UserID
 from pytest_simcore.helpers.fastapi import url_from_operation_id
 from pytest_simcore.helpers.httpx_assert_checks import assert_status