lamindb_setup 0.73.1__tar.gz → 0.73.2__tar.gz

{lamindb_setup-0.73.1 → lamindb_setup-0.73.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamindb_setup
-Version: 0.73.1
+Version: 0.73.2
 Summary: Setup & configure LaminDB.
 Author-email: Lamin Labs <laminlabs@gmail.com>
 Description-Content-Type: text/markdown

{lamindb_setup-0.73.1 → lamindb_setup-0.73.2}/docs/changelog.md

@@ -3,6 +3,8 @@
 <!-- prettier-ignore -->
 Name | PR | Developer | Date | Version
 --- | --- | --- | --- | ---
+🐛 Fix permission error when screening for local storage root | [778](https://github.com/laminlabs/lamindb-setup/pull/778) | [falexwolf](https://github.com/falexwolf) | 2024-06-19 | 0.73.2
+🐛 Fix same root check in get_locker | [777](https://github.com/laminlabs/lamindb-setup/pull/777) | [Koncopd](https://github.com/Koncopd) | 2024-06-13 |
 ✨ Add .ome.zarr as composite suffix | [775](https://github.com/laminlabs/lamindb-setup/pull/775) | [sunnyosun](https://github.com/sunnyosun) | 2024-06-05 |
 🏗️ Update instance schema in the hub | [774](https://github.com/laminlabs/lamindb-setup/pull/774) | [fredericenard](https://github.com/fredericenard) | 2024-06-04 |
 ⬆️ Migrate to upath 0.2.2 | [723](https://github.com/laminlabs/lamindb-setup/pull/723) | [Koncopd](https://github.com/Koncopd) | 2024-06-02 |

{lamindb_setup-0.73.1 → lamindb_setup-0.73.2}/docs/hub-prod/test-sqlite-lock.ipynb

@@ -75,6 +75,9 @@
    "source": [
     "ln_setup.init(storage=\"s3://lamindb-ci/test-load-lock\", name=\"test-load-lock\")\n",
     "instance_id = ln_setup.settings.instance._id\n",
+    "\n",
+    "assert ln_setup.settings.instance._cloud_sqlite_locker is ln_setup.settings.instance._cloud_sqlite_locker\n",
+    "\n",
     "ln_setup.close()"
    ]
   },

{lamindb_setup-0.73.1 → lamindb_setup-0.73.2}/lamindb_setup/__init__.py

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

{lamindb_setup-0.73.1 → lamindb_setup-0.73.2}/lamindb_setup/core/_settings_instance.py

@@ -120,13 +120,25 @@ class InstanceSettings:
             if root_path.exists():
                 marker_path = root_path / ".lamindb/_is_initialized"
                 if marker_path.exists():
-                    uid = marker_path.read_text()
+                    try:
+                        uid = marker_path.read_text()
+                    except PermissionError:
+                        logger.warning(
+                            f"ignoring the following location because no permission to read it: {marker_path}"
+                        )
+                        continue
                     if uid == record.uid:
                         found = True
                         break
                     elif uid == "":
-                        # legacy instance that was not yet marked properly
-                        mark_storage_root(record.root, record.uid)
+                        try:
+                            # legacy instance that was not yet marked properly
+                            mark_storage_root(record.root, record.uid)
+                        except PermissionError:
+                            logger.warning(
+                                f"ignoring the following location because no permission to write to it: {marker_path}"
+                            )
+                            continue
                     else:
                         continue
                 else:

{lamindb_setup-0.73.1 → lamindb_setup-0.73.2}/lamindb_setup/core/cloud_sqlite_locker.py

@@ -111,6 +111,7 @@ class Locker:
         if self._counter <= MAX_MSG_COUNTER:
             self._counter += 1
 
+    # Lamport's bakery algorithm
     def _lock_unsafe(self):
         if self._has_lock:
             return None
@@ -186,7 +187,7 @@ def get_locker(isettings) -> Locker:
     if (
         _locker is None
         or _locker.user != user_uid
-        or _locker.root is not storage_root
+        or _locker.root != storage_root
         or _locker.instance_id != isettings._id
     ):
         _locker = Locker(user_uid, storage_root, isettings._id)

{lamindb_setup-0.73.1 → lamindb_setup-0.73.2}/tests/hub-cloud/test_connect_instance.py

@@ -28,7 +28,7 @@ def test_connect_after_revoked_access():
             # if a previous test run failed, this will
             # error with a violation of a unique constraint
             collaborator_handler.add_by_slug(
-                "laminlabs/static-test-instance-private-sqlite",
+                "testuser1/static-test-instance-private-sqlite",
                 "testuser2",
                 "write",
                 "default",
@@ -38,19 +38,19 @@ def test_connect_after_revoked_access():
             pass
         ln_setup.login("testuser2@lamin.ai")
         ln_setup.connect(
-            "https://lamin.ai/laminlabs/static-test-instance-private-sqlite", _test=True
+            "https://lamin.ai/testuser1/static-test-instance-private-sqlite", _test=True
         )
         assert (
             ln_setup.settings.instance.storage.root_as_str
             == "s3://lamindb-setup-private-bucket"
         )
         collaborator_handler.delete_by_slug(
-            "laminlabs/static-test-instance-private-sqlite", "testuser2"
+            "testuser1/static-test-instance-private-sqlite", "testuser2"
         )
         # make the instance private
         with pytest.raises(InstanceNotFoundError):
             ln_setup.connect(
-                "https://lamin.ai/laminlabs/static-test-instance-private-sqlite",
+                "https://lamin.ai/testuser1/static-test-instance-private-sqlite",
                 _test=True,
             )
 
@@ -61,7 +61,7 @@ def test_connect_after_private_public_switch():
         # this assumes that testuser1 is an admin of static-test-instance-private-sqlite
         ln_setup.login("testuser1@lamin.ai")
         ln_setup.connect(
-            "https://lamin.ai/laminlabs/static-test-instance-private-sqlite", _test=True
+            "https://lamin.ai/testuser1/static-test-instance-private-sqlite", _test=True
         )
         admin_hub = connect_hub_with_auth()
         # make the instance private
@@ -74,7 +74,7 @@ def test_connect_after_private_public_switch():
         ln_setup.login("testuser2")
         with pytest.raises(InstanceNotFoundError):
             ln_setup.connect(
-                "https://lamin.ai/laminlabs/static-test-instance-private-sqlite",
+                "https://lamin.ai/testuser1/static-test-instance-private-sqlite",
                 _test=True,
             )
         # make the instance public
@@ -85,7 +85,7 @@ def test_connect_after_private_public_switch():
         )
         # load instance with non-collaborator user, should work now
         ln_setup.connect(
-            "https://lamin.ai/laminlabs/static-test-instance-private-sqlite", _test=True
+            "https://lamin.ai/testuser1/static-test-instance-private-sqlite", _test=True
         )
         # make the instance private again
         update_instance(

{lamindb_setup-0.73.1 → lamindb_setup-0.73.2}/tests/storage/test_storage_access.py

@@ -17,7 +17,7 @@ def test_connect_instance_with_private_storage_and_no_storage_access():
     # this should fail because of insufficient AWS permission for the storage bucket
     # that has the SQLite file on it, but because _test=True, we don't actually try to
     # pull the SQLite file -> see the line below to proxy this
-    ln_setup.connect("laminlabs/static-test-instance-private-sqlite", _test=True)
+    ln_setup.connect("testuser1/static-test-instance-private-sqlite", _test=True)
     with pytest.raises(PermissionError):
         (ln_setup.settings.storage.root / "test_file").exists()
     # connecting to a postgres instance should work because it doesn't touch