Merge branch 'gh-535/UUID-set-comparison-failure' of github.com:akshat62/deepdiff into gh-535/UUID-set-comparison-failure

Author: seperman

deepdiff/deephash.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import logging
 import datetime
+import uuid
 from typing import Union, Optional, Any, List, TYPE_CHECKING
 from collections.abc import Iterable, MutableMapping
 from collections import defaultdict
@@ -569,6 +570,17 @@ def _hash(self, obj, parent, parents_ids=EMPTY_FROZENSET):
         elif isinstance(obj, ipranges):
             result = self._prep_ipranges(obj)
 
+        elif isinstance(obj, uuid.UUID):
+            # Handle UUID objects (including uuid6.UUID) by using their integer value
+            result = f"uuid:{obj.int}"
+            if self.apply_hash:
+                result = self.hasher(result)
+            try:
+                self.hashes[obj] = (result, counts)
+            except TypeError:
+                self.hashes[get_id(obj)] = (result, counts)
+            return result, counts
+
         elif isinstance(obj, MutableMapping):
             result, counts = self._prep_dict(obj=obj, parent=parent, parents_ids=parents_ids)
 

tests/test_hash.py

@@ -208,6 +208,30 @@ def test_numpy_datetime64(self):
         later_hash = DeepHash(later)
         assert a_hash[a] != later_hash[later]
 
+    def test_uuid6_hash_positive(self):
+        """Positive test case: Same UUID objects should produce the same hash."""
+        import uuid6
+        uuid_obj = uuid6.uuid7()
+        hash1 = DeepHash(uuid_obj)
+        hash2 = DeepHash(uuid_obj)
+        assert hash1[uuid_obj] == hash2[uuid_obj]
+
+        import uuid
+        regular_uuid = uuid.uuid4()
+        hash_regular = DeepHash(regular_uuid)
+        assert hash_regular[regular_uuid] is not unprocessed
+
+    def test_uuid6_deepdiff_negative(self):
+        """Negative test case: DeepDiff should detect differences between sets containing different UUID objects."""
+        import uuid6
+        dummy_id_1 = uuid6.uuid7()
+        dummy_id_2 = uuid6.uuid7()
+        set1 = {dummy_id_1}
+        set2 = {dummy_id_1, dummy_id_2}
+        diff = DeepDiff(set1, set2)
+        assert diff != {}
+        assert 'set_item_added' in diff
+        assert str(dummy_id_2) in str(diff)
 
 class TestDeepHashPrep:
     """DeepHashPrep Tests covering object serialization."""