support classmethods

Author: abrookins

redisvl/utils/utils.py

@@ -93,10 +93,13 @@ def decorator(func):
 
             @wraps(underlying)
             def inner_wrapped(*args, **kwargs):
-                sig = inspect.signature(underlying)
-                bound_args = sig.bind(*args, **kwargs)
-                if argument in bound_args.arguments:
+                if argument in kwargs:
                     warn(message, DeprecationWarning, stacklevel=2)
+                else:
+                    sig = inspect.signature(underlying)
+                    bound_args = sig.bind(*args, **kwargs)
+                    if argument in bound_args.arguments:
+                        warn(message, DeprecationWarning, stacklevel=2)
                 return underlying(*args, **kwargs)
 
             if isinstance(func, classmethod):
@@ -107,10 +110,13 @@ def inner_wrapped(*args, **kwargs):
 
             @wraps(func)
             def inner_normal(*args, **kwargs):
-                sig = inspect.signature(func)
-                bound_args = sig.bind(*args, **kwargs)
-                if argument in bound_args.arguments:
+                if argument in kwargs:
                     warn(message, DeprecationWarning, stacklevel=2)
+                else:
+                    sig = inspect.signature(func)
+                    bound_args = sig.bind(*args, **kwargs)
+                    if argument in bound_args.arguments:
+                        warn(message, DeprecationWarning, stacklevel=2)
                 return func(*args, **kwargs)
 
             return inner_normal

tests/unit/test_utils.py

@@ -382,6 +382,18 @@ def __init__(self, old_arg=None, new_arg=None):
         with assert_no_warnings():
             TestClass(new_arg="float32")
 
+    def test_class_init_keyword_argument_kwargs(self):
+        class TestClass:
+            @deprecated_argument("old_arg", "new_arg")
+            def __init__(self, new_arg=None, **kwargs):
+                pass
+
+        with pytest.warns(DeprecationWarning):
+            TestClass(old_arg="float32")
+
+        with assert_no_warnings():
+            TestClass(new_arg="float32")
+
     async def test_async_function_argument(self):
         @deprecated_argument("old_arg", "new_arg")
         async def test_func(old_arg=None, new_arg=None):