kisa-utils 0.39.0__py3-none-any.whl → 0.39.1__py3-none-any.whl

kisa_utils/servers/flask.py

@@ -445,8 +445,7 @@ def endpoint(
     def decorator(func):
         # in case the decorator is called as `@endpoint` as opposed to `@endpoint(...)`
         nonlocal name, group, methods , security
-
-            
+  
         if callable(name):
             name, group = '', ''
 
@@ -455,6 +454,8 @@ def endpoint(
         if responseHeaders and not (resp := __verifyResponseHeaders(responseHeaders)):
             raise ValueError(resp.log)
 
+        __DEFAULTS = {}
+
         if 1:
             _group = group + '/' if group else ''
             _name = '/' + _group + (name or func.__name__)
@@ -526,10 +527,15 @@ def endpoint(
                     raise ValueError(
                         f'function `{func.__name__}`: *{key} or **{key} not allowed in function signature')
 
+                # print(f'<{key}> <{value}> <{value.default}> <{inspect._empty==value.default}>')
+
                 hint = typeHints.get(key, None)
                 if not hint:
                     raise TypeError(f"parameter {key} has no type hint")
 
+                if inspect._empty != value.default:
+                    __DEFAULTS[key] = value.default
+
             # print(typeHints)
             if "headers" in typeHints and "headers" in _WHITE_LISTED_PARAMS:
                 del typeHints["headers"]
@@ -543,7 +549,8 @@ def endpoint(
                 "handler": handler,
                 "expectedStructure": validationStructure,
                 "path": __getHandlerRelativePath(handler),
-                "docs": handler.__doc__
+                "docs": handler.__doc__,
+                "defaults": __DEFAULTS,
             }
             setEndpoints(__group, _name, new_entry)
 
@@ -551,7 +558,7 @@ def endpoint(
         def w():
             nonlocal handler, new_entry
 
-            resp = process_request_data(request, new_entry["expectedStructure"])
+            resp = process_request_data(request, new_entry["expectedStructure"], defaults=copy.deepcopy(__DEFAULTS))
             if not resp: 
                 return resp
 
@@ -664,7 +671,7 @@ def _normalize_and_validate_methods(methods: list[str], /) -> list:
     return normalized_methods
 
 
-def process_request_data(request, expected_structure:dict) -> Response:
+def process_request_data(request, expected_structure:dict, *, defaults:dict = {}) -> Response:
     """
     Process incoming request data.
 
@@ -672,7 +679,8 @@ def process_request_data(request, expected_structure:dict) -> Response:
         request: the request to process
         expected_structure(dict): the structure against which to process the request data
     """
-    urlData = request.values.to_dict()
+    urlData = defaults
+    urlData.update(request.values.to_dict())
     jsonData = {}
     
     if request.is_json:
@@ -864,6 +872,8 @@ def generate_html(data:dict[str, dict[str, Any]]) -> str:
             html += "<pre style='background-color: #272822; color: #f8f8f2; padding: 10px; border-radius: 5px; font-size: 0.9em; overflow-x: auto;'>"
             html += "{<br>"
 
+            __defaults = details['defaults']
+
             for key, val in details['expectedStructure'].items():
                 # print(key, val, isinstance(val, type))
                 expandStructure:bool = False
@@ -878,7 +888,7 @@ def generate_html(data:dict[str, dict[str, Any]]) -> str:
                     _type = type(val).__name__ #+ f'\n  {val} \n'.replace("'",'').replace('class ','').replace('<','').replace('>','')
                     expandStructure = True
 
-                html += f"<span style='color: #66d9ef;'>&nbsp;&nbsp;'{key}'</span>: <span style='color: #a6e22e;'>{_type}</span>,<br>"
+                html += f"<span style='color: #66d9ef;'>&nbsp;&nbsp;'{key}'</span>: <span style='color: #a6e22e;'>{_type}</span>,"
                 if expandStructure:
                     expanded:str = f'{val}'\
                         .replace("'",'')\
@@ -892,7 +902,19 @@ def generate_html(data:dict[str, dict[str, Any]]) -> str:
                     indentation = '&nbsp;'*(len(type(val).__name__)+len(':'))
                     expanded = __customPrettyPrint(expanded).replace('\n',f'<br>{indentation}')
                         
-                    html += f"<span style='color: #66d9ef;'>{indentation}</span> <span style='color: #fae22e;'>{expanded}</span><br>"
+                    html += f"<br><span style='color: #66d9ef;'>{indentation}</span> <span style='color: #fae22e;'>{expanded}</span>"
+
+                if key in __defaults:
+                    trailingComma = False
+                    if html[-1] in [',']: 
+                        html = html[:-1]
+                        trailingComma = True
+
+                    html += " <span style='color: #ef66d9; font-weight:bold;'>=</span>"
+                    html += f" <span style='color: #ffa000; font-weight:bold;'>{__defaults[key]}</span>"
+                    if trailingComma: html += ','
+
+                html += "<br>"
 
             html += "}</pre></p></div>"
 
@@ -1012,27 +1034,12 @@ def conform_dict(data: Dict[str, Any], structure: Dict[str, Any]) -> Response:
             continue
         
         # Handle union types (e.g., int | float)
+        if not (_resp := validateWithResponse(value, expected_type)):
+            return Error(f'key `{key}`: {_resp.log}')
+        result[key] = value
+
         origin = get_origin(expected_type)
-        if origin is Union:
-            allowed_types = get_args(expected_type)
-            converted = None
-            
-            for t in allowed_types:
-                # print("t======>", t)
-                try:
-                    converted = convert_value(value, t)
-                    break
-                except (ValueError, TypeError):
-                    continue
-            
-            if converted is None:
-                return Error(
-                    f"Value '{value}' for key '{key}' couldn't be converted to any of {allowed_types}"
-                )
-            result[key] = converted
-        else:
-            result[key] = convert_value(value, expected_type)
-    
+
     return Ok(result)
 
 def convert_value(value:Any, target_type:type)->Any:

{kisa_utils-0.39.0.dist-info → kisa_utils-0.39.1.dist-info}/METADATA

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

{kisa_utils-0.39.0.dist-info → kisa_utils-0.39.1.dist-info}/RECORD

@@ -19,11 +19,11 @@ kisa_utils/token.py,sha256=Y2qglWYWpmHxoXBh-TH0r1as0uPV5LLqMNcunLvM4vM,7850
 kisa_utils/permissions/__config__.py,sha256=i3ELkOydDnjKx2ozQTxLZdZ8DXSeUncnl2kRxANjFmM,613
 kisa_utils/permissions/__init__.py,sha256=q7LGl26f-MPXkLS6nxBKDotW3xdB8y7pI5S_Oo5fPOw,47976
 kisa_utils/servers/__init__.py,sha256=lPqDyGTrFo0qwPZ2WA9Xtcpc5D8AIU4huqgFx1iZf68,19
-kisa_utils/servers/flask.py,sha256=o76cJKlQ3L8EOVdHUF092qwoAZMzgttuLt0mMhtCsGI,40085
+kisa_utils/servers/flask.py,sha256=XZYY1pWnP1mSvaS5Uv8G3EFJV5BJBQtU2gDbO8suvLc,40422
 kisa_utils/structures/__init__.py,sha256=JBU1j3A42jQ62ALKnsS1Hav9YXcYwjDw1wQJtohXPbU,83
 kisa_utils/structures/utils.py,sha256=665rXIapGwFqejizeJwy3DryeskCQOdgP25BCdLkGvk,2898
 kisa_utils/structures/validator.py,sha256=Y4UmB4TH7N-GkK22EV1WOsPWjTeqxVWLTentl1keZD4,4053
-kisa_utils-0.39.0.dist-info/METADATA,sha256=M6VVyZ0NOG7urg1fPt48fHuxc85qD0keInyLNBq4LQY,477
-kisa_utils-0.39.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.39.0.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
-kisa_utils-0.39.0.dist-info/RECORD,,
+kisa_utils-0.39.1.dist-info/METADATA,sha256=_lCvaoHUhJMTWCKO93XOLW-uqssorWIkxc9wB5Ifr7E,477
+kisa_utils-0.39.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kisa_utils-0.39.1.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
+kisa_utils-0.39.1.dist-info/RECORD,,