eliminate mocks

laminlabs · Jan 2, 2025 · 9c505e6 · 9c505e6
1 parent a4ea5be
commit 9c505e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/lamindb/base/mocks.py b/lamindb/base/mocks.py
diff --git a/lamindb/base/users.py b/lamindb/base/users.py
@@ -1,11 +1,11 @@
-import lamindb_setup as ln_setup
-from lamindb_setup import settings
-from lamindb_setup._init_instance import register_user
-
 user_id_cache = {}
 
 
 def current_user_id() -> int:
+    import lamindb_setup as ln_setup
+    from lamindb_setup import settings
+    from lamindb_setup._init_instance import register_user
+
     from lamindb.models import User
 
     def query_user_id():

diff --git a/lamindb/models.py b/lamindb/models.py
@@ -37,8 +37,9 @@
     OneToOneField,
     TextField,
 )
-from lamindb.base.ids import base62_8, base62_12, base62_20
-from lamindb.base.types import (
+
+from .base.ids import base62_8, base62_12, base62_20
+from .base.types import (
     ArtifactType,
     FeatureDtype,
     FieldAttr,
@@ -47,7 +48,7 @@
     TransformType,
     VisibilityChoice,
 )
-from lamindb.base.users import current_user_id
+from .base.users import current_user_id
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
@@ -64,14 +65,8 @@
     from tiledbsoma import Experiment as SOMAExperiment
     from upath import UPath
 
-    from lamindb.base.mocks import (
-        AnnDataAccessor,
-        BackedAccessor,
-        MappedCollection,
-        QuerySet,
-        RecordList,
-    )
-    from lamindb.core import LabelManager
+    from lamindb.core import LabelManager, MappedCollection, QuerySet, RecordList
+    from lamindb.core.storage import AnnDataAccessor, BackedAccessor
 
 
 _TRACKING_READY: bool | None = None