Skip to content

Support PEP 604 union annotations #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 23, 2023
Merged

Support PEP 604 union annotations #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0ef100
fix: convert
Jan 16, 2023
8923046
feat: add test
Jan 16, 2023
d60ddf3
feat: add test
Jan 16, 2023
f8512f4
chore: format
Jan 16, 2023
332b5fe
fix: compatibility
Jan 16, 2023
b868eca
fix: compatibility
Jan 16, 2023
9d32a84
feat: more test cases
Jan 16, 2023
fffdc83
Merge branch 'main' into main
dnnsthnnr Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion temporalio/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
if sys.version_info >= (3, 11):
from enum import StrEnum

if sys.version_info >= (3, 10):
from types import UnionType


class PayloadConverter(ABC):
"""Base payload converter to/from multiple payloads/values."""
Expand Down Expand Up @@ -1155,8 +1158,12 @@ def value_to_type(hint: Type, value: Any) -> Any:
raise TypeError(f"Value {value} not in literal values {type_args}")
return value

is_union = origin is Union
if sys.version_info >= (3, 10):
is_union = is_union or isinstance(origin, UnionType)

# Union
if origin is Union:
if is_union:
# Try each one. Note, Optional is just a union w/ none.
for arg in type_args:
try:
Expand Down
6 changes: 6 additions & 0 deletions tests/test_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,12 @@ def fail(hint: Type, value: Any) -> None:
ok(Union[int, str], "foo")
ok(Union[MyDataClass, NestedDataClass], MyDataClass("foo", 5, SerializableEnum.FOO))
ok(Union[MyDataClass, NestedDataClass], NestedDataClass("foo"))
if sys.version_info >= (3, 10):
ok(int | None, None)
ok(int | None, 5)
fail(int | None, "1")
ok(MyDataClass | NestedDataClass, MyDataClass("foo", 5, SerializableEnum.FOO))
ok(MyDataClass | NestedDataClass, NestedDataClass("foo"))

# NewType
ok(NewIntType, 5)
Expand Down