megfile 3.1.0.post1__py3-none-any.whl → 3.1.0.post2__py3-none-any.whl

megfile/s3_path.py

@@ -779,12 +779,12 @@ def s3_buffered_open(
         max_concurrency: Optional[int] = None,
         max_buffer_size: int = DEFAULT_MAX_BUFFER_SIZE,
         forward_ratio: Optional[float] = None,
-        block_size: int = DEFAULT_BLOCK_SIZE,
+        block_size: Optional[int] = None,
         limited_seekable: bool = False,
         buffered: bool = False,
         share_cache_key: Optional[str] = None,
         cache_path: Optional[str] = None,
-        min_block_size: int = DEFAULT_MIN_BLOCK_SIZE,
+        min_block_size: Optional[int] = None,
         max_block_size: int = DEFAULT_MAX_BLOCK_SIZE) -> IO:
     '''Open an asynchronous prefetch reader, to support fast sequential read
 
@@ -814,6 +814,8 @@ def s3_buffered_open(
             s3_url = s3_url.readlink()
         except S3NotALinkError:
             pass
+    min_block_size = min_block_size or block_size or DEFAULT_MIN_BLOCK_SIZE
+    block_size = block_size or DEFAULT_BLOCK_SIZE
 
     bucket, key = parse_s3_url(s3_url.path_with_protocol)
     config = botocore.config.Config(max_pool_connections=max_pool_connections)
@@ -1124,9 +1126,9 @@ class S3Cacher(FileCacher):
             self, path: str, cache_path: Optional[str] = None, mode: str = 'r'):
         if mode not in ('r', 'w', 'a'):
             raise ValueError('unacceptable mode: %r' % mode)
+        if cache_path is None:
+            cache_path = generate_cache_path(path)
         if mode in ('r', 'a'):
-            if cache_path is None:
-                cache_path = generate_cache_path(path)
             s3_download(path, cache_path)
         self.name = path
         self.mode = mode

megfile/smart.py

@@ -966,9 +966,9 @@ class SmartCacher(FileCacher):
             self, path: str, cache_path: Optional[str] = None, mode: str = 'r'):
         if mode not in ('r', 'w', 'a'):
             raise ValueError('unacceptable mode: %r' % mode)
+        if cache_path is None:
+            cache_path = generate_cache_path(path)
         if mode in ('r', 'a'):
-            if cache_path is None:
-                cache_path = generate_cache_path(path)
             smart_copy(path, cache_path)
         self.name = path
         self.mode = mode

megfile/version.py

@@ -1 +1 @@
-VERSION = "3.1.0.post1"
+VERSION = "3.1.0.post2"

{megfile-3.1.0.post1.dist-info → megfile-3.1.0.post2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: megfile
-Version: 3.1.0.post1
+Version: 3.1.0.post2
 Summary: Megvii file operation library
 Author-email: megvii <megfile@megvii.com>
 Project-URL: Homepage, https://github.com/megvii-research/megfile

{megfile-3.1.0.post1.dist-info → megfile-3.1.0.post2.dist-info}/RECORD

@@ -12,14 +12,14 @@ megfile/http_path.py,sha256=mnoN5hHJro23cLny1r5ePMJ28r2gnBrzqA0S-grpwrE,16215
 megfile/interfaces.py,sha256=PLNv0hDBTrTFJGTwT5mbDKYTsCjNryrHHMJCYhL9Wp0,8522
 megfile/pathlike.py,sha256=FjY88X1IA4-ue5jcekwlIO740D0oT_wNo95y3eo6vNA,30685
 megfile/s3.py,sha256=JfYWFHNJrBAoncB5RPDMyhjrIwVYGZ2lh8prGst-L_M,12874
-megfile/s3_path.py,sha256=WvP6AsFpS0bR11ABbOYSMUOVm3H2ffYcKrBbXxZJdrI,93001
+megfile/s3_path.py,sha256=UV-rOV-j1uWhTjsClqNmYbqpPrrBd0CZldo717pd63o,93107
 megfile/sftp.py,sha256=cXS1LZh4gtJgDCmR9p2_uM1wlycV34ebuTJGaceatVE,12984
 megfile/sftp_path.py,sha256=QcV4DK192c5GL2CeK07JgpELpBXpGVAKswQ1JtZ2DZQ,53336
-megfile/smart.py,sha256=3Rm-nI3HCLdljdo3mGn1JWFnw1qGwuxUunb1MIEJK0I,36032
+megfile/smart.py,sha256=jOTBBbDKpLuRbob9-Omj_GRsk66Vpql7LPJX4xCm5fs,36024
 megfile/smart_path.py,sha256=OMTM9JeowIa6j2Yn8XEH-HS4gWD3gBkKgSj8GBD08Bk,6734
 megfile/stdio.py,sha256=rsBMGr4LaFYOQjL-6k4GE_WznLsa8cPzMhSVNEEDh5o,671
 megfile/stdio_path.py,sha256=2n3gTEN1-7d8cCRsQJ7zj8rdP1VPlgr78oSClYndxXI,2806
-megfile/version.py,sha256=HgxsH8zUeKbwsczoAuIOhPyGbI_oqu-LqLFys9BLbJQ,25
+megfile/version.py,sha256=ae-mMzuH1fX-ttz5eeJLdyu4AWB_y_CTVSIASAW4msI,25
 megfile/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megfile/lib/base_prefetch_reader.py,sha256=iTHdWvpERMELgv2sEAsf9tiiJFDYp2mHzodszFrB9T4,13213
 megfile/lib/combine_reader.py,sha256=dV1AblB8LTHK2a4aM03w1eBEcTpxMBWln9g_fuz0v7Y,4561
@@ -46,10 +46,10 @@ megfile/utils/__init__.py,sha256=QFDDhVAmptdMzYE91O6GRARHTalj_ZfSKZNF71uCj7w,885
 megfile/utils/mutex.py,sha256=-2KH3bNovKRd9zvsXq9n3bWM7rQdoG9hO7tUPxVG_Po,2538
 scripts/convert_results_to_sarif.py,sha256=SI0vw4TrpJ9gAZ2pH8ywu-lXMYeZ-TYW2dLEHw5Rx84,4218
 scripts/generate_file.py,sha256=OLAH9iZKQlHTjuV8zpC6exCXLS6bNdu4Njoc3IKO9Sc,10173
-megfile-3.1.0.post1.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-megfile-3.1.0.post1.dist-info/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
-megfile-3.1.0.post1.dist-info/METADATA,sha256=0Q1RFftQQ8ewo_hz4GleF1x5ucyCzIPbMseirlbX6ls,9112
-megfile-3.1.0.post1.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-megfile-3.1.0.post1.dist-info/entry_points.txt,sha256=M6ZWSSv5_5_QtIpZafy3vq7WuOJ_5dSGQQnEZbByt2Q,49
-megfile-3.1.0.post1.dist-info/top_level.txt,sha256=oTnYXo1Z3V61qSWAKtnY9RkDgRSHvfRN38FQae6E0W0,50
-megfile-3.1.0.post1.dist-info/RECORD,,
+megfile-3.1.0.post2.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+megfile-3.1.0.post2.dist-info/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
+megfile-3.1.0.post2.dist-info/METADATA,sha256=0uNjuwKWUR2rcoeKxcUPFexqf2fysX_igYT4uUBrZ0I,9112
+megfile-3.1.0.post2.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+megfile-3.1.0.post2.dist-info/entry_points.txt,sha256=M6ZWSSv5_5_QtIpZafy3vq7WuOJ_5dSGQQnEZbByt2Q,49
+megfile-3.1.0.post2.dist-info/top_level.txt,sha256=oTnYXo1Z3V61qSWAKtnY9RkDgRSHvfRN38FQae6E0W0,50
+megfile-3.1.0.post2.dist-info/RECORD,,

{megfile-3.1.0.post1.dist-info → megfile-3.1.0.post2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any