Merge branch 'main' into nanokvm-driver

Author: mangelajo

packages/jumpstarter/jumpstarter/driver/base.py

@@ -48,6 +48,7 @@
         Compression.GZIP,
         Compression.XZ,
         Compression.BZ2,
+        Compression.ZSTD,
     }
 )
 

packages/jumpstarter/jumpstarter/streams/encoding.py

@@ -1,5 +1,6 @@
 import bz2
 import lzma
+import sys
 import zlib
 from dataclasses import dataclass
 from enum import StrEnum
@@ -8,11 +9,17 @@
 from anyio import ClosedResourceError, EndOfStream
 from anyio.abc import AnyByteStream, ObjectStream
 
+if sys.version_info >= (3, 14):
+    from compression import zstd
+else:
+    from backports import zstd
+
 
 class Compression(StrEnum):
     GZIP = "gzip"
     XZ = "xz"
     BZ2 = "bz2"
+    ZSTD = "zstd"
 
 
 @dataclass(kw_only=True)
@@ -86,3 +93,9 @@ def compress_stream(stream: AnyByteStream, compression: Compression | None) -> A
                 compressor=bz2.BZ2Compressor(),
                 decompressor=bz2.BZ2Decompressor(),
             )
+        case Compression.ZSTD:
+            return CompressedStream(
+                stream=stream,
+                compressor=zstd.ZstdCompressor(),
+                decompressor=zstd.ZstdDecompressor(),
+            )

packages/jumpstarter/jumpstarter/streams/encoding_test.py

@@ -14,7 +14,7 @@ def create_buffer(size):
     return StapledObjectStream(tx, rx)
 
 
-@pytest.mark.parametrize("compression", [None, "gzip", "xz", "bz2"])
+@pytest.mark.parametrize("compression", [None, "gzip", "xz", "bz2", "zstd"])
 async def test_compress_stream(compression):
     stream = compress_stream(create_buffer(128), compression)
 

packages/jumpstarter/pyproject.toml

@@ -20,6 +20,7 @@ dependencies = [
     "pydantic-settings>=2.9.1",
     "rich>=14.0.0",
     "tenacity>=8.2.0",
+    "backports-zstd>=1.1.0 ; python_full_version < '3.14'",
 ]
 
 [dependency-groups]