lamindb_setup 1.0a1__py3-none-any.whl → 1.0.1__py3-none-any.whl

lamindb_setup/__init__.py

@@ -33,10 +33,9 @@ Modules & settings:
 
 """
 
-__version__ = "1.0a1"  # denote a release candidate for 0.1.0 with 0.1rc1
+__version__ = "1.0.1"  # denote a release candidate for 0.1.0 with 0.1rc1
 
-import os as _os
-import sys as _sys
+import os
 
 from . import core
 from ._check_setup import _check_instance_setup
@@ -76,27 +75,11 @@ def _is_CI_environment() -> bool:
         "SEMAPHORE",  # Semaphore CI
         "BUILD_ID",  # Generic build environments
     ]
-    return any(env_var in _os.environ for env_var in ci_env_vars)
+    return any(env_var in os.environ for env_var in ci_env_vars)
 
 
 _TESTING = _is_CI_environment()
 
-
-# hide the supabase error in a thread on windows
-if _os.name == "nt":
-    if _sys.version_info.minor > 7:
-        import threading
-
-        _original_excepthook = threading.excepthook
-
-        def _except_hook(args):
-            is_overflow = args.exc_type is OverflowError
-            for_timeout = str(args.exc_value) == "timeout value is too large"
-            if not (is_overflow and for_timeout):
-                _original_excepthook(args)
-
-        threading.excepthook = _except_hook
-
 # provide a way for other packages to run custom code on import
 _call_registered_entry_points("lamindb_setup.on_import")
 

lamindb_setup/_cache.py

@@ -10,11 +10,15 @@ from .core._settings_save import save_system_storage_settings
 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()
+    try:
+        if settings.instance._is_cloud_sqlite:
+            logger.warning(
+                "Closing the current instance to update the cloud sqlite database."
+            )
+            close()
+    except SystemExit as e:
+        if str(e) != "No instance is loaded! Call `lamin init` or `lamin connect`":
+            raise e
 
     cache_dir = settings.cache_dir
     shutil.rmtree(cache_dir)

lamindb_setup/_check_setup.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import functools
 import importlib as il
 import os
 from typing import TYPE_CHECKING
@@ -13,6 +14,8 @@ from .core._settings_store import current_instance_settings_file
 from .core.exceptions import DefaultMessageException
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from .core._settings_instance import InstanceSettings
 
 
@@ -30,6 +33,20 @@ CURRENT_ISETTINGS: InstanceSettings | None = None
 IS_LOADING: bool = False
 
 
+# decorator to disable auto-connect when importing a module such as lamindb
+def _loading(func: Callable):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        global IS_LOADING
+        IS_LOADING = True
+        try:
+            return func(*args, **kwargs)
+        finally:
+            IS_LOADING = False
+
+    return wrapper
+
+
 def _get_current_instance_settings() -> InstanceSettings | None:
     global CURRENT_ISETTINGS
 

lamindb_setup/_close.py

@@ -24,7 +24,7 @@ def close(mute: bool = False) -> None:
                 logger.warning("did not upload cache file - not enough permissions")
             else:
                 raise e
-        if "bionty" in settings.instance.schema:
+        if "bionty" in settings.instance.modules:
             delete_bionty_sources_yaml()
         current_instance_settings_file().unlink()
         clear_locker()

lamindb_setup/_connect_instance.py

@@ -7,7 +7,7 @@ from uuid import UUID
 
 from lamin_utils import logger
 
-from ._check_setup import _check_instance_setup
+from ._check_setup import _check_instance_setup, _get_current_instance_settings
 from ._close import close as close_instance
 from ._init_instance import (
     MESSAGE_CANNOT_SWITCH_DEFAULT_INSTANCE,
@@ -160,7 +160,7 @@ def _connect_instance(
                 name=name,
                 storage=ssettings,
                 db=db_updated,
-                schema=instance_result["schema_str"],
+                modules=instance_result["schema_str"],
                 git_repo=instance_result["git_repo"],
                 keep_artifacts_local=bool(instance_result["keep_artifacts_local"]),
                 is_on_hub=True,
@@ -186,12 +186,12 @@ def _connect_instance(
 
 
 @unlock_cloud_sqlite_upon_exception(ignore_prev_locker=True)
-def connect(slug: str, **kwargs) -> str | tuple | None:
-    """Connect to instance.
+def connect(instance: str | None = None, **kwargs) -> str | tuple | None:
+    """Connect to an instance.
 
     Args:
-        slug: The instance slug `account_handle/instance_name` or URL.
-            If the instance is owned by you, it suffices to pass the instance name.
+        instance: `None` or an instance identifier (URL, slug `account/name`, or `name` if the instance is local or in your account).
+            If `None`, it will connect to the instance that was connected via the CLI.
     """
     # validate kwargs
     valid_kwargs = {
@@ -220,39 +220,46 @@ def connect(slug: str, **kwargs) -> str | tuple | None:
         access_token = _user.access_token
 
     try:
-        owner, name = get_owner_name_from_identifier(slug)
-
-        if _check_instance_setup() and not _test:
-            if (
-                settings._instance_exists
-                and f"{owner}/{name}" == settings.instance.slug
+        if instance is None:
+            isettings_or_none = _get_current_instance_settings()
+            if isettings_or_none is None:
+                raise SystemExit(
+                    "No instance was connected through the CLI, pass a value to `instance` or connect via the CLI."
+                )
+            isettings = isettings_or_none
+        else:
+            owner, name = get_owner_name_from_identifier(instance)
+            if _check_instance_setup() and not _test:
+                if (
+                    settings._instance_exists
+                    and f"{owner}/{name}" == settings.instance.slug
+                ):
+                    logger.important(f"connected lamindb: {settings.instance.slug}")
+                    return None
+                else:
+                    raise CannotSwitchDefaultInstance(
+                        MESSAGE_CANNOT_SWITCH_DEFAULT_INSTANCE
+                    )
+            elif (
+                _write_settings
+                and settings._instance_exists
+                and f"{owner}/{name}" != settings.instance.slug
             ):
-                logger.info(f"connected lamindb: {settings.instance.slug}")
-                return None
-            else:
-                raise CannotSwitchDefaultInstance(
-                    MESSAGE_CANNOT_SWITCH_DEFAULT_INSTANCE
+                close_instance(mute=True)
+
+            try:
+                isettings = _connect_instance(
+                    owner, name, db=_db, access_token=access_token
                 )
-        elif (
-            _write_settings
-            and settings._instance_exists
-            and f"{owner}/{name}" != settings.instance.slug
-        ):
-            close_instance(mute=True)
-
-        try:
-            isettings = _connect_instance(
-                owner, name, db=_db, access_token=access_token
-            )
-        except InstanceNotFoundError as e:
-            if _raise_not_found_error:
-                raise e
-            else:
-                return "instance-not-found"
-        if isinstance(isettings, str):
-            return isettings
+            except InstanceNotFoundError as e:
+                if _raise_not_found_error:
+                    raise e
+                else:
+                    return "instance-not-found"
+            if isinstance(isettings, str):
+                return isettings
         # at this point we have checked already that isettings is not a string
-        # _user is passed to lock cloud sqite for this user in isettings._load_db()
+        # _user is passed to lock cloud sqlite for this user in isettings._load_db()
         # has no effect if _user is None or if not cloud sqlite instance
         isettings._locker_user = _user
         isettings._persist(write_to_disk=_write_settings)
@@ -304,6 +311,7 @@ def connect(slug: str, **kwargs) -> str | tuple | None:
         load_from_isettings(isettings, user=_user, write_settings=_write_settings)
         if _reload_lamindb:
             importlib.reload(importlib.import_module("lamindb"))
+        logger.important(f"connected lamindb: {isettings.slug}")
     except Exception as e:
         if isettings is not None:
             if _write_settings:
@@ -381,7 +389,7 @@ def migrate_lnschema_core(
         else:
             try:
                 response = input(
-                    f"Do you want to migrate to lamindb 0.78 (integrate lnschema_core into lamindb)? (y/n) -- Will rename {tables_to_rename}"
+                    f"Do you want to migrate to lamindb 1.0 (integrate lnschema_core into lamindb)? (y/n) -- Will rename {tables_to_rename}"
                 )
                 if response != "y":
                     print("Aborted.")

lamindb_setup/_entry_points.py

@@ -5,10 +5,7 @@ from importlib.metadata import entry_points
 
 def call_registered_entry_points(group, **kwargs):
     """load and call entry points registered under group."""
-    if sys.version_info >= (3, 10):
-        eps = entry_points(group=group)
-    else:
-        eps = entry_points().get(group, [])
+    eps = entry_points(group=group)
 
     for ep in eps:
         func = ep.load()

lamindb_setup/_exportdb.py

@@ -12,7 +12,7 @@ MODELS = {
         "User": False,
         "Storage": False,
         "Feature": False,
-        "FeatureSet": False,
+        "Schema": False,
         "ULabel": False,
     },
     # "bionty": {
@@ -57,9 +57,9 @@ def exportdb() -> None:
 
     # export data to parquet files
     print(f"\nexporting data to parquet files in: {directory}\n")
-    for schema_name, models in MODELS.items():
+    for module_name, models in MODELS.items():
         for model_name in models.keys():
-            schema_module = import_module(f"lnschema_{schema_name}")
+            schema_module = import_module(f"lnschema_{module_name}")
             registry = getattr(schema_module, model_name)
             export_registry(registry, directory)
             many_to_many_names = [field.name for field in registry._meta.many_to_many]

lamindb_setup/_importdb.py

@@ -36,10 +36,10 @@ def importdb() -> None:
     with engine.begin() as connection:
         if ln_setup.settings.instance.dialect == "postgresql":
             connection.execute(text("SET CONSTRAINTS ALL DEFERRED;"))
-        for schema_name, models in MODELS.items():
+        for module_name, models in MODELS.items():
             for model_name in models.keys():
                 print(model_name)
-                schema_module = import_module(f"lnschema_{schema_name}")
+                schema_module = import_module(f"lnschema_{module_name}")
                 registry = getattr(schema_module, model_name)
                 import_registry(registry, directory, connection)
                 many_to_many_names = [

lamindb_setup/_init_instance.py

@@ -25,17 +25,17 @@ if TYPE_CHECKING:
     from .core.types import UPathStr
 
 
-def get_schema_module_name(schema_name, raise_import_error: bool = True) -> str | None:
+def get_schema_module_name(module_name, raise_import_error: bool = True) -> str | None:
     import importlib.util
 
-    if schema_name == "core":
+    if module_name == "core":
         return "lamindb"
-    name_attempts = [f"lnschema_{schema_name.replace('-', '_')}", schema_name]
+    name_attempts = [f"lnschema_{module_name.replace('-', '_')}", module_name]
     for name in name_attempts:
         module_spec = importlib.util.find_spec(name)
         if module_spec is not None:
             return name
-    message = f"Schema module '{schema_name}' is not installed → no access to its labels & registries (resolve via `pip install {schema_name}`)"
+    message = f"schema module '{module_name}' is not installed → no access to its labels & registries (resolve via `pip install {module_name}`)"
     if raise_import_error:
         raise ImportError(message)
     logger.warning(message.lower())
@@ -129,12 +129,21 @@ def process_connect_response(
     return instance_id, instance_state
 
 
+def process_modules_arg(modules: str | None = None) -> str:
+    if modules is None or modules == "":
+        return ""
+    # currently no actual validation, can add back if we see a need
+    # the following just strips white spaces
+    to_be_validated = [s.strip() for s in modules.split(",")]
+    return ",".join(to_be_validated)
+
+
 def validate_init_args(
     *,
     storage: UPathStr,
     name: str | None = None,
     db: PostgresDsn | None = None,
-    schema: str | None = None,
+    modules: str | None = None,
     _test: bool = False,
     _write_settings: bool = True,
     _user: UserSettings | None = None,
@@ -150,9 +159,6 @@ def validate_init_args(
     str,
 ]:
     from ._connect_instance import connect
-    from .core._hub_utils import (
-        validate_schema_arg,
-    )
 
     if storage is None:
         raise SystemExit("✗ `storage` argument can't be `None`")
@@ -178,7 +184,7 @@ def validate_init_args(
     instance_id = None
     if response is not None:
         instance_id, instance_state = process_connect_response(response, instance_slug)
-    schema = validate_schema_arg(schema)
+    modules = process_modules_arg(modules)
     return name_str, instance_id, instance_state, instance_slug
 
 
@@ -202,22 +208,23 @@ def init(
     storage: UPathStr,
     name: str | None = None,
     db: PostgresDsn | None = None,
-    schema: str | None = None,
+    modules: str | None = None,
     **kwargs,
 ) -> None:
     """Create and load a LaminDB instance.
 
     Args:
-        storage: Either ``"create-s3"``, local or
-            remote folder (``"s3://..."`` or ``"gs://..."``).
+        storage: Either local or remote folder (`"s3://..."` or `"gs://..."`).
         name: Instance name.
         db: Database connection url, do not pass for SQLite.
-        schema: Comma-separated string of schema modules. None if not set.
+        modules: Comma-separated string of modules. None if the lamindb registries are enough.
     """
     isettings = None
     ssettings = None
 
     _write_settings: bool = kwargs.get("_write_settings", True)
+    if modules is None:
+        modules = kwargs.get("schema", None)
     _test: bool = kwargs.get("_test", False)
 
     # use this user instead of settings.user
@@ -241,7 +248,7 @@ def init(
             storage=storage,
             name=name,
             db=db,
-            schema=schema,
+            modules=modules,
             _test=_test,
             _write_settings=_write_settings,
             _user=_user,  # will get from settings.user if _user is None
@@ -268,7 +275,7 @@ def init(
             name=name_str,
             storage=ssettings,
             db=db,
-            schema=schema,
+            modules=modules,
             uid=ssettings.uid,
             # to lock passed user in isettings._cloud_sqlite_locker.lock()
             _locker_user=_user,  # only has effect if cloud sqlite

lamindb_setup/_migrate.py

@@ -5,7 +5,7 @@ from django.db.migrations.loader import MigrationLoader
 from lamin_utils import logger
 from packaging import version
 
-from . import _check_setup
+from ._check_setup import _check_instance_setup, _loading
 from .core._settings import settings
 from .core.django import setup_django
 
@@ -23,9 +23,9 @@ def check_whether_migrations_in_sync(db_version_str: str):
         return None
     installed_version = version.parse(installed_version_str)
     db_version = version.parse(db_version_str)
-    if (
-        installed_version.major < db_version.major
-        or installed_version.minor < db_version.minor
+    if installed_version.major < db_version.major or (
+        installed_version.major == db_version.major
+        and installed_version.minor < db_version.minor
     ):
         db_version_lower = f"{db_version.major}.{db_version.minor}"
         db_version_upper = f"{db_version.major}.{db_version.minor + 1}"
@@ -37,9 +37,9 @@ def check_whether_migrations_in_sync(db_version_str: str):
             "please update lamindb: pip install"
             f' "lamindb>={db_version_lower},<{db_version_upper}"'
         )
-    elif (
-        installed_version.major > db_version.major
-        or installed_version.minor > db_version.minor
+    elif installed_version.major > db_version.major or (
+        installed_version.major == db_version.major
+        and installed_version.minor > db_version.minor
     ):
         logger.warning(
             f"the database ({db_version_str}) is behind your installed lamindb package"
@@ -62,20 +62,20 @@ class migrate:
     """
 
     @classmethod
+    @_loading
     def create(cls) -> None:
         """Create a migration."""
-        if _check_setup._check_instance_setup():
+        if _check_instance_setup():
             raise RuntimeError("Restart Python session to create migration or use CLI!")
-        _check_setup.IS_LOADING = True
         setup_django(settings.instance, create_migrations=True)
-        _check_setup.IS_LOADING = False
 
     @classmethod
+    @_loading
     def deploy(cls) -> None:
         """Deploy a migration."""
         from ._schema_metadata import update_schema_in_hub
 
-        if _check_setup._check_instance_setup():
+        if _check_instance_setup():
             raise RuntimeError("Restart Python session to migrate or use CLI!")
         from lamindb_setup.core._hub_client import call_with_fallback_auth
         from lamindb_setup.core._hub_crud import (
@@ -115,6 +115,7 @@ class migrate:
             )
 
     @classmethod
+    @_loading
     def check(cls) -> bool:
         """Check whether Registry definitions are in sync with migrations."""
         from django.core.management import call_command
@@ -131,6 +132,7 @@ class migrate:
         return True
 
     @classmethod
+    @_loading
     def squash(
         cls, package_name, migration_nr, start_migration_nr: str | None = None
     ) -> None:
@@ -146,6 +148,7 @@ class migrate:
             call_command("squashmigrations", package_name, migration_nr)
 
     @classmethod
+    @_loading
     def show(cls) -> None:
         """Show migrations."""
         from django.core.management import call_command

lamindb_setup/_schema_metadata.py

@@ -238,15 +238,15 @@ class _ModelHandler:
         model_name = field.model._meta.model_name
         relation_type = self._get_relation_type(model, field)
         if field.related_model is None:
-            schema_name = field.model.__get_schema_name__()
+            schema_name = field.model.__get_module_name__()
             related_model_name = None
             related_schema_name = None
             related_field_name = None
             field_name = field.name
         else:
             related_model_name = field.related_model._meta.model_name
-            related_schema_name = field.related_model.__get_schema_name__()
-            schema_name = field.model.__get_schema_name__()
+            related_schema_name = field.related_model.__get_module_name__()
+            schema_name = field.model.__get_module_name__()
             related_field_name = field.remote_field.name
             field_name = field.name
 
@@ -362,7 +362,7 @@ class _ModelHandler:
 
 class _SchemaHandler:
     def __init__(self) -> None:
-        self.included_modules = ["core"] + list(settings.instance.schema)
+        self.included_modules = ["core"] + list(settings.instance.modules)
         self.modules = self._get_modules_metadata()
 
     def to_dict(self, include_django_objects: bool = True):
@@ -391,7 +391,7 @@ class _SchemaHandler:
                 if model.__class__ is Registry
                 and model is not Record
                 and not model._meta.abstract
-                and model.__get_schema_name__() == module_name
+                and model.__get_module_name__() == module_name
             }
             for module_name in self.included_modules
         }

lamindb_setup/core/_deprecated.py

@@ -30,23 +30,30 @@ from functools import wraps
 def deprecated(new_name: str):
     """Deprecated.
 
-    This is a decorator which can be used to mark functions
+    This is a decorator which can be used to mark functions, methods and properties
     as deprecated. It will result in a warning being emitted
     when the function is used.
+
+    It will also hide the function from the docs.
+
+    Example::
+
+        @property
+        @deprecated("n_files")
+        def n_objects(self) -> int:
+            return self.n_files
+
     """
 
     def decorator(func):
         @wraps(func)
         def new_func(*args, **kwargs):
-            # turn off filter
-            warnings.simplefilter("always", DeprecationWarning)
             warnings.warn(
                 f"Use {new_name} instead of {func.__name__}, "
                 f"{func.__name__} will be removed in the future.",
-                category=DeprecationWarning,
+                category=FutureWarning,
                 stacklevel=2,
             )
-            warnings.simplefilter("default", DeprecationWarning)  # reset filter
             return func(*args, **kwargs)
 
         setattr(new_func, "__deprecated", True)

lamindb_setup/core/_hub_utils.py

@@ -7,15 +7,6 @@ from pydantic import BaseModel, Field, GetCoreSchemaHandler
 from pydantic_core import CoreSchema, core_schema
 
 
-def validate_schema_arg(schema: str | None = None) -> str:
-    if schema is None or schema == "":
-        return ""
-    # currently no actual validation, can add back if we see a need
-    # the following just strips white spaces
-    to_be_validated = [s.strip() for s in schema.split(",")]
-    return ",".join(to_be_validated)
-
-
 def validate_db_arg(db: str | None) -> None:
     if db is not None:
         LaminDsnModel(db=db)

lamindb_setup/core/_settings_instance.py

@@ -8,6 +8,7 @@ from typing import TYPE_CHECKING, Literal
 from django.db.utils import ProgrammingError
 from lamin_utils import logger
 
+from ._deprecated import deprecated
 from ._hub_client import call_with_fallback
 from ._hub_crud import select_account_handle_name_by_lnid
 from ._hub_utils import LaminDsn, LaminDsnModel
@@ -53,7 +54,7 @@ class InstanceSettings:
         keep_artifacts_local: bool = False,  # default to local storage
         uid: str | None = None,  # instance uid/lnid
         db: str | None = None,  # DB URI
-        schema: str | None = None,  # comma-separated string of schema names
+        modules: str | None = None,  # comma-separated string of module names
         git_repo: str | None = None,  # a git repo URL
         is_on_hub: bool | None = None,  # initialized from hub
         api_url: str | None = None,
@@ -69,7 +70,7 @@ class InstanceSettings:
         self._storage: StorageSettings = storage
         validate_db_arg(db)
         self._db: str | None = db
-        self._schema_str: str | None = schema
+        self._schema_str: str | None = modules
         self._git_repo = None if git_repo is None else sanitize_git_repo_url(git_repo)
         # local storage
         self._keep_artifacts_local = keep_artifacts_local
@@ -84,7 +85,7 @@ class InstanceSettings:
     def __repr__(self):
         """Rich string representation."""
         representation = f"Current instance: {self.slug}"
-        attrs = ["owner", "name", "storage", "db", "schema", "git_repo"]
+        attrs = ["owner", "name", "storage", "db", "modules", "git_repo"]
         for attr in attrs:
             value = getattr(self, attr)
             if attr == "storage":
@@ -271,12 +272,20 @@ class InstanceSettings:
         return hash_and_encode_as_b62(self._id.hex)[:12]
 
     @property
-    def schema(self) -> set[str]:
-        """Schema modules in addition to core schema."""
+    def modules(self) -> set[str]:
+        """The set of modules that defines the database schema.
+
+        The core schema contained in lamindb is not included in this set.
+        """
         if self._schema_str is None:
             return {}  # type: ignore
         else:
-            return {schema for schema in self._schema_str.split(",") if schema != ""}
+            return {module for module in self._schema_str.split(",") if module != ""}
+
+    @property
+    @deprecated("modules")
+    def schema(self) -> set[str]:
+        return self.modules
 
     @property
     def _sqlite_file(self) -> UPath:

lamindb_setup/core/_settings_load.py

@@ -98,7 +98,7 @@ def setup_instance_from_store(store: InstanceSettingsStore) -> InstanceSettings:
         name=store.name,
         storage=ssettings,
         db=_null_to_value(store.db),
-        schema=_null_to_value(store.schema_str),
+        modules=_null_to_value(store.schema_str),
         git_repo=_null_to_value(store.git_repo),
         keep_artifacts_local=store.keep_artifacts_local,  # type: ignore
     )

lamindb_setup/core/_setup_bionty_sources.py

@@ -17,7 +17,7 @@ RENAME = {"name": "source", "description": "source_name"}
 
 def write_bionty_sources(isettings: InstanceSettings) -> None:
     """Write bionty sources to Source table."""
-    if "bionty" not in isettings.schema:
+    if "bionty" not in isettings.modules:
         return None
     import shutil
 
@@ -79,7 +79,7 @@ def load_bionty_sources(isettings: InstanceSettings | None = None):
             # not setting up bionty sources
             return None
     if isettings is not None:
-        if "bionty" not in isettings.schema:
+        if "bionty" not in isettings.modules:
             # no need to setup anything
             return None
 
@@ -96,7 +96,7 @@ def load_bionty_sources(isettings: InstanceSettings | None = None):
         for kwargs in active_records:
             for db_field, base_col in RENAME.items():
                 kwargs[base_col] = kwargs.pop(db_field)
-            # TODO: non-bionty schema?
+            # TODO: non-bionty modules?
             kwargs["entity"] = kwargs["entity"].replace("bionty.", "")
         write_yaml(
             parse_currently_used_sources(active_records),

lamindb_setup/core/django.py

@@ -52,14 +52,15 @@ def setup_django(
         }
         from .._init_instance import get_schema_module_name
 
-        schema_names = ["core"] + list(isettings.schema)
+        module_names = ["core"] + list(isettings.modules)
         raise_import_error = True if init else False
-        installed_apps = [
+        installed_apps = ["django.contrib.contenttypes"]
+        installed_apps += [
             package_name
-            for n in schema_names
+            for name in module_names
             if (
                 package_name := get_schema_module_name(
-                    n, raise_import_error=raise_import_error
+                    name, raise_import_error=raise_import_error
                 )
             )
             is not None

lamindb_setup/core/hashing.py

@@ -119,7 +119,7 @@ def hash_dir(path: Path):
             hashes_sizes = pool.map(hash_size, files)
     else:
         hashes_sizes = map(hash_size, files)
-    hashes, sizes = zip(*hashes_sizes)
+    hashes, sizes = zip(*hashes_sizes, strict=False)
 
     hash, hash_type = hash_from_hashes_list(hashes), "md5-d"
     n_files = len(hashes)

lamindb_setup/core/upath.py

@@ -549,7 +549,7 @@ def compute_file_tree(
         pointers = [tee] * (len(contents) - 1) + [last]
         n_files_per_dir_and_type = defaultdict(lambda: 0)  # type: ignore
         # TODO: pass strict=False to zip with python > 3.9
-        for pointer, child_path in zip(pointers, contents):  # type: ignore
+        for pointer, child_path in zip(pointers, contents, strict=False):  # type: ignore
             if child_path.is_dir():
                 if include_dirs and child_path not in include_dirs:
                     continue

{lamindb_setup-1.0a1.dist-info → lamindb_setup-1.0.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: lamindb_setup
-Version: 1.0a1
+Version: 1.0.1
 Summary: Setup & configure LaminDB.
 Author-email: Lamin Labs <open-source@lamin.ai>
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: lamin_utils>=0.3.3
 Requires-Dist: django>=5,<5.2

{lamindb_setup-1.0a1.dist-info → lamindb_setup-1.0.1.dist-info}/RECORD

@@ -1,47 +1,47 @@
-lamindb_setup/__init__.py,sha256=k7P3AZb2980R0v07EyB8b-cVODo3vHm5kzBOn5fYj_4,2646
-lamindb_setup/_cache.py,sha256=1XnM-V_KprbjpgPY7Bg3FYn53Iz_2_fEgcMOaSdKKbg,1332
+lamindb_setup/__init__.py,sha256=IMQj8c7P8mhACmlJoPc_4cGqpaw9mK9SCvBBH3WBxHM,2127
+lamindb_setup/_cache.py,sha256=aszT-zk3S5dTLKp5g1W-S_FPh2E5YVCALwWSGPJLWBM,1493
 lamindb_setup/_check.py,sha256=28PcG8Kp6OpjSLSi1r2boL2Ryeh6xkaCL87HFbjs6GA,129
-lamindb_setup/_check_setup.py,sha256=FQA-wrLJgsBMmK5zJv3-2528CWhS-kwe4vOOXJ06yCM,3023
-lamindb_setup/_close.py,sha256=cXNwK7QTTyNFt2XTpLnO3KHljJ7ShOcISk95np_dltE,1239
-lamindb_setup/_connect_instance.py,sha256=YU54loNCweRy-lqfqd2i2Us6xxwftkUPlmCjiGWJ_wI,16109
+lamindb_setup/_check_setup.py,sha256=DJ4lZp4N9Dcri8H7PEOl-YDoi4qqfQnXvwBuL4venAw,3425
+lamindb_setup/_close.py,sha256=pf8PHrtRBC6TycBtVAXzD9EZSGufoyp5M82o6zLHmt4,1240
+lamindb_setup/_connect_instance.py,sha256=XGYQhUjzGnH-KYniW5a396-U-C90lHXq0QqIzsZXlg0,16778
 lamindb_setup/_delete.py,sha256=Mip5M9tCxyfsjzdcPCl6x9CQ0TkYTqKNNWDIcJ-KVMo,5677
 lamindb_setup/_django.py,sha256=uIQflpkp8l3axyPaKURlk3kacgpElVP5KOKmFxYSMGk,1454
-lamindb_setup/_entry_points.py,sha256=Hs2oJQOCTaGUdWn-1mufM6qUZr9W_EJ_Oc3f0_Vc0Yw,616
-lamindb_setup/_exportdb.py,sha256=VjaeTsYgnhicbQUN05Ae0Au8lFKPAIeii7flOBcaMk4,2117
-lamindb_setup/_importdb.py,sha256=yYYShzUajTsR-cTW4CZ-UNDWZY2uE5PAgNbp-wn8Ogc,1874
-lamindb_setup/_init_instance.py,sha256=OFoaF_wadtxD_ICLq9uPLHP-IWTqGeu8Ea57F-CqgJ4,13617
-lamindb_setup/_migrate.py,sha256=bIW6TkgU93rTdnNAKWcyMgjTF0ypc_dzqsJG2lo_4Iw,9001
+lamindb_setup/_entry_points.py,sha256=sKwXPX9xjOotoAjvgkU5LBwjjHLWVkh0ZGdiSsrch9k,522
+lamindb_setup/_exportdb.py,sha256=QLjoH4dEwqa01A12naKaDPglCCzl2_VLKWFfJRE_uSg,2113
+lamindb_setup/_importdb.py,sha256=fKv9ev5OOj_-bmzC8XZ1GxOcjIjI486yrHSHDWQrJeI,1874
+lamindb_setup/_init_instance.py,sha256=JV34P4ShinIdeUmHeoOvNE3WtzLbk37HcsWxfaEC_ks,13944
+lamindb_setup/_migrate.py,sha256=86ShCTLGnBT3HreYhua4B8YQTy6tyIOgpa0qlsdob1k,9093
 lamindb_setup/_register_instance.py,sha256=alQuYp2f8Ct8xvRC1gt8p_HZ0tqCd3gZD3kiPBLPpsI,1269
 lamindb_setup/_schema.py,sha256=b3uzhhWpV5mQtDwhMINc2MabGCnGLESy51ito3yl6Wc,679
-lamindb_setup/_schema_metadata.py,sha256=2uO6uwWScjwggK44z_UgYAuxL66BdKfy-ad8V4ebwxI,13985
+lamindb_setup/_schema_metadata.py,sha256=7ITlzIK32GHdhMq9e0GtPM3QbzJWhUvzPutiHrjjPk0,13986
 lamindb_setup/_set_managed_storage.py,sha256=4tDxXQMt8Gw028uY3vIQxZQ7qBNXhQMc8saarNK_Z-s,2043
 lamindb_setup/_setup_user.py,sha256=-g7Xj6510BDyM8kuqAsVBZFwehlhBa_uWBSV1rPeuM8,4586
 lamindb_setup/_silence_loggers.py,sha256=AKF_YcHvX32eGXdsYK8MJlxEaZ-Uo2f6QDRzjKFCtws,1568
 lamindb_setup/core/__init__.py,sha256=BxIVMX5HQq8oZ1OuY_saUEJz5Tdd7gaCPngxVu5iou4,417
 lamindb_setup/core/_aws_credentials.py,sha256=_wBWC10MGx3PW9UXGhsVNlq7YvCER3RhfRgAdlxEjNM,6120
 lamindb_setup/core/_aws_storage.py,sha256=nEjeUv4xUVpoV0Lx-zjjmyb9w804bDyaeiM-OqbfwM0,1799
-lamindb_setup/core/_deprecated.py,sha256=3qxUI1dnDlSeR0BYrv7ucjqRBEojbqotPgpShXs4KF8,2520
+lamindb_setup/core/_deprecated.py,sha256=HN7iUBdEgahw5e4NHCd1VJooUfieNb6GRzS5x8jU-q8,2549
 lamindb_setup/core/_docs.py,sha256=3k-YY-oVaJd_9UIY-LfBg_u8raKOCNfkZQPA73KsUhs,276
 lamindb_setup/core/_hub_client.py,sha256=cN19XbZmvLCxL_GKdOcKbedNRL7kR47vmLmA--NMv-U,6306
 lamindb_setup/core/_hub_core.py,sha256=qVGGsWVfP6GK9UzmEz1kuR_B8wFkgTstMJJoMHeUF0c,20007
 lamindb_setup/core/_hub_crud.py,sha256=IAuPZes1am8OFwtcf5jSRQPGG1eKwVTEsp9Li-uq0cQ,5377
-lamindb_setup/core/_hub_utils.py,sha256=08NwQsb53-tXa_pr-f0tPTN0FeeVf_i1p3dEbEWD0F4,3016
+lamindb_setup/core/_hub_utils.py,sha256=6dyDGyzYFgVfR_lE3VN3CP1jGp98gxPtr-T91PAP05U,2687
 lamindb_setup/core/_private_django_api.py,sha256=KIn43HOhiRjkbTbddyJqv-WNTTa1bAizbM1tWXoXPBg,2869
 lamindb_setup/core/_settings.py,sha256=eslFO84vb5uRRfJ3r_uu4O8677l8lU5BbpZJMSAYw6A,8244
-lamindb_setup/core/_settings_instance.py,sha256=gUbffwhsp_SygjU0P1bohXnRejAQ2sDTjctSg4-O94A,19199
-lamindb_setup/core/_settings_load.py,sha256=5OpghcbkrK9KBM_0Iu-61FTI76UbOpPkkJpUittXS-w,4098
+lamindb_setup/core/_settings_instance.py,sha256=agzlSvKhvLyyNPf-Gw-M3FYn2ARpR1QEoCexhIHX5IU,19437
+lamindb_setup/core/_settings_load.py,sha256=boeNntqIZ_DjelRBUAGp0ujc5akmbrrsk-LY28exa7E,4099
 lamindb_setup/core/_settings_save.py,sha256=rxGxgaK5i9exKqSJERQQyY1WZio20meoQJoYXlVW-1w,3138
 lamindb_setup/core/_settings_storage.py,sha256=dPIvbA6PkdjM8gsX6zxtH7VNMc4vhkuEO4luVMZY7RQ,12243
 lamindb_setup/core/_settings_store.py,sha256=WcsgOmgnu9gztcrhp-N4OONNZyxICHV8M0HdJllTaEo,2219
 lamindb_setup/core/_settings_user.py,sha256=lWqV3HmZCsEq2UsU_iVNW0p9ddsNg7-B6xOaMNH1aw0,1475
-lamindb_setup/core/_setup_bionty_sources.py,sha256=jZOPXpipW_5IjMO-bLMk-_wVwk7-5MLd72K2rnqqy7U,4001
+lamindb_setup/core/_setup_bionty_sources.py,sha256=qTPMV5TEbNiTB81QqG2rSs6W8j8kQ7kVQMLOXRzAxBI,4004
 lamindb_setup/core/cloud_sqlite_locker.py,sha256=i6TrT7HG0lqliPvZTlsZ_uplPaqhPBbabyfeR32SkA8,7107
-lamindb_setup/core/django.py,sha256=bJme5D9KHmo98S9dLzFktdS2rZ0Aoj4EdkirniirB1I,3763
+lamindb_setup/core/django.py,sha256=jSbckc_R39BhnANGhO5YFzKA8BHNANJDDgS5rwkDWmU,3828
 lamindb_setup/core/exceptions.py,sha256=4NpLUNUIfXYVTFX2FvLZF8RW34exk2Vn2X3G4YhnTRg,276
-lamindb_setup/core/hashing.py,sha256=2kZy_7NQB1WoUK8SBrhFX90lBpTkBr1V9tf7FS9Fe2Q,3380
+lamindb_setup/core/hashing.py,sha256=EO7NSXMdKZLe9cHxCNHiqd5-6pVhv97uafqpoWV9FKc,3394
 lamindb_setup/core/types.py,sha256=zJii2le38BJUmsNVvzDrbzGYr0yaeb-9Rw9IKmsBr3k,523
-lamindb_setup/core/upath.py,sha256=UqfZcSIEflje2393osJ0tleizGKip5N1VJtXXVFUH7U,31061
-lamindb_setup-1.0a1.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
-lamindb_setup-1.0a1.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-lamindb_setup-1.0a1.dist-info/METADATA,sha256=YRknY51lYN64_4Nm-ytu8YmaeVvcD4B2XLCutFPNkNo,1689
-lamindb_setup-1.0a1.dist-info/RECORD,,
+lamindb_setup/core/upath.py,sha256=iZIGnkvG6uZhjiq2qJ8v4pgABxw2rBwm_XSnZACzHVo,31075
+lamindb_setup-1.0.1.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
+lamindb_setup-1.0.1.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+lamindb_setup-1.0.1.dist-info/METADATA,sha256=MpFtq1_UbY_S1hUZpEIZRZVcpJQ3-rVwbrxDkjA0P88,1690
+lamindb_setup-1.0.1.dist-info/RECORD,,