scope 0.7.0__tar.gz → 0.7.1__tar.gz

{scope-0.7.0 → scope-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scope
-Version: 0.7.0
+Version: 0.7.1
 Summary: Metrics logging and analysis
 Author: Danijar Hafner
 License-Expression: MIT
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Dist: av
 Requires-Dist: elements>=3.16.6
 Requires-Dist: fastapi
+Requires-Dist: filelock
 Requires-Dist: mediapy
 Requires-Dist: numpy
 Requires-Dist: orjson

{scope-0.7.0 → scope-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "scope"
-version = "0.7.0"
+version = "0.7.1"
 requires-python = ">=3.10"
 description = "Metrics logging and analysis"
 readme="README.md"
@@ -17,6 +17,7 @@ dependencies = [
   "av",
   "elements>=3.16.6",
   "fastapi",
+  "filelock",
   "mediapy",
   "numpy",
   "orjson",
@@ -48,6 +49,7 @@ module-name = ["scope", "scope_viewer"]
 build = "cd scope_viewer && npm install && npm run build && cd .. && uv build"
 check = "ruff check"
 format = "ruff format"
+test = "uv run pytest"
 
 [tool.ruff]
 line-length = 79

{scope-0.7.0 → scope-0.7.1}/scope_viewer/filesystems.py

@@ -4,6 +4,7 @@ import pathlib
 import subprocess
 
 import elements
+import filelock
 
 
 class Local:
@@ -103,6 +104,7 @@ class WithFileCache:
         self.localfs = Local()
         self.cachedir = cachedir
         self.maxsize = maxsize
+        self.lock = filelock.FileLock(cachedir / '.lock')
 
     def list(self, path):
         return self.fs.list(path)
@@ -124,23 +126,26 @@ class WithFileCache:
         localpath = self.cachedir / name
         if not localpath.exists():
             buffer = self.fs.read(path)
-            self._freeup(len(buffer), path)
+            self._freeup(len(buffer))
             localpath.write_bytes(buffer)
         return localpath
 
-    def _freeup(self, needed, path):
-        # Catch errors because parallel workers share the cache.
+    def _freeup(self, needed):
         pairs = []
         for path in self.cachedir.glob('*'):
+            if path.name == '.lock':
+                continue
             try:
                 stat = path.stat()
                 pairs.append((path, stat))
             except FileNotFoundError:
                 pass
+        total = sum(s.st_size for _, s in pairs)
+        if total + needed <= self.maxsize:
+            return
         pairs = sorted(pairs, key=lambda x: x[1].st_ctime)
-        while sum([s.st_size for p, s in pairs]) + needed > self.maxsize:
-            path, _ = pairs.pop(0)
-            try:
-                path.unlink()
-            except IndexError:
-                pass
+        with self.lock:
+            while total + needed > self.maxsize and pairs:
+                path, stat = pairs.pop(0)
+                path.unlink(missing_ok=True)
+                total -= stat.st_size