refactor: Change Absolute Imports to Relative Imports in Storage-Proxy

changes/3685.enhance.md

@@ -0,0 +1 @@
+Change Absolute Imports to Relative Imports in Storage-Proxy

src/ai/backend/common/dto/storage/response.py

@@ -2,8 +2,8 @@
 
 from pydantic import Field
 
-from ai.backend.common.api_handlers import BaseResponseModel
-from ai.backend.common.dto.storage.field import VFolderMetaField, VolumeMetaField
+from ...api_handlers import BaseResponseModel
+from .field import VFolderMetaField, VolumeMetaField
 
 
 class GetVolumeResponse(BaseResponseModel):

src/ai/backend/storage/api/manager.py

@@ -45,11 +45,10 @@
 from ai.backend.common.metrics.http import build_api_metric_middleware
 from ai.backend.common.types import AgentId, BinarySize, ItemResult, QuotaScopeID, ResultSet
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.exception import ExecutionError
-from ai.backend.storage.watcher import ChownTask, MountTask, UmountTask
 
 from .. import __version__
 from ..exception import (
+    ExecutionError,
     ExternalError,
     InvalidQuotaConfig,
     InvalidSubpathError,
@@ -60,6 +59,7 @@
 )
 from ..types import QuotaConfig, VFolderID
 from ..utils import check_params, log_manager_api_entry
+from ..watcher import ChownTask, MountTask, UmountTask
 
 if TYPE_CHECKING:
     from ..context import RootContext

src/ai/backend/storage/volumes/abc.py

@@ -20,7 +20,6 @@
 from ai.backend.common.events import EventDispatcher, EventProducer
 from ai.backend.common.types import BinarySize, HardwareMetadata, QuotaScopeID
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.watcher import WatcherClient
 
 from ..exception import InvalidSubpathError, VFolderNotFoundError
 from ..types import (
@@ -32,6 +31,7 @@
     TreeUsage,
     VFolderID,
 )
+from ..watcher import WatcherClient
 
 # Available capabilities of a volume implementation
 CAP_VFOLDER: Final = "vfolder"  # ability to create vfolder

src/ai/backend/storage/volumes/cephfs/__init__.py

@@ -7,10 +7,10 @@
 import aiofiles.os
 
 from ai.backend.common.types import BinarySize, QuotaScopeID
-from ai.backend.storage.exception import QuotaScopeNotFoundError
-from ai.backend.storage.subproc import run
-from ai.backend.storage.types import CapacityUsage, Optional, QuotaConfig, QuotaUsage, TreeUsage
 
+from ...exception import QuotaScopeNotFoundError
+from ...subproc import run
+from ...types import CapacityUsage, Optional, QuotaConfig, QuotaUsage, TreeUsage
 from ..abc import (
     CAP_FAST_SIZE,
     CAP_QUOTA,

src/ai/backend/storage/volumes/ddn/__init__.py

@@ -8,10 +8,10 @@
 
 from ai.backend.common.etcd import AsyncEtcd
 from ai.backend.common.types import QuotaScopeID
-from ai.backend.storage.exception import QuotaScopeAlreadyExists, QuotaScopeNotFoundError
-from ai.backend.storage.subproc import run
-from ai.backend.storage.types import Optional, QuotaConfig, QuotaUsage
 
+from ...exception import QuotaScopeAlreadyExists, QuotaScopeNotFoundError
+from ...subproc import run
+from ...types import Optional, QuotaConfig, QuotaUsage
 from ..abc import CAP_QUOTA, CAP_VFOLDER, AbstractQuotaModel
 from ..vfs import BaseQuotaModel, BaseVolume
 

src/ai/backend/storage/volumes/dellemc/__init__.py

@@ -9,9 +9,9 @@
 from ai.backend.common.etcd import AsyncEtcd
 from ai.backend.common.events import EventDispatcher, EventProducer
 from ai.backend.common.types import HardwareMetadata, QuotaScopeID
-from ai.backend.storage.exception import NotEmptyError
-from ai.backend.storage.types import CapacityUsage, FSPerfMetric, QuotaConfig, QuotaUsage
 
+from ...exception import NotEmptyError
+from ...types import CapacityUsage, FSPerfMetric, QuotaConfig, QuotaUsage
 from ..abc import CAP_FAST_FS_SIZE, CAP_METRIC, CAP_QUOTA, CAP_VFOLDER, AbstractQuotaModel
 from ..vfs import BaseQuotaModel, BaseVolume
 from .config import config_iv

src/ai/backend/storage/volumes/gpfs/__init__.py

@@ -7,8 +7,8 @@
 from ai.backend.common.events import EventDispatcher, EventProducer
 from ai.backend.common.types import BinarySize, HardwareMetadata, QuotaScopeID
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.types import CapacityUsage, FSPerfMetric
 
+from ...types import CapacityUsage, FSPerfMetric
 from ..abc import (
     CAP_FAST_FS_SIZE,
     CAP_METRIC,

src/ai/backend/storage/volumes/gpfs/gpfs_client.py

@@ -18,8 +18,8 @@
 
 from ai.backend.common.types import BinarySize
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.exception import ExternalError
 
+from ...exception import ExternalError
 from .exceptions import (
     GPFSAPIError,
     GPFSInvalidBodyError,

src/ai/backend/storage/volumes/netapp/__init__.py

@@ -29,14 +29,15 @@
 
 from ai.backend.common.types import BinarySize, HardwareMetadata, QuotaScopeID
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.exception import (
+
+from ...exception import (
     ExecutionError,
     InvalidQuotaScopeError,
     NotEmptyError,
     QuotaScopeNotFoundError,
 )
-from ai.backend.storage.subproc import spawn_and_watch
-from ai.backend.storage.types import (
+from ...subproc import spawn_and_watch
+from ...types import (
     SENTINEL,
     CapacityUsage,
     DirEntry,
@@ -48,8 +49,7 @@
     Stat,
     TreeUsage,
 )
-from ai.backend.storage.utils import fstime2datetime
-
+from ...utils import fstime2datetime
 from ..abc import (
     CAP_FAST_FS_SIZE,
     CAP_FAST_SIZE,

src/ai/backend/storage/volumes/netapp/netappclient.py

@@ -75,8 +75,8 @@
 
 import aiohttp
 
-from ai.backend.storage.exception import ExternalError
-from ai.backend.storage.types import QuotaConfig, QuotaUsage
+from ...exception import ExternalError
+from ...types import QuotaConfig, QuotaUsage
 
 StorageID: TypeAlias = uuid.UUID
 VolumeID: TypeAlias = uuid.UUID

src/ai/backend/storage/volumes/purestorage/__init__.py

@@ -8,8 +8,8 @@
 
 from ai.backend.common.types import HardwareMetadata
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.types import CapacityUsage, FSPerfMetric
 
+from ...types import CapacityUsage, FSPerfMetric
 from ..abc import (
     CAP_FAST_FS_SIZE,
     CAP_FAST_SCAN,

src/ai/backend/storage/volumes/purestorage/rapidfiles.py

@@ -6,10 +6,10 @@
 from typing import AsyncIterator
 
 from ai.backend.common.types import BinarySize
-from ai.backend.storage.subproc import run
-from ai.backend.storage.types import DirEntry, DirEntryType, Stat, TreeUsage
-from ai.backend.storage.utils import fstime2datetime
 
+from ...subproc import run
+from ...types import DirEntry, DirEntryType, Stat, TreeUsage
+from ...utils import fstime2datetime
 from ..vfs import BaseFSOpModel
 
 

src/ai/backend/storage/volumes/purestorage/rapidfiles_v2.py

@@ -5,10 +5,9 @@
 from subprocess import CalledProcessError
 from typing import AsyncIterator
 
-from ai.backend.storage.subproc import run
-from ai.backend.storage.types import DirEntry, DirEntryType, Stat, TreeUsage
-from ai.backend.storage.utils import fstime2datetime
-
+from ...subproc import run
+from ...types import DirEntry, DirEntryType, Stat, TreeUsage
+from ...utils import fstime2datetime
 from .rapidfiles import RapidFileToolsFSOpModel
 
 

src/ai/backend/storage/volumes/vast/__init__.py

@@ -13,14 +13,14 @@
 from ai.backend.common.events import EventDispatcher, EventProducer
 from ai.backend.common.types import HardwareMetadata, QuotaConfig, QuotaScopeID
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.exception import (
+
+from ...exception import (
     ExternalError,
     InvalidQuotaConfig,
     QuotaScopeNotFoundError,
     StorageProxyError,
 )
-from ai.backend.storage.types import CapacityUsage, FSPerfMetric, QuotaUsage
-
+from ...types import CapacityUsage, FSPerfMetric, QuotaUsage
 from ..abc import CAP_FAST_FS_SIZE, CAP_FAST_SIZE, CAP_METRIC, CAP_QUOTA, CAP_VFOLDER
 from ..vfs import BaseQuotaModel, BaseVolume
 from .config import config_iv

src/ai/backend/storage/volumes/vast/vastdata_client.py

@@ -13,9 +13,9 @@
 from yarl import URL
 
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.exception import ExternalError, QuotaScopeAlreadyExists
-from ai.backend.storage.types import CapacityUsage
 
+from ...exception import ExternalError, QuotaScopeAlreadyExists
+from ...types import CapacityUsage
 from .config import APIVersion
 from .exceptions import (
     VASTAPIError,

src/ai/backend/storage/volumes/vfs/__init__.py

@@ -19,15 +19,16 @@
 from ai.backend.common.defs import DEFAULT_VFOLDER_PERMISSION_MODE
 from ai.backend.common.types import BinarySize, HardwareMetadata, QuotaScopeID
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.exception import (
+
+from ...exception import (
     ExecutionError,
     InvalidAPIParameters,
     InvalidQuotaScopeError,
     NotEmptyError,
     QuotaScopeNotFoundError,
 )
-from ai.backend.storage.subproc import run
-from ai.backend.storage.types import (
+from ...subproc import run
+from ...types import (
     SENTINEL,
     CapacityUsage,
     DirEntry,
@@ -40,7 +41,6 @@
     TreeUsage,
     VFolderID,
 )
-
 from ...utils import fstime2datetime
 from ...watcher import DeletePathTask, WatcherClient
 from ..abc import CAP_VFOLDER, AbstractFSOpModel, AbstractQuotaModel, AbstractVolume

src/ai/backend/storage/volumes/weka/__init__.py

@@ -12,8 +12,8 @@
 from ai.backend.common.events import EventDispatcher, EventProducer
 from ai.backend.common.types import HardwareMetadata, QuotaConfig, QuotaScopeID
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.types import CapacityUsage, FSPerfMetric, QuotaUsage
 
+from ...types import CapacityUsage, FSPerfMetric, QuotaUsage
 from ..abc import CAP_FAST_FS_SIZE, CAP_METRIC, CAP_QUOTA, CAP_VFOLDER, AbstractQuotaModel
 from ..vfs import BaseQuotaModel, BaseVolume
 from .exceptions import WekaAPIError, WekaInitError, WekaNoMetricError, WekaNotFoundError

src/ai/backend/storage/volumes/xfs/__init__.py

@@ -17,14 +17,14 @@
 from ai.backend.common.lock import FileLock
 from ai.backend.common.types import QuotaScopeID
 from ai.backend.logging import BraceStyleAdapter
-from ai.backend.storage.exception import InvalidQuotaScopeError, NotEmptyError
-from ai.backend.storage.subproc import run
-from ai.backend.storage.types import (
+
+from ...exception import InvalidQuotaScopeError, NotEmptyError
+from ...subproc import run
+from ...types import (
     QuotaConfig,
     QuotaUsage,
 )
-from ai.backend.storage.volumes.abc import CAP_QUOTA, CAP_VFOLDER
-
+from ...volumes.abc import CAP_QUOTA, CAP_VFOLDER
 from ..abc import AbstractQuotaModel
 from ..vfs import BaseQuotaModel, BaseVolume