lamindb_setup 1.7.0__tar.gz → 1.7.1__tar.gz

{lamindb_setup-1.7.0 → lamindb_setup-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lamindb_setup
-Version: 1.7.0
+Version: 1.7.1
 Summary: Setup & configure LaminDB.
 Author-email: Lamin Labs <open-source@lamin.ai>
 Requires-Python: >=3.10

{lamindb_setup-1.7.0 → lamindb_setup-1.7.1}/docs/hub-cloud/08-test-multi-session.ipynb

@@ -54,15 +54,6 @@
     "ln_setup.init(storage=\"./testsetup\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "assert ln_setup.settings.instance.slug == \"testuser1/testsetup\""
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -120,7 +111,43 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Connect to another instance in the same process:"
+    "Let us try to init another instance in the same Python session:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from lamindb_setup._init_instance import CannotSwitchDefaultInstance\n",
+    "\n",
+    "with pytest.raises(CannotSwitchDefaultInstance):\n",
+    "    ln_setup.init(storage=\"./testsetup2\")\n",
+    "with pytest.raises(CannotSwitchDefaultInstance):\n",
+    "    ln_setup.connect(\"testsetup\")\n",
+    "with pytest.raises(RuntimeError):\n",
+    "    ln_setup.migrate.create()\n",
+    "with pytest.raises(RuntimeError):\n",
+    "    ln_setup.migrate.deploy()\n",
+    "\n",
+    "assert ln_setup.settings.instance.slug == \"testuser1/testsetup\""
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Reset `django` and connect to another instance:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "ln_setup.core.django.reset_django()"
    ]
   },
   {

{lamindb_setup-1.7.0 → lamindb_setup-1.7.1}/lamindb_setup/__init__.py

@@ -35,7 +35,7 @@ Modules & settings:
 
 """
 
-__version__ = "1.7.0"  # denote a release candidate for 0.1.0 with 0.1rc1
+__version__ = "1.7.1"  # denote a release candidate for 0.1.0 with 0.1rc1
 
 import os
 

{lamindb_setup-1.7.0 → lamindb_setup-1.7.1}/lamindb_setup/_connect_instance.py

@@ -9,7 +9,10 @@ from lamin_utils import logger
 
 from ._check_setup import _check_instance_setup, _get_current_instance_settings
 from ._disconnect import disconnect
-from ._init_instance import load_from_isettings
+from ._init_instance import (
+    MESSAGE_CANNOT_SWITCH_DEFAULT_INSTANCE,
+    load_from_isettings,
+)
 from ._silence_loggers import silence_loggers
 from .core._hub_core import connect_instance_hub
 from .core._hub_utils import (
@@ -238,9 +241,9 @@ def connect(instance: str | None = None, **kwargs: Any) -> str | tuple | None:
                     logger.important(f"connected lamindb: {settings.instance.slug}")
                     return None
                 else:
-                    from lamindb_setup.core.django import reset_django
-
-                    reset_django()
+                    raise CannotSwitchDefaultInstance(
+                        MESSAGE_CANNOT_SWITCH_DEFAULT_INSTANCE
+                    )
             elif (
                 _write_settings
                 and settings._instance_exists

{lamindb_setup-1.7.0 → lamindb_setup-1.7.1}/lamindb_setup/_init_instance.py

@@ -215,6 +215,16 @@ def validate_init_args(
     return name_str, instance_id, instance_state, instance_slug
 
 
+MESSAGE_CANNOT_SWITCH_DEFAULT_INSTANCE = """
+You cannot write to different instances in the same Python session.
+
+Do you want to read from another instance via `SQLRecord.using()`? For example:
+
+ln.Artifact.using("laminlabs/cellxgene").filter()
+
+Or do you want to switch off auto-connect via `lamin settings set auto-connect false`?
+"""
+
 DOC_STORAGE_ARG = "A local or remote folder (`'s3://...'` or `'gs://...'`). Defaults to current working directory."
 DOC_INSTANCE_NAME = (
     "Instance name. If not passed, it will equal the folder name passed to `storage`."
@@ -262,9 +272,7 @@ def init(
         from ._check_setup import _check_instance_setup
 
         if _check_instance_setup() and not _test:
-            from lamindb_setup.core.django import reset_django
-
-            reset_django()
+            raise CannotSwitchDefaultInstance(MESSAGE_CANNOT_SWITCH_DEFAULT_INSTANCE)
         elif _write_settings:
             disconnect(mute=True)
         from .core._hub_core import init_instance_hub