lamindb_setup 0.69.4__py2.py3-none-any.whl → 0.69.5__py2.py3-none-any.whl

lamindb_setup/__init__.py

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

lamindb_setup/core/upath.py

@@ -165,7 +165,7 @@ class ProgressCallback(fsspec.callbacks.Callback):
         return None
 
 
-def download_to(self, path, print_progress: bool = False, **kwargs):
+def download_to(self, path: UPathStr, print_progress: bool = False, **kwargs):
     """Download to a path."""
     if print_progress:
         # can't do path.is_dir() because path doesn't exist
@@ -180,20 +180,38 @@ def download_to(self, path, print_progress: bool = False, **kwargs):
     self.fs.download(str(self), str(path), **kwargs)
 
 
-def upload_from(self, path, print_progress: bool = False, **kwargs):
+def upload_from(
+    self,
+    path: UPathStr,
+    dir_inplace: bool = False,
+    print_progress: bool = False,
+    **kwargs,
+):
     """Upload from a local path."""
+    path_is_dir = os.path.isdir(path)
+    if not path_is_dir:
+        dir_inplace = False
+
     if print_progress:
-        if not os.path.isdir(path):
+        if not path_is_dir:
             cb = ProgressCallback("uploading")
         else:
             # todo: make proper progress bar for directories
             cb = fsspec.callbacks.NoOpCallback()
         kwargs["callback"] = cb
+
+    if dir_inplace:
+        path = Path(path)
+        source = [f for f in path.rglob("*") if f.is_file()]
+        destination = [str(self / f.relative_to(path)) for f in source]
+        source = [str(f) for f in source]  # type: ignore
+    else:
+        source = str(path)  # type: ignore
+        destination = str(self)  # type: ignore
     # this weird thing is to avoid s3fs triggering create_bucket in upload
     # if dirs are present
     # it allows to avoid permission error
-    destination = str(self)
-    if self.protocol != "s3" or os.path.isfile(path):
+    if self.protocol != "s3" or not path_is_dir or dir_inplace:
         cleanup_cache = False
     else:
         bucket = self._url.netloc
@@ -205,7 +223,7 @@ def upload_from(self, path, print_progress: bool = False, **kwargs):
         else:
             cleanup_cache = False
 
-    self.fs.upload(str(path), destination, **kwargs)
+    self.fs.upload(source, destination, **kwargs)
 
     if cleanup_cache:
         # normally this is invalidated after the upload but still better to check

{lamindb_setup-0.69.4.dist-info → lamindb_setup-0.69.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamindb_setup
-Version: 0.69.4
+Version: 0.69.5
 Summary: Setup & configure LaminDB.
 Author-email: Lamin Labs <laminlabs@gmail.com>
 Description-Content-Type: text/markdown

{lamindb_setup-0.69.4.dist-info → lamindb_setup-0.69.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-lamindb_setup/__init__.py,sha256=0WvssKET9TeGkrbvOxtdFPzn4cpVXtv8JyRR4eGz7qU,1558
+lamindb_setup/__init__.py,sha256=UtfzeMDIIg5wzz8ahXKmjc2p9pgSXvoXop6PeSM3fig,1558
 lamindb_setup/_add_remote_storage.py,sha256=S2rFvn-JcGaBOiBNQoAiaTPM590GQh-g4OJeNsben0Q,1802
 lamindb_setup/_cache.py,sha256=wrwlHi2IfxcWDfOW-cHzzkQNlLvasoQPPNxihICbwew,809
 lamindb_setup/_check.py,sha256=xgc5kF2HA4lGuAA9FJT9BJyQV5z1EwYMr92RTbGcQg4,92
@@ -36,8 +36,8 @@ lamindb_setup/core/django.py,sha256=MNlEFS8a7GX1IxmMgJymoRf3M03Eg881zQ2_MKONOQI,
 lamindb_setup/core/exceptions.py,sha256=YzkJA51ZAa2w9lawAggSdg-NA-EIYJGNRnFd0DN3_bE,275
 lamindb_setup/core/hashing.py,sha256=nbQO_CSiX09O4bznHABft94fdFZAHPm2NIyvH5xagoo,2011
 lamindb_setup/core/types.py,sha256=fR71SLjoN1MkCjx8TJcjYDgmgO4bPXBX5J_RKpmmy_o,497
-lamindb_setup/core/upath.py,sha256=ahyWAQQfZRmtQBz-p_UN7R-wqsti6YZ8ZMixy-n8XlQ,24039
-lamindb_setup-0.69.4.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
-lamindb_setup-0.69.4.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-lamindb_setup-0.69.4.dist-info/METADATA,sha256=HKUfuOqFrwnVrQmc-wDO3_5rc4DNJMEu25L2BjPPKbo,1469
-lamindb_setup-0.69.4.dist-info/RECORD,,
+lamindb_setup/core/upath.py,sha256=rK1GvW_-23gE5Wr3VmAv1hw4PZCxN878P-EUxXr0RlM,24510
+lamindb_setup-0.69.5.dist-info/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
+lamindb_setup-0.69.5.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+lamindb_setup-0.69.5.dist-info/METADATA,sha256=o7IyD1LbQF4cqks-lrF4XgOh25jZcnYkrV0o9JU_9Jo,1469
+lamindb_setup-0.69.5.dist-info/RECORD,,