ul-api-utils 8.1.17__py3-none-any.whl → 8.1.19__py3-none-any.whl

ul_api_utils/api_resource/api_resource_fn_typing.py

@@ -2,7 +2,7 @@ import inspect
 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
+from pydantic import BaseModel, ValidationError, validate_call, TypeAdapter, RootModel
 from pydantic.v1.utils import deep_update
 from pydantic_core import ErrorDetails
 
@@ -82,18 +82,18 @@ class ApiResourceFnTyping(NamedTuple):
 
         if self.request_body_optional:
             if self.request_body_many:
-                class BodyTypingOptList(BaseModel):
-                    __root__: Optional[List[body_typing]] = None  # type: ignore
+                class BodyTypingOptList(RootModel[List[body_typing] | None]):  # type: ignore
+                    pass
 
                 return BodyTypingOptList
 
-            class BodyTypingOpt(BaseModel):
-                __root__: Optional[body_typing] = None  # type: ignore
+            class BodyTypingOpt(RootModel[Optional[body_typing]]):  # type: ignore
+                pass
             return BodyTypingOpt
 
         if self.request_body_many:
-            class BodyTypingList(BaseModel):
-                __root__: List[body_typing]  # type: ignore
+            class BodyTypingList(RootModel[List[body_typing]]):  # type: ignore
+                pass
 
             return BodyTypingList
         return body_typing
@@ -165,7 +165,7 @@ class ApiResourceFnTyping(NamedTuple):
             return kwargs, errors
         body = self._get_body()
         try:
-            expected_typing: Type[BaseModel | List[BaseModel]] = List[self.body_typing] if self.request_body_many else self.body_typing
+            expected_typing: Type[BaseModel | List[BaseModel]] = List[self.body_typing] if self.request_body_many else self.body_typing  # type: ignore
             kwargs['body'] = TypeAdapter(expected_typing).validate_python(body)
         except ValidationError as ve:
             if self.has_body_validation_error:

ul_api_utils/api_resource/api_response.py

@@ -1,6 +1,5 @@
 import io
 from datetime import datetime
-from types import NoneType
 from typing import TypeVar, Generic, List, Optional, Dict, Any, Callable, Union, BinaryIO, Tuple, Type
 
 import msgpack
@@ -64,8 +63,8 @@ class HtmlApiResponse(ApiResponse):
 
     @classmethod
     def _internal_use__mk_schema(cls, inner_type: Optional[Type[BaseModel]]) -> Type[BaseModel]:
-        class _ResponseNoneType(BaseModel):
-            __root__: NoneType  # type: ignore
+        class _ResponseNoneType(RootModel[None]):
+            pass
         return _ResponseNoneType
 
     def to_flask_response(self, debugger: Optional[Debugger] = None) -> BaseResponse:
@@ -103,8 +102,8 @@ class FileApiResponse(ApiResponse):
 
     @classmethod
     def _internal_use__mk_schema(cls, inner_type: Optional[Type[BaseModel]]) -> Type[BaseModel]:
-        class _ResponseNoneType(BaseModel):
-            __root__: NoneType  # type: ignore
+        class _ResponseNoneType(RootModel[None]):
+            pass
         return _ResponseNoneType
 
     def to_flask_response(self, debugger: Optional[Debugger] = None) -> BaseResponse:
@@ -131,8 +130,8 @@ class EmptyJsonApiResponse(ApiResponse):
 
     @classmethod
     def _internal_use__mk_schema(cls, inner_type: Optional[Type[BaseModel]]) -> Type[BaseModel]:
-        class _ResponseNoneType(BaseModel):
-            __root__: NoneType  # type: ignore
+        class _ResponseNoneType(RootModel[None]):
+            pass
         return _ResponseNoneType
 
     def to_flask_response(self, debugger: Optional[Debugger] = None) -> BaseResponse:
@@ -199,8 +198,8 @@ class RootJsonApiResponse(Generic[TJsonObjApiResponsePayload], EmptyJsonApiRespo
 
     @classmethod
     def _internal_use__mk_schema(cls, inner_type: Optional[Type[BaseModel]]) -> Type[BaseModel]:
-        class _ResponseStd(BaseModel):
-            __root__: inner_type  # type: ignore
+        class _ResponseStd(RootModel[inner_type]):  # type: ignore
+            pass
         return _ResponseStd
 
     def to_flask_response(self, debugger: Optional[Debugger] = None) -> BaseResponse:

ul_api_utils/utils/json_encoder.py

@@ -2,7 +2,7 @@ import dataclasses
 import decimal
 import json
 from base64 import b64encode
-from datetime import date, datetime
+from datetime import date, datetime, time
 from enum import Enum
 from json import JSONEncoder
 from typing import Dict, Any, Union, List, Optional, TYPE_CHECKING
@@ -62,6 +62,8 @@ class CustomJSONEncoder(JSONEncoder):
             return str(obj.isoformat())
         if isinstance(obj, date):
             return str(obj.isoformat())
+        if isinstance(obj, time):
+            return str(obj.isoformat())
         if isinstance(obj, UUID):
             return str(obj)
         if isinstance(obj, Enum):

{ul_api_utils-8.1.17.dist-info → ul_api_utils-8.1.19.dist-info}/METADATA

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

{ul_api_utils-8.1.17.dist-info → ul_api_utils-8.1.19.dist-info}/RECORD

@@ -29,9 +29,9 @@ ul_api_utils/api_resource/api_request.py,sha256=6Ag2trKIkenhYYPU2--hnfNJC5lLgBxV
 ul_api_utils/api_resource/api_resource.py,sha256=ERAGC4rrN_jmZ_dFhYZZ_Eczqdy5tQK7cfN7SY4sIfA,17914
 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=2jTHmcTeTZBpYc-LZ1wcT1YfM8NaifBBo1Bhs_uP6zw,18965
+ul_api_utils/api_resource/api_resource_fn_typing.py,sha256=gyWEnYuepvaVW4O6ljpoPA5S4i9EeKsYBaAN2mHXDcw,18963
 ul_api_utils/api_resource/api_resource_type.py,sha256=mgjSQI3swGpgpLI6y35LYtFrdN-kXyV5cQorwGW7h6g,462
-ul_api_utils/api_resource/api_response.py,sha256=DYKqNI8xbXIMBCn-GmZx24Bsr7SBgKQDtGU2nbw3p6Q,10141
+ul_api_utils/api_resource/api_response.py,sha256=tJxo8rFPkQYTwDITPKr8ett9CC4T8cuwnvTRSTdudVQ,10038
 ul_api_utils/api_resource/api_response_db.py,sha256=ucY6ANPlHZml7JAbvq-PL85z0bvERTjEJKvz-REPyok,888
 ul_api_utils/api_resource/api_response_payload_alias.py,sha256=FoD0LhQGZ2T8A5-VKRX5ADyzSgm7_dd3qxU2BgCVXkA,587
 ul_api_utils/api_resource/db_types.py,sha256=gF0oxisRkYLf7_2e7YEU-HJDxLy3dJCVaJsYQbOfG5k,433
@@ -111,7 +111,7 @@ ul_api_utils/utils/deprecated.py,sha256=xR3ELgoDj7vJEY4CAYeEhdbtSJTfkukbjxcULtpM
 ul_api_utils/utils/flags.py,sha256=AYN5nKWp4-uu6PSlPptL7ZiLqr3Pu-x5dffF6SBsqfg,957
 ul_api_utils/utils/imports.py,sha256=i8PhoD0c_jnWTeXt_VxW_FihynwXSL_dHRT7jQiFyXE,376
 ul_api_utils/utils/instance_checks.py,sha256=9punTfY5uabuJhmSGLfTgBqRderoFysCXBSI8rvbPco,467
-ul_api_utils/utils/json_encoder.py,sha256=ra43WhkAadIvVpUY3uik_Nzg0LVXUXTGYvx4Gx7fD_g,4578
+ul_api_utils/utils/json_encoder.py,sha256=2uJuoZHNx0TpDLYdlVpch_Am1OXIG_gWHHvdPkfRV2c,4658
 ul_api_utils/utils/load_modules.py,sha256=_CPmQuB6o_33FE6zFl_GyO5xS5gmjfNffB6k-cglKAA,685
 ul_api_utils/utils/token_check.py,sha256=-Quuh8gOs9fNE1shYhdiMpQedafsLN7MB2ilSxG_F8E,489
 ul_api_utils/utils/token_check_through_request.py,sha256=OyyObu6Btk9br7auIYvWcMULhNznNSD5T0mWOwZX7Uk,663
@@ -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.17.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-8.1.17.dist-info/METADATA,sha256=sErifyqu-OT3p_wAZzWuKVGN8TM7q3SZnN9hq5LvHtg,14748
-ul_api_utils-8.1.17.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-8.1.17.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-8.1.17.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-8.1.17.dist-info/RECORD,,
+ul_api_utils-8.1.19.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
+ul_api_utils-8.1.19.dist-info/METADATA,sha256=RsXe4E1R3Qr06uA63N8eJHskl8oYXUv5SYUzQ-D4Kyw,14748
+ul_api_utils-8.1.19.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ul_api_utils-8.1.19.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
+ul_api_utils-8.1.19.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
+ul_api_utils-8.1.19.dist-info/RECORD,,