lamindb_setup 0.71.1__tar.gz → 0.71.3__tar.gz

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

@@ -12,6 +12,7 @@ jobs:
   # tests only on production hub
   hub-prod:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -91,6 +92,7 @@ jobs:
   # test user access to storage
   storage:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
@@ -114,7 +116,7 @@ jobs:
   # test low-level hub functionality
   hub-local:
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 10
     steps:
       - uses: aws-actions/configure-aws-credentials@v2
         with:

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

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

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

@@ -3,6 +3,11 @@
 <!-- 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 |
 ♻️ Extend valid suffixes to composite suffixes | [746](https://github.com/laminlabs/lamindb-setup/pull/746) | [falexwolf](https://github.com/falexwolf) | 2024-05-03 | 0.71.1
 🐛 Fix test failures | [745](https://github.com/laminlabs/lamindb-setup/pull/745) | [Koncopd](https://github.com/Koncopd) | 2024-05-03 |
 ♻️ Persist keep-artifacts-local in settings.env | [743](https://github.com/laminlabs/lamindb-setup/pull/743) | [falexwolf](https://github.com/falexwolf) | 2024-05-03 |

{lamindb_setup-0.71.1 → 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.1 → lamindb_setup-0.71.3}/lamindb_setup/__init__.py

@@ -34,7 +34,7 @@ Modules & settings:
 
 """
 
-__version__ = "0.71.1"  # 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.1 → lamindb_setup-0.71.3}/lamindb_setup/_connect_instance.py

@@ -107,7 +107,7 @@ def connect(
     *,
     db: str | None = None,
     storage: UPathStr | None = None,
-    _raise_not_reachable_error: bool = True,
+    _raise_not_found_error: bool = True,
     _test: bool = False,
 ) -> str | tuple | None:
     """Connect to instance.
@@ -181,12 +181,12 @@ def connect(
                 if settings_file.exists():
                     isettings = load_instance_settings(settings_file)
                     if isettings.is_remote:
-                        if _raise_not_reachable_error:
+                        if _raise_not_found_error:
                             raise InstanceNotFoundError(message)
                         return "instance-not-found"
 
                 else:
-                    if _raise_not_reachable_error:
+                    if _raise_not_found_error:
                         raise InstanceNotFoundError(message)
                     return "instance-not-found"
 
@@ -209,7 +209,7 @@ def connect(
                     f" {isettings._sqlite_file_local}\nTo push the file to the cloud,"
                     " call: lamin close"
                 )
-            elif _raise_not_reachable_error:
+            elif _raise_not_found_error:
                 raise SystemExit(msg)
             else:
                 logger.warning(

{lamindb_setup-0.71.1 → lamindb_setup-0.71.3}/lamindb_setup/_init_instance.py

@@ -184,7 +184,7 @@ def validate_init_args(
     name_str = infer_instance_name(storage=storage, name=name, db=db)
     # test whether instance exists by trying to load it
     instance_slug = f"{settings.user.handle}/{name_str}"
-    response = connect(instance_slug, _raise_not_reachable_error=False, _test=_test)
+    response = connect(instance_slug, db=db, _raise_not_found_error=False, _test=_test)
     instance_state: Literal[
         "connected",
         "instance-corrupted-or-deleted",

{lamindb_setup-0.71.1 → lamindb_setup-0.71.3}/lamindb_setup/core/_hub_core.py

@@ -290,7 +290,7 @@ def _init_instance(isettings: InstanceSettings, client: Client) -> None:
     client.table("storage").update(
         {"instance_id": isettings._id.hex, "is_default": True}
     ).eq("id", isettings.storage._uuid.hex).execute()  # type: ignore
-    logger.save(f"browse to: https://lamin.ai/{isettings.owner}/{isettings.name}")
+    logger.important(f"go to: https://lamin.ai/{isettings.owner}/{isettings.name}")
 
 
 def connect_instance(

{lamindb_setup-0.71.1 → 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.1 → lamindb_setup-0.71.3}/lamindb_setup/core/upath.py

@@ -471,7 +471,8 @@ def compute_file_tree(
             contents = [d for d in contents if d.is_dir()]
         pointers = [tee] * (len(contents) - 1) + [last]
         n_files_per_dir_and_type = defaultdict(lambda: 0)  # type: ignore
-        for pointer, child_path in zip(pointers, contents, strict=False):  # type: ignore
+        # TODO: pass strict=False to zip with python > 3.9
+        for pointer, child_path in zip(pointers, contents):  # type: ignore
             if child_path.is_dir():
                 if include_dirs and child_path not in include_dirs:
                     continue
@@ -504,8 +505,8 @@ def compute_file_tree(
     display_suffixes = ", ".join([f"{suffix!r}" for suffix in suffixes])
     suffix_message = f" with suffixes {display_suffixes}" if n_objects > 0 else ""
     message = (
-        f"{path.name} ({n_directories} sub-{directory_info} &"
-        f" {n_objects} files{suffix_message}): {folder_tree}"
+        f"{n_directories} sub-{directory_info} &"
+        f" {n_objects} files{suffix_message}\n{path.resolve()}{folder_tree}"
     )
     return message, n_objects
 
@@ -810,12 +811,12 @@ def check_storage_is_empty(
         if raise_error
         else "consider deleting them"
     )
-    hint = "'./lamindb/_is_initialized' "
+    hint = "'_is_initialized'"
     if n_offset_objects == 2:
-        hint += "& SQLite file"
+        hint += " & SQLite file"
     hint += " ignored"
     message = (
-        f"Storage {directory_string} contains {n_objects} objects "
+        f"Storage {directory_string} contains {n_objects - n_offset_objects} objects "
         f"({hint}) - {ask_for_deletion}\n{objects}"
     )
     if n_diff > 0:

{lamindb_setup-0.71.1 → 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.1 → 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.1 → 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(