lamindb_setup 0.77.0__py2.py3-none-any.whl → 0.77.2__py2.py3-none-any.whl

lamindb_setup/__init__.py

@@ -34,7 +34,7 @@ Modules & settings:
 
 """
 
-__version__ = "0.77.0"  # denote a release candidate for 0.1.0 with 0.1rc1
+__version__ = "0.77.2"  # denote a release candidate for 0.1.0 with 0.1rc1
 
 import os as _os
 import sys as _sys
@@ -45,6 +45,7 @@ from ._close import close
 from ._connect_instance import connect, load
 from ._delete import delete
 from ._django import django
+from ._entry_points import call_registered_entry_points as _call_registered_entry_points
 from ._init_instance import init
 from ._migrate import migrate
 from ._register_instance import register
@@ -68,4 +69,7 @@ if _os.name == "nt":
 
         threading.excepthook = _except_hook
 
+# provide a way for other packages to run custom code on import
+_call_registered_entry_points("lamindb_setup.on_import")
+
 settings.__doc__ = """Global :class:`~lamindb.setup.core.SetupSettings`."""

lamindb_setup/_connect_instance.py

@@ -12,6 +12,7 @@ from ._init_instance import MESSAGE_NO_MULTIPLE_INSTANCE, load_from_isettings
 from ._migrate import check_whether_migrations_in_sync
 from ._silence_loggers import silence_loggers
 from .core._hub_core import connect_instance as load_instance_from_hub
+from .core._hub_core import connect_instance_new as load_instance_from_hub_edge
 from .core._hub_utils import (
     LaminDsn,
     LaminDsnModel,
@@ -126,7 +127,10 @@ def _connect_instance(
         # on the hub
         # do not call hub if the user is anonymous
         if owner != "anonymous":
-            hub_result = load_instance_from_hub(owner=owner, name=name)
+            if settings.user.handle in {"Koncopd", "sunnyosun", "falexwolf"}:
+                hub_result = load_instance_from_hub_edge(owner=owner, name=name)
+            else:
+                hub_result = load_instance_from_hub(owner=owner, name=name)
         else:
             hub_result = "anonymous-user"
         # if hub_result is not a string, it means it made a request

lamindb_setup/_entry_points.py

@@ -0,0 +1,22 @@
+import sys
+import warnings
+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, [])
+
+    for ep in eps:
+        func = ep.load()
+        try:
+            func(**kwargs)
+        except BaseException as e:
+            warnings.warn(
+                f"Error loading entry point of group {group!r}: {ep} -> {e}",
+                RuntimeWarning,
+                stacklevel=2,
+            )

lamindb_setup/_setup_user.py

@@ -28,7 +28,7 @@ def load_user(email: str | None = None, handle: str | None = None) -> UserSettin
     if settings_file.exists():
         user_settings = load_user_settings(settings_file)
         save_user_settings(user_settings)  # needed to save to current_user.env
-        assert user_settings.email is not None
+        assert user_settings.email is not None or user_settings.api_key is not None
     else:
         user_settings = load_or_create_user_settings()
         if email is None:
@@ -74,13 +74,15 @@ def login(
             # within UserSettings, we still call it "password" for a while
             user_settings.password = key
 
-        if user_settings.email is None:
-            raise SystemExit(f"✗ No stored user email, please call: lamin login {user}")
-
         if user_settings.password is None:
-            raise SystemExit(
-                "✗ No stored API key, please call: lamin login <your-email> --key <API-key>"
-            )
+            api_key = user_settings.api_key
+            if api_key is None:
+                raise SystemExit(
+                    "✗ No stored API key, please call: "
+                    "`lamin login` or `lamin login <your-email> --key <API-key>`"
+                )
+        elif user_settings.email is None:
+            raise SystemExit(f"✗ No stored user email, please call: lamin login {user}")
     else:
         user_settings = load_or_create_user_settings()
 
@@ -94,6 +96,7 @@ def login(
         )
     else:
         response = sign_in_hub_api_key(api_key)
+        user_settings.password = None
 
     if isinstance(response, Exception):
         raise response

lamindb_setup/core/_hub_client.py

@@ -131,7 +131,7 @@ def call_with_fallback_auth(
         try:
             if renew_token:
                 logger.warning(
-                    "renewing expired lamin token: call `lamin login` to avoid this"
+                    "renewing expired lamin token: call `lamin login <your-handle>` to avoid this"
                 )
             client = connect_hub_with_auth(
                 renew_token=renew_token, fallback_env=fallback_env

lamindb_setup/core/_hub_core.py

@@ -277,7 +277,6 @@ def _init_instance(isettings: InstanceSettings, client: Client) -> None:
         "id": isettings._id.hex,
         "account_id": settings.user._uuid.hex,  # type: ignore
         "name": isettings.name,
-        "storage_id": isettings.storage._uuid.hex,  # type: ignore
         "lnid": isettings.uid,
         "schema_str": isettings._schema_str,
         "lamindb_version": lamindb_version,
@@ -340,7 +339,7 @@ def _connect_instance(
         # get default storage
         storage = select_default_storage_by_instance_id(instance["id"], client)
         if storage is None:
-            return "storage-does-not-exist-on-hub"
+            return "default-storage-does-not-exist-on-hub"
     else:
         account = instance_account_storage.pop("account")
         storage = instance_account_storage.pop("storage")
@@ -367,6 +366,73 @@ def _connect_instance(
     return instance, storage  # type: ignore
 
 
+def _connect_instance_new(
+    owner: str,  # account_handle
+    name: str,  # instance_name
+    client: Client,
+) -> tuple[dict, dict] | str:
+    response = client.functions.invoke(
+        "get-instance-settings", invoke_options={"body": {"owner": owner, "name": name}}
+    )
+    # no instance found, check why is that
+    if response == b"{}":
+        # try the via single requests, will take more time
+        account = select_account_by_handle(owner, client)
+        if account is None:
+            return "account-not-exists"
+        instance = select_instance_by_name(account["id"], name, client)
+        if instance is None:
+            return "instance-not-found"
+        # get default storage
+        storage = select_default_storage_by_instance_id(instance["id"], client)
+        if storage is None:
+            return "default-storage-does-not-exist-on-hub"
+        logger.warning(
+            "Could not find instance via API, but found directly querying hub."
+        )
+    else:
+        instance = json.loads(response)
+        storage = instance.pop("storage")
+
+    if instance["db_scheme"] is not None:
+        db_user_name, db_user_password = None, None
+        if "db_user_name" in instance and "db_user_password" in instance:
+            db_user_name, db_user_password = (
+                instance["db_user_name"],
+                instance["db_user_password"],
+            )
+        else:
+            db_user = select_db_user_by_instance(instance["id"], client)
+            if db_user is not None:
+                db_user_name, db_user_password = (
+                    db_user["db_user_name"],
+                    db_user["db_user_password"],
+                )
+        db_dsn = LaminDsn.build(
+            scheme=instance["db_scheme"],
+            user=db_user_name if db_user_name is not None else "none",
+            password=db_user_password if db_user_password is not None else "none",
+            host=instance["db_host"],
+            port=instance["db_port"],
+            database=instance["db_database"],
+        )
+        instance["db"] = db_dsn
+    return instance, storage  # type: ignore
+
+
+def connect_instance_new(
+    *,
+    owner: str,  # account_handle
+    name: str,  # instance_name
+) -> tuple[dict, dict] | str:
+    from ._settings import settings
+
+    if settings.user.handle != "anonymous":
+        return call_with_fallback_auth(_connect_instance_new, owner=owner, name=name)
+    else:
+        return call_with_fallback(_connect_instance_new, owner=owner, name=name)
+
+
 def access_aws(storage_root: str, access_token: str | None = None) -> dict[str, dict]:
     from ._settings import settings
 

lamindb_setup/core/_settings_instance.py

@@ -333,6 +333,12 @@ class InstanceSettings:
     @property
     def db(self) -> str:
         """Database connection string (URI)."""
+        if "LAMINDB_DJANGO_DATABASE_URL" in os.environ:
+            logger.warning(
+                "LAMINDB_DJANGO_DATABASE_URL env variable "
+                f"is set to {os.environ['LAMINDB_DJANGO_DATABASE_URL']}. "
+                "It overwrites all db connections and is used instead of `instance.db`."
+            )
         if self._db is None:
             # here, we want the updated sqlite file
             # hence, we don't use self._sqlite_file_local()

lamindb_setup/core/_settings_save.py

@@ -55,7 +55,7 @@ def save_settings(
                         settings_key = f"_{store_key.rstrip('_')}"
                     else:
                         settings_key = store_key
-                    value = getattr(settings, settings_key)
+                    value = getattr(settings, settings_key, None)
                 if value is None:
                     value = "null"
                 elif isinstance(value, UUID):

lamindb_setup/core/_settings_store.py

@@ -49,12 +49,14 @@ def system_storage_settings_file():
 
 
 class InstanceSettingsStore(BaseSettings):
+    api_url: Optional[str] = None
     owner: str
     name: str
     storage_root: str
     storage_region: Optional[str]  # take old type annotations here because pydantic
     db: Optional[str]  # doesn't like new types on 3.9 even with future annotations
     schema_str: Optional[str]
+    schema_id: Optional[str] = None
     id: str
     git_repo: Optional[str]
     keep_artifacts_local: Optional[bool]

lamindb_setup/core/django.py

@@ -42,6 +42,7 @@ def setup_django(
     # configuration
     if not settings.configured:
         default_db = dj_database_url.config(
+            env="LAMINDB_DJANGO_DATABASE_URL",
             default=isettings.db,
             # see comment next to patching BaseDatabaseWrapper below
             conn_max_age=CONN_MAX_AGE,

{lamindb_setup-0.77.0.dist-info → lamindb_setup-0.77.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamindb_setup
-Version: 0.77.0
+Version: 0.77.2
 Summary: Setup & configure LaminDB.
 Author-email: Lamin Labs <open-source@lamin.ai>
 Description-Content-Type: text/markdown

{lamindb_setup-0.77.0.dist-info → lamindb_setup-0.77.2.dist-info}/RECORD

@@ -1,11 +1,12 @@
-lamindb_setup/__init__.py,sha256=si77fb-FM3YtS5mR_apN1fteFqtzFd3fI7j2UREy4XM,1515
+lamindb_setup/__init__.py,sha256=qb9t881MUHVHKM2hZh_a8wqQJ594sKEkhTWq5AU1ABw,1726
 lamindb_setup/_cache.py,sha256=wA7mbysANwe8hPNbjDo9bOmXJ0xIyaS5iyxIpxSWji4,846
 lamindb_setup/_check.py,sha256=28PcG8Kp6OpjSLSi1r2boL2Ryeh6xkaCL87HFbjs6GA,129
 lamindb_setup/_check_setup.py,sha256=cNEL9Q4yPpmEkGKHH8JgullWl1VUZwALJ4RHn9wZypY,2613
 lamindb_setup/_close.py,sha256=cXNwK7QTTyNFt2XTpLnO3KHljJ7ShOcISk95np_dltE,1239
-lamindb_setup/_connect_instance.py,sha256=TaY317ufYYAVWoEAfeGI_P8IJDP4AYTcHxA4w0-CIqU,16386
+lamindb_setup/_connect_instance.py,sha256=Ln7i-J4ALqmPEMiG-jdYwxz08sAbbMPlbPW72r90Iz0,16647
 lamindb_setup/_delete.py,sha256=Y8KSFYgY0UHAvjd7cCL6hZ_XiLeJwx50BguVATcj_Xo,5524
 lamindb_setup/_django.py,sha256=EoyWvFzH0i9wxjy4JZhcoXCTckztP_Mrl6FbYQnMmLE,1534
+lamindb_setup/_entry_points.py,sha256=Hs2oJQOCTaGUdWn-1mufM6qUZr9W_EJ_Oc3f0_Vc0Yw,616
 lamindb_setup/_exportdb.py,sha256=43g77-tH-vAlTn8ig1mMD9-KXLKvxUeDLaq0gVu3l-c,2114
 lamindb_setup/_importdb.py,sha256=yYYShzUajTsR-cTW4CZ-UNDWZY2uE5PAgNbp-wn8Ogc,1874
 lamindb_setup/_init_instance.py,sha256=VxHgD2i0hrFm2f_WCX76YmS_Lsx2iufrMtfab82r8X0,12391
@@ -14,33 +15,33 @@ lamindb_setup/_register_instance.py,sha256=alQuYp2f8Ct8xvRC1gt8p_HZ0tqCd3gZD3kiP
 lamindb_setup/_schema.py,sha256=b3uzhhWpV5mQtDwhMINc2MabGCnGLESy51ito3yl6Wc,679
 lamindb_setup/_schema_metadata.py,sha256=XfKCcpQXoatx4Dm2pflp-mPhZ9tpqjn2Cq4ip3MOFSY,13715
 lamindb_setup/_set_managed_storage.py,sha256=4tDxXQMt8Gw028uY3vIQxZQ7qBNXhQMc8saarNK_Z-s,2043
-lamindb_setup/_setup_user.py,sha256=vvmzotU_6C-fFLIZ85mevdkKMV9qXHsQFIXoXV3GUEk,4395
+lamindb_setup/_setup_user.py,sha256=z2TTnnTZw2m3szuezn2ToU_qVfjD9ZMGvcH792KjINM,4601
 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=uKMQO9q42Hnepz8aj3RxwLKDWUJx8pNOYrFnnNh5X40,5325
 lamindb_setup/core/_aws_storage.py,sha256=nEjeUv4xUVpoV0Lx-zjjmyb9w804bDyaeiM-OqbfwM0,1799
 lamindb_setup/core/_deprecated.py,sha256=3qxUI1dnDlSeR0BYrv7ucjqRBEojbqotPgpShXs4KF8,2520
 lamindb_setup/core/_docs.py,sha256=3k-YY-oVaJd_9UIY-LfBg_u8raKOCNfkZQPA73KsUhs,276
-lamindb_setup/core/_hub_client.py,sha256=nhdF9qYABRzVkDQMFI-Ft4KVZPDJXrZiyHIvAE5e2j4,6103
-lamindb_setup/core/_hub_core.py,sha256=IOH8yI60xYel42aXTk2yYlF5Z2jJPsHFhvn9cguA-FY,18690
+lamindb_setup/core/_hub_client.py,sha256=8sD_AbH_Iaw87Vdcoe3Va0I-_kT2jfYjfWM2zbuQETg,6117
+lamindb_setup/core/_hub_core.py,sha256=ZpjGaNRPLSt3QMyBJC5ug3yhTgC7jdqJpwd0AMPDXbc,21140
 lamindb_setup/core/_hub_crud.py,sha256=eZErpq9t1Cp2ULBSi457ekrcqfesw4Y6IJgaqyrINMY,5276
 lamindb_setup/core/_hub_utils.py,sha256=w5IRtrxZcvxmGSJslzuZF89ewkzXV4cCUmZUVrqmAfo,3026
 lamindb_setup/core/_private_django_api.py,sha256=KIn43HOhiRjkbTbddyJqv-WNTTa1bAizbM1tWXoXPBg,2869
 lamindb_setup/core/_settings.py,sha256=46axQ5HPvI0X9YuotgdpuSOfSo7qYU1DudIx3vxpFk0,4471
-lamindb_setup/core/_settings_instance.py,sha256=QkhBeDrnM86WDq_FL6KwBIkQxW9mqLjwNW7FSBoKXxs,17608
+lamindb_setup/core/_settings_instance.py,sha256=dpNuFlD0bJF6pyz_GhKtejDMrKCEGd_ERPXLL_OOlIo,17930
 lamindb_setup/core/_settings_load.py,sha256=n7-_vg7YfuoMo4wdwwL2hdBjorywTq0GiprsfILWCko,3720
-lamindb_setup/core/_settings_save.py,sha256=n_tYfb9EBSxwm4LHyPRHJptE5uB8lmHhcRkz1JkAmhg,2781
+lamindb_setup/core/_settings_save.py,sha256=2sd8o-5MHazfDFO13iRIuCDpmzztn2b5J3fmfw4MGxY,2787
 lamindb_setup/core/_settings_storage.py,sha256=jFdoIkSn1gPDDZKjAlgKyrlsHBqZDOvv-UnuUI7aD_4,14249
-lamindb_setup/core/_settings_store.py,sha256=tEpHPEqg58ZMyCZUKRkekQ3VzTByqsRTnWh_esTWUVY,2149
+lamindb_setup/core/_settings_store.py,sha256=WcsgOmgnu9gztcrhp-N4OONNZyxICHV8M0HdJllTaEo,2219
 lamindb_setup/core/_settings_user.py,sha256=N3a3CjZSCs0TW5Q0A_HVUaKBCpb0_82wZMoa5C_YsbA,1390
 lamindb_setup/core/_setup_bionty_sources.py,sha256=o2L5Ww8TKgSqJtL4cGUcpJwLNYxA9BZgddhCMCu_E2g,3428
 lamindb_setup/core/cloud_sqlite_locker.py,sha256=reu02M4aE2BT_A5AFqwhv48l91mOMyQ4zTd-hh-wtuU,6922
-lamindb_setup/core/django.py,sha256=QUQm3zt5QIiD8uv6o9vbSm_bshqiSWzKSkgD3z2eJCg,3542
+lamindb_setup/core/django.py,sha256=3pVbUWDSU2mkMLCFRGAWpIHdFUinnDI9zga5WrcM47g,3589
 lamindb_setup/core/exceptions.py,sha256=eoI7AXgATgDVzgArtN7CUvpaMUC067vsBg5LHCsWzDM,305
 lamindb_setup/core/hashing.py,sha256=Y2cvEaqtm3KwpHqj5ZG2f_sLaXhsQT4oDrmJdHbOQeo,3116
 lamindb_setup/core/types.py,sha256=bcYnZ0uM_2NXKJCl94Mmc-uYrQlRUUVKG3sK2N-F-N4,532
 lamindb_setup/core/upath.py,sha256=EPLLm62q-Y3hZzd-286cynFMttXKDNXNOKL3_QGkeug,27215
-lamindb_setup-0.77.0.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
-lamindb_setup-0.77.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-lamindb_setup-0.77.0.dist-info/METADATA,sha256=n4t0efsUWS3gfVZOGhDWQtL6QpHAEqQJUJskEXg14qE,1667
-lamindb_setup-0.77.0.dist-info/RECORD,,
+lamindb_setup-0.77.2.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
+lamindb_setup-0.77.2.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+lamindb_setup-0.77.2.dist-info/METADATA,sha256=x9pp3IAYEixvruorfano5Q650a7i3Y-fH5YWW4JqH-k,1667
+lamindb_setup-0.77.2.dist-info/RECORD,,