added handling of hashing of types with args and typing special forms

Author: tclose

pydra/utils/hash.py

@@ -3,6 +3,7 @@
 
 # import stat
 import struct
+import typing as ty
 from collections.abc import Mapping
 from functools import singledispatch
 from hashlib import blake2b
@@ -14,7 +15,6 @@
     NewType,
     Sequence,
     Set,
-    _SpecialForm,
 )
 import attrs.exceptions
 
@@ -224,10 +224,27 @@ def bytes_repr_dict(obj: dict, cache: Cache) -> Iterator[bytes]:
     yield b"}"
 
 
-@register_serializer(_SpecialForm)
+@register_serializer(ty._GenericAlias)
+@register_serializer(ty._SpecialForm)
 @register_serializer(type)
 def bytes_repr_type(klass: type, cache: Cache) -> Iterator[bytes]:
-    yield f"type:({klass.__module__}.{klass.__name__})".encode()
+    try:
+        yield f"type:({klass.__module__}.{klass.__name__}".encode()
+    except AttributeError:
+        yield f"type:(typing.{klass._name}:(".encode()  # type: ignore
+    args = ty.get_args(klass)
+    if args:
+
+        def sort_key(a):
+            try:
+                return a.__name__
+            except AttributeError:
+                return a._name
+
+        yield b"["
+        yield from bytes_repr_sequence_contents(sorted(args, key=sort_key), cache)
+        yield b"]"
+    yield b")"
 
 
 @register_serializer(list)

pydra/utils/tests/test_hash.py

@@ -4,6 +4,7 @@
 
 import attrs
 import pytest
+import typing as ty
 
 from ..hash import Cache, UnhashableError, bytes_repr, hash_object, register_serializer
 
@@ -143,11 +144,26 @@ class MyClass:
     assert re.match(rb".*\.MyClass:{str:1:x=.{16}}", obj_repr)
 
 
-def test_bytes_repr_type():
+def test_bytes_repr_type1():
     obj_repr = join_bytes_repr(Path)
     assert obj_repr == b"type:(pathlib.Path)"
 
 
+def test_bytes_repr_type2():
+    T = ty.TypeVar("T")
+
+    class MyClass(ty.Generic[T]):
+        pass
+
+    obj_repr = join_bytes_repr(MyClass[int])
+    assert re.match(rb"type:\(pydra.utils.tests.test_hash.MyClass\[.{16}\]\)", obj_repr)
+
+
+def test_bytes_special_form():
+    obj_repr = join_bytes_repr(ty.Union[int, float])
+    assert re.match(rb"type:\(typing.Union\[.{32}\]\)", obj_repr)
+
+
 def test_recursive_object():
     a = []
     b = [a]