Removed dependency on buggy typing_inspect

Author: sveinugu

pyproject.toml

@@ -25,7 +25,6 @@ prefect = ">2.13.2,<3"
 pytest-asyncio = "^0.20.2"
 pytest-cases = "^3.6.13"
 requests = "^2.25.1"
-typing-inspect = "^0.8.0"
 
 # Potential dependencies
 #dpath = "^2.1.0"

src/omnipy/util/helpers.py

@@ -38,7 +38,6 @@
 from pydantic import BaseModel, ValidationError
 from pydantic.generics import GenericModel
 from pydantic.typing import is_none_type
-from typing_inspect import get_generic_bases, is_generic_type
 
 from omnipy.api.protocols.private.util import HasContents, IsSnapshotWrapper
 from omnipy.api.typedefs import LocaleType, TypeForm
@@ -99,8 +98,8 @@ def repr_max_len(data: object, max_len: int = 200):
     return f'{repr_str[:max_len]}...' if len(repr_str) > max_len else repr_str
 
 
-def get_bases(cls):
-    return get_generic_bases(cls) if is_generic_type(cls) else cls.__bases__
+def get_parametrized_type(obj: object):
+    return getattr(obj, '__orig_class__', type(obj))
 
 
 def generic_aware_issubclass_ignore_args(cls, cls_or_tuple):

src/omnipy/util/mixin.py

@@ -3,9 +3,9 @@
 import types
 from typing import DefaultDict, Protocol, Type
 
-from omnipy.util.helpers import (generic_aware_issubclass_ignore_args,
-                                 get_bases,
-                                 transfer_generic_args_to_cls)
+from typing_extensions import get_original_bases
+
+from omnipy.util.helpers import generic_aware_issubclass_ignore_args, transfer_generic_args_to_cls
 
 
 class IsMixin(Protocol):
@@ -30,7 +30,7 @@ def __class_getitem__(cls, item):
     def __init_subclass__(cls, **kwargs):
         super().__init_subclass__(**kwargs)
 
-        if DynamicMixinAcceptor in get_bases(cls) and cls.__init__ is object.__init__:
+        if DynamicMixinAcceptor in get_original_bases(cls) and cls.__init__ is object.__init__:
             raise TypeError(
                 'Dynamic mixin acceptor class is required to define a __init__() method.')
 
@@ -133,6 +133,7 @@ def reset_mixins(cls):
         cls.__init__.__signature__ = cls._orig_init_signature
 
     def __new__(cls, *args, **kwargs):
+        print(cls.__name__)
         if not cls.__name__.endswith(cls.WITH_MIXINS_CLS_SUFFIX):
             cls_with_mixins = cls._create_subcls_inheriting_from_mixins_and_orig_cls()
             obj = super(cls, cls_with_mixins).__new__(cls_with_mixins, *args, **kwargs)
@@ -183,7 +184,7 @@ def __init__(self, *args, **kwargs):
                     # print(f'Calling... {base.__name__}(kwargs={mixin_kwargs})')
                     base.__init__(self, **mixin_kwargs)
 
-        cls_bases = list(get_bases(cls))
+        cls_bases = list(get_original_bases(cls))
         if not cls.__name__.endswith(cls.WITH_MIXINS_CLS_SUFFIX):
             cls_bases = list(cls._mixin_classes) + cls_bases
 

tests/util/test_helpers.py

@@ -19,7 +19,6 @@
 from pydantic.fields import Undefined
 from pydantic.generics import GenericModel
 import pytest
-from typing_inspect import get_generic_type
 
 from omnipy.api.protocols.private.util import HasContents, IsSnapshotHolder
 from omnipy.data.dataset import Dataset
@@ -31,6 +30,7 @@
                                  evaluate_any_forward_refs_if_possible,
                                  get_calling_module_name,
                                  get_first_item,
+                                 get_parametrized_type,
                                  has_items,
                                  is_iterable,
                                  is_non_omnipy_pydantic_model,
@@ -59,29 +59,29 @@ class MyGenericDict(dict[T, U], Generic[T, U]):
 def test_transfer_generic_params_to_new_generic_cls() -> None:
     init_dict = MyGenericDict[str, int]({'a': 123})
 
-    assert get_args(get_generic_type(init_dict)) == (str, int)
+    assert get_args(get_parametrized_type(init_dict)) == (str, int)
 
     class MyDict(dict[T, U]):
         ...
 
     my_dict = MyDict({'b': 234})
 
-    assert get_args(get_generic_type(my_dict)) == ()
+    assert get_args(get_parametrized_type(my_dict)) == ()
 
-    my_typed_dict_cls = transfer_generic_args_to_cls(MyDict, get_generic_type(init_dict))
+    my_typed_dict_cls = transfer_generic_args_to_cls(MyDict, get_parametrized_type(init_dict))
 
     my_typed_dict = my_typed_dict_cls({'b': 234})
 
-    assert get_args(get_generic_type(my_typed_dict)) == (str, int)
+    assert get_args(get_parametrized_type(my_typed_dict)) == (str, int)
 
 
 def test_do_not_transfer_generic_params_to_non_generic_cls() -> None:
     my_int = 123
-    my_int_cls = transfer_generic_args_to_cls(int, get_generic_type(my_int))
+    my_int_cls = transfer_generic_args_to_cls(int, get_parametrized_type(my_int))
 
     my_typed_int = my_int_cls(123)
 
-    assert get_args(get_generic_type(my_typed_int)) == ()
+    assert get_args(get_parametrized_type(my_typed_int)) == ()
 
 
 def test_ensure_plain_type() -> None: