Now works for Optional[List[type]], Optional[List[type]], but only some of Optional[Tuple[type]]

Author: martinjm97

tap/tap.py

@@ -228,7 +228,6 @@ def _add_argument(self, *name_or_flags, **kwargs) -> None:
                     # Handle the cases of List[bool], Set[bool], Tuple[bool]
                     if var_type == bool:
                         var_type = boolean_type
-
                 # If bool then set action, otherwise set type
                 if var_type == bool:
                     if explicit_bool:
@@ -401,6 +400,10 @@ def parse_args(self: TapType,
                 if type(value) == list:
                     var_type = get_origin(self._annotations[variable])
 
+                    # Unpack nested boxed types such as Optional[List[int]]
+                    if var_type is Union:
+                        var_type = get_origin(get_args(self._annotations[variable])[0])
+
                     if var_type in (Set, set):
                         value = set(value)
                     elif var_type in (Tuple, tuple):

tests/test_integration.py

@@ -172,14 +172,14 @@ class NestedOptionalTypesTap(Tap):
     set_bool: Optional[Set[bool]]
     set_int: Optional[Set[int]]
     set_str: Optional[Set[str]]
-    # tuple_bool: Optional[Tuple[bool]]
-    # tuple_int: Optional[Tuple[int]]
-    # tuple_str: Optional[Tuple[str]]
+    tuple_bool: Optional[Tuple[bool]]
+    tuple_int: Optional[Tuple[int]]
+    tuple_str: Optional[Tuple[str]]
     # tuple_pair: Optional[Tuple[bool, str, int]]
     # tuple_arbitrary_len_bool: Optional[Tuple[bool, ...]]
     # tuple_arbitrary_len_int: Optional[Tuple[int, ...]]
     # tuple_arbitrary_len_str: Optional[Tuple[str, ...]]    
-    
+
 
 class NestedOptionalTypeTests(TestCase):
 
@@ -205,9 +205,9 @@ def test_nested_optional_types(self):
             '--set_bool', *stringify(set_bool),
             '--set_int', *stringify(set_int),
             '--set_str', *stringify(set_str),
-            # '--tuple_bool', *stringify(tuple_bool),
-            # '--tuple_int', *stringify(tuple_int),
-            # '--tuple_str', *stringify(tuple_str),
+            '--tuple_bool', *stringify(tuple_bool),
+            '--tuple_int', *stringify(tuple_int),
+            '--tuple_str', *stringify(tuple_str),
             # '--tuple_pair', *stringify(tuple_pair),
             # '--tuple_arbitrary_len_bool', *stringify(tuple_arbitrary_len_bool), 
             # '--tuple_arbitrary_len_int', *stringify(tuple_arbitrary_len_int),
@@ -225,10 +225,10 @@ def test_nested_optional_types(self):
         self.assertEqual(args.tuple_bool, tuple_bool)
         self.assertEqual(args.tuple_int, tuple_int)
         self.assertEqual(args.tuple_str, tuple_str)
-        self.assertEqual(args.tuple_pair, tuple_pair)
-        self.assertEqual(args.tuple_arbitrary_len_bool, tuple_arbitrary_len_bool)
-        self.assertEqual(args.tuple_arbitrary_len_int, tuple_arbitrary_len_int)
-        self.assertEqual(args.tuple_arbitrary_len_str, tuple_arbitrary_len_str)
+        # self.assertEqual(args.tuple_pair, tuple_pair)
+        # self.assertEqual(args.tuple_arbitrary_len_bool, tuple_arbitrary_len_bool)
+        # self.assertEqual(args.tuple_arbitrary_len_int, tuple_arbitrary_len_int)
+        # self.assertEqual(args.tuple_arbitrary_len_str, tuple_arbitrary_len_str)
 
 
 class ComplexTypeTap(Tap):