lamindb_setup 0.71.2__tar.gz → 0.71.3__tar.gz

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/.github/workflows/build.yml

@@ -61,7 +61,7 @@ jobs:
           repository: laminlabs/laminapp-ui
           token: ${{ secrets.GH_TOKEN_DEPLOY_LAMINAPP }}
           path: laminhub
-          ref: 11b0e5065d6f1a05484e1ef8ab8413f3c65bfa5a
+          ref: main
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pre-commit
@@ -130,7 +130,7 @@ jobs:
           repository: laminlabs/laminapp-ui
           token: ${{ secrets.GH_TOKEN_DEPLOY_LAMINAPP }}
           path: laminhub
-          ref: 11b0e5065d6f1a05484e1ef8ab8413f3c65bfa5a
+          ref: main
       - name: Set env file for local test of edge functions
         run: |
           touch .env.local

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/PKG-INFO

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

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/docs/changelog.md

@@ -3,6 +3,8 @@
 <!-- prettier-ignore -->
 Name | PR | Developer | Date | Version
 --- | --- | --- | --- | ---
+♻️ Better treatment of current_user_id | [754](https://github.com/laminlabs/lamindb-setup/pull/754) | [falexwolf](https://github.com/falexwolf) | 2024-05-06 | 0.72.2
+💚 Fix tests | [753](https://github.com/laminlabs/lamindb-setup/pull/753) | [fredericenard](https://github.com/fredericenard) | 2024-05-06 |
 ♻️ Actually use local db | [751](https://github.com/laminlabs/lamindb-setup/pull/751) | [falexwolf](https://github.com/falexwolf) | 2024-05-06 | 0.71.2
 ✏️ Restore view_tree py3.9 compatibility | [750](https://github.com/laminlabs/lamindb-setup/pull/750) | [sunnyosun](https://github.com/sunnyosun) | 2024-05-06 |
 💚 Pin laminapp-ui | [749](https://github.com/laminlabs/lamindb-setup/pull/749) | [falexwolf](https://github.com/falexwolf) | 2024-05-06 |

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/docs/hub-cloud/03-add-managed-storage.ipynb

@@ -302,16 +302,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from laminhub_rest.core.collaborator._add_collaborator import add_collaborator\n",
+    "from laminhub_rest.core.instance.collaborator import InstanceCollaboratorHandler\n",
     "from lamindb_setup.core._hub_client import connect_hub_with_auth\n",
     "\n",
     "admin_hub = connect_hub_with_auth()\n",
-    "add_collaborator(\n",
+    "InstanceCollaboratorHandler(admin_hub).add_by_slug(\n",
+    "    \"testuser1/test-add-managed-storage\",\n",
     "    \"testuser2\",\n",
-    "    \"testuser1\",\n",
-    "    \"test-add-managed-storage\",\n",
-    "    \"write\",\n",
-    "    admin_hub,\n",
+    "    \"write\"\n",
     ")\n",
     "admin_hub.auth.close()"
    ]

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/lamindb_setup/__init__.py

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

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/lamindb_setup/core/_settings_user.py

@@ -46,10 +46,6 @@ class UserSettings:
     @property
     def id(self):
         """Integer id valid in current intance."""
-        # do NOT use the function below because this
-        # doesn't error - it needs to be this way to have
-        # a user id available in migrations
-        # from lnschema_core.users import current_user_id
-        from lnschema_core.models import User
+        from lnschema_core.users import current_user_id
 
-        return User.objects.get(uid=self.uid).id
+        return current_user_id()

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/lamindb_setup/core/django.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 import builtins
 import os
 from pathlib import Path
-import shutil
 import time
 from lamin_utils import logger
 from ._settings_store import current_instance_settings_file
@@ -12,6 +11,7 @@ from ._settings_instance import InstanceSettings
 
 IS_RUN_FROM_IPYTHON = getattr(builtins, "__IPYTHON__", False)
 IS_SETUP = False
+IS_MIGRATING = False
 CONN_MAX_AGE = 299
 
 
@@ -101,7 +101,10 @@ def setup_django(
         call_command("migrate", verbosity=2)
         isettings._update_cloud_sqlite_file(unlock_cloud_sqlite=False)
     elif init:
+        global IS_MIGRATING
+        IS_MIGRATING = True
         call_command("migrate", verbosity=0)
+        IS_MIGRATING = False
 
     global IS_SETUP
     IS_SETUP = True

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/tests/hub-cloud/test_connect_instance.py

@@ -7,8 +7,7 @@ import pytest
 from lamindb_setup._connect_instance import InstanceNotFoundError
 from lamindb_setup.core._hub_client import connect_hub_with_auth
 from lamindb_setup.core._hub_crud import update_instance
-from laminhub_rest.core.collaborator._add_collaborator import add_collaborator
-from laminhub_rest.core.collaborator._delete_collaborator import delete_collaborator
+from laminhub_rest.core.instance.collaborator import InstanceCollaboratorHandler
 from postgrest.exceptions import APIError
 
 # @pytest.fixture
@@ -24,15 +23,16 @@ def test_connect_after_revoked_access():
     if os.getenv("LAMIN_ENV") == "prod":
         ln_setup.login("testuser1@lamin.ai")
         admin_hub = connect_hub_with_auth()
+        collaborator_handler = InstanceCollaboratorHandler(admin_hub)
         try:
             # if a previous test run failed, this will
             # error with a violation of a unique constraint
-            add_collaborator(
+            collaborator_handler.add_by_slug(
+                "laminlabs/static-test-instance-private-sqlite",
                 "testuser2",
-                "laminlabs",
-                "static-test-instance-private-sqlite",
                 "write",
-                admin_hub,
+                "default",
+                skip_insert_user_table=True,
             )
         except APIError:
             pass
@@ -44,11 +44,8 @@ def test_connect_after_revoked_access():
             ln_setup.settings.instance.storage.root_as_str
             == "s3://lamindb-setup-private-bucket"
         )
-        delete_collaborator(
-            "laminlabs",
-            "static-test-instance-private-sqlite",
-            ln_setup.settings.user._uuid,
-            admin_hub,
+        collaborator_handler.delete_by_slug(
+            "laminlabs/static-test-instance-private-sqlite", "testuser2"
         )
         # make the instance private
         with pytest.raises(InstanceNotFoundError):

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/tests/hub-local/conftest.py

@@ -6,7 +6,7 @@ from lamin_utils import logger
 from laminhub_rest.dev._setup_local_hub import setup_local_hub
 
 pytest_plugins = [
-    "laminhub_rest.test.fixtures.user",
+    "laminhub_rest.core.account.user.test.fixtures",
     "laminhub_rest.test.fixtures.run_id",
 ]
 

{lamindb_setup-0.71.2 → lamindb_setup-0.71.3}/tests/hub-local/test_all.py

@@ -34,7 +34,7 @@ from lamindb_setup.core._settings_save import save_user_settings
 from lamindb_setup.core._settings_storage import base62
 from lamindb_setup.core._settings_storage import init_storage as init_storage_base
 from lamindb_setup.core._settings_user import UserSettings
-from laminhub_rest.core.collaborator._add_collaborator import add_collaborator_by_ids
+from laminhub_rest.core.instance.collaborator import InstanceCollaboratorHandler
 from postgrest.exceptions import APIError
 
 
@@ -196,11 +196,11 @@ def test_db_user(
     )
     assert db_collaborator is None
     # now add testreader1 as a collaborator
-    add_collaborator_by_ids(
+    InstanceCollaboratorHandler(admin_client).add(
         account_id=reader_settings._uuid,
         instance_id=instance_id,
         role="read",
-        supabase_client=admin_client,
+        skip_insert_user_table=True,
     )
     # check that this was successful and can be read by the reader
     db_collaborator = select_collaborator(