lamindb 0.77.2__py3-none-any.whl → 1.0rc1__py3-none-any.whl

lamindb/core/storage/paths.py

@@ -3,20 +3,16 @@ from __future__ import annotations
 import shutil
 from typing import TYPE_CHECKING
 
-import anndata as ad
 import fsspec
-import pandas as pd
 from lamin_utils import logger
 from lamindb_setup.core import StorageSettings
 from lamindb_setup.core.upath import (
     LocalPathClasses,
     UPath,
-    create_path,
-    infer_filesystem,
 )
-from lnschema_core.models import Artifact, Storage
 
 from lamindb.core._settings import settings
+from lamindb.models import Artifact, Storage
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -30,7 +26,7 @@ AUTO_KEY_PREFIX = ".lamindb/"
 # add type annotations back asap when re-organizing the module
 def auto_storage_key_from_artifact(artifact: Artifact):
     if artifact.key is None or artifact._key_is_virtual:
-        is_dir = artifact.n_objects is not None
+        is_dir = artifact.n_files is not None
         return auto_storage_key_from_artifact_uid(artifact.uid, artifact.suffix, is_dir)
     else:
         return artifact.key
@@ -52,10 +48,19 @@ def check_path_is_child_of_root(path: UPathStr, root: UPathStr) -> bool:
     # and for fsspec.utils.get_protocol
     path_str = str(path)
     root_str = str(root)
+    root_protocol = fsspec.utils.get_protocol(root_str)
     # check that the protocols are the same first
-    if fsspec.utils.get_protocol(path_str) != fsspec.utils.get_protocol(root_str):
+    if fsspec.utils.get_protocol(path_str) != root_protocol:
         return False
-    return UPath(root_str).resolve() in UPath(path_str).resolve().parents
+    if root_protocol in {"http", "https"}:
+        # in this case it is a base url, not a file
+        # so formally does not exist
+        resolve_kwargs = {"follow_redirects": False}
+    else:
+        resolve_kwargs = {}
+    return (
+        UPath(root_str).resolve(**resolve_kwargs) in UPath(path_str).resolve().parents
+    )
 
 
 # returns filepath and root of the storage

lamindb/core/subsettings/__init__.py

@@ -3,10 +3,8 @@
 .. autosummary::
    :toctree: .
 
-   TransformSettings
    CreationSettings
 
 """
 
 from ._creation_settings import CreationSettings
-from ._transform_settings import TransformSettings

lamindb/core/types.py

@@ -1,27 +1,6 @@
-"""Types.
-
-Central object types.
-
-.. autosummary::
-   :toctree: .
-
-   ArtifactType
-   TransformType
-   FeatureDtype
-
-Basic types.
-
-.. autosummary::
-   :toctree: .
-
-   UPathStr
-   StrField
-   ListLike
-"""
-
 from lamindb_setup.core.types import UPathStr
-from lnschema_core.types import (
-    ArtifactType,
+
+from lamindb.base.types import (
     FeatureDtype,
     FieldAttr,
     ListLike,

lamindb/core/versioning.py

@@ -5,10 +5,11 @@ from typing import TYPE_CHECKING, Literal
 from lamin_utils import logger
 from lamin_utils._base62 import increment_base62
 from lamindb_setup.core.upath import LocalPathClasses, UPath
-from lnschema_core import ids
+
+from lamindb.base import ids
 
 if TYPE_CHECKING:
-    from lnschema_core.models import IsVersioned
+    from lamindb.models import IsVersioned
 
 
 def message_update_key_in_version_family(
@@ -132,15 +133,18 @@ def get_new_path_from_uid(old_path: UPath, old_uid: str, new_uid: str):
 def process_revises(
     revises: IsVersioned | None,
     version: str | None,
-    name: str | None,
+    key: str | None,
+    description: str | None,
     type: type[IsVersioned],
-) -> tuple[str, str, str, IsVersioned | None]:
+) -> tuple[str, str, str, str, IsVersioned | None]:
     if revises is not None and not isinstance(revises, type):
         raise TypeError(f"`revises` has to be of type `{type.__name__}`")
     uid, revises = create_uid(
         revises=revises, version=version, n_full_id=type._len_full_uid
     )
     if revises is not None:
-        if name is None:
-            name = revises.name
-    return uid, version, name, revises
+        if description is None:
+            description = revises.description
+        if key is None:
+            key = revises.key
+    return uid, version, key, description, revises