kisa-utils 0.36.3__py3-none-any.whl → 0.36.4__py3-none-any.whl

kisa_utils/functionUtils.py

@@ -6,7 +6,7 @@ from kisa_utils.response import Response, Ok, Error
 from kisa_utils.storage import Path
 from kisa_utils.structures.validator import Value, validateWithResponse
 import copy
-from typing import Any
+from typing import Any, get_args
 
 class Definition:
     @staticmethod
@@ -83,7 +83,8 @@ def enforceRequirements(func):
                 if value.default is not inspect.Parameter.empty:
                     if not (resp := validateWithResponse(value.default, typeHints[key])):
                         raise ValueError(f'arg `{key}` default value: {resp.log}')
-                registeredArgs.append((key, typeHints[key]))
+
+                registeredArgs.append((key, typeHints[key] ))
             elif value.kind == inspect.Parameter.KEYWORD_ONLY:
                 if value.default is not inspect.Parameter.empty:
                     if not (resp := validateWithResponse(value.default, typeHints[key])):
@@ -100,6 +101,8 @@ def enforceRequirements(func):
 
         expectectedReturnType = typeHints['return']
 
+        # print(registeredArgs, registeredKwargs)
+
     @wraps(func)
     def w(*args, **kwargs):
         for index, arg in enumerate(args):
@@ -120,14 +123,19 @@ def enforceRequirements(func):
 
         resp = func(*args, **kwargs)
 
-        if not isinstance(resp, expectectedReturnType):
-            if isinstance(resp, type):
-                log = f'`{func.__name__}` returned `{resp.__name__}`, expected `{expectectedReturnType}`'
-            else:
-                log = f'`{func.__name__}` returned `{type(resp).__name__}`, expected `{expectectedReturnType}`'
-            
+        # if not isinstance(resp, expectectedReturnType):
+        if not (resp := validateWithResponse(resp, expectectedReturnType)):
             if Response == expectectedReturnType: return Error(log)
-            raise TypeError(log)
+
+            raise TypeError(f'`{func.__name__}` return error: {resp.log}')
+
+            # if isinstance(resp, type):
+            #     log = f'`{func.__name__}` returned `{resp.__name__}`, expected `{expectectedReturnType}`'
+            # else:
+            #     log = f'`{func.__name__}` returned `{type(resp).__name__}`, expected `{expectectedReturnType}`'
+            
+            # if Response == expectectedReturnType: return Error(log)
+            # raise TypeError(log)
 
         return resp
 

kisa_utils/structures/utils.py

@@ -1,6 +1,6 @@
 import inspect
 import typing
-from typing import Any, Callable
+from typing import Any, Callable, get_origin
 from types import UnionType
 from kisa_utils.response import Response
 
@@ -30,13 +30,23 @@ class Value:
             raise TypeError(f'validator should take only 1 argument (not counting `self` for methods)')
         
         reply = validator(
-            valueType() if type(valueType)==type(type) else list(typing.get_args(valueType))[0]()
+            valueType() if type(valueType)==type(type) \
+            else (
+                (
+                    _:=list(typing.get_args(valueType))[0]
+                ) 
+                and (
+                    get_origin(_) or _
+                )
+            )()
         )
 
         if not isinstance(reply, Response):
             raise TypeError(f'`validator` must return kutils.response.Response object')
 
-        self._valueType = valueType
+        typesTuple = valueType
+
+        self._valueType = typesTuple
         self._validator = validator
     
     def validate(self, valueInstance:Any, /) -> Response:
@@ -47,8 +57,9 @@ class Value:
 
     @property
     def __name__(self) -> str:
+        print(self._valueType)
         if not isinstance(self._valueType, UnionType):
-            _type = self._valueType.__name__
+            _type = (get_origin(self._valueType) or self._valueType).__name__
         else:
             types = self._valueType.__args__
             _type = '|'.join(_.__name__ for _ in types)

kisa_utils/structures/validator.py

@@ -3,7 +3,7 @@ this modules handle data structure validation to ensure that
 data is passed in expected formats/structures
 '''
 
-from typing import Any, get_args
+from typing import Any, get_args, get_origin
 from types import UnionType
 from kisa_utils.structures.utils import Value
 from kisa_utils.response import Response, Ok, Error
@@ -20,18 +20,23 @@ def validate(instance:Any, structure:Any, path:str='$') -> dict:
     
     result = {'status':False, 'log':''}
 
+    print(instance, structure, end=' => ')
+    if not isinstance(structure, UnionType) and get_origin(structure):
+        structure = get_origin(structure)
+    print(instance, structure)
+
     # union types such as int|float...
     if isinstance(structure, UnionType):
-        if not isinstance(instance, get_args(structure)):
-            expectedTypes = [str(_).split("'")[1] for _ in get_args(structure)]
+        if not isinstance(instance, tuple([get_origin(t) or t for t in get_args(structure)])):
+            expectedTypes = [str(_).split("'")[1] for _ in tuple([(get_args(t) or t) for t in get_args(structure)])]
             result['log'] = f'E06: types not similar:: {path}, expected one of {"|".join(expectedTypes)} but got {str(type(instance))[7:-1]}'
             return result
 
     # when the structure is a block type/class eg dict,list,tuple,etc
-    elif type(structure)==type(type) or isinstance(structure, Value):
-        _structure = structure._valueType if isinstance(structure, Value) else structure
+    elif type(structure)==type(type) or isinstance(structure, Value) or get_args(type):
+        _structure = structure._valueType if isinstance(structure, Value) else (get_args(structure) or structure)
 
-        if instance!=_structure and not isinstance(instance, _structure):
+        if instance != _structure and not isinstance(instance, _structure):
             result['log'] = f'E01: types not similar:: {path}, expected {str(_structure)[7:-1] if type(structure)==type(type) else structure.__name__} but got {str(type(instance))[7:-1]}'
             return result
 

{kisa_utils-0.36.3.dist-info → kisa_utils-0.36.4.dist-info}/METADATA

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

{kisa_utils-0.36.3.dist-info → kisa_utils-0.36.4.dist-info}/RECORD

@@ -7,7 +7,7 @@ kisa_utils/db.py,sha256=qMOPfBHz9qJIKUwGvSk32EyyhvEFqOpDv0MX4QseXl0,40788
 kisa_utils/encryption.py,sha256=KwSUtjZj6m2JqEeeg0GW3bx93PCpEwJlcBzLZrnReyE,3522
 kisa_utils/enqueue.py,sha256=RbImgoPNFFCQHT1ow9zJEM-tHwWE1bNnHznJqEVXL9k,11290
 kisa_utils/figures.py,sha256=ossQHBR7T9rOV1yhQJLDbwrY23xf0RIGOmjcFH7P0ss,1860
-kisa_utils/functionUtils.py,sha256=v8ShUZ56yxdYLMTsxRdj4vQfk6wTo0ATqB1wD1dJYYw,5420
+kisa_utils/functionUtils.py,sha256=OPP9by-bpc7DssUFBpNNb0fPrUYxCnji4VlmxswHOrc,5718
 kisa_utils/log.py,sha256=EKBAVvDpY_hgALDCC6i-ARdqQzZwxBxxeHR4NsYgs9U,2120
 kisa_utils/queues.py,sha256=D0bCtI95VEg-xLuzf-Wp0Pfjc5hoEwlmzEJHuokx-i0,5418
 kisa_utils/remote.py,sha256=2EMG2kJudCYqpNPsACe3riQCqTsg-MzviVSZPbjCtxk,1793
@@ -21,9 +21,9 @@ kisa_utils/permissions/__init__.py,sha256=k7WbNlE8i9Vyf_SdbXbTh8D3gt4obDe3f8rONV
 kisa_utils/servers/__init__.py,sha256=lPqDyGTrFo0qwPZ2WA9Xtcpc5D8AIU4huqgFx1iZf68,19
 kisa_utils/servers/flask.py,sha256=niD6Cv04cs6YVMXB7MVjOQ4__78UfLLia7qHdz2FgUs,30354
 kisa_utils/structures/__init__.py,sha256=JBU1j3A42jQ62ALKnsS1Hav9YXcYwjDw1wQJtohXPbU,83
-kisa_utils/structures/utils.py,sha256=doZnnrKT5qGWZIOhXqBnD7mBBc7r-lhwcfpRKcK95Is,2237
-kisa_utils/structures/validator.py,sha256=2cKaVuY6ia6-pt6o73A6L11qInDz_tygFZdsbZU-RbA,3328
-kisa_utils-0.36.3.dist-info/METADATA,sha256=q8DInAIFbutxylvRMLc-_VibGckjlnXKlwDJv7baeBI,477
-kisa_utils-0.36.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.36.3.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
-kisa_utils-0.36.3.dist-info/RECORD,,
+kisa_utils/structures/utils.py,sha256=svnzNyVL-wLBEgkovgrqDKvGM4wxYaQGuQ4fFDUR_mo,2515
+kisa_utils/structures/validator.py,sha256=MPPZHXAepBWlF1UFuh5sShkqTzlqANWRLTE42gPz3oA,3647
+kisa_utils-0.36.4.dist-info/METADATA,sha256=kSNW8__fbO_VuZjb5d-eN3WjLE9lr9rFUqijPoKmVKY,477
+kisa_utils-0.36.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kisa_utils-0.36.4.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
+kisa_utils-0.36.4.dist-info/RECORD,,