fix2

Author: davidhozic

tkclasswiz/annotations.py

@@ -6,6 +6,7 @@
 from contextlib import suppress
 from inspect import isclass
 from .doc import doc_category
+from .utilities import issubclass_noexcept
 
 
 __all__ = (
@@ -97,7 +98,7 @@ def get_annotations(class_) -> dict:
     with suppress(AttributeError, TypeError):
         if isclass(class_):
             annotations = get_type_hints(class_.__init__)
-        elif isclass(origin_class := get_origin(class_)) and issubclass(origin_class, Generic):
+        elif isclass(origin_class := get_origin(class_)) and issubclass_noexcept(origin_class, Generic):
             # Resolve generics
             annotations = get_type_hints(origin_class.__init__)
             generic_types = get_args(origin_class.__orig_bases__[0])

tkclasswiz/object_frame/frame_base.py

@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from inspect import isabstract
 from contextlib import suppress
-from itertools import chain
+from itertools import chain, product
 from functools import cache
 
 from ..convert import *
@@ -202,6 +202,7 @@ def remove_classes(types: list):
 
             return tuple({a:0 for a in r})
 
+
         if isinstance(input_type, str):
             raise TypeError(
                 f"Provided type '{input_type}' is not a type - it is a string!\n"
@@ -217,20 +218,20 @@ def remove_classes(types: list):
         # Unpack Union items into a tuple
         if origin is Union or issubclass_noexcept(origin, (Iterable, Generic)):
             new_types = []
-            for type_ in chain.from_iterable([cls.convert_types(r) for r in get_args(input_type)]):
-                new_types.append(type_)
+            for arg_group in get_args(input_type):
+                new_types.append(remove_classes(list(cls.convert_types(arg_group))))
 
-            new_types = remove_classes(new_types)
             if origin is Union:
-                return new_types  # Just expand unions
+                return tuple(chain.from_iterable(new_types))  # Just expand unions
 
             # Process abstract classes and polymorphism
             new_origins = []
             for origin in cls.convert_types(origin):
                 if issubclass_noexcept(origin, Iterable):
-                    new_origins.append(origin[tuple(new_types)])
+                    new_origins.append(origin[tuple(chain.from_iterable(new_types))])
                 elif issubclass_noexcept(origin, Generic):
-                    new_origins.append(origin[tuple(new_types[:len(origin.__parameters__)])])
+                    for comb in product(*new_types):
+                        new_origins.append(origin[comb])
                 else:
                     new_origins.append(origin)
 

tkclasswiz/object_frame/window.py

@@ -112,7 +112,7 @@ def _create_and_add_frame(
 
         if issubclass_noexcept(class_origin, Flag):
             frame_class = NewObjectFrameFlag
-        elif issubclass(class_origin, str):
+        elif issubclass_noexcept(class_origin, str):
             frame_class = NewObjectFrameString
         elif issubclass_noexcept(class_origin, (int, float, complex)):
             frame_class = NewObjectFrameNumber