lamindb_setup 0.76.3__py2.py3-none-any.whl → 0.76.4__py2.py3-none-any.whl

lamindb_setup/__init__.py

@@ -34,7 +34,7 @@ Modules & settings:
 
 """
 
-__version__ = "0.76.3"  # denote a release candidate for 0.1.0 with 0.1rc1
+__version__ = "0.76.4"  # denote a release candidate for 0.1.0 with 0.1rc1
 
 import sys
 from os import name as _os_name

lamindb_setup/core/_hub_core.py

@@ -19,10 +19,10 @@ from ._hub_crud import (
     _delete_instance_record,
     select_account_by_handle,
     select_db_user_by_instance,
+    select_default_storage_by_instance_id,
     select_instance_by_id_with_storage,
     select_instance_by_name,
     select_instance_by_owner_name,
-    select_storage,
 )
 from ._hub_crud import update_instance as _update_instance_record
 from ._hub_utils import (
@@ -338,7 +338,7 @@ def _connect_instance(
         if instance is None:
             return "instance-not-found"
         # get default storage
-        storage = select_storage(instance["storage_id"], client)
+        storage = select_default_storage_by_instance_id(instance["id"], client)
         if storage is None:
             return "storage-does-not-exist-on-hub"
     else:
@@ -364,7 +364,7 @@ def _connect_instance(
             database=instance["db_database"],
         )
         instance["db"] = db_dsn
-    return instance, storage
+    return instance, storage  # type: ignore
 
 
 def access_aws(storage_root: str, access_token: str | None = None) -> dict[str, dict]:

lamindb_setup/core/_hub_crud.py

@@ -17,10 +17,11 @@ def select_instance_by_owner_name(
             client.table("instance")
             .select(
                 "*, account!inner!instance_account_id_28936e8f_fk_account_id(*),"
-                " storage!instance_storage_id_87963cc8_fk_storage_id(*)"
+                " storage!inner!storage_instance_id_359fca71_fk_instance_id(*)"
             )
-            .eq("account.handle", owner)
             .eq("name", name)
+            .eq("account.handle", owner)
+            .eq("storage.is_default", True)
             .execute()
             .data
         )
@@ -28,7 +29,11 @@ def select_instance_by_owner_name(
         return None
     if len(data) == 0:
         return None
-    return data[0]
+    result = data[0]
+    # this is now a list
+    # assume only one default storage
+    result["storage"] = result["storage"][0]
+    return result
 
 
 # --------------- ACCOUNT ----------------------
@@ -131,8 +136,20 @@ def select_collaborator(
 # --------------- STORAGE ----------------------
 
 
-def select_storage(id: str, client: Client):
-    data = client.table("storage").select("*").eq("id", id).execute().data
+def select_default_storage_by_instance_id(
+    instance_id: str, client: Client
+) -> dict | None:
+    try:
+        data = (
+            client.table("storage")
+            .select("*")
+            .eq("instance_id", instance_id)
+            .eq("is_default", True)
+            .execute()
+            .data
+        )
+    except Exception:
+        return None
     if len(data) == 0:
         return None
     return data[0]

lamindb_setup/core/_settings_load.py

@@ -36,14 +36,9 @@ def load_instance_settings(instance_settings_file: Path | None = None):
             content = f.read()
         raise SettingsEnvFileOutdated(
             f"\n\n{error}\n\nYour instance settings file with\n\n{content}\nis invalid"
-            f" (likely outdated), please delete {instance_settings_file} &"
-            " re-initialize (local) or re-connect to the instance (remote)"
+            f" (likely outdated), see validation error. Please delete {instance_settings_file} &"
+            " reload (remote) or re-initialize (local) the instance with the same name & storage location."
         ) from error
-    if settings_store.id == "null":
-        raise ValueError(
-            "Your instance._id is undefined, please either load your instance from the"
-            f" hub or update {instance_settings_file} with a new id: {uuid4().hex}"
-        )
     isettings = setup_instance_from_store(settings_store)
     return isettings
 

lamindb_setup/core/upath.py

@@ -18,7 +18,7 @@ from upath.implementations.cloud import CloudPath, S3Path  # keep CloudPath!
 from upath.implementations.local import LocalPath, PosixUPath, WindowsUPath
 
 from ._aws_credentials import HOSTED_BUCKETS, get_aws_credentials_manager
-from .hashing import b16_to_b64, hash_md5s_from_dir
+from .hashing import HASH_LENGTH, b16_to_b64, hash_md5s_from_dir
 
 if TYPE_CHECKING:
     from .types import UPathStr
@@ -707,9 +707,9 @@ def get_stat_file_cloud(stat: dict) -> tuple[int, str, str]:
     else:
         stripped_etag, suffix = etag.split("-")
         suffix = suffix.strip('"')
-        hash = f"{b16_to_b64(stripped_etag)}-{suffix}"
-        hash_type = "md5-n"  # this is the S3 chunk-hashing strategy
-    return size, hash, hash_type
+        hash = b16_to_b64(stripped_etag)
+        hash_type = f"md5-{suffix}"  # this is the S3 chunk-hashing strategy
+    return size, hash[:HASH_LENGTH], hash_type
 
 
 def get_stat_dir_cloud(path: UPath) -> tuple[int, str, str, int]:

{lamindb_setup-0.76.3.dist-info → lamindb_setup-0.76.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamindb_setup
-Version: 0.76.3
+Version: 0.76.4
 Summary: Setup & configure LaminDB.
 Author-email: Lamin Labs <open-source@lamin.ai>
 Description-Content-Type: text/markdown

{lamindb_setup-0.76.3.dist-info → lamindb_setup-0.76.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-lamindb_setup/__init__.py,sha256=hXWSzOTJWwpoCg2nw2RH87bEJu7oXk_jyxAbJdcrsYU,1542
+lamindb_setup/__init__.py,sha256=Rx_9cNg5fupK0-Rj7m3ms6u7mrLnirEkiiMlGktz7QM,1542
 lamindb_setup/_cache.py,sha256=wA7mbysANwe8hPNbjDo9bOmXJ0xIyaS5iyxIpxSWji4,846
 lamindb_setup/_check.py,sha256=28PcG8Kp6OpjSLSi1r2boL2Ryeh6xkaCL87HFbjs6GA,129
 lamindb_setup/_check_setup.py,sha256=cNEL9Q4yPpmEkGKHH8JgullWl1VUZwALJ4RHn9wZypY,2613
@@ -22,13 +22,13 @@ lamindb_setup/core/_aws_storage.py,sha256=nEjeUv4xUVpoV0Lx-zjjmyb9w804bDyaeiM-Oq
 lamindb_setup/core/_deprecated.py,sha256=3qxUI1dnDlSeR0BYrv7ucjqRBEojbqotPgpShXs4KF8,2520
 lamindb_setup/core/_docs.py,sha256=3k-YY-oVaJd_9UIY-LfBg_u8raKOCNfkZQPA73KsUhs,276
 lamindb_setup/core/_hub_client.py,sha256=Gpt3TmxWQMVenKugCu1agUb-xGN9YFsQOKmrHuFiiDs,5605
-lamindb_setup/core/_hub_core.py,sha256=XqXZatJOIDXukfdwL3Buq3WXZK-VVGg5OFRm2PrzO1o,16836
-lamindb_setup/core/_hub_crud.py,sha256=b1XF7AJpM9Q-ttm9nPG-r3OTRWHQaGzAGIyvmb83NTo,4859
+lamindb_setup/core/_hub_core.py,sha256=cyLyEQcVTC2Dd6G-M0-O1Ur0ujI5IMKq1YXVpn4faCs,16890
+lamindb_setup/core/_hub_crud.py,sha256=eZErpq9t1Cp2ULBSi457ekrcqfesw4Y6IJgaqyrINMY,5276
 lamindb_setup/core/_hub_utils.py,sha256=w5IRtrxZcvxmGSJslzuZF89ewkzXV4cCUmZUVrqmAfo,3026
 lamindb_setup/core/_private_django_api.py,sha256=KIn43HOhiRjkbTbddyJqv-WNTTa1bAizbM1tWXoXPBg,2869
 lamindb_setup/core/_settings.py,sha256=46axQ5HPvI0X9YuotgdpuSOfSo7qYU1DudIx3vxpFk0,4471
 lamindb_setup/core/_settings_instance.py,sha256=rPTL_Iwv-ZVMRzu_EV_E7APFkEXLoD0TgUrz5293-vg,17586
-lamindb_setup/core/_settings_load.py,sha256=63PTIVLk3oH1XUmznswygcOk_8VADrJLMB6O9AOppYg,3907
+lamindb_setup/core/_settings_load.py,sha256=bRkGgaEnLZmnOlU5ptDoSM-YXzC2l0Cb7RBoBY6VH9k,3717
 lamindb_setup/core/_settings_save.py,sha256=n_tYfb9EBSxwm4LHyPRHJptE5uB8lmHhcRkz1JkAmhg,2781
 lamindb_setup/core/_settings_storage.py,sha256=bvEOm2aH4M6xBTfTARcWkx6b-jtKYl_AIUbH5yQC9GI,13435
 lamindb_setup/core/_settings_store.py,sha256=VEE8Ff2A7y4j8ksOaa7g48jNaOqe1PBnBjb1PKKGUKU,2115
@@ -39,8 +39,8 @@ lamindb_setup/core/django.py,sha256=QUQm3zt5QIiD8uv6o9vbSm_bshqiSWzKSkgD3z2eJCg,
 lamindb_setup/core/exceptions.py,sha256=eoI7AXgATgDVzgArtN7CUvpaMUC067vsBg5LHCsWzDM,305
 lamindb_setup/core/hashing.py,sha256=Y2cvEaqtm3KwpHqj5ZG2f_sLaXhsQT4oDrmJdHbOQeo,3116
 lamindb_setup/core/types.py,sha256=bcYnZ0uM_2NXKJCl94Mmc-uYrQlRUUVKG3sK2N-F-N4,532
-lamindb_setup/core/upath.py,sha256=Bhxr1B1sFuIp13YTBOEYJSmSOwmU6owk8giBGLCKdg4,27194
-lamindb_setup-0.76.3.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
-lamindb_setup-0.76.3.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-lamindb_setup-0.76.3.dist-info/METADATA,sha256=29omTu3ShcauGqhxT0g_ZAAuOBZveomsA-hFBH3OGzs,1638
-lamindb_setup-0.76.3.dist-info/RECORD,,
+lamindb_setup/core/upath.py,sha256=EPLLm62q-Y3hZzd-286cynFMttXKDNXNOKL3_QGkeug,27215
+lamindb_setup-0.76.4.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
+lamindb_setup-0.76.4.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+lamindb_setup-0.76.4.dist-info/METADATA,sha256=7Oeyg7Uvp5hFrFw37iJcUOiyrvsI9DxWGBbRtqeZJhs,1638
+lamindb_setup-0.76.4.dist-info/RECORD,,