Skip to content

[#30019] Fix type checking failures around yielding unions with nested complex types #39413

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

Open
jrmccluskey wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −6
Open

[#30019] Fix type checking failures around yielding unions with nested complex types #39413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions sdks/python/apache_beam/typehints/typehints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ def regex_consistency(sub, base) -> bool:


def get_yielded_type(type_hint):
"""Obtains the type of elements yielded by an iterable.s
"""Obtains the type of elements yielded by an iterable.

Note that "iterable" here means: can be iterated over in a for loop, excluding
strings and dicts.
Expand All @@ -1583,10 +1583,16 @@ def get_yielded_type(type_hint):
Raises:
ValueError if not iterable.
"""
type_hint = normalize(type_hint, none_as_type=True)
if isinstance(type_hint, typing.TypeVar):
return typing.Any
if isinstance(type_hint, AnyTypeConstraint):
return type_hint
if isinstance(type_hint, UnionConstraint):
yielded_types = set()
for typ in type_hint.inner_types():
yielded_types.add(get_yielded_type(typ))
return Union[yielded_types]
if is_consistent_with(type_hint, Iterator[Any]):
return type_hint.yielded_type
if is_consistent_with(type_hint, Tuple[Any, ...]):
Expand All @@ -1595,11 +1601,6 @@ def get_yielded_type(type_hint):
else: # TupleSequenceConstraint
return type_hint.inner_type
if is_consistent_with(type_hint, Iterable[Any]):
if isinstance(type_hint, UnionConstraint):
yielded_types = set()
for typ in type_hint.inner_types():
yielded_types.add(get_yielded_type(typ))
return Union[yielded_types]
return type_hint.inner_type
raise ValueError('%s is not iterable' % type_hint)

Expand Down
18 changes: 18 additions & 0 deletions sdks/python/apache_beam/typehints/typehints_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,6 +1703,22 @@ def test_iterables(self):
typehints.Union[int, str],
typehints.get_yielded_type(
typehints.Union[typehints.List[int], typehints.List[str]]))
self.assertEqual(
typehints.Union[int, str],
typehints.get_yielded_type(
typehints.Union[typehints.Iterator[int], typehints.Iterator[str]]))
self.assertEqual(
typehints.Union[int, str],
typehints.get_yielded_type(
typehints.Union[typehints.Tuple[int, int],
typehints.Tuple[str, str]]))
self.assertEqual(
typehints.Union[int, str],
typehints.get_yielded_type(typing.Iterable[int] | typing.Iterable[str]))
self.assertEqual(
typehints.Union[int, str],
typehints.get_yielded_type(
typing.Union[typing.Iterator[int], typing.Iterator[str]]))

def test_not_iterable(self):
with self.assertRaisesRegex(ValueError, r'not iterable'):
Expand All @@ -1711,6 +1727,8 @@ def test_not_iterable(self):
def test_union_not_iterable(self):
with self.assertRaisesRegex(ValueError, r'not iterable'):
typehints.get_yielded_type(typehints.Union[int, typehints.List[int]])
with self.assertRaisesRegex(ValueError, r'not iterable'):
typehints.get_yielded_type(int | typing.List[str])


class TestCoerceToKvType(TypeHintTestCase):
Expand Down
Loading