ul-api-utils 8.1.8__py3-none-any.whl → 8.1.10__py3-none-any.whl

ul_api_utils/api_resource/api_resource_fn_typing.py

@@ -1,5 +1,5 @@
 import inspect
-from typing import NamedTuple, Any, Callable, Optional, List, Dict, Type, Tuple, TYPE_CHECKING
+from typing import NamedTuple, Any, Callable, Optional, List, Dict, Type, Tuple, TYPE_CHECKING, Union
 
 from flask import request
 from pydantic import BaseModel, ValidationError, validate_call, TypeAdapter
@@ -25,6 +25,18 @@ if TYPE_CHECKING:
 FN_SYSTEM_PROPS = {"api_resource", "query", "body", "return", "body_validation_error", "query_validation_error"}
 
 
+def _is_complex_type(annotation):
+    origin = get_origin(annotation)
+
+    # Optional[type_] is typing.Union
+    if origin is Union:
+        return any(_is_complex_type(arg) for arg in get_args(annotation))
+
+    if origin is None:
+        return annotation not in (str, int, float, bool, type(None))
+
+    return origin in (list, dict, tuple, set)
+
 def _patch_errors(dest_errors: List[Dict[str, str]], errors: List[ErrorDetails], kind: str) -> List[Dict[str, str]]:
     for error in errors:
         dest_errors.append({
@@ -156,7 +168,9 @@ class ApiResourceFnTyping(NamedTuple):
             return kwargs, errors
         body = self._get_body()
         try:
-            kwargs['body'] = TypeAdapter(Type[BaseModel | List[BaseModel]]).validate_python(body)
+            expected_typing: Type[BaseModel | List[BaseModel]] = List[self.body_typing] \
+                if self.request_body_many else self.body_typing
+            kwargs['body'] = TypeAdapter(expected_typing).validate_python(body)
         except ValidationError as ve:
             if self.has_body_validation_error:
                 kwargs['body_validation_error'] = ve
@@ -168,11 +182,13 @@ class ApiResourceFnTyping(NamedTuple):
         if self.query_typing is None:
             return kwargs, errors
         try:
-            is_complex_field = lambda field: field.annotation and not isinstance(field.annotation, (str, int, float, bool, type(None)))  # noqa: E731
             kwargs["query"] = set_model(self.query_typing, {
                 **request.args.to_dict(),
-                **{key: value for key, value in request.args.to_dict(flat=False).items()
-                if key in self.query_typing.model_fields and is_complex_field(self.query_typing.model_fields[key])},
+                **{
+                    key: value for key, value in request.args.to_dict(flat=False).items()
+                    if key in self.query_typing.model_fields
+                       and _is_complex_type(self.query_typing.model_fields[key].annotation)
+                },
             })
         except ValidationError as ve:
             if self.has_query_validation_error:

{ul_api_utils-8.1.8.dist-info → ul_api_utils-8.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 8.1.8
+Version: 8.1.10
 Summary: Python api utils
 Author: Unic-lab
 Author-email: 
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ul-unipipeline (==2.0.5)
+Requires-Dist: ul-unipipeline (==2.0.6)
 Requires-Dist: jinja2 (==3.1.2)
 Requires-Dist: flask (==2.1.3)
 Requires-Dist: flask-wtf (==1.0.1)

{ul_api_utils-8.1.8.dist-info → ul_api_utils-8.1.10.dist-info}/RECORD

@@ -29,7 +29,7 @@ ul_api_utils/api_resource/api_request.py,sha256=6Ag2trKIkenhYYPU2--hnfNJC5lLgBxV
 ul_api_utils/api_resource/api_resource.py,sha256=j-E8KJiXWS1L0oVIerJZlbGpDL2ijlQrck4GrJPWPyE,17840
 ul_api_utils/api_resource/api_resource_config.py,sha256=l9OYJy75UZLshOkEQDO5jlhXeb5H4HDPu-nLOjuoexw,769
 ul_api_utils/api_resource/api_resource_error_handling.py,sha256=E0SWpjFSIP-4SumbgzrHtFuFiGe9q38WsvLROt0YcPE,1168
-ul_api_utils/api_resource/api_resource_fn_typing.py,sha256=8aCYTHClOiP6Y3s1gS7j3_yRNNmiM3YdqqiPQN-tWbU,18624
+ul_api_utils/api_resource/api_resource_fn_typing.py,sha256=HzYaXemHnHKjTwvtOk5xk5c7DHqoxLWUmx-JWe1x8nY,19041
 ul_api_utils/api_resource/api_resource_type.py,sha256=mgjSQI3swGpgpLI6y35LYtFrdN-kXyV5cQorwGW7h6g,462
 ul_api_utils/api_resource/api_response.py,sha256=z1Hf9UQ1nQDzhmyykUkEEd5ltXiIfK3CO_F2ee4-UcY,10026
 ul_api_utils/api_resource/api_response_db.py,sha256=ucY6ANPlHZml7JAbvq-PL85z0bvERTjEJKvz-REPyok,888
@@ -148,9 +148,9 @@ ul_api_utils/validators/validate_empty_object.py,sha256=3Ck_iwyJE_M5e7l6s1i88aqb
 ul_api_utils/validators/validate_uuid.py,sha256=EfvlRirv2EW0Z6w3s8E8rUa9GaI8qXZkBWhnPs8NFrA,257
 ul_api_utils/validators/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/validators/__tests__/test_custom_fields.py,sha256=20gLlnm1Ithsbbz3NIUXVAd92lW6YwVRSg_nETZhfaI,1442
-ul_api_utils-8.1.8.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-8.1.8.dist-info/METADATA,sha256=tRxLuaF6hJobp3xOKIoA7piU9b2S7lpemRyLSLLxyxE,14747
-ul_api_utils-8.1.8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-8.1.8.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-8.1.8.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-8.1.8.dist-info/RECORD,,
+ul_api_utils-8.1.10.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
+ul_api_utils-8.1.10.dist-info/METADATA,sha256=yvItorjgfEt9LgXDimmcZhvDT3dl9DpIKSY4fg-hnLc,14748
+ul_api_utils-8.1.10.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ul_api_utils-8.1.10.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
+ul_api_utils-8.1.10.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
+ul_api_utils-8.1.10.dist-info/RECORD,,