ul-api-utils 8.1.9__tar.gz → 8.1.11__tar.gz

{ul-api-utils-8.1.9 → ul-api-utils-8.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 8.1.9
+Version: 8.1.11
 Summary: Python api utils
 Author: Unic-lab
 Author-email: 

{ul-api-utils-8.1.9 → ul-api-utils-8.1.11}/setup.py

@@ -9,7 +9,7 @@ with open(path.join(HERE, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='ul-api-utils',
-    version='8.1.9',
+    version='8.1.11',
     description='Python api utils',
     author='Unic-lab',
     long_description=long_description,

{ul-api-utils-8.1.9 → ul-api-utils-8.1.11}/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, get_origin, get_args
 
 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.9 → ul-api-utils-8.1.11}/ul_api_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 8.1.9
+Version: 8.1.11
 Summary: Python api utils
 Author: Unic-lab
 Author-email: