lamindb_setup 0.77.4__py2.py3-none-any.whl → 0.77.6__py2.py3-none-any.whl

lamindb_setup/__init__.py

@@ -21,7 +21,6 @@ Instance operations:
    :toctree:
 
    migrate
-   register
 
 Modules & settings:
 
@@ -34,7 +33,7 @@ Modules & settings:
 
 """
 
-__version__ = "0.77.4"  # denote a release candidate for 0.1.0 with 0.1rc1
+__version__ = "0.77.6"  # denote a release candidate for 0.1.0 with 0.1rc1
 
 import os as _os
 import sys as _sys

lamindb_setup/_cache.py

@@ -1,34 +1,34 @@
-from __future__ import annotations
-
-import shutil
-
-from lamin_utils import logger
-
-
-def clear_cache_dir():
-    from lamindb_setup import close, settings
-
-    if settings.instance._is_cloud_sqlite:
-        logger.warning(
-            "Closing the current instance to update the cloud sqlite database."
-        )
-        close()
-
-    cache_dir = settings.storage.cache_dir
-    shutil.rmtree(cache_dir)
-    cache_dir.mkdir()
-    logger.success("The cache directory was cleared.")
-
-
-def get_cache_dir():
-    from lamindb_setup import settings
-
-    return settings.storage.cache_dir.as_posix()
-
-
-def set_cache_dir(cache_dir: str):
-    from lamindb_setup import settings
-
-    settings.storage.cache_dir = cache_dir
-    cache_str = settings.storage.cache_dir.as_posix()  # type: ignore
-    logger.success(f"The cache directory was set to {cache_str}.")
+from __future__ import annotations
+
+import shutil
+
+from lamin_utils import logger
+
+
+def clear_cache_dir():
+    from lamindb_setup import close, settings
+
+    if settings.instance._is_cloud_sqlite:
+        logger.warning(
+            "Closing the current instance to update the cloud sqlite database."
+        )
+        close()
+
+    cache_dir = settings.storage.cache_dir
+    shutil.rmtree(cache_dir)
+    cache_dir.mkdir()
+    logger.success("The cache directory was cleared.")
+
+
+def get_cache_dir():
+    from lamindb_setup import settings
+
+    return settings.storage.cache_dir.as_posix()
+
+
+def set_cache_dir(cache_dir: str):
+    from lamindb_setup import settings
+
+    settings.storage.cache_dir = cache_dir
+    cache_str = settings.storage.cache_dir.as_posix()  # type: ignore
+    logger.success(f"The cache directory was set to {cache_str}.")

lamindb_setup/_check.py

@@ -1,7 +1,7 @@
-from __future__ import annotations
-
-
-def check():
-    from django.core.management import call_command
-
-    call_command("check")
+from __future__ import annotations
+
+
+def check():
+    from django.core.management import call_command
+
+    call_command("check")

lamindb_setup/_check_setup.py

@@ -1,79 +1,92 @@
-from __future__ import annotations
-
-import os
-from typing import TYPE_CHECKING, Optional
-
-from lamin_utils import logger
-
-from ._silence_loggers import silence_loggers
-from .core import django
-from .core._settings import settings
-from .core._settings_store import current_instance_settings_file
-from .core.exceptions import DefaultMessageException
-
-if TYPE_CHECKING:
-    from .core._settings_instance import InstanceSettings
-
-
-class InstanceNotSetupError(DefaultMessageException):
-    default_message = """\
-To use lamindb, you need to connect to an instance.
-
-Connect to an instance: `ln.connect()`. Init an instance: `ln.setup.init()`.
-
-If you used the CLI to set up lamindb in a notebook, restart the Python session.
-"""
-
-
-CURRENT_ISETTINGS: InstanceSettings | None = None
-
-
-def _get_current_instance_settings() -> InstanceSettings | None:
-    global CURRENT_ISETTINGS
-
-    if CURRENT_ISETTINGS is not None:
-        return CURRENT_ISETTINGS
-    if current_instance_settings_file().exists():
-        from .core._settings_load import load_instance_settings
-
-        try:
-            isettings = load_instance_settings()
-        except Exception as e:
-            # user will get more detailed traceback once they run the CLI
-            logger.error(
-                "Current instance cannot be reached, unload it: `lamin load --unload`\n"
-                "Alternatively, init or load a connectable instance on the"
-                " command line: `lamin load <instance>` or `lamin init <...>`"
-            )
-            raise e
-        return isettings
-    else:
-        return None
-
-
-# we make this a private function because in all the places it's used,
-# users should see it
-def _check_instance_setup(from_lamindb: bool = False) -> bool:
-    if django.IS_SETUP:
-        return True
-    silence_loggers()
-    if os.environ.get("LAMINDB_MULTI_INSTANCE") == "true":
-        logger.warning(
-            "running LaminDB in multi-instance mode; you'll experience "
-            "errors in regular lamindb usage"
-        )
-        return True
-    isettings = _get_current_instance_settings()
-    if isettings is not None:
-        if from_lamindb and settings.auto_connect:
-            if not django.IS_SETUP:
-                from ._init_instance import reload_schema_modules
-
-                django.setup_django(isettings)
-                reload_schema_modules(isettings)
-                logger.important(f"connected lamindb: {isettings.slug}")
-        return django.IS_SETUP
-    else:
-        if from_lamindb and settings.auto_connect:
-            logger.warning(InstanceNotSetupError.default_message)
-        return False
+from __future__ import annotations
+
+import importlib as il
+import os
+from typing import TYPE_CHECKING, Optional
+
+from lamin_utils import logger
+
+from ._silence_loggers import silence_loggers
+from .core import django
+from .core._settings import settings
+from .core._settings_store import current_instance_settings_file
+from .core.exceptions import DefaultMessageException
+
+if TYPE_CHECKING:
+    from .core._settings_instance import InstanceSettings
+
+
+class InstanceNotSetupError(DefaultMessageException):
+    default_message = """\
+To use lamindb, you need to connect to an instance.
+
+Connect to an instance: `ln.connect()`. Init an instance: `ln.setup.init()`.
+
+If you used the CLI to set up lamindb in a notebook, restart the Python session.
+"""
+
+
+CURRENT_ISETTINGS: InstanceSettings | None = None
+
+
+def _get_current_instance_settings() -> InstanceSettings | None:
+    global CURRENT_ISETTINGS
+
+    if CURRENT_ISETTINGS is not None:
+        return CURRENT_ISETTINGS
+    if current_instance_settings_file().exists():
+        from .core._settings_load import load_instance_settings
+
+        try:
+            isettings = load_instance_settings()
+        except Exception as e:
+            # user will get more detailed traceback once they run the CLI
+            logger.error(
+                "Current instance cannot be reached, unload it: `lamin load --unload`\n"
+                "Alternatively, init or load a connectable instance on the"
+                " command line: `lamin load <instance>` or `lamin init <...>`"
+            )
+            raise e
+        return isettings
+    else:
+        return None
+
+
+# we make this a private function because in all the places it's used,
+# users should not see it
+def _check_instance_setup(
+    from_lamindb: bool = False, from_module: str | None = None
+) -> bool:
+    reload_module = from_lamindb or from_module is not None
+    from ._init_instance import get_schema_module_name, reload_schema_modules
+
+    if django.IS_SETUP:
+        # reload logic here because module might not yet have been imported
+        # upon first setup
+        if from_module is not None:
+            il.reload(il.import_module(from_module))
+        return True
+    silence_loggers()
+    if os.environ.get("LAMINDB_MULTI_INSTANCE") == "true":
+        logger.warning(
+            "running LaminDB in multi-instance mode; you'll experience "
+            "errors in regular lamindb usage"
+        )
+        return True
+    isettings = _get_current_instance_settings()
+    if isettings is not None:
+        if reload_module and settings.auto_connect:
+            if not django.IS_SETUP:
+                django.setup_django(isettings)
+                if from_module is not None:
+                    # this only reloads `from_module`
+                    il.reload(il.import_module(from_module))
+                else:
+                    # this bulk reloads all schema modules
+                    reload_schema_modules(isettings)
+                logger.important(f"connected lamindb: {isettings.slug}")
+        return django.IS_SETUP
+    else:
+        if reload_module and settings.auto_connect:
+            logger.warning(InstanceNotSetupError.default_message)
+        return False

lamindb_setup/_close.py

@@ -1,35 +1,35 @@
-from __future__ import annotations
-
-from lamin_utils import logger
-
-from .core._settings import settings
-from .core._settings_store import current_instance_settings_file
-from .core._setup_bionty_sources import delete_bionty_sources_yaml
-from .core.cloud_sqlite_locker import clear_locker
-
-
-def close(mute: bool = False) -> None:
-    """Close existing instance.
-
-    Returns `None` if succeeds, otherwise an exception is raised.
-    """
-    if current_instance_settings_file().exists():
-        instance = settings.instance.slug
-        try:
-            settings.instance._update_cloud_sqlite_file()
-        except Exception as e:
-            if isinstance(e, FileNotFoundError):
-                logger.warning("did not find local cache file")
-            elif isinstance(e, PermissionError):
-                logger.warning("did not upload cache file - not enough permissions")
-            else:
-                raise e
-        if "bionty" in settings.instance.schema:
-            delete_bionty_sources_yaml()
-        current_instance_settings_file().unlink()
-        clear_locker()
-        if not mute:
-            logger.success(f"closed instance: {instance}")
-    else:
-        if not mute:
-            logger.info("no instance loaded")
+from __future__ import annotations
+
+from lamin_utils import logger
+
+from .core._settings import settings
+from .core._settings_store import current_instance_settings_file
+from .core._setup_bionty_sources import delete_bionty_sources_yaml
+from .core.cloud_sqlite_locker import clear_locker
+
+
+def close(mute: bool = False) -> None:
+    """Close existing instance.
+
+    Returns `None` if succeeds, otherwise an exception is raised.
+    """
+    if current_instance_settings_file().exists():
+        instance = settings.instance.slug
+        try:
+            settings.instance._update_cloud_sqlite_file()
+        except Exception as e:
+            if isinstance(e, FileNotFoundError):
+                logger.warning("did not find local cache file")
+            elif isinstance(e, PermissionError):
+                logger.warning("did not upload cache file - not enough permissions")
+            else:
+                raise e
+        if "bionty" in settings.instance.schema:
+            delete_bionty_sources_yaml()
+        current_instance_settings_file().unlink()
+        clear_locker()
+        if not mute:
+            logger.success(f"closed instance: {instance}")
+    else:
+        if not mute:
+            logger.info("no instance loaded")