lamindb_setup 0.74.1__py2.py3-none-any.whl → 0.74.3__py2.py3-none-any.whl

lamindb_setup/__init__.py

@@ -34,7 +34,7 @@ Modules & settings:
 
 """
 
-__version__ = "0.74.1"  # denote a release candidate for 0.1.0 with 0.1rc1
+__version__ = "0.74.3"  # denote a release candidate for 0.1.0 with 0.1rc1
 
 import sys
 from os import name as _os_name

lamindb_setup/_connect_instance.py

@@ -74,7 +74,8 @@ def update_db_using_local(
             # read from a cached settings file in case the hub result is only
             # read level or inexistent
             elif settings_file.exists() and (
-                "read" in db_dsn_hub.db.user or db_dsn_hub.db.user is None
+                db_dsn_hub.db.user is None
+                or (db_dsn_hub.db.user is not None and "read" in db_dsn_hub.db.user)
             ):
                 isettings = load_instance_settings(settings_file)
                 db_dsn_local = LaminDsnModel(db=isettings.db)
@@ -101,7 +102,7 @@ def update_db_using_local(
             scheme=db_dsn_hub.db.scheme,
             user=db_dsn_local.db.user,
             password=db_dsn_local.db.password,
-            host=db_dsn_hub.db.host,
+            host=db_dsn_hub.db.host,  # type: ignore
             port=db_dsn_hub.db.port,
             database=db_dsn_hub.db.database,
         )

lamindb_setup/_exportdb.py

@@ -29,7 +29,7 @@ MODELS = {
     #     "ExperimentalFactor": False,
     #     "DevelopmentalStage": False,
     #     "Ethnicity": False,
-    #     "PublicSource": False,
+    #     "Source": False,
     # },
     # "wetlab": {
     #     "ExperimentType": False,

lamindb_setup/_init_instance.py

@@ -245,7 +245,10 @@ def init(
         if instance_state == "connected":
             settings.auto_connect = True  # we can also debate this switch here
             return None
-        ssettings = init_storage(storage, instance_id=instance_id)
+        # cannot past instance_id here because instance does not yet exist!
+        # the instance_id field of the storage table is populated at the end of
+        # init_instance_hub
+        ssettings = init_storage(storage)
         isettings = InstanceSettings(
             id=instance_id,  # type: ignore
             owner=settings.user.handle,

lamindb_setup/core/_hub_client.py

@@ -5,7 +5,7 @@ from urllib.request import urlretrieve
 
 from gotrue.errors import AuthUnknownError
 from lamin_utils import logger
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings
 from supabase import Client, create_client  # type: ignore
 from supabase.lib.client_options import ClientOptions
 
@@ -59,9 +59,11 @@ class Environment:
 
 # runs ~0.5s
 def connect_hub(
-    fallback_env: bool = False, client_options: ClientOptions = ClientOptions()
+    fallback_env: bool = False, client_options: ClientOptions | None = None
 ) -> Client:
     env = Environment(fallback=fallback_env)
+    if client_options is None:
+        client_options = ClientOptions(auto_refresh_token=False)
     return create_client(env.supabase_api_url, env.supabase_anon_key, client_options)
 
 

lamindb_setup/core/_hub_core.py

@@ -93,20 +93,21 @@ def _select_storage(
         return False
     else:
         existing_storage = response.data[0]
-        if ssettings._instance_id is not None:
-            # consider storage settings that are meant to be managed by an instance
-            if UUID(existing_storage["instance_id"]) != ssettings._instance_id:
-                # everything is alright if the instance_id matches
-                # we're probably just switching storage locations
-                # below can be turned into a warning and then delegate the error
-                # to a unique constraint violation below
-                raise ValueError(
-                    f"Storage root {root} is already managed by instance {existing_storage['instance_id']}."
-                )
-        else:
-            # if the request is agnostic of the instance, that's alright,
-            # we'll update the instance_id with what's stored in the hub
-            ssettings._instance_id = UUID(existing_storage["instance_id"])
+        if existing_storage["instance_id"] is not None:
+            if ssettings._instance_id is not None:
+                # consider storage settings that are meant to be managed by an instance
+                if UUID(existing_storage["instance_id"]) != ssettings._instance_id:
+                    # everything is alright if the instance_id matches
+                    # we're probably just switching storage locations
+                    # below can be turned into a warning and then delegate the error
+                    # to a unique constraint violation below
+                    raise ValueError(
+                        f"Storage root {root} is already managed by instance {existing_storage['instance_id']}."
+                    )
+            else:
+                # if the request is agnostic of the instance, that's alright,
+                # we'll update the instance_id with what's stored in the hub
+                ssettings._instance_id = UUID(existing_storage["instance_id"])
         ssettings._uuid_ = UUID(existing_storage["id"])
         if update_uid:
             ssettings._uid = existing_storage["lnid"]
@@ -145,11 +146,14 @@ def _init_storage(ssettings: StorageSettings, client: Client) -> None:
         id = uuid.uuid5(uuid.NAMESPACE_URL, root)
     else:
         id = uuid.uuid4()
-    if ssettings._instance_id is None:
+    if ssettings._instance_id is None and settings._instance_exists:
         logger.warning(
             f"will manage storage location {ssettings.root_as_str} with instance {settings.instance.slug}"
         )
         ssettings._instance_id = settings.instance._id
+    instance_id_hex = (
+        None if ssettings._instance_id is None else ssettings._instance_id.hex
+    )
     fields = {
         "id": id.hex,
         "lnid": ssettings.uid,
@@ -157,7 +161,7 @@ def _init_storage(ssettings: StorageSettings, client: Client) -> None:
         "root": root,
         "region": ssettings.region,
         "type": ssettings.type,
-        "instance_id": ssettings._instance_id.hex,
+        "instance_id": instance_id_hex,
         # the empty string is important as we want the user flow to be through LaminHub
         # if this errors with unique constraint error, the user has to update
         # the description in LaminHub

lamindb_setup/core/_hub_utils.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
-from typing import Optional
+from typing import Any, ClassVar, Optional
+from urllib.parse import urlparse, urlunparse
 
-from pydantic import BaseModel, validator
-from pydantic.networks import MultiHostDsn
+from pydantic import BaseModel, Field, GetCoreSchemaHandler
+from pydantic_core import CoreSchema, core_schema
 
 
 def validate_schema_arg(schema: str | None = None) -> str:
@@ -20,26 +21,59 @@ def validate_db_arg(db: str | None) -> None:
         LaminDsnModel(db=db)
 
 
-class LaminDsn(MultiHostDsn):
-    """Custom DSN Type for Lamin.
-
-    This class allows us to customize the allowed schemes for databases
-    and also handles the parsing and building of DSN strings with the
-    database name instead of URL path.
-    """
-
-    allowed_schemes = {
+class LaminDsn(str):
+    allowed_schemes: ClassVar[set[str]] = {
         "postgresql",
         # future enabled schemes
         # "snowflake",
         # "bigquery"
     }
-    user_required = True
-    __slots__ = ()
+
+    @classmethod
+    def __get_pydantic_core_schema__(
+        cls, source_type: Any, handler: GetCoreSchemaHandler
+    ) -> CoreSchema:
+        return core_schema.no_info_after_validator_function(
+            cls.validate,
+            core_schema.str_schema(),
+            serialization=core_schema.plain_serializer_function_ser_schema(str),
+        )
+
+    @classmethod
+    def validate(cls, v: Any) -> LaminDsn:
+        if isinstance(v, str):
+            parsed = urlparse(v)
+            if parsed.scheme not in cls.allowed_schemes:
+                raise ValueError(f"Invalid scheme: {parsed.scheme}")
+            return cls(v)
+        elif isinstance(v, cls):
+            return v
+        else:
+            raise ValueError(f"Invalid value for LaminDsn: {v}")
+
+    @property
+    def user(self) -> str | None:
+        return urlparse(self).username
+
+    @property
+    def password(self) -> str | None:
+        return urlparse(self).password
+
+    @property
+    def host(self) -> str | None:
+        return urlparse(self).hostname
+
+    @property
+    def port(self) -> int | None:
+        return urlparse(self).port
 
     @property
-    def database(self):
-        return self.path[1:]
+    def database(self) -> str:
+        return urlparse(self).path.lstrip("/")
+
+    @property
+    def scheme(self) -> str:
+        return urlparse(self).scheme
 
     @classmethod
     def build(
@@ -49,28 +83,27 @@ class LaminDsn(MultiHostDsn):
         user: str | None = None,
         password: str | None = None,
         host: str,
-        port: str | None = None,
+        port: int | None = None,
         database: str | None = None,
         query: str | None = None,
         fragment: str | None = None,
-        **_kwargs: str,
-    ) -> str:
-        return super().build(
-            scheme=scheme,
-            user=user,
-            password=password,
-            host=host,
-            port=str(port),
-            path=f"/{database}",
-            query=query,
-            fragment=fragment,
-        )
+    ) -> LaminDsn:
+        netloc = host
+        if port is not None:
+            netloc = f"{netloc}:{port}"
+        if user is not None:
+            auth = user
+            if password is not None:
+                auth = f"{auth}:{password}"
+            netloc = f"{auth}@{netloc}"
+
+        path = f"/{database}" if database else ""
+
+        url = urlunparse((scheme, netloc, path, "", query or "", fragment or ""))
+        return cls(url)
 
 
 class LaminDsnModel(BaseModel):
-    db: LaminDsn
+    db: LaminDsn = Field(..., description="The database DSN")
 
-    @validator("db")
-    def check_db_name(cls, v):
-        assert v.path and len(v.path) > 1, "database must be provided"
-        return v
+    model_config = {"arbitrary_types_allowed": True}

lamindb_setup/core/_settings_load.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Optional
 from uuid import UUID, uuid4
 
 from lamin_utils import logger
-from pydantic.error_wrappers import ValidationError
+from pydantic import ValidationError
 
 from ._settings_instance import InstanceSettings
 from ._settings_storage import StorageSettings

lamindb_setup/core/_settings_save.py

@@ -44,6 +44,8 @@ def save_settings(
             if type == Optional[bool]:
                 type = bool
             if "__" not in store_key:
+                if store_key == "model_config":
+                    continue
                 if store_key == "storage_root":
                     value = settings.storage.root_as_str
                 elif store_key == "storage_region":

lamindb_setup/core/_settings_store.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 from typing import Optional
 
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 if "LAMIN_SETTINGS_DIR" in os.environ:
     # Needed when running with AWS Lambda, as only tmp/ directory has a write access
@@ -58,10 +58,7 @@ class InstanceSettingsStore(BaseSettings):
     id: str
     git_repo: Optional[str]
     keep_artifacts_local: Optional[bool]
-
-    class Config:
-        env_prefix = "lamindb_instance_"
-        env_file = ".env"
+    model_config = SettingsConfigDict(env_prefix="lamindb_instance_", env_file=".env")
 
 
 class UserSettingsStore(BaseSettings):
@@ -72,7 +69,4 @@ class UserSettingsStore(BaseSettings):
     uuid: str
     handle: str
     name: str
-
-    class Config:
-        env_prefix = "lamin_user_"
-        env_file = ".env"
+    model_config = SettingsConfigDict(env_prefix="lamin_user_", env_file=".env")

lamindb_setup/core/_setup_bionty_sources.py

@@ -9,14 +9,14 @@ if TYPE_CHECKING:
 
 
 def write_bionty_sources(isettings: InstanceSettings) -> None:
-    """Write bionty sources to PublicSource table."""
+    """Write bionty sources to Source table."""
     if "bionty" not in isettings.schema:
         return None
     import shutil
 
     import bionty_base
     from bionty_base.dev._handle_sources import parse_sources_yaml
-    from lnschema_bionty.models import PublicSource
+    from lnschema_bionty.models import Source
 
     shutil.copy(
         bionty_base.settings.current_sources, bionty_base.settings.lamindb_sources
@@ -32,16 +32,11 @@ def write_bionty_sources(isettings: InstanceSettings) -> None:
             .set_index(["entity", key])
         )
 
-    try:
-        currently_used = _get_currently_used("organism")
-        key = "organism"
-    except KeyError:
-        currently_used = _get_currently_used("species")
-        key = "species"
+    currently_used = _get_currently_used("organism")
 
     all_records = []
     for kwargs in all_sources_dict:
-        act = currently_used.loc[(kwargs["entity"], kwargs[key])].to_dict()
+        act = currently_used.loc[(kwargs["entity"], kwargs["organism"])].to_dict()
         if (act["source"] == kwargs["source"]) and (
             act["version"] == kwargs["version"]
         ):
@@ -49,15 +44,13 @@ def write_bionty_sources(isettings: InstanceSettings) -> None:
 
         # when the database is not yet migrated but setup is updated
         # won't need this once lamindb is released with the new pin
-        if hasattr(PublicSource, "species") and "organism" in kwargs:
-            kwargs["species"] = kwargs.pop("organism")
-        elif hasattr(PublicSource, "organism") and "species" in kwargs:
-            kwargs["organism"] = kwargs.pop("species")
         kwargs["run"] = None  # can't yet access tracking information
-        record = PublicSource(**kwargs)
+        kwargs["in_db"] = False
+        # kwargs["name"] = kwargs.pop("source")
+        record = Source(**kwargs)
         all_records.append(record)
 
-    PublicSource.objects.bulk_create(all_records, ignore_conflicts=True)
+    Source.objects.bulk_create(all_records, ignore_conflicts=True)
 
 
 def load_bionty_sources(isettings: InstanceSettings):
@@ -68,11 +61,11 @@ def load_bionty_sources(isettings: InstanceSettings):
     import bionty_base
     from bionty_base.dev._handle_sources import parse_currently_used_sources
     from bionty_base.dev._io import write_yaml
-    from lnschema_bionty.models import PublicSource
+    from lnschema_bionty.models import Source
 
     try:
         # need try except because of integer primary key migration
-        active_records = PublicSource.objects.filter(currently_used=True).all().values()
+        active_records = Source.objects.filter(currently_used=True).all().values()
         write_yaml(
             parse_currently_used_sources(active_records),
             bionty_base.settings.lamindb_sources,

{lamindb_setup-0.74.1.dist-info → lamindb_setup-0.74.3.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: lamindb_setup
-Version: 0.74.1
+Version: 0.74.3
 Summary: Setup & configure LaminDB.
-Author-email: Lamin Labs <laminlabs@gmail.com>
+Author-email: Lamin Labs <open-source@lamin.ai>
 Description-Content-Type: text/markdown
 Requires-Dist: lnschema_core>=0.51.0
 Requires-Dist: lamin_utils>=0.3.3
 Requires-Dist: django>4.2,<5.3.0
 Requires-Dist: dj_database_url>=1.3.0,<3.0.0
-Requires-Dist: pydantic[dotenv]<2.0.0
+Requires-Dist: pydantic-settings
 Requires-Dist: appdirs<2.0.0
 Requires-Dist: requests
 Requires-Dist: universal_pathlib==0.2.2

{lamindb_setup-0.74.1.dist-info → lamindb_setup-0.74.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
-lamindb_setup/__init__.py,sha256=py6U8kAsM7yVxbCmuhhE_tINXO4q4Oc7G9kjonGLzT8,1542
+lamindb_setup/__init__.py,sha256=FLoipEAQXtUmcK_Dwo1brKCnl2kfCxuCwN6GTe1FgxU,1542
 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=1QS9p2SCacgovYn6xqWU4zFvwHN1RgIccvzwJgFvKgU,1186
-lamindb_setup/_connect_instance.py,sha256=wDmXP6bZovdG9IZYNfoNmDeG5GFYeX2B7HzsG8lBkhY,12443
+lamindb_setup/_connect_instance.py,sha256=dWqvNBBxqCG6xOiY_fI-P5ccyzno_ePGP3Rp1rgNq3g,12512
 lamindb_setup/_delete.py,sha256=Y8KSFYgY0UHAvjd7cCL6hZ_XiLeJwx50BguVATcj_Xo,5524
 lamindb_setup/_django.py,sha256=EoyWvFzH0i9wxjy4JZhcoXCTckztP_Mrl6FbYQnMmLE,1534
-lamindb_setup/_exportdb.py,sha256=uTIZjKKTB7arzEr1j0O6lONiT2pRBKeOFdLvOV8ZwzE,2120
+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=e6OJSpN2eJZd22kAfUVEUbqXF48FzNfLc5xMTS8gZ84,11919
+lamindb_setup/_init_instance.py,sha256=jcKtXLOwkoq7bC-0j0xnNU4_up9nPl0iKQPNoJbBts8,12078
 lamindb_setup/_migrate.py,sha256=P4n3x0SYzO9szjF2-JMa7z4mQadtWjHv5ow4HbCDZLI,8864
 lamindb_setup/_register_instance.py,sha256=LlD2n44Gmh8OXrAkL9iL9NiML8QDKnk4d869MhXoOWI,1083
 lamindb_setup/_schema.py,sha256=b3uzhhWpV5mQtDwhMINc2MabGCnGLESy51ito3yl6Wc,679
@@ -21,26 +21,26 @@ lamindb_setup/core/_aws_credentials.py,sha256=uKMQO9q42Hnepz8aj3RxwLKDWUJx8pNOYr
 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=g0Lmpv19xiUWoD67SpdT6re1EDfrd7D6Bsz4gIKpx_E,5504
-lamindb_setup/core/_hub_core.py,sha256=RGjTqf1owuWmkXAYy0EPaoHAaJ-0T0hAidkqa3cIdiM,16352
+lamindb_setup/core/_hub_client.py,sha256=Gpt3TmxWQMVenKugCu1agUb-xGN9YFsQOKmrHuFiiDs,5605
+lamindb_setup/core/_hub_core.py,sha256=VToaY2uUHpP5ETkNeuMO4gUeuAfj6ap8uFSndCN1fGk,16592
 lamindb_setup/core/_hub_crud.py,sha256=b1XF7AJpM9Q-ttm9nPG-r3OTRWHQaGzAGIyvmb83NTo,4859
-lamindb_setup/core/_hub_utils.py,sha256=b_M1LkdCjiMWm1EOlSb9GuPdLijwVgQDtATTpeZuXI0,1875
+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=OMN6ZROF7iV9Juh0bgE9fOmedE7EJI_YniztwJ5-acI,17623
-lamindb_setup/core/_settings_load.py,sha256=NGgCDpN85j1EqoKlrYFIlZBMlBJm33gx2-wc96CP_ZQ,3922
-lamindb_setup/core/_settings_save.py,sha256=d1A-Ex-7H08mb8l7I0Oe0j0GilrfaDuprh_NMxhQAsQ,2704
+lamindb_setup/core/_settings_load.py,sha256=63PTIVLk3oH1XUmznswygcOk_8VADrJLMB6O9AOppYg,3907
+lamindb_setup/core/_settings_save.py,sha256=n_tYfb9EBSxwm4LHyPRHJptE5uB8lmHhcRkz1JkAmhg,2781
 lamindb_setup/core/_settings_storage.py,sha256=65aobewYX6VfOeYZjZQOOI7ZD_3b4QA9TDmrduU0m4c,13262
-lamindb_setup/core/_settings_store.py,sha256=dagS5c7wAMRnuZTRfCU4sKaIOyF_HwAP5Fnnn8vphno,2084
+lamindb_setup/core/_settings_store.py,sha256=VEE8Ff2A7y4j8ksOaa7g48jNaOqe1PBnBjb1PKKGUKU,2115
 lamindb_setup/core/_settings_user.py,sha256=P2lC4WDRAFfT-Xq3MlXJ-wMKIHCoGNhMTQfRGIAyUNQ,1344
-lamindb_setup/core/_setup_bionty_sources.py,sha256=h_pBANsSGK6ujAFsG21mtADHVJoMLKDR4eGgRP4Fgls,3072
+lamindb_setup/core/_setup_bionty_sources.py,sha256=i_fVCnoh38ouTKKeM-MUXQbkkxMcrSz5dTM_mOCHUcU,2732
 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/exceptions.py,sha256=eoI7AXgATgDVzgArtN7CUvpaMUC067vsBg5LHCsWzDM,305
 lamindb_setup/core/hashing.py,sha256=_JliYeCcjT_foOUJ5ck1rvcCo9q7r4b4SaSclQ_w4Qo,3071
 lamindb_setup/core/types.py,sha256=bcYnZ0uM_2NXKJCl94Mmc-uYrQlRUUVKG3sK2N-F-N4,532
 lamindb_setup/core/upath.py,sha256=dwudkTVsXuyjS-2xR16WomcWtXJAEfRZ0ZzFq8_EDhE,27157
-lamindb_setup-0.74.1.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
-lamindb_setup-0.74.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-lamindb_setup-0.74.1.dist-info/METADATA,sha256=r-xZGjftei2ae6s9yYK6Btrz8GXH_GOdFp-BoGvHISg,1642
-lamindb_setup-0.74.1.dist-info/RECORD,,
+lamindb_setup-0.74.3.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
+lamindb_setup-0.74.3.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+lamindb_setup-0.74.3.dist-info/METADATA,sha256=dqS1Dfpqk1G-BoZzexMF8b1wv_MxWPuqKwKMM1rvWx8,1638
+lamindb_setup-0.74.3.dist-info/RECORD,,