kisa-utils 0.37.4__py3-none-any.whl → 0.37.6__py3-none-any.whl

kisa_utils/functionUtils.py

@@ -77,7 +77,7 @@ def enforceRequirements(func:Callable) -> Callable:
             raise ValueError(
                 f"function `{func.__name__}` has no docString!")
 
-        if not typeHints.get("return", None):
+        if -1 == typeHints.get("return", -1):
             raise TypeError(
                 f"function `{func.__name__}` has no return type")
 
@@ -85,6 +85,10 @@ def enforceRequirements(func:Callable) -> Callable:
         registeredKwargs = {}
 
         for key, value in signature.parameters.items():
+            if 'self' == key:
+                registeredArgs.append((key, None))
+                continue
+
             if value.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD:
                 raise TypeError(
                     f"function `{func.__name__}` should take either positional-only or keyword-only parameters. `{key}` is neither")
@@ -116,6 +120,7 @@ def enforceRequirements(func:Callable) -> Callable:
     @wraps(func)
     def w(*args, **kwargs):
         for index, arg in enumerate(args):
+            if registeredArgs[index][0] in ['self']: 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/permissions/__init__.py

@@ -1031,7 +1031,7 @@ class Permissions:
                 return Error(f'permission at index #{index}(`{permission}`), error:{rep.log}')
 
             if permission in self.__globalPermissions:
-                return Error(f'permission at index #{index}(`{permission}`), error:global permission can not be added to resource')
+                return Error(f'permission at index #{index}(`{permission}`), error:permission already in global permissions')
 
         return Ok()
 

kisa_utils/servers/flask.py

@@ -547,6 +547,7 @@ def endpoint(
             }
             setEndpoints(__group, _name, new_entry)
 
+        @wraps(func)
         def w():
             nonlocal handler, new_entry
 
@@ -630,6 +631,8 @@ def endpoint(
 
         w.__name__ = f'__kisa_wrapper_{_group}_{handler.__name__}'
         __SERVER_APP.route(_name, methods=methods)(w)
+        
+        return func
 
     # in case the decorator is called as `@endpoint` as opposed to `@endpoint(...)`
     if callable(name):

{kisa_utils-0.37.4.dist-info → kisa_utils-0.37.6.dist-info}/METADATA

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

{kisa_utils-0.37.4.dist-info → kisa_utils-0.37.6.dist-info}/RECORD

@@ -7,7 +7,7 @@ kisa_utils/db.py,sha256=Mv9BcHydRZZHE_ONbNPhGiezqVYXuILXct6qBZhgrdU,44223
 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=y1C8N80ZJ5a6eBgEt_zZbweYAoZCOd9VxIb8if8RIdA,6030
+kisa_utils/functionUtils.py,sha256=BMtXL3aaL_X1K56mZhQoGvZ2etJ6zdRvrorsi5ICFhA,6199
 kisa_utils/log.py,sha256=0TYdxcIBts026RCSuVIQBcZ-CW1ES7n3M1nEIjmeLTM,2295
 kisa_utils/queues.py,sha256=9QqPtDujw6tbWk7uUiXrsd0rVBTIkzeQw9b45l5Fo3k,6502
 kisa_utils/remote.py,sha256=0RDrfC4RUW4m6JLziC0_EXJYqzWp38Rw8NDroJ0MuqI,2149
@@ -17,13 +17,13 @@ kisa_utils/storage.py,sha256=8-NgrY6BpIo-B9IJNTd-TqMB0m9BY1PuQgZ9WL1z8SM,7683
 kisa_utils/threads.py,sha256=qQqsf64YHMyLpboq5AEXKxYqf3iXUhxiJe6Ymg-vlxI,12840
 kisa_utils/token.py,sha256=RUdov01FlCfxMPY0onj0kvPkXTOxutvS96xQN1bhPBE,8282
 kisa_utils/permissions/__config__.py,sha256=i3ELkOydDnjKx2ozQTxLZdZ8DXSeUncnl2kRxANjFmM,613
-kisa_utils/permissions/__init__.py,sha256=Zwt7b1_P-Tu0CRZ8-TpCpnP3F7LnEEDTlQnkVWnwfyg,47982
+kisa_utils/permissions/__init__.py,sha256=q7LGl26f-MPXkLS6nxBKDotW3xdB8y7pI5S_Oo5fPOw,47976
 kisa_utils/servers/__init__.py,sha256=lPqDyGTrFo0qwPZ2WA9Xtcpc5D8AIU4huqgFx1iZf68,19
-kisa_utils/servers/flask.py,sha256=DC-WuxB5NP6rvmYR40_yV_RD6zd9DiI98W1maeXf_7Y,40035
+kisa_utils/servers/flask.py,sha256=o76cJKlQ3L8EOVdHUF092qwoAZMzgttuLt0mMhtCsGI,40085
 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.4.dist-info/METADATA,sha256=cd4lkWJ2TSanY57w3wu6SKah-BHVLs51oAfZMPrDkcU,477
-kisa_utils-0.37.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.37.4.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
-kisa_utils-0.37.4.dist-info/RECORD,,
+kisa_utils-0.37.6.dist-info/METADATA,sha256=oiwwsLrbrDpaxy1FKalHU5QGuozuq8PQGfboFaUxgQE,477
+kisa_utils-0.37.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kisa_utils-0.37.6.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
+kisa_utils-0.37.6.dist-info/RECORD,,