ul-api-utils 8.1.18__tar.gz → 8.1.20__tar.gz

{ul-api-utils-8.1.18 → ul-api-utils-8.1.20}/PKG-INFO

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

{ul-api-utils-8.1.18 → ul-api-utils-8.1.20}/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.18',
+    version='8.1.20',
     description='Python api utils',
     author='Unic-lab',
     long_description=long_description,
@@ -66,7 +66,7 @@ setup(
         "cryptography==38.0.1",
         "colored==1.4.3",
         "flask-socketio==5.3.6",
-        "ormsgpack==1.4.1",
+        "ormsgpack==1.8.0",
         "msgpack==1.0.4",
         "msgpack-types==0.2.0",
         "fastavro==1.7.0",

{ul-api-utils-8.1.18 → ul-api-utils-8.1.20}/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

{ul-api-utils-8.1.18 → ul-api-utils-8.1.20}/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-8.1.18 → ul-api-utils-8.1.20}/ul_api_utils/validators/custom_fields.py

@@ -59,6 +59,8 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
         if cls._contains_type is None:
             raise TypeError("QueryParamsSeparatedList must be parameterized with a type, e.g., QueryParamsSeparatedList[int]")
 
+        adapter = TypeAdapter(cls._contains_type)
+
         if not isinstance(query_param, list):
             query_param = [query_param]
 
@@ -70,14 +72,7 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
 
         for idx, value in enumerate(splitted):
             try:
-                if cls._contains_type == Union[int, str]:
-                    try:
-                        validated_items.append(int(value))
-                    except ValueError:
-                        validated_items.append(value)  # type: ignore
-                else:
-                    adapter = TypeAdapter(cls._contains_type)
-                    validated_items.append(adapter.validate_python(value))
+                validated_items.append(adapter.validate_python(value))
             except ValidationError as e:
                 for error in e.errors(include_url=False):
                     error['loc'] = ('param', idx)
@@ -86,4 +81,4 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
         if errors:
             raise ValidationError.from_exception_data("List validation error", errors)
 
-        return validated_items  # type: ignore
+        return validated_items

{ul-api-utils-8.1.18 → ul-api-utils-8.1.20}/ul_api_utils.egg-info/PKG-INFO

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

{ul-api-utils-8.1.18 → ul-api-utils-8.1.20}/ul_api_utils.egg-info/requires.txt

@@ -16,7 +16,7 @@ requests==2.28.1
 cryptography==38.0.1
 colored==1.4.3
 flask-socketio==5.3.6
-ormsgpack==1.4.1
+ormsgpack==1.8.0
 msgpack==1.0.4
 msgpack-types==0.2.0
 fastavro==1.7.0