lamindb_setup 0.76.5__py2.py3-none-any.whl → 0.76.6__py2.py3-none-any.whl

lamindb_setup/__init__.py

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

lamindb_setup/_set_managed_storage.py

@@ -30,8 +30,8 @@ def set_managed_storage(root: UPathStr, **fs_kwargs):
             "Can't add additional managed storage locations for instances that aren't managed through the hub."
         )
     # here the storage is registered in the hub
-    # hub_record_status="hub_record_created" if a new record is created
-    # "hub_record_retrieved" if the storage is in the hub already
+    # hub_record_status="hub-record-created" if a new record is created
+    # "hub-record-retireved" if the storage is in the hub already
     ssettings, hub_record_status = init_storage(
         root=root, instance_id=settings.instance._id, register_hub=True
     )
@@ -46,7 +46,7 @@ def set_managed_storage(root: UPathStr, **fs_kwargs):
     try:
         register_storage_in_instance(ssettings)
     except Exception as e:
-        if hub_record_status == "hub_record_created" and ssettings._uuid is not None:
+        if hub_record_status == "hub-record-created" and ssettings._uuid is not None:
             delete_storage_record(ssettings._uuid)  # type: ignore
         raise e
 

lamindb_setup/core/_hub_core.py

@@ -119,7 +119,7 @@ def _select_storage(
 def init_storage(
     ssettings: StorageSettings,
     auto_populate_instance: bool = True,
-) -> Literal["hub_record_retrieved", "hub_record_created"]:
+) -> Literal["hub-record-retireved", "hub-record-created"]:
     if settings.user.handle != "anonymous":
         return call_with_fallback_auth(
             _init_storage,
@@ -131,21 +131,21 @@ def init_storage(
             _select_storage, ssettings=ssettings, update_uid=True
         )
         if storage_exists:
-            return "hub_record_retrieved"
+            return "hub-record-retireved"
         else:
             raise ValueError("Log in to create a storage location on the hub.")
 
 
 def _init_storage(
     ssettings: StorageSettings, auto_populate_instance: bool, client: Client
-) -> Literal["hub_record_retrieved", "hub_record_created"]:
+) -> Literal["hub-record-retireved", "hub-record-created"]:
     from lamindb_setup import settings
 
     # storage roots are always stored without the trailing slash in the SQL
     # database
     root = ssettings.root_as_str
     if _select_storage(ssettings, update_uid=True, client=client):
-        return "hub_record_retrieved"
+        return "hub-record-retireved"
     if ssettings.type_is_cloud:
         id = uuid.uuid5(uuid.NAMESPACE_URL, root)
     else:
@@ -181,7 +181,7 @@ def _init_storage(
     # on root & description
     client.table("storage").upsert(fields).execute()
     ssettings._uuid_ = id
-    return "hub_record_created"
+    return "hub-record-created"
 
 
 def delete_instance(identifier: UUID | str, require_empty: bool = True) -> str | None:

lamindb_setup/core/_settings_storage.py

@@ -85,11 +85,15 @@ def init_storage(
     init_instance: bool = False,
 ) -> tuple[
     StorageSettings,
-    Literal["hub_record_not_created", "hub_record_retrieved", "hub_record_created"],
+    Literal["hub-record-not-created", "hub-record-retireved", "hub-record-created"],
 ]:
     if root is None:
         raise ValueError("`storage` argument can't be `None`")
     root_str = str(root)  # ensure we have a string
+    if ".lamindb" in root_str:
+        raise ValueError(
+            'Please pass a folder name that does not end or contain ".lamindb"'
+        )
     uid = base62(12)
     region = None
     lamin_env = os.getenv("LAMIN_ENV")
@@ -122,8 +126,8 @@ def init_storage(
     )
     # this stores the result of init_storage_hub
     hub_record_status: Literal[
-        "hub_record_not_created", "hub_record_retrieved", "hub_record_created"
-    ] = "hub_record_not_created"
+        "hub-record-not-created", "hub-record-retireved", "hub-record-created"
+    ] = "hub-record-not-created"
     # the below might update the uid with one that's already taken on the hub
     if not prevent_register_hub:
         if ssettings.type_is_cloud or register_hub:
@@ -146,7 +150,7 @@ def init_storage(
         # _select_storage inside init_storage_hub also populates ssettings._uuid
         # and we don't want to delete an existing storage record here
         # only newly created
-        if hub_record_status == "hub_record_created" and ssettings._uuid is not None:
+        if hub_record_status == "hub-record-created" and ssettings._uuid is not None:
             delete_storage_record(ssettings._uuid)  # type: ignore
         ssettings._instance_id = None
     return ssettings, hub_record_status
@@ -184,7 +188,7 @@ class StorageSettings:
                 (self._root_init / ".lamindb").mkdir(parents=True, exist_ok=True)
                 self._root_init = self._root_init.resolve()
             except Exception:
-                logger.warning("unable to create .lamindb folder")
+                logger.warning(f"unable to create .lamindb folder in {self._root_init}")
                 pass
         self._root = None
         self._instance_id = instance_id

{lamindb_setup-0.76.5.dist-info → lamindb_setup-0.76.6.dist-info}/METADATA

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

{lamindb_setup-0.76.5.dist-info → lamindb_setup-0.76.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-lamindb_setup/__init__.py,sha256=NzRrDVvtOt5b48-AV5mbNzjP35fl6FOZy8R6GWGSOy4,1542
+lamindb_setup/__init__.py,sha256=oS0T4Bi_gmUMhmQgSv_QLNn_UX7KoGP3pVyA6cv1XBI,1542
 lamindb_setup/_cache.py,sha256=wA7mbysANwe8hPNbjDo9bOmXJ0xIyaS5iyxIpxSWji4,846
 lamindb_setup/_check.py,sha256=28PcG8Kp6OpjSLSi1r2boL2Ryeh6xkaCL87HFbjs6GA,129
 lamindb_setup/_check_setup.py,sha256=cNEL9Q4yPpmEkGKHH8JgullWl1VUZwALJ4RHn9wZypY,2613
@@ -13,7 +13,7 @@ lamindb_setup/_migrate.py,sha256=P4n3x0SYzO9szjF2-JMa7z4mQadtWjHv5ow4HbCDZLI,886
 lamindb_setup/_register_instance.py,sha256=alQuYp2f8Ct8xvRC1gt8p_HZ0tqCd3gZD3kiPBLPpsI,1269
 lamindb_setup/_schema.py,sha256=b3uzhhWpV5mQtDwhMINc2MabGCnGLESy51ito3yl6Wc,679
 lamindb_setup/_schema_metadata.py,sha256=nF29OuMNswJUCyvSyOHEUQLQ7PcfB7uwvczloBYSWuU,13187
-lamindb_setup/_set_managed_storage.py,sha256=aFVxk8sl6Jzh-LU_1sxICm_rcDPMr5Q9qmwPtUtrUbA,2043
+lamindb_setup/_set_managed_storage.py,sha256=4tDxXQMt8Gw028uY3vIQxZQ7qBNXhQMc8saarNK_Z-s,2043
 lamindb_setup/_setup_user.py,sha256=6Oc7Rke-yRQSZbuntdUAz8QbJ6UuPzYHI9FnYlf_q-A,3670
 lamindb_setup/_silence_loggers.py,sha256=AKF_YcHvX32eGXdsYK8MJlxEaZ-Uo2f6QDRzjKFCtws,1568
 lamindb_setup/core/__init__.py,sha256=BxIVMX5HQq8oZ1OuY_saUEJz5Tdd7gaCPngxVu5iou4,417
@@ -22,7 +22,7 @@ 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=YQ8-RiNbhTzXC_bGob3WfL47Svm0g8U8e1kxxn1nlzY,17049
+lamindb_setup/core/_hub_core.py,sha256=2Ni7vIkUcZw9ryBLgjercvLsdAL8-3xZNmrxyzNCU98,17049
 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
@@ -30,7 +30,7 @@ lamindb_setup/core/_settings.py,sha256=46axQ5HPvI0X9YuotgdpuSOfSo7qYU1DudIx3vxpF
 lamindb_setup/core/_settings_instance.py,sha256=azgqSWEnTfZM9ghgdF6atvIxoUP6fx49Y9tZTqMQTuc,17589
 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=aP5cdEy9xmvNFAtU8AmpBifYWxeSFwp4Vt1UwpaKJ7o,14080
+lamindb_setup/core/_settings_storage.py,sha256=jFdoIkSn1gPDDZKjAlgKyrlsHBqZDOvv-UnuUI7aD_4,14249
 lamindb_setup/core/_settings_store.py,sha256=VEE8Ff2A7y4j8ksOaa7g48jNaOqe1PBnBjb1PKKGUKU,2115
 lamindb_setup/core/_settings_user.py,sha256=P2lC4WDRAFfT-Xq3MlXJ-wMKIHCoGNhMTQfRGIAyUNQ,1344
 lamindb_setup/core/_setup_bionty_sources.py,sha256=ANBIiWHoYxLBQqsiKs-rCq3k-p6D34T4NM28gkY6YLA,3389
@@ -40,7 +40,7 @@ lamindb_setup/core/exceptions.py,sha256=eoI7AXgATgDVzgArtN7CUvpaMUC067vsBg5LHCsW
 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=EPLLm62q-Y3hZzd-286cynFMttXKDNXNOKL3_QGkeug,27215
-lamindb_setup-0.76.5.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
-lamindb_setup-0.76.5.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-lamindb_setup-0.76.5.dist-info/METADATA,sha256=RLVkEp_g_smCBEWDglvm2IcBKUbCV3SHFfNOZjOngNk,1638
-lamindb_setup-0.76.5.dist-info/RECORD,,
+lamindb_setup-0.76.6.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
+lamindb_setup-0.76.6.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+lamindb_setup-0.76.6.dist-info/METADATA,sha256=aipPhnfIkB8MWkSmDkqbCSb-iOcQNbbs0lcQzqa5_w8,1638
+lamindb_setup-0.76.6.dist-info/RECORD,,