PyPI - flow.record - Versions diffs - 3.15.dev12__tar.gz → 3.15.dev13__tar.gz - Mend

@@ -201,7 +201,27 @@ class Record:
         return result
     def __hash__(self) -> int:
-        return hash(self._pack(excluded_fields=IGNORE_FIELDS_FOR_COMPARISON))
+        desc_identifier, values = self._pack(excluded_fields=IGNORE_FIELDS_FOR_COMPARISON)
+        if not any((isinstance(value, list) for value in values)):
+            return hash((desc_identifier, values))
+        # Lists have to be converted to tuples to be able to hash them
+        record_values = []
+        for value in values:
+            if not isinstance(value, list):
+                record_values.append(value)
+                continue
+            list_values = []
+            for list_value in value:
+                if isinstance(list_value, dict):
+                    # List values that are dicts must be converted to tuples
+                    dict_as_tuple = tuple(list_value.items())
+                    list_values.append(dict_as_tuple)
+                else:
+                    list_values.append(list_value)
+            record_values.append(tuple(list_values))
+        return hash((desc_identifier, tuple(record_values)))
     def __repr__(self):
         return "<{} {}>".format(

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flow.record
-Version: 3.15.dev12
+Version: 3.15.dev13
 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

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
-__version__ = version = '3.15.dev12'
-__version_tuple__ = version_tuple = (3, 15, 'dev12')
+__version__ = version = '3.15.dev13'
+__version_tuple__ = version_tuple = (3, 15, 'dev13')

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flow.record
-Version: 3.15.dev12
+Version: 3.15.dev13
 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

@@ -922,3 +922,16 @@ def test_ignore_fields_for_comparision_contextmanager():
     # test reset again
     assert len(set(records)) == len(records)
     assert records[0] != records[1]
+def test_list_field_type_hashing():
+    TestRecord = RecordDescriptor(
+        "test/record",
+        [
+            ("string[]", "stringlist"),
+            ("dictlist", "dictlist"),
+        ],
+    )
+    test_record = TestRecord(stringlist=["a", "b", "c", "d"], dictlist=[{"a": "b", "c": "d"}, {"foo": "bar"}])
+    assert isinstance(hash(test_record), int)

flow.record 3.15.dev12__tar.gz → 3.15.dev13__tar.gz