Make conversion to Iterable tighter (#25866)

apache · Mar 17, 2023 · 7555d98 · 7555d98
1 parent de578e6
commit 7555d98
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/sdks/python/apache_beam/typehints/native_type_compatibility.py b/sdks/python/apache_beam/typehints/native_type_compatibility.py
@@ -201,7 +201,7 @@ def convert_collections_to_typing(typ):
       typ = typing.Iterator[typ.__args__]
     elif hasattr(typ, 'send') and hasattr(typ, 'throw'):
       typ = typing.Generator[typ.__args__]
-    else:
+    elif _match_is_exactly_iterable(typ):
       typ = typing.Iterable[typ.__args__]
   return typ
 

diff --git a/sdks/python/apache_beam/typehints/native_type_compatibility_test.py b/sdks/python/apache_beam/typehints/native_type_compatibility_test.py
@@ -156,6 +156,14 @@ def test_convert_to_beam_type_with_collections_types(self):
               'nested iterable',
               tuple[bytes, collections.abc.Iterable[int]],
               typehints.Tuple[bytes, typehints.Iterable[int]]),
+          (
+              'iterable over tuple',
+              collections.abc.Iterable[tuple[str, int]],
+              typehints.Iterable[typehints.Tuple[str, int]]),
+          (
+              'mapping not caught',
+              collections.abc.Mapping[str, int],
+              collections.abc.Mapping[str, int]),
       ]
 
       for test_case in test_cases: