kisa-utils 0.37.9__py3-none-any.whl → 0.37.11__py3-none-any.whl

kisa_utils/functionUtils.py

@@ -59,7 +59,12 @@ def protected(func:Callable) -> Callable:
         return func(*args, **kwargs)
     return wrapper
 
-def enforceRequirements(func:Callable) -> Callable:
+# ------------------------------------------------------------------------------
+from typing import ParamSpec, TypeVar
+P = ParamSpec('P')
+T = TypeVar('T')
+
+def enforceRequirements(func:Callable[P, T]) -> Callable[P, T]:
     '''
     force decorated function to observe the following
     - have type hints for all `args`, and `kwargs` as well as the `return` type-hint
@@ -68,9 +73,9 @@ def enforceRequirements(func:Callable) -> Callable:
     - ensure all arguments are given values of the right type when the function is called
     - return the right data-type as specified by the return type-hint when invoked
     '''
+    signature = inspect.signature(func)
+    typeHints = func.__annotations__
     if 1:
-        signature = inspect.signature(func)
-        typeHints = func.__annotations__
         parameters = signature.parameters
 
         if not (func.__doc__ and func.__doc__.strip()):
@@ -84,11 +89,17 @@ def enforceRequirements(func:Callable) -> Callable:
         registeredArgs = []
         registeredKwargs = {}
 
+        argCount = 0
         for key, value in signature.parameters.items():
-            if 'self' == key:
+            argCount += 1
+            if (key in ['self', 'cls']) and 1==argCount:
                 registeredArgs.append((key, None))
                 continue
 
+            hint = typeHints.get(key, None)
+            if not hint:
+                raise TypeError(f"function/method `{func.__name__}`: parameter `{key}` has no type hint")
+
             if value.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD:
                 raise TypeError(
                     f"function/method `{func.__name__}` should take either positional-only or keyword-only parameters. `{key}` is neither")
@@ -109,18 +120,14 @@ def enforceRequirements(func:Callable) -> Callable:
                 raise ValueError(
                     f'function/method `{func.__name__}`: *{key} or **{key} not allowed in function signature')
 
-            hint = typeHints.get(key, None)
-            if not hint:
-                raise TypeError(f"parameter `{key}` has no type hint")
-
         expectectedReturnType = typeHints['return']
 
         # print(registeredArgs, registeredKwargs)
 
     @wraps(func)
-    def w(*args, **kwargs):
+    def w(*args:P.args, **kwargs:P.kwargs):
         for index, arg in enumerate(args):
-            if registeredArgs[index][0] in ['self']: continue
+            if (registeredArgs[index][0] in ['self', 'cls']) and 0==index: continue
             if not (resp := validateWithResponse(arg, registeredArgs[index][1])):
                 log = f'arg `{registeredArgs[index][0]}`, arg-index {index}: {resp.log}'
                 if Response == expectectedReturnType: return Error(log)

{kisa_utils-0.37.9.dist-info → kisa_utils-0.37.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kisa-utils
-Version: 0.37.9
+Version: 0.37.11
 Summary: Utility functions and modules for KISA Developers
 Author: Tom Bukenya
 Author-email: glayn2bukman@gmail.com

{kisa_utils-0.37.9.dist-info → kisa_utils-0.37.11.dist-info}/RECORD

@@ -7,7 +7,7 @@ kisa_utils/db.py,sha256=gU6BSBSglrndUMhmhOmIEVNXKSiRV6vqf2pskJKYmlQ,44463
 kisa_utils/encryption.py,sha256=nFzNpzWV_D9uSEq4FsgCnlS7FQtqWP9fvM_81rsfcLo,4218
 kisa_utils/enqueue.py,sha256=VIliaMvw4MUdOqts0dXdZCYNxs-QrOVjIRAR3scGrRM,11786
 kisa_utils/figures.py,sha256=pYIpQzu1OXRSsY1d98GhgPifnIRmgl-r7S32ai-Ms0c,3731
-kisa_utils/functionUtils.py,sha256=BV1HMkALLbBM-n-7qCFZ1u2qzITRBA8WQZK9B3nOTUE,6246
+kisa_utils/functionUtils.py,sha256=PlXjnmU1uJWNdISlJJ3SCgavTsgNBoebaa9dtWSFhRA,6553
 kisa_utils/log.py,sha256=0TYdxcIBts026RCSuVIQBcZ-CW1ES7n3M1nEIjmeLTM,2295
 kisa_utils/queues.py,sha256=9QqPtDujw6tbWk7uUiXrsd0rVBTIkzeQw9b45l5Fo3k,6502
 kisa_utils/remote.py,sha256=0RDrfC4RUW4m6JLziC0_EXJYqzWp38Rw8NDroJ0MuqI,2149
@@ -23,7 +23,7 @@ kisa_utils/servers/flask.py,sha256=o76cJKlQ3L8EOVdHUF092qwoAZMzgttuLt0mMhtCsGI,4
 kisa_utils/structures/__init__.py,sha256=JBU1j3A42jQ62ALKnsS1Hav9YXcYwjDw1wQJtohXPbU,83
 kisa_utils/structures/utils.py,sha256=l56NQiPVcFijpuLqt2n9ZwnVKT4XzK6oknRVallRzwQ,2573
 kisa_utils/structures/validator.py,sha256=Y4UmB4TH7N-GkK22EV1WOsPWjTeqxVWLTentl1keZD4,4053
-kisa_utils-0.37.9.dist-info/METADATA,sha256=uYcqbW-zurJOnLotGzCOZMbmO-hDvjFBVLFkYGHMsRQ,477
-kisa_utils-0.37.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.37.9.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
-kisa_utils-0.37.9.dist-info/RECORD,,
+kisa_utils-0.37.11.dist-info/METADATA,sha256=j_xQph98QIGh8sRWaVx9mXa8Jy-cIiz14egzhgxtjmc,478
+kisa_utils-0.37.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kisa_utils-0.37.11.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
+kisa_utils-0.37.11.dist-info/RECORD,,