cloud-files 6.4.2__tar.gz → 6.4.4__tar.gz

{cloud_files-6.4.2 → cloud_files-6.4.4}/AUTHORS

@@ -5,3 +5,4 @@ William Silversmith <william.silvermsith@gmail.com>
 William Silversmith <william.silversmith@gmail.com>
 madiganz <madiganz@users.noreply.github.com>
 ranlu <ranlu@users.noreply.github.com>
+tabedzki <35670232+tabedzki@users.noreply.github.com>

{cloud_files-6.4.2 → cloud_files-6.4.4}/ChangeLog

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+6.4.4
+-----
+
+* fix: use stdlib compression.zstd on Python 3.14+ (#136)
+* fix: windows elapsed time is sometimes given in quanta of 16 msec (#135)
+
 6.4.2
 -----
 

{cloud_files-6.4.2 → cloud_files-6.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 6.4.2
+Version: 6.4.4
 Summary: Fast access to cloud storage and local FS.
 Home-page: https://github.com/seung-lab/cloud-files/
 Author: William Silversmith
@@ -40,9 +40,9 @@ Requires-Dist: six>=1.14.0
 Requires-Dist: tenacity>=4.10.0
 Requires-Dist: tqdm
 Requires-Dist: urllib3>=1.26.3
-Requires-Dist: zstandard
 Requires-Dist: rsa>=4.7.2
 Requires-Dist: fasteners
+Requires-Dist: zstandard; python_version < "3.14"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: moto>=5; extra == "test"

{cloud_files-6.4.2 → cloud_files-6.4.4}/automated_test.py

@@ -1458,3 +1458,21 @@ class TestTransmissionMonitor:
     
     assert new_monitor.total_bytes() == 100
     assert hasattr(new_monitor, '_lock')
+
+  def test_slow_clock_tick(self, tx_monitor):
+    import time
+
+    real_monotonic = time.monotonic
+    time.monotonic = lambda: 1
+
+    flight_id = tx_monitor.start_io(100)
+    time.sleep(0.01) 
+    tx_monitor.end_io(flight_id, 100)
+    
+    assert len(tx_monitor._in_flight) == 0
+    assert tx_monitor._in_flight_bytes == 0
+    assert tx_monitor._total_bytes_landed == 100
+    assert len(tx_monitor._intervaltree) == 1
+
+    time.monotonic = real_monotonic
+

{cloud_files-6.4.2 → cloud_files-6.4.4}/cloud_files.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 6.4.2
+Version: 6.4.4
 Summary: Fast access to cloud storage and local FS.
 Home-page: https://github.com/seung-lab/cloud-files/
 Author: William Silversmith
@@ -40,9 +40,9 @@ Requires-Dist: six>=1.14.0
 Requires-Dist: tenacity>=4.10.0
 Requires-Dist: tqdm
 Requires-Dist: urllib3>=1.26.3
-Requires-Dist: zstandard
 Requires-Dist: rsa>=4.7.2
 Requires-Dist: fasteners
+Requires-Dist: zstandard; python_version < "3.14"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: moto>=5; extra == "test"

cloud_files-6.4.4/cloud_files.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "7814dde", "is_release": true}

{cloud_files-6.4.2 → cloud_files-6.4.4}/cloud_files.egg-info/requires.txt

@@ -19,10 +19,12 @@ six>=1.14.0
 tenacity>=4.10.0
 tqdm
 urllib3>=1.26.3
-zstandard
 rsa>=4.7.2
 fasteners
 
+[:(python_version < "3.14")]
+zstandard
+
 [apache]
 lxml
 

{cloud_files-6.4.2 → cloud_files-6.4.4}/cloudfiles/compression.py

@@ -12,7 +12,12 @@ except ImportError:
   deflate = None
 
 import brotli
-import zstandard as zstd
+
+if sys.version_info >= (3, 14):
+  from compression import zstd # PEP 784
+else:
+  zstd = None
+  import zstandard
 
 from tqdm import tqdm
 
@@ -221,15 +226,26 @@ def brotli_decompress(content):
   return brotli.decompress(content)
 
 def zstd_compress(content, level=None):
+  if level is not None:
+    level = int(level)
+
+  # The stdlib ZstdCompressor.compress() buffers its output
+  # by default, so use the one-shot function instead.
+  if zstd is not None:
+    return zstd.compress(content, level=level)
+
   kwargs = {}
   if level is not None:
-    kwargs['level'] = int(level)
+    kwargs['level'] = level
 
-  ctx = zstd.ZstdCompressor(**kwargs)
+  ctx = zstandard.ZstdCompressor(**kwargs)
   return ctx.compress(content)
 
 def zstd_decompress(content):
-  ctx = zstd.ZstdDecompressor()
+  if zstd is not None:
+    return zstd.decompress(content)
+
+  ctx = zstandard.ZstdDecompressor()
   return ctx.decompress(content)
 
 

{cloud_files-6.4.2 → cloud_files-6.4.4}/cloudfiles/monitoring.py

@@ -10,6 +10,8 @@ import intervaltree
 import numpy as np
 import numpy.typing as npt
 
+EPSILON_SEC = 1e-7
+
 class IOEnum(enum.Enum):
   RX = 1
   TX = 2
@@ -63,6 +65,8 @@ class TransmissionMonitor:
     
     with self._lock:
       start_us = int(self._in_flight.pop(flight_id) * 1e6)
+      if start_us == end_us:
+        end_us += 1
       self._in_flight_bytes -= num_bytes
       self._intervaltree.addi(start_us, end_us, [flight_id, num_bytes])
       self._total_bytes_landed += num_bytes
@@ -662,7 +666,7 @@ class IOSampler:
       time.monotonic()
       time.monotonic()
       e = time.monotonic()
-      return (e - s) / 5
+      return ((e - s) / 5) or EPSILON_SEC
 
     time_correction = measure_correction()
     psutil.net_io_counters.cache_clear()
@@ -679,12 +683,15 @@ class IOSampler:
         recorrection_start = time.monotonic()
 
       e = time.monotonic()
+      elapsed = (e-s) or EPSILON_SEC
 
-      wait = interval - (e-s)
+      wait = interval - elapsed
       if wait > 0:
         time.sleep(wait)
 
-    if (interval * 0.5) < (time.monotonic() - e):
+    elapsed = (time.monotonic() - e) or EPSILON_SEC
+
+    if (interval * 0.5) < elapsed:
       self._do_sample(time_correction)
 
   def is_sampling(self):

{cloud_files-6.4.2 → cloud_files-6.4.4}/requirements.txt

@@ -19,6 +19,6 @@ six>=1.14.0
 tenacity>=4.10.0
 tqdm
 urllib3>=1.26.3
-zstandard
+zstandard; python_version < "3.14"
 rsa>=4.7.2
 fasteners

cloud_files-6.4.2/cloud_files.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "fff3997", "is_release": true}