flow.record 3.21.dev8__tar.gz → 3.21.dev10__tar.gz

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev8
+Version: 3.21.dev10
 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
+License-Expression: AGPL-3.0-or-later
 Project-URL: homepage, https://dissect.tools
 Project-URL: documentation, https://docs.dissect.tools/en/latest/projects/flow.record
 Project-URL: repository, https://github.com/fox-it/flow.record
@@ -11,12 +11,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Utilities
-Requires-Python: ~=3.9
+Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
@@ -25,6 +24,7 @@ Requires-Dist: tzdata; platform_system == "Windows"
 Provides-Extra: compression
 Requires-Dist: lz4; extra == "compression"
 Requires-Dist: zstandard; extra == "compression"
+Requires-Dist: zstandard==0.23.0; (platform_python_implementation == "PyPy" and python_version == "3.9") and extra == "compression"
 Provides-Extra: elastic
 Requires-Dist: elasticsearch; extra == "elastic"
 Provides-Extra: geoip
@@ -39,15 +39,6 @@ Provides-Extra: splunk
 Requires-Dist: httpx; extra == "splunk"
 Provides-Extra: xlsx
 Requires-Dist: openpyxl; extra == "xlsx"
-Provides-Extra: test
-Requires-Dist: flow.record[compression]; extra == "test"
-Requires-Dist: flow.record[avro]; extra == "test"
-Requires-Dist: flow.record[elastic]; extra == "test"
-Requires-Dist: flow.record[xlsx]; extra == "test"
-Requires-Dist: duckdb; (platform_python_implementation != "PyPy" and python_version < "3.12") and extra == "test"
-Requires-Dist: pytz; (platform_python_implementation != "PyPy" and python_version < "3.12") and extra == "test"
-Requires-Dist: tqdm; extra == "test"
-Requires-Dist: structlog; extra == "test"
 Provides-Extra: full
 Requires-Dist: flow.record[compression]; extra == "full"
 Requires-Dist: tqdm; extra == "full"

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/flow/record/adapter/elastic.py

@@ -287,6 +287,6 @@ def enrich_elastic_exception(exception: Exception) -> Exception:
     error_str = ", ".join(errors)
     original_message = exception.args[0] if exception.args else ""
     new_message = f"{original_message} {error_str}"
-    exception.args = (new_message,) + exception.args[1:]
+    exception.args = (new_message, *exception.args[1:])
 
     return exception

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/flow/record/jsonpacker.py

@@ -97,7 +97,8 @@ class JsonRecordPacker:
                 del obj["_type"]
                 for field_type, field_name in record_descriptor.get_field_tuples():
                     if field_type == "bytes":
-                        obj[field_name] = base64.b64decode(obj[field_name])
+                        value = obj[field_name]
+                        obj[field_name] = base64.b64decode(value) if value is not None else None
                 return record_descriptor.recordType(**obj)
             if _type == "recorddescriptor":
                 data = obj["_data"]

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/flow/record/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.21.dev8'
-__version_tuple__ = version_tuple = (3, 21, 'dev8')
+__version__ = version = '3.21.dev10'
+__version_tuple__ = version_tuple = (3, 21, 'dev10')
 
-__commit_id__ = commit_id = 'g820113cc3'
+__commit_id__ = commit_id = 'g04aec16c5'

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/flow.record.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev8
+Version: 3.21.dev10
 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
+License-Expression: AGPL-3.0-or-later
 Project-URL: homepage, https://dissect.tools
 Project-URL: documentation, https://docs.dissect.tools/en/latest/projects/flow.record
 Project-URL: repository, https://github.com/fox-it/flow.record
@@ -11,12 +11,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Utilities
-Requires-Python: ~=3.9
+Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
@@ -25,6 +24,7 @@ Requires-Dist: tzdata; platform_system == "Windows"
 Provides-Extra: compression
 Requires-Dist: lz4; extra == "compression"
 Requires-Dist: zstandard; extra == "compression"
+Requires-Dist: zstandard==0.23.0; (platform_python_implementation == "PyPy" and python_version == "3.9") and extra == "compression"
 Provides-Extra: elastic
 Requires-Dist: elasticsearch; extra == "elastic"
 Provides-Extra: geoip
@@ -39,15 +39,6 @@ Provides-Extra: splunk
 Requires-Dist: httpx; extra == "splunk"
 Provides-Extra: xlsx
 Requires-Dist: openpyxl; extra == "xlsx"
-Provides-Extra: test
-Requires-Dist: flow.record[compression]; extra == "test"
-Requires-Dist: flow.record[avro]; extra == "test"
-Requires-Dist: flow.record[elastic]; extra == "test"
-Requires-Dist: flow.record[xlsx]; extra == "test"
-Requires-Dist: duckdb; (platform_python_implementation != "PyPy" and python_version < "3.12") and extra == "test"
-Requires-Dist: pytz; (platform_python_implementation != "PyPy" and python_version < "3.12") and extra == "test"
-Requires-Dist: tqdm; extra == "test"
-Requires-Dist: structlog; extra == "test"
 Provides-Extra: full
 Requires-Dist: flow.record[compression]; extra == "full"
 Requires-Dist: tqdm; extra == "full"

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/flow.record.egg-info/requires.txt

@@ -13,6 +13,9 @@ cramjam<2.8.4
 lz4
 zstandard
 
+[compression:platform_python_implementation == "PyPy" and python_version == "3.9"]
+zstandard==0.23.0
+
 [duckdb]
 duckdb
 pytz
@@ -31,17 +34,5 @@ maxminddb
 [splunk]
 httpx
 
-[test]
-flow.record[compression]
-flow.record[avro]
-flow.record[elastic]
-flow.record[xlsx]
-tqdm
-structlog
-
-[test:platform_python_implementation != "PyPy" and python_version < "3.12"]
-duckdb
-pytz
-
 [xlsx]
 openpyxl

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/pyproject.toml

@@ -1,13 +1,14 @@
 [build-system]
-requires = ["setuptools>=65.5.0", "setuptools_scm[toml]>=6.4.0"]
+requires = ["setuptools>=80.9.0", "setuptools_scm[toml]>=6.4.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "flow.record"
 description = "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"
 readme = "README.md"
-requires-python = "~=3.9"
-license.text = "Affero General Public License v3"
+requires-python = ">=3.9.0"
+license = "AGPL-3.0-or-later"
+license-files = ["LICENSE", "COPYRIGHT"]
 authors = [
   {name = "Dissect Team", email = "dissect@fox-it.com"}
 ]
@@ -16,7 +17,6 @@ classifiers = [
   "Environment :: Console",
   "Intended Audience :: Developers",
   "Intended Audience :: Information Technology",
-  "License :: OSI Approved",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
   "Topic :: Scientific/Engineering :: Information Analysis",
@@ -38,6 +38,7 @@ repository = "https://github.com/fox-it/flow.record"
 compression = [
     "lz4",
     "zstandard",
+    "zstandard==0.23.0; platform_python_implementation == 'PyPy' and python_version == '3.9'", # Pin to last working for PyPy3.9
 ]
 elastic = [
     "elasticsearch",
@@ -46,7 +47,7 @@ geoip = [
     "maxminddb",
 ]
 avro = [
-    "cramjam<2.8.4; platform_python_implementation == 'PyPy' and python_version == '3.9'",
+    "cramjam<2.8.4; platform_python_implementation == 'PyPy' and python_version == '3.9'", # Pin to last working for PyPy3.9
     "fastavro[snappy]",
 ]
 duckdb = [
@@ -59,16 +60,6 @@ splunk = [
 xlsx = [
     "openpyxl",
 ]
-test = [
-    "flow.record[compression]",
-    "flow.record[avro]",
-    "flow.record[elastic]",
-    "flow.record[xlsx]",
-    "duckdb; platform_python_implementation != 'PyPy' and python_version < '3.12'", # duckdb
-    "pytz; platform_python_implementation != 'PyPy' and python_version < '3.12'", # duckdb
-    "tqdm",
-    "structlog",
-]
 full = [
     "flow.record[compression]",
     "tqdm",
@@ -130,12 +121,63 @@ ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM1
 [tool.ruff.lint.isort]
 known-first-party = ["flow.record"]
 
-[tool.setuptools]
-license-files = ["LICENSE", "COPYRIGHT"]
-
 [tool.setuptools.packages.find]
 include = ["flow.*"]
 
 [tool.setuptools_scm]
 local_scheme = "no-local-version"
 version_file = "flow/record/version.py"
+
+# This list is duplicated due to https://github.com/fox-it/flow.record/pull/182#discussion_r2284582481
+[dependency-groups]
+compression = [
+    "lz4",
+    "zstandard==0.23.0; platform_python_implementation == 'PyPy' and python_version == '3.9'", # Pin to last working for PyPy3.9
+    "zstandard",
+]
+elastic = [
+    "elasticsearch",
+]
+geoip = [
+    "maxminddb",
+]
+avro = [
+    "cramjam<2.8.4; platform_python_implementation == 'PyPy' and python_version == '3.9'", # Pin to last working for PyPy3.9
+    "fastavro[snappy]",
+]
+duckdb = [
+    "duckdb; platform_python_implementation != 'PyPy'", # Don't install duckdb on PyPy
+    "pytz; platform_python_implementation != 'PyPy'", # Don't install duckdb on PyPy
+]
+splunk = [
+    "httpx",
+]
+xlsx = [
+    "openpyxl",
+]
+test = [
+    {include-group = "compression"},
+    {include-group = "avro"},
+    {include-group = "elastic"},
+    {include-group = "xlsx"},
+    {include-group = "duckdb"},
+    "tqdm",
+    "structlog",
+    "pytest",
+]
+full = [
+    {include-group = "compression"},
+    "tqdm",
+    "structlog",
+]
+build = [
+    "build",
+]
+lint = [
+    "ruff==0.12.9",
+    "vermin",
+]
+dev = [
+    {include-group = "test"},
+    {include-group = "lint"},
+]

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/tests/adapter/test_splunk.py

@@ -339,7 +339,7 @@ def test_https_protocol_records_sourcetype(mock_httpx_package: MagicMock) -> Non
     if "flow.record.adapter.splunk" in sys.modules:
         del sys.modules["flow.record.adapter.splunk"]
 
-    from flow.record.adapter.splunk import Protocol, SourceType, SplunkWriter
+    from flow.record.adapter.splunk import Protocol, SourceType, SplunkWriter  # noqa: PLC0415
 
     with patch.object(
         flow.record.adapter.splunk,
@@ -387,7 +387,7 @@ def test_https_protocol_json_sourcetype(mock_httpx_package: MagicMock) -> None:
     if "flow.record.adapter.splunk" in sys.modules:
         del sys.modules["flow.record.adapter.splunk"]
 
-    from flow.record.adapter.splunk import SplunkWriter
+    from flow.record.adapter.splunk import SplunkWriter  # noqa: PLC0415
 
     with patch.object(
         flow.record.adapter.splunk,

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/tests/adapter/test_sqlite_duckdb.py

@@ -169,11 +169,12 @@ def test_read_from_sqlite(tmp_path: Path, db: Database) -> None:
             """
         )
         for i in range(1, 30):
+            dt_isoformat = datetime(2023, 10, i, 13, 37, tzinfo=timezone.utc).isoformat()
             con.execute(
                 """
                 INSERT INTO 'test/record' VALUES (?, ?, ?, ?)
                 """,
-                (f"record{i}", f"foobar{i}".encode(), datetime(2023, 10, i, 13, 37, tzinfo=timezone.utc), 3.14 + i),
+                (f"record{i}", f"foobar{i}".encode(), dt_isoformat, 3.14 + i),
             )
 
     # Read the SQLite database using flow.record

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/tests/packer/test_json_packer.py

@@ -112,3 +112,29 @@ def test_record_pack_surrogateescape() -> None:
 
     # pack the json string back to a record and make sure it is the same as before
     assert packer.unpack(data) == record
+
+
+def test_json_packer_bytes_type() -> None:
+    TestRecord = RecordDescriptor(
+        "test/bytes",
+        [
+            ("bytes", "data"),
+        ],
+    )
+
+    packer = JsonRecordPacker()
+
+    record = TestRecord(b"hello world")
+    data = packer.pack(record)
+    assert data.startswith('{"data": "aGVsbG8gd29ybGQ="')
+    assert packer.unpack(data) == record
+
+    record = TestRecord(data=None)
+    data = packer.pack(record)
+    assert data.startswith('{"data": null')
+    assert packer.unpack(data) == record
+
+    record = TestRecord(data=b"")
+    data = packer.pack(record)
+    assert data.startswith('{"data": ""')
+    assert packer.unpack(data) == record

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/tests/record/test_record.py

@@ -877,7 +877,7 @@ def test_compare_environment_variable() -> None:
 
         importlib.import_module("flow.record")
 
-        from flow.record import IGNORE_FIELDS_FOR_COMPARISON, RecordDescriptor
+        from flow.record import IGNORE_FIELDS_FOR_COMPARISON, RecordDescriptor  # noqa: PLC0415
 
         assert {"_generated", "lastname"} == IGNORE_FIELDS_FOR_COMPARISON
 

{flow_record-3.21.dev8 → flow_record-3.21.dev10}/tox.ini

@@ -16,7 +16,7 @@ deps =
     pytest
     pytest-cov
     coverage
-extras = test
+dependency_groups = test
 commands =
 # Capturing output will fail on pypy, possibly due to this issue: https://github.com/pytest-dev/pytest/issues/5502
     pytest --basetemp="{envtmpdir}" {posargs:--color=yes --capture=no --cov=flow --cov-report=term-missing -v tests}
@@ -25,24 +25,20 @@ commands =
 
 [testenv:build]
 package = skip
-deps =
-    build
+dependency_groups = build
 commands =
     pyproject-build
 
 [testenv:fix]
 package = skip
-deps =
-    ruff==0.9.2
+dependency_groups = lint
 commands =
     ruff check --fix flow tests
     ruff format flow tests
 
 [testenv:lint]
 package = skip
-deps =
-    ruff==0.9.2
-    vermin
+dependency_groups = lint
 commands =
     ruff check flow tests
     vermin -t=3.9- --no-tips --lint flow tests