lamindb_setup 1.6.0__tar.gz → 1.6.1__tar.gz

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/.github/workflows/build.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 12
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.10" # run one job on 3.9
+          python-version: "3.10"
           cache: "pip"
       - uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -35,7 +35,7 @@ jobs:
 
   # tests both on production and staging hub
   hub-cloud:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -43,7 +43,7 @@ jobs:
           - lamin_env: "prod"
             python-version: "3.11"
           - lamin_env: "staging"
-            python-version: "3.10" # test on 3.9
+            python-version: "3.10"
     timeout-minutes: 12
     steps:
       - uses: aws-actions/configure-aws-credentials@v4
@@ -97,7 +97,7 @@ jobs:
     timeout-minutes: 12
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: "pip"
@@ -205,7 +205,7 @@ jobs:
           ssh-key: ${{ secrets.READ_LNDOCS }}
           path: lndocs
           ref: main
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: "pip"

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/PKG-INFO

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

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/docs/hub-cloud/01-init-local-instance.ipynb

@@ -92,7 +92,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "lamindb",
    "language": "python",
    "name": "python3"
   },
@@ -106,12 +106,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.16"
-  },
-  "vscode": {
-   "interpreter": {
-    "hash": "40d3a090f54c6569ab1632332b64b2c03c39dcf918b08424e98f38b5ae0af88f"
-   }
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/docs/hub-cloud/07-keep-artifacts-local.ipynb

@@ -20,6 +20,7 @@
     "import pytest\n",
     "import lamindb_setup as ln_setup\n",
     "from upath import UPath\n",
+    "from pathlib import Path\n",
     "\n",
     "name = f\"keep-artifacts-local-setup-{os.environ['LAMIN_ENV']}\"\n",
     "storage = (UPath(\"s3://lamindb-ci\") / name).as_posix()\n",
@@ -189,6 +190,31 @@
     "test_file.unlink()"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Expand user directory:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Test expanduser works\n",
+    "test_path = \"~/test/file.txt\"\n",
+    "result = ln_setup.core.upath.create_path(test_path)\n",
+    "expected = UPath(Path(test_path).expanduser())\n",
+    "assert result.as_posix() == expected.as_posix()\n",
+    "\n",
+    "# Test it doesn't affect absolute paths\n",
+    "test_path = \"/absolute/path/file.txt\"\n",
+    "result = ln_setup.core.upath.create_path(test_path)\n",
+    "assert str(result) == test_path"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -201,7 +227,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "lamindb",
    "language": "python",
    "name": "python3"
   },
@@ -215,7 +241,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.17"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/docs/hub-cloud/08-test-multi-session.ipynb

@@ -182,7 +182,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "lamindb",
    "language": "python",
    "name": "python3"
   },
@@ -196,7 +196,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.16"
+   "version": "3.12.8"
   }
  },
  "nbformat": 4,

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/lamindb_setup/__init__.py

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

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/lamindb_setup/_connect_instance.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import importlib
 import os
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 from uuid import UUID
 
 from lamin_utils import logger
@@ -189,7 +189,7 @@ def _connect_instance(
 
 
 @unlock_cloud_sqlite_upon_exception(ignore_prev_locker=True)
-def connect(instance: str | None = None, **kwargs) -> str | tuple | None:
+def connect(instance: str | None = None, **kwargs: Any) -> str | tuple | None:
     """Connect to an instance.
 
     Args:

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/lamindb_setup/core/_hub_client.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import json
 import os
+from typing import Literal
 from urllib.request import urlretrieve
 
 from gotrue.errors import AuthUnknownError
@@ -25,7 +26,7 @@ def load_fallback_connector() -> Connector:
     return connector
 
 
-PROD_URL = "https://hub.lamin.ai"
+PROD_URL = "https://laesaummdydllppgfchu.supabase.co"
 PROD_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImxhZXNhdW1tZHlkbGxwcGdmY2h1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE2NTY4NDA1NTEsImV4cCI6MTk3MjQxNjU1MX0.WUeCRiun0ExUxKIv5-CtjF6878H8u26t0JmCWx3_2-c"
 
 
@@ -197,10 +198,20 @@ def requests_client():
     return requests
 
 
-def request_get_auth(url: str, access_token: str, renew_token: bool = True):
+def request_with_auth(
+    url: str,
+    method: Literal["get", "post", "put", "delete", "head", "options"],
+    access_token: str,
+    renew_token: bool = True,
+    **kwargs,
+):
     requests = requests_client()
 
-    response = requests.get(url, headers={"Authorization": f"Bearer {access_token}"})
+    headers = kwargs.pop("headers", {})
+    headers["Authorization"] = f"Bearer {access_token}"
+
+    make_request = getattr(requests, method)
+    response = make_request(url, headers=headers, **kwargs)
     # upate access_token and try again if failed
     if response.status_code != 200 and renew_token:
         from lamindb_setup import settings
@@ -212,7 +223,7 @@ def request_get_auth(url: str, access_token: str, renew_token: bool = True):
         settings.user.access_token = access_token
         save_user_settings(settings.user)
 
-        response = requests.get(
-            url, headers={"Authorization": f"Bearer {access_token}"}
-        )
+        headers["Authorization"] = f"Bearer {access_token}"
+
+        response = make_request(url, headers=headers, **kwargs)
     return response

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/lamindb_setup/core/_hub_core.py

@@ -17,7 +17,7 @@ from ._hub_client import (
     call_with_fallback,
     call_with_fallback_auth,
     connect_hub,
-    request_get_auth,
+    request_with_auth,
 )
 from ._hub_crud import (
     _delete_instance_record,
@@ -495,7 +495,7 @@ def access_db(
             )
         url = instance_api_url + url
 
-    response = request_get_auth(url, access_token, renew_token)  # type: ignore
+    response = request_with_auth(url, "get", access_token, renew_token)  # type: ignore
     response_json = response.json()
     if response.status_code != 200:
         raise PermissionError(

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/lamindb_setup/core/_settings_storage.py

@@ -2,9 +2,7 @@ from __future__ import annotations
 
 import os
 import secrets
-import shutil
 import string
-from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal
 
 import fsspec
@@ -208,7 +206,7 @@ class StorageSettings:
     ):
         self._uid = uid
         self._uuid_ = uuid
-        self._root_init = UPath(root)
+        self._root_init = UPath(root).expanduser()
         if isinstance(self._root_init, LocalPathClasses):  # local paths
             try:
                 (self._root_init / ".lamindb").mkdir(parents=True, exist_ok=True)

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/lamindb_setup/core/cloud_sqlite_locker.py

@@ -9,12 +9,17 @@ from lamin_utils import logger
 from .upath import UPath, create_mapper, infer_filesystem
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from pathlib import Path
+    from typing import ParamSpec, TypeVar
     from uuid import UUID
 
     from ._settings_instance import InstanceSettings
     from ._settings_user import UserSettings
 
+    P = ParamSpec("P")
+    R = TypeVar("R")
+
 EXPIRATION_TIME = 24 * 60 * 60 * 7  # 7 days
 
 MAX_MSG_COUNTER = 100  # print the msg after this number of iterations
@@ -207,7 +212,9 @@ def clear_locker():
 
 
 # decorator
-def unlock_cloud_sqlite_upon_exception(ignore_prev_locker: bool = False):
+def unlock_cloud_sqlite_upon_exception(
+    ignore_prev_locker: bool = False,
+) -> Callable[[Callable[P, R]], Callable[P, R]]:
     """Decorator to unlock a cloud sqlite instance upon an exception.
 
     Ignores `InstanceLockedException`.

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/lamindb_setup/core/upath.py

@@ -821,7 +821,7 @@ register_implementation("s3", S3QueryPath, clobber=True)
 
 
 def create_path(path: UPathStr, access_token: str | None = None) -> UPath:
-    upath = UPath(path)
+    upath = UPath(path).expanduser()
 
     if upath.protocol == "s3":
         # add managed credentials and other options for AWS s3 paths

{lamindb_setup-1.6.0 → lamindb_setup-1.6.1}/tests/hub-cloud/test_init_instance.py

@@ -11,7 +11,6 @@ from lamindb_setup._init_instance import infer_instance_name
 from lamindb_setup.core._hub_client import connect_hub_with_auth
 from lamindb_setup.core._hub_core import _connect_instance_hub
 from lamindb_setup.core._hub_crud import (
-    Client,
     select_account_by_handle,
     select_default_storage_by_instance_id,
     select_instance_by_name,
@@ -123,6 +122,13 @@ def test_init_instance_cwd():
     ln_setup.delete("mystorage_cwd", force=True)
 
 
+def test_init_instance_user():
+    ln_setup.init(storage="~/mydata", _test=True)
+    assert not ln_setup.settings.instance.storage.type_is_cloud
+    assert ln_setup.settings.storage.root.is_relative_to(Path.home())
+    ln_setup.delete("mydata", force=True)
+
+
 def test_init_instance_cloud_aws_us():
     storage = (
         f"s3://lamindb-ci/{os.environ['LAMIN_ENV']}_test/init_instance_cloud_aws_us"