debugged bytes_repr for types for Py <3.9

Author: tclose

pydra/utils/hash.py

@@ -234,22 +234,21 @@ def bytes_repr_dict(obj: dict, cache: Cache) -> Iterator[bytes]:
 @register_serializer(ty._SpecialForm)
 @register_serializer(type)
 def bytes_repr_type(klass: type, cache: Cache) -> Iterator[bytes]:
-    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)
+    def type_name(tp):
+        try:
+            name = tp.__name__
+        except AttributeError:
+            name = tp._name
+        return name
+
+    yield b"type:("
+    origin = ty.get_origin(klass)
+    if origin:
+        yield f"{origin.__module__}.{type_name(origin)}[".encode()
+        yield from bytes_repr_sequence_contents(ty.get_args(klass), cache)
         yield b"]"
+    else:
+        yield f"{klass.__module__}.{type_name(klass)}".encode()
     yield b")"
 
 

pydra/utils/tests/test_hash.py

@@ -5,7 +5,7 @@
 import attrs
 import pytest
 import typing as ty
-
+from fileformats.application import Zip, Json
 from ..hash import Cache, UnhashableError, bytes_repr, hash_object, register_serializer
 
 
@@ -172,6 +172,11 @@ def test_bytes_repr_type1():
     assert obj_repr == b"type:(pathlib.Path)"
 
 
+def test_bytes_repr_type1a():
+    obj_repr = join_bytes_repr(Zip[Json])
+    assert re.match(rb"type:\(fileformats.application.Zip\[.{16}\]\)", obj_repr)
+
+
 def test_bytes_repr_type2():
     T = ty.TypeVar("T")
 
@@ -182,11 +187,32 @@ class MyClass(ty.Generic[T]):
     assert re.match(rb"type:\(pydra.utils.tests.test_hash.MyClass\[.{16}\]\)", obj_repr)
 
 
-def test_bytes_special_form():
+def test_bytes_special_form1():
     obj_repr = join_bytes_repr(ty.Union[int, float])
     assert re.match(rb"type:\(typing.Union\[.{32}\]\)", obj_repr)
 
 
+def test_bytes_special_form2():
+    obj_repr = join_bytes_repr(ty.Any)
+    assert re.match(rb"type:\(typing.Any\)", obj_repr)
+
+
+def test_bytes_special_form3():
+    obj_repr = join_bytes_repr(ty.Optional[Path])
+    assert re.match(rb"type:\(typing.Optional\[.{16}\]\)", obj_repr)
+
+
+def test_bytes_special_form4():
+    obj_repr = join_bytes_repr(ty.Type[Path])
+    assert re.match(rb"type:\(builtins.type\[.{16}\]\)", obj_repr)
+
+
+def test_bytes_special_form5():
+    obj_repr = join_bytes_repr(ty.Callable[[Path, int], ty.Tuple[float, str]])
+    assert re.match(rb"type:\(typing.Callable\[.{16}\]\)", obj_repr)
+    assert obj_repr != join_bytes_repr(ty.Callable[[Path, int], ty.Tuple[float, bytes]])
+
+
 def test_recursive_object():
     a = []
     b = [a]

pydra/utils/tests/test_typing.py

@@ -8,7 +8,7 @@
 from ...engine.specs import File, LazyOutField
 from ..typing import TypeParser
 from pydra import Workflow
-from fileformats.serialization import Json
+from fileformats.application import Json
 from .utils import (
     generic_func_task,
     GenericShellTask,