nextmv 1.8.0.dev0__tar.gz → 1.8.0.dev1__tar.gz

{nextmv-1.8.0.dev0 → nextmv-1.8.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 1.8.0.dev0
+Version: 1.8.0.dev1
 Summary: The all-purpose Python SDK for Nextmv
 Project-URL: Homepage, https://www.nextmv.io
 Project-URL: Documentation, https://nextmv-py.docs.nextmv.io/en/latest/nextmv/

nextmv-1.8.0.dev1/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v1.8.0.dev1"

{nextmv-1.8.0.dev0 → nextmv-1.8.0.dev1}/nextmv/cache.py

@@ -33,6 +33,8 @@ _DEPS_CACHE_DIR = _CACHE_DIR / "deps"
 """Directory storing per-package dependency tarballs."""
 _CACHE_INFO_FILE = "cache_info.json"
 """Name of the metadata file stored alongside each cached entry."""
+_DEP_TARBALL_NAME = "installed.tar.gz"
+"""Name of the per-package tarball containing installed files for a single package."""
 _MAX_DEPS = 2000
 """Maximum number of individual package tarballs to keep in the cache."""
 _MAX_DEP_BYTES = 5 * 1024**3
@@ -63,6 +65,12 @@ def get_cache() -> dict[str, Any]:
                 with open(info_file) as f:
                     info = json.load(f)
 
+                tarball = entry_dir / _DEP_TARBALL_NAME
+                try:
+                    tarball_size = format_bytes(tarball.stat().st_size)
+                except OSError:
+                    tarball_size = ""
+
                 dependencies.append(
                     {
                         "key": entry_dir.name,
@@ -71,13 +79,14 @@ def get_cache() -> dict[str, Any]:
                         "last_used_at": info.get("last_used_at", ""),
                         "python_version": info.get("python_version", ""),
                         "platform": info.get("platform", ""),
+                        "size": tarball_size,
                     }
                 )
             except Exception:
                 pass
 
     if dependencies:
-        dependencies.sort(key=lambda d: (d["last_used_at"], d["name"], d["version"]))
+        dependencies.sort(key=lambda d: (d["last_used_at"], d["name"], d["version"]), reverse=True)
 
     return {
         "num_dependencies": num_deps,
@@ -100,10 +109,7 @@ def clear_cache() -> tuple[int, int]:
         return 0, 0
 
     num_deps, total_bytes = _cache_stats()
-
-    if _CACHE_DIR.exists():
-        shutil.rmtree(str(_CACHE_DIR))
-
+    shutil.rmtree(str(_CACHE_DIR))
     _create_cache()
 
     return num_deps, total_bytes
@@ -165,7 +171,7 @@ def get_cached_dep(pkg_key: str) -> Path | None:
 
     entry_dir = _DEPS_CACHE_DIR / pkg_key
     info_file = entry_dir / _CACHE_INFO_FILE
-    installed_tar = entry_dir / "installed.tar.gz"
+    installed_tar = entry_dir / _DEP_TARBALL_NAME
 
     if not installed_tar.is_file() or not info_file.is_file():
         return None
@@ -225,7 +231,7 @@ def store_dep(
 
     with tempfile.TemporaryDirectory(dir=_DEPS_CACHE_DIR, prefix=f"{pkg_key}-tmp-", ignore_cleanup_errors=True) as _tmp:
         tmp_entry = Path(_tmp)
-        shutil.copy2(str(tar_path), tmp_entry / "installed.tar.gz")
+        shutil.copy2(str(tar_path), tmp_entry / _DEP_TARBALL_NAME)
         now = _now_iso()
         info = {
             "created_at": now,
@@ -300,6 +306,11 @@ def _create_cache() -> None:
 
     _DEPS_CACHE_DIR.mkdir(parents=True, exist_ok=True)
 
+    # Remove leftover staging dirs from previous crashed/killed runs.
+    for entry in _DEPS_CACHE_DIR.iterdir():
+        if entry.is_dir() and "-tmp-" in entry.name:
+            shutil.rmtree(str(entry), ignore_errors=True)
+
 
 def _evict_lru(max_entries: int = _MAX_DEPS, max_bytes: int = _MAX_DEP_BYTES) -> int:
     """
@@ -324,7 +335,7 @@ def _evict_lru(max_entries: int = _MAX_DEPS, max_bytes: int = _MAX_DEP_BYTES) ->
 
     entries = []
     for entry_dir in _DEPS_CACHE_DIR.iterdir():
-        if not entry_dir.is_dir():
+        if not entry_dir.is_dir() or "-tmp-" in entry_dir.name:
             continue
 
         info_file = entry_dir / _CACHE_INFO_FILE
@@ -414,7 +425,7 @@ def _write_json_atomic(path: Path, data: dict) -> None:
         tmp = Path(f.name)
 
     try:
-        tmp.rename(path)
+        os.replace(tmp, path)
     except Exception as e:
         tmp.unlink(missing_ok=True)
         raise e

{nextmv-1.8.0.dev0 → nextmv-1.8.0.dev1}/nextmv/cloud/package.py

@@ -271,7 +271,7 @@ def _copy_manifest_files(
 
         try:
             shutil.copy2(file["absolute_path"], os.path.join(temp_dir, target_dir))
-        except subprocess.CalledProcessError as e:
+        except OSError as e:
             raise Exception(f"error copying asset files {file['absolute_path']}: {e}") from e
 
 
@@ -847,13 +847,13 @@ def _install_and_compress_package(
         # the entries (no EOF block).  Omitting the EOF block lets these
         # per-package gzip streams be raw-concatenated without causing tar
         # to stop at the first end-of-archive marker.
-        with tempfile.NamedTemporaryFile(suffix=".tar", delete=False, dir=install_tmp) as _tmp_f:
-            tmp_tar_path = _tmp_f.name
+        tmp_tar_path = os.path.join(install_tmp, "pkg.tar")
 
-        tar_obj = tarfile.open(tmp_tar_path, mode="w")
-        tar_obj.add(install_dir, arcname=dep_arcname)
-        entry_end = tar_obj.offset  # byte offset where EOF marker begins
-        tar_obj.close()
+        with tarfile.open(tmp_tar_path, mode="w") as tar_obj:
+            tar_obj.add(install_dir, arcname=dep_arcname)
+            # Byte offset where EOF marker begins; captured before close()
+            # appends EOF blocks.
+            entry_end = tar_obj.offset
 
         with open(tmp_tar_path, "rb") as raw_f:
             with gzip.open(str(tar_path), "wb") as gz:

{nextmv-1.8.0.dev0 → nextmv-1.8.0.dev1}/tests/test_cache.py

@@ -12,6 +12,7 @@ from unittest.mock import patch
 
 from nextmv.cache import (
     _CACHE_INFO_FILE,
+    _DEP_TARBALL_NAME,
     _MAX_DEP_BYTES,
     _MAX_DEPS,
     _evict_lru,
@@ -121,7 +122,7 @@ class TestGetCachedPackageTar(unittest.TestCase):
     def _make_pkg_tar_entry(self, key: str) -> Path:
         entry_dir = self._tmpdir / key
         entry_dir.mkdir(parents=True, exist_ok=True)
-        installed_tar = entry_dir / "installed.tar.gz"
+        installed_tar = entry_dir / _DEP_TARBALL_NAME
         with tarfile.open(str(installed_tar), "w:gz"):
             pass  # empty tar
         now = datetime.now(tz=timezone.utc).isoformat()
@@ -152,7 +153,7 @@ class TestGetCachedPackageTar(unittest.TestCase):
             result = get_cached_dep(key)
 
         self.assertIsNotNone(result)
-        self.assertTrue(str(result).endswith("installed.tar.gz"))
+        self.assertTrue(str(result).endswith(_DEP_TARBALL_NAME))
 
     def test_hit_updates_last_used_at(self):
         from nextmv import cache as cache_mod
@@ -182,7 +183,7 @@ class TestGetCachedPackageTar(unittest.TestCase):
         key = "noinfo"
         entry_dir = self._tmpdir / key
         entry_dir.mkdir(parents=True)
-        with tarfile.open(str(entry_dir / "installed.tar.gz"), "w:gz"):
+        with tarfile.open(str(entry_dir / _DEP_TARBALL_NAME), "w:gz"):
             pass  # no cache_info.json written
 
         with patch.object(cache_mod, "_DEPS_CACHE_DIR", self._tmpdir):
@@ -252,7 +253,7 @@ class TestStorePackageTar(unittest.TestCase):
 
         entry_dir = self._pkg_tars_dir / key
         self.assertTrue(entry_dir.is_dir())
-        self.assertTrue((entry_dir / "installed.tar.gz").is_file())
+        self.assertTrue((entry_dir / _DEP_TARBALL_NAME).is_file())
 
     def test_info_file_has_required_fields(self):
         from nextmv import cache as cache_mod
@@ -335,7 +336,7 @@ class TestEvictLruPackages(unittest.TestCase):
     def _add_entry(self, key: str, last_used: str, size_bytes: int = 0):
         entry_dir = self._pkg_tars_dir / key
         entry_dir.mkdir(parents=True, exist_ok=True)
-        installed_tar = entry_dir / "installed.tar.gz"
+        installed_tar = entry_dir / _DEP_TARBALL_NAME
         if size_bytes > 0:
             data = os.urandom(size_bytes)
             with tarfile.open(str(installed_tar), "w:gz") as tar:

nextmv-1.8.0.dev0/nextmv/__about__.py

@@ -1 +0,0 @@
-__version__ = "v1.8.0.dev0"