flow.record 3.21.dev5__tar.gz → 3.21.dev7__tar.gz

flow_record-3.21.dev7/.gitattributes

@@ -0,0 +1 @@
+tests/_data/** filter=lfs diff=lfs merge=lfs -text

{flow_record-3.21.dev5 → flow_record-3.21.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev5
+Version: 3.21.dev7
 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: Affero General Public License v3

{flow_record-3.21.dev5 → flow_record-3.21.dev7}/flow/record/adapter/csvfile.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import csv
 import sys
 from pathlib import Path
@@ -89,7 +90,8 @@ class CsvfileReader(AbstractReader):
 
         self.dialect = "excel"
         if self.fp.seekable():
-            self.dialect = csv.Sniffer().sniff(self.fp.read(1024))
+            with contextlib.suppress(csv.Error):
+                self.dialect = csv.Sniffer().sniff(self.fp.read(1024))
             self.fp.seek(0)
         self.reader = csv.reader(self.fp, dialect=self.dialect)
 

{flow_record-3.21.dev5 → flow_record-3.21.dev7}/flow/record/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.21.dev5'
-__version_tuple__ = version_tuple = (3, 21, 'dev5')
+__version__ = version = '3.21.dev7'
+__version_tuple__ = version_tuple = (3, 21, 'dev7')

{flow_record-3.21.dev5 → flow_record-3.21.dev7}/flow.record.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev5
+Version: 3.21.dev7
 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: Affero General Public License v3

{flow_record-3.21.dev5 → flow_record-3.21.dev7}/flow.record.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 .git-blame-ignore-revs
+.gitattributes
 COPYRIGHT
 LICENSE
 MANIFEST.in
@@ -9,6 +10,7 @@ examples/__init__.py
 examples/filesystem.py
 examples/passivedns.py
 examples/records.json
+examples/selectors.py
 examples/tcpconn.py
 flow.record.egg-info/PKG-INFO
 flow.record.egg-info/SOURCES.txt
@@ -54,32 +56,36 @@ flow/record/tools/geoip.py
 flow/record/tools/rdump.py
 tests/__init__.py
 tests/_utils.py
-tests/selector_explain_example.py
-tests/standalone_test.py
-tests/test_adapter_line.py
-tests/test_adapter_text.py
-tests/test_avro.py
-tests/test_avro_adapter.py
-tests/test_compiled_selector.py
-tests/test_csv_adapter.py
 tests/test_deprecations.py
-tests/test_elastic_adapter.py
-tests/test_fieldtype_ip.py
-tests/test_fieldtypes.py
-tests/test_json_packer.py
-tests/test_json_record_adapter.py
-tests/test_multi_timestamp.py
-tests/test_packer.py
-tests/test_rdump.py
-tests/test_record.py
-tests/test_record_adapter.py
-tests/test_record_descriptor.py
-tests/test_regression.py
-tests/test_selector.py
-tests/test_splunk_adapter.py
-tests/test_sqlite_duckdb_adapter.py
+tests/test_regressions.py
 tests/test_utils.py
-tests/test_xlsx_adapter.py
-tests/docs/Makefile
-tests/docs/conf.py
-tests/docs/index.rst
+tests/_data/.gitkeep
+tests/_docs/Makefile
+tests/_docs/conf.py
+tests/_docs/index.rst
+tests/adapter/__init__.py
+tests/adapter/test_avro.py
+tests/adapter/test_csv.py
+tests/adapter/test_elastic.py
+tests/adapter/test_json.py
+tests/adapter/test_line.py
+tests/adapter/test_splunk.py
+tests/adapter/test_sqlite_duckdb.py
+tests/adapter/test_text.py
+tests/adapter/test_xlsx.py
+tests/fieldtypes/__init__.py
+tests/fieldtypes/test_fieldtypes.py
+tests/fieldtypes/test_ip.py
+tests/packer/__init__.py
+tests/packer/test_json_packer.py
+tests/packer/test_packer.py
+tests/record/__init__.py
+tests/record/test_adapter.py
+tests/record/test_descriptor.py
+tests/record/test_multi_timestamp.py
+tests/record/test_record.py
+tests/selector/__init__.py
+tests/selector/test_compiled.py
+tests/selector/test_selectors.py
+tests/tools/__init__.py
+tests/tools/test_rdump.py

{flow_record-3.21.dev5 → flow_record-3.21.dev7}/pyproject.toml

@@ -125,7 +125,7 @@ select = [
 ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM105", "TRY003", "TRY400"]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/docs/**" = ["INP001"]
+"tests/_docs/**" = ["INP001"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["flow.record"]

{flow_record-3.21.dev5/tests → flow_record-3.21.dev7/tests/adapter}/test_avro.py

@@ -5,9 +5,10 @@ from typing import TYPE_CHECKING
 
 import pytest
 
-from flow.record import RecordDescriptor, RecordReader
+from flow.record import RecordDescriptor, RecordReader, RecordWriter
 from flow.record.adapter.avro import AvroReader, AvroWriter
 from flow.record.base import HAS_AVRO
+from tests._utils import generate_plain_records
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -68,3 +69,51 @@ def test_avrostream_filelike_object(tmp_path: Path) -> None:
         assert rec.name == f"record{index}"
         assert rec.foo == "bar"
         assert rec.bar == "baz"
+
+
+def test_avro_adapter(tmpdir: Path) -> None:
+    json_file = tmpdir.join("records.avro")
+    record_adapter_path = f"avro://{json_file}"
+    writer = RecordWriter(record_adapter_path)
+    nr_records = 1337
+
+    for record in generate_plain_records(nr_records):
+        writer.write(record)
+    writer.flush()
+
+    nr_received_records = 0
+    reader = RecordReader(record_adapter_path)
+    for _ in reader:
+        nr_received_records += 1
+
+    assert nr_records == nr_received_records
+
+
+def test_avro_adapter_contextmanager(tmpdir: Path) -> None:
+    json_file = tmpdir.join("records.avro")
+    record_adapter_path = f"avro://{json_file}"
+    with RecordWriter(record_adapter_path) as writer:
+        nr_records = 1337
+        for record in generate_plain_records(nr_records):
+            writer.write(record)
+
+    nr_received_records = 0
+    with RecordReader(record_adapter_path) as reader:
+        for _ in reader:
+            nr_received_records += 1
+
+        assert nr_records == nr_received_records
+
+
+def test_avro_adapter_empty(tmpdir: Path) -> None:
+    json_file = tmpdir.join("records.avro")
+    record_adapter_path = f"avro://{json_file}"
+    with RecordWriter(record_adapter_path):
+        pass
+
+    nr_received_records = 0
+    with RecordReader(record_adapter_path) as reader:
+        for _ in reader:
+            nr_received_records += 1
+
+        assert nr_received_records == 0

flow_record-3.21.dev5/tests/test_json_record_adapter.py → flow_record-3.21.dev7/tests/adapter/test_json.py

@@ -6,8 +6,7 @@ from typing import TYPE_CHECKING
 import pytest
 
 from flow.record import RecordReader, RecordWriter
-
-from ._utils import generate_records
+from tests._utils import generate_records
 
 if TYPE_CHECKING:
     from pathlib import Path

flow_record-3.21.dev5/tests/test_record_adapter.py → flow_record-3.21.dev7/tests/record/test_adapter.py

@@ -28,8 +28,7 @@ from flow.record.base import (
     ZSTD_MAGIC,
 )
 from flow.record.selector import CompiledSelector, Selector
-
-from ._utils import generate_records
+from tests._utils import generate_records
 
 if TYPE_CHECKING:
     from pathlib import Path

flow_record-3.21.dev5/tests/test_regression.py → flow_record-3.21.dev7/tests/test_regressions.py

@@ -711,5 +711,15 @@ def test_rdump_selected_fields(capsysbinary: pytest.CaptureFixture) -> None:
     assert captured.out == b"Q42eWSaF,A sample pastebin record,text\r\n"
 
 
+def test_rdump_csv_sniff(tmp_path: Path, capsysbinary: pytest.CaptureFixture) -> None:
+    csv_path = tmp_path / "test.csv"
+    csv_path.write_text("ip,common_name,vulnerable\n127.0.0.1,localhost,1\n192.168.4.20,")
+    rdump.main([str(csv_path)])
+
+    captured = capsysbinary.readouterr()
+    assert b"<csv/reader ip='127.0.0.1' common_name='localhost' vulnerable='1'>" in captured.out
+    assert b"<csv/reader ip='192.168.4.20' common_name='' vulnerable=None>" in captured.out
+
+
 if __name__ == "__main__":
     __import__("standalone_test").main(globals())

{flow_record-3.21.dev5 → flow_record-3.21.dev7}/tox.ini

@@ -57,12 +57,12 @@ deps =
     sphinx-design
     furo
 commands =
-    make -C tests/docs clean
-    make -C tests/docs html
+    make -C tests/_docs clean
+    make -C tests/_docs html
 
 [testenv:docs-linkcheck]
 allowlist_externals = make
 deps = {[testenv:docs-build]deps}
 commands =
-    make -C tests/docs clean
-    make -C tests/docs linkcheck
+    make -C tests/_docs clean
+    make -C tests/_docs linkcheck

flow_record-3.21.dev5/tests/standalone_test.py

@@ -1,19 +0,0 @@
-from __future__ import annotations
-
-import traceback
-from typing import Callable
-
-
-def main(glob: dict[str, Callable[..., None]]) -> None:
-    for var, val in sorted(glob.items()):
-        if not var.startswith("test_"):
-            continue
-
-        print(f"{var:40s}", end="")
-        try:
-            val()
-            print("PASSED")
-        except Exception:
-            print("FAILED")
-
-            traceback.print_exc()

flow_record-3.21.dev5/tests/test_avro_adapter.py

@@ -1,58 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from flow.record import RecordReader, RecordWriter
-
-from ._utils import generate_plain_records
-
-if TYPE_CHECKING:
-    from pathlib import Path
-
-
-def test_avro_adapter(tmpdir: Path) -> None:
-    json_file = tmpdir.join("records.avro")
-    record_adapter_path = f"avro://{json_file}"
-    writer = RecordWriter(record_adapter_path)
-    nr_records = 1337
-
-    for record in generate_plain_records(nr_records):
-        writer.write(record)
-    writer.flush()
-
-    nr_received_records = 0
-    reader = RecordReader(record_adapter_path)
-    for _ in reader:
-        nr_received_records += 1
-
-    assert nr_records == nr_received_records
-
-
-def test_avro_adapter_contextmanager(tmpdir: Path) -> None:
-    json_file = tmpdir.join("records.avro")
-    record_adapter_path = f"avro://{json_file}"
-    with RecordWriter(record_adapter_path) as writer:
-        nr_records = 1337
-        for record in generate_plain_records(nr_records):
-            writer.write(record)
-
-    nr_received_records = 0
-    with RecordReader(record_adapter_path) as reader:
-        for _ in reader:
-            nr_received_records += 1
-
-        assert nr_records == nr_received_records
-
-
-def test_avro_adapter_empty(tmpdir: Path) -> None:
-    json_file = tmpdir.join("records.avro")
-    record_adapter_path = f"avro://{json_file}"
-    with RecordWriter(record_adapter_path):
-        pass
-
-    nr_received_records = 0
-    with RecordReader(record_adapter_path) as reader:
-        for _ in reader:
-            nr_received_records += 1
-
-        assert nr_received_records == 0