flow.record 3.21.dev15__tar.gz → 3.22.dev1__tar.gz

{flow_record-3.21.dev15 → flow_record-3.22.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev15
+Version: 3.22.dev1
 Summary: A library for defining and creating structured data (called records) that can be streamed to disk or piped to other tools that use flow.record
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: msgpack>=0.5.2
 Requires-Dist: tzdata; platform_system == "Windows"
 Provides-Extra: compression
 Requires-Dist: lz4; extra == "compression"
-Requires-Dist: zstandard; platform_python_implementation != "PyPy" and extra == "compression"
+Requires-Dist: backports.zstd; python_version < "3.14" and extra == "compression"
 Provides-Extra: elastic
 Requires-Dist: elasticsearch; extra == "elastic"
 Provides-Extra: geoip

{flow_record-3.21.dev15 → flow_record-3.22.dev1}/flow/record/base.py

@@ -27,25 +27,33 @@ from urllib.parse import parse_qsl, urlparse
 from flow.record.exceptions import RecordAdapterNotFound, RecordDescriptorError
 from flow.record.utils import get_stdin, get_stdout
 
+# lz4
 try:
     import lz4.frame as lz4
 
     HAS_LZ4 = True
 except ImportError:
     HAS_LZ4 = False
+
+# bzip2
 try:
     import bz2
 
     HAS_BZ2 = True
 except ImportError:
     HAS_BZ2 = False
-try:
-    import zstandard as zstd
 
+# zstandard
+try:
+    if sys.version_info >= (3, 14):
+        from compression import zstd  # novermin
+    else:
+        from backports import zstd
     HAS_ZSTD = True
 except ImportError:
     HAS_ZSTD = False
 
+# fastavro
 try:
     import fastavro as avro  # noqa
 
@@ -727,8 +735,7 @@ def open_stream(fp: BinaryIO, mode: str) -> BinaryIO:
     elif HAS_LZ4 and peek_data[:4] == LZ4_MAGIC:
         fp = lz4.open(fp, mode=mode)
     elif HAS_ZSTD and peek_data[:4] == ZSTD_MAGIC:
-        dctx = zstd.ZstdDecompressor()
-        fp = dctx.stream_reader(fp)
+        fp = zstd.ZstdFile(fp, mode=mode)
 
     return fp
 
@@ -804,13 +811,8 @@ def open_path(path: str, mode: str, clobber: bool = True) -> IO:
             fp = lz4.open(path, mode)
         elif path.endswith((".zstd", ".zst")):
             if not HAS_ZSTD:
-                raise RuntimeError("zstandard python module not available")
-            if not out:
-                dctx = zstd.ZstdDecompressor()
-                fp = dctx.stream_reader(pathobj.open("rb"))
-            else:
-                cctx = zstd.ZstdCompressor()
-                fp = cctx.stream_writer(pathobj.open("wb"))
+                raise RuntimeError("backports.zstd python module not available")
+            fp = zstd.ZstdFile(path, mode)
 
     # normal file or stdio for reading or writing
     if not fp:

{flow_record-3.21.dev15 → flow_record-3.22.dev1}/flow/record/fieldtypes/net/ip.py

@@ -73,20 +73,9 @@ class ipnetwork(FieldType):
     def __hash__(self) -> int:
         return hash(self.val)
 
-    @staticmethod
-    def _is_subnet_of(a: _IPNetwork, b: _IPNetwork) -> bool:
-        try:
-            # Always false if one is v4 and the other is v6.
-            if a._version != b._version:
-                raise TypeError(f"{a} and {b} are not of the same version")
-        except AttributeError:
-            raise TypeError(f"Unable to test subnet containment between {a} and {b}")
-        else:
-            return b.network_address <= a.network_address and b.broadcast_address >= a.broadcast_address
-
     def __contains__(self, b: object) -> bool:
         try:
-            return self._is_subnet_of(ip_network(b), self.val)
+            return ip_network(b).subnet_of(self.val)
         except (ValueError, TypeError):
             return False
 

{flow_record-3.21.dev15 → flow_record-3.22.dev1}/flow/record/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.21.dev15'
-__version_tuple__ = version_tuple = (3, 21, 'dev15')
+__version__ = version = '3.22.dev1'
+__version_tuple__ = version_tuple = (3, 22, 'dev1')
 
-__commit_id__ = commit_id = 'ge5a9f567a'
+__commit_id__ = commit_id = 'gf3a1c5fa4'

{flow_record-3.21.dev15 → flow_record-3.22.dev1}/flow.record.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev15
+Version: 3.22.dev1
 Summary: A library for defining and creating structured data (called records) that can be streamed to disk or piped to other tools that use flow.record
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: msgpack>=0.5.2
 Requires-Dist: tzdata; platform_system == "Windows"
 Provides-Extra: compression
 Requires-Dist: lz4; extra == "compression"
-Requires-Dist: zstandard; platform_python_implementation != "PyPy" and extra == "compression"
+Requires-Dist: backports.zstd; python_version < "3.14" and extra == "compression"
 Provides-Extra: elastic
 Requires-Dist: elasticsearch; extra == "elastic"
 Provides-Extra: geoip

{flow_record-3.21.dev15 → flow_record-3.22.dev1}/flow.record.egg-info/requires.txt

@@ -9,8 +9,8 @@ fastavro[snappy]
 [compression]
 lz4
 
-[compression:platform_python_implementation != "PyPy"]
-zstandard
+[compression:python_version < "3.14"]
+backports.zstd
 
 [duckdb]
 

{flow_record-3.21.dev15 → flow_record-3.22.dev1}/pyproject.toml

@@ -37,7 +37,7 @@ repository = "https://github.com/fox-it/flow.record"
 # Note: these compression libraries do not work well with pypy
 compression = [
     "lz4",
-    "zstandard; platform_python_implementation != 'PyPy'",
+    "backports.zstd; python_version < '3.14'",
 ]
 elastic = [
     "elasticsearch",
@@ -68,7 +68,7 @@ full = [
 [dependency-groups]
 compression = [
     "lz4",
-    "zstandard; platform_python_implementation != 'PyPy'",
+    "backports.zstd; python_version < '3.14'",
 ]
 elastic = [
     "elasticsearch",

{flow_record-3.21.dev15 → flow_record-3.22.dev1}/tests/record/test_adapter.py

@@ -85,12 +85,10 @@ def test_compressed_writer_reader(tmp_path: Path, compression: str) -> None:
     if compression == "lz4" and not HAS_LZ4:
         pytest.skip("lz4 module not installed")
     if compression == "zstd" and not HAS_ZSTD:
-        pytest.skip("zstandard module not installed")
+        pytest.skip("backports.zstd module not installed")
 
     if compression == "lz4" and platform.python_implementation() == "PyPy":
         pytest.skip("lz4 module not supported on PyPy")
-    if compression == "zstd" and platform.python_implementation() == "PyPy":
-        pytest.skip("zstandard module not supported on PyPy")
 
     p = tmp_path.joinpath(f"{compression}-test")
     p.mkdir()