ul-api-utils 8.0.1a0__py3-none-any.whl → 8.0.3__py3-none-any.whl

example/routes/api_some.py

@@ -51,7 +51,7 @@ class Eeenum(IntEnum):
 
 class SomeBody(BaseModel):
     seconds: float
-    eenum: Optional[Eeenum]
+    eenum: Optional[Eeenum] = None
 
 
 class Some2Query(ApiRequestQuery):

ul_api_utils/access/__init__.py

@@ -1,7 +1,7 @@
 import re
 from typing import Dict, List, Union, Any, Iterable
 
-from pydantic import BaseModel
+from pydantic import ConfigDict, BaseModel
 
 from ul_api_utils.conf import APPLICATION_F
 
@@ -13,8 +13,7 @@ class PermissionDefinition(BaseModel):
     category: str
     flags: str = ''
 
-    class Config:
-        allow_mutation: bool = False
+    model_config = ConfigDict(frozen=True)
 
 
 class PermissionRegistry:

ul_api_utils/api_resource/api_request.py

@@ -1,7 +1,7 @@
 import json
 from typing import NamedTuple, Iterable, Any, List, Tuple, Dict, Optional
 
-from pydantic import BaseModel, root_validator
+from pydantic import model_validator, BaseModel
 
 from ul_api_utils.errors import SimpleValidateApiError
 from ul_api_utils.utils.api_pagination import ApiPagination
@@ -42,7 +42,8 @@ class ApiRequestQuery(BaseModel):
     offset: Optional[int] = None
     page: Optional[int] = None
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def validate_empty_values(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         vals = dict()
         for k, v in values.items():

ul_api_utils/api_resource/api_resource.py

@@ -7,7 +7,7 @@ from tempfile import NamedTemporaryFile
 from typing import List, Dict, Any, Optional, Tuple, Union, BinaryIO, Mapping, TypeVar, Callable, Set, TYPE_CHECKING
 
 from flask import render_template, request
-from pydantic.errors import PydanticValueError
+from pydantic_core import PydanticCustomError
 from werkzeug.datastructures import FileStorage
 
 from ul_api_utils.access import GLOBAL_PERMISSION__PUBLIC, PermissionDefinition, GLOBAL_PERMISSION__PRIVATE_RT, GLOBAL_PERMISSION__PRIVATE
@@ -170,12 +170,13 @@ class ApiResource:
             return JsonApiResponse._internal_use_response_error(self._fn_typing.response_payload_many, 401, [self._mk_error("access-error", str(err), False)])
         if isinstance(err, SimpleValidateApiError):
             return JsonApiResponse._internal_use_response_error(self._fn_typing.response_payload_many, 400, [self._mk_error("validation-error", str(err), False)])
-        if isinstance(err, (PydanticValueError, ValidateApiError)):
+        if isinstance(err, (PydanticCustomError, ValidateApiError)):
             return JsonApiResponse._internal_use_response_error(self._fn_typing.response_payload_many, 400, [{
-                "error_kind": f"value_error.{err.code}",
+                "error_kind": f"value_error.{err.code}",  # type: ignore
                 "error_location": err.location,  # type: ignore
                 "error_type": "body-validation-error",
-                "error_message": f"{err.msg_template}",
+                "error_message": f"{err.msg_template}",  # type: ignore
+                "error_input": err.input,  # type: ignore
             }])
         if isinstance(err, NoResultFoundApiError):
             return JsonApiResponse._internal_use_response_error(self._fn_typing.response_payload_many, 404, [
@@ -222,7 +223,7 @@ class ApiResource:
         apply_auth_headers: bool = False,
     ) -> HtmlApiResponse:
         if hasattr(happened_exception, "status_code"):
-            default_status_code = happened_exception.status_code  # type: ignore
+            default_status_code = happened_exception.status_code
         assert self._config.web_error_template is not None  # only for mypy
         response = HtmlApiResponse(
             content=self.render_template(

ul_api_utils/api_resource/api_resource_config.py

@@ -1,6 +1,6 @@
 from typing import Optional, Callable, Tuple
 
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 from ul_api_utils.api_resource.api_response import ApiResponse
 from werkzeug import Response as BaseResponse
@@ -14,6 +14,7 @@ class ApiResourceConfig(BaseModel):
     exc_handler_endpoint: Optional[Callable[[Exception], Optional[ApiResponse]]] = None
     override_flask_response: Optional[Callable[[Tuple[BaseResponse, int]], Tuple[BaseResponse, int]]] = None
 
-    class Config:
-        extra = Extra.forbid
-        allow_mutation = False
+    model_config = ConfigDict(
+        extra="forbid",
+        frozen=True,
+    )

ul_api_utils/api_resource/api_resource_fn_typing.py

@@ -2,8 +2,9 @@ import inspect
 from typing import NamedTuple, Any, Callable, Optional, List, Dict, Type, Tuple, TYPE_CHECKING
 
 from flask import request
-from pydantic import BaseModel, ValidationError, parse_obj_as, validate_arguments
+from pydantic import BaseModel, ValidationError, validate_call, TypeAdapter
 from pydantic.utils import deep_update
+from pydantic_core import ErrorDetails
 
 from ul_api_utils.api_resource.api_request import ApiRequestQuery
 from ul_api_utils.api_resource.api_resource_type import ApiResourceType
@@ -19,23 +20,23 @@ from ul_api_utils.utils.unwrap_typing import UnwrappedOptionalObjOrListOfObj
 
 if TYPE_CHECKING:
     from ul_api_utils.api_resource.api_resource import ApiResource
-    from pydantic.error_wrappers import ErrorDict
 
 FN_SYSTEM_PROPS = {"api_resource", "query", "body", "return", "body_validation_error", "query_validation_error"}
 
 
-def _patch_errors(dest_errors: List[Dict[str, str]], errors: List['ErrorDict'], kind: str) -> List[Dict[str, str]]:
+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({
             "error_type": kind,
             "error_message": error['msg'],
             "error_location": error["loc"],  # type: ignore
             "error_kind": error["type"],
+            "error_input": error["input"],
         })
     return dest_errors
 
 
-@validate_arguments
+@validate_call()
 def _body_list(root: List[Dict[str, Any]]) -> List[Any]:  # only for pydantic validation
     return root
 
@@ -72,12 +73,12 @@ class ApiResourceFnTyping(NamedTuple):
         if self.request_body_optional:
             if self.request_body_many:
                 class BodyTypingOptList(BaseModel):
-                    __root__: Optional[List[body_typing]]  # type: ignore
+                    __root__: Optional[List[body_typing]] = None  # type: ignore
 
                 return BodyTypingOptList
 
             class BodyTypingOpt(BaseModel):
-                __root__: Optional[body_typing]  # type: ignore
+                __root__: Optional[body_typing] = None  # type: ignore
             return BodyTypingOpt
 
         if self.request_body_many:
@@ -154,8 +155,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      # type: ignore
-            kwargs['body'] = parse_obj_as(expected_typing, body)
+            kwargs['body'] = TypeAdapter(Type[BaseModel | List[BaseModel]]).validate_python(body)
         except ValidationError as ve:
             if self.has_body_validation_error:
                 kwargs['body_validation_error'] = ve
@@ -167,9 +167,11 @@ 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.__fields__ and self.query_typing.__fields__[key].is_complex()},
+                **{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])},
             })
         except ValidationError as ve:
             if self.has_query_validation_error:
@@ -182,7 +184,7 @@ class ApiResourceFnTyping(NamedTuple):
         loc_err = []
         for name, type_ in self.signatures_typing:
             try:
-                kwargs[name] = parse_obj_as(type_, kwargs.get(name))
+                kwargs[name] = TypeAdapter(type_).validate_python(kwargs.get(name))
             except ValidationError as e:
                 err = e.errors()[0]
                 err["loc"] = [name]  # type: ignore
@@ -246,7 +248,7 @@ class ApiResourceFnTyping(NamedTuple):
                     ret_payload_res = get_typing(return_payload_typing)
                     if len(ret_payload_res) > 1:
                         return_payload_typing = ret_payload_res[1]
-                        if ret_payload_res[0] != list:
+                        if ret_payload_res[0] != list:  # noqa: E721
                             raise TypeError(f'{fn.__name__} :: invalid response payload type wrapper. only List is supported')
                         response_many = True
 

ul_api_utils/api_resource/api_response.py

@@ -4,8 +4,8 @@ from types import NoneType
 from typing import TypeVar, Generic, List, Optional, Dict, Any, Callable, Union, BinaryIO, Tuple, Type
 import msgpack
 from flask import jsonify, send_file, redirect, Response, request
-from pydantic import Extra
-from pydantic.main import BaseModel
+from pydantic import ConfigDict, RootModel
+from pydantic import BaseModel
 from werkzeug import Response as BaseResponse
 
 from ul_api_utils.api_resource.db_types import TPayloadInputUnion
@@ -28,9 +28,10 @@ class ApiResponse(BaseModel):
     status_code: int
     headers: Dict[str, str] = {}
 
-    class Config:
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        extra="forbid",
+        arbitrary_types_allowed=True
+    )
 
     @classmethod
     def _internal_use__mk_schema(cls, inner_type: Optional[Type[BaseModel]]) -> Type[BaseModel]:
@@ -87,7 +88,7 @@ class HtmlApiResponse(ApiResponse):
 
 class FileApiResponse(ApiResponse):
     file_path: Union[str, BinaryIO, io.BytesIO]
-    mimetype: Optional[str]  # it will be auto-detected by extension if mimetype==None
+    mimetype: Optional[str] = None  # it will be auto-detected by extension if mimetype==None
     as_attachment: bool = False
     download_name: Optional[str] = None
     attachment_filename: Optional[str] = None
@@ -139,8 +140,7 @@ class EmptyJsonApiResponse(ApiResponse):
 
 
 class JsonApiResponsePayload(BaseModel):
-    class Config:
-        extra = Extra.ignore
+    model_config = ConfigDict(extra="ignore")
 
 
 TResultPayloadUnion = Union[None, Dict[str, Any], JsonApiResponsePayload, List[JsonApiResponsePayload], List[Dict[str, Any]]]
@@ -153,8 +153,8 @@ TPayloadTotalUnion = Union[
 ]
 
 
-class DictJsonApiResponsePayload(JsonApiResponsePayload):
-    __root__: Dict[str, Any]
+class DictJsonApiResponsePayload(RootModel[Dict[str, Any]]):
+    pass
 
 
 TProxyPayload = TypeVar('TProxyPayload', bound=Union[JsonApiResponsePayload, List[JsonApiResponsePayload], None])
@@ -208,7 +208,7 @@ class AnyJsonApiResponse(ApiResponse):
     def _internal_use__mk_schema(cls, inner_type: Optional[Type[BaseModel]]) -> Type[BaseModel]:
         class _ResponseStd(BaseModel):
             ok: bool
-            payload: Any
+            payload: Any = None
             errors: List[Dict[str, Any]]
             total_count: Optional[int] = None
             count: Optional[int] = None

ul_api_utils/api_resource/signature_check.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, Optional, Union, Type, TypeVar, Tuple, TYPE_CHECKING
 from typing import _GenericAlias  # type: ignore
 
-from pydantic import BaseModel
+from pydantic import BaseModel, RootModel
 
 from ul_api_utils.utils.json_encoder import to_dict
 
@@ -14,8 +14,8 @@ TPydanticModel = TypeVar('TPydanticModel', bound=BaseModel)
 def set_model(model: Type[TPydanticModel], data: Union[Dict[str, Any], TPydanticModel]) -> TPydanticModel:
     if isinstance(data, model):
         return data
-    if "__root__" in model.__fields__:
-        return model(__root__=data).__root__  # type: ignore
+    if issubclass(model, RootModel):
+        return model(data).root
     assert isinstance(data, dict), f'data must be dict. "{type(data).__name__}" was given'
     return model(**data)
 
@@ -26,13 +26,13 @@ def set_model_dictable(model: Type[TPydanticModel], data: 'TDictable') -> Option
     res: Optional[Dict[str, Any]] = to_dict(data)
     if res is None:
         return None
-    if "__root__" in model.__fields__:
-        return model(__root__=res).__root__  # type: ignore
+    if issubclass(model, RootModel):
+        return model(data).root
     return model(**res)
 
 
 def get_typing(t: Type[Any]) -> Tuple[Type[Any], ...]:
-    if type(t) == _GenericAlias:
+    if type(t) == _GenericAlias:  # noqa: E721
         src_t = t
         return src_t.__origin__, *(it for it in src_t.__args__)
     return t,  # noqa: C818

ul_api_utils/commands/cmd_enc_keys.py

@@ -27,11 +27,11 @@ class CmdEncKeys(Cmd):
     name: str
     services: List[str]
     dir: str
-    permissions_module: Optional[str]
-    permissions_uri: Optional[str]
-    env: Optional[str]
-    org_id: Optional[UUID]
-    user_id: Optional[UUID]
+    permissions_module: Optional[str] = None
+    permissions_uri: Optional[str] = None
+    env: Optional[str] = None
+    org_id: Optional[UUID] = None
+    user_id: Optional[UUID] = None
 
     @staticmethod
     def add_parser_args(parser: argparse.ArgumentParser) -> None:

ul_api_utils/commands/cmd_gen_new_api_user.py

@@ -29,7 +29,7 @@ class CmdGenerateNewApiUser(Cmd):
     uri_auth_api: str
     internal_access_key: str
     permissions_list: List[int]
-    permissions_uri: Optional[str]
+    permissions_uri: Optional[str] = None
     api_user_name: str
     api_user_note: str
     api_user_date_exp: datetime

ul_api_utils/commands/cmd_generate_api_docs.py

@@ -85,7 +85,7 @@ class CmdGenApiFunctionDocumentation(Cmd):
 
     @staticmethod
     def load_functions(directory: str) -> Dict[str, Callable[..., Any]]:
-        function_name_object__map = {}
+        function_name_object__map: dict[str, Callable[..., Any]] = {}
         for root, _dirs, files in os.walk(directory):
             for file in files:
                 py_postfix = '.py'

ul_api_utils/commands/cmd_start.py

@@ -29,8 +29,8 @@ class CmdStart(Cmd):
     max_requests_jitter: int
     worker_class: str
     freeze_gc: bool
-    statsd_endpoint: Optional[str]
-    statsd_prefix: Optional[str]
+    statsd_endpoint: Optional[str] = None
+    statsd_prefix: Optional[str] = None
 
     @property
     def app_rel_dir(self) -> str:

ul_api_utils/debug/debugger.py

@@ -22,7 +22,7 @@ class DebuggerJSONEncoder(JSONEncoder):
         if isinstance(obj, set):
             return list(obj)
         if hasattr(obj, "__html__"):  # it needs for Flask ?
-            return str(obj.__html__())  # type: ignore
+            return str(obj.__html__())
         return super().default(obj)
 
 

ul_api_utils/errors.py

@@ -1,6 +1,4 @@
-from typing import Dict, List
-
-from pydantic import PydanticValueError
+from typing import Dict, List, Any
 
 from ul_api_utils.internal_api.internal_api_error import InternalApiResponseErrorObj
 
@@ -94,7 +92,7 @@ class ResponseStatusAbstractInternalApiError(ResponseAbstractInternalApiError):
     def __init__(self, status_code: int, errors: List[InternalApiResponseErrorObj]) -> None:
         assert isinstance(status_code, int), f'status_code must be int. "{type(status_code).__name__}" was given'
         assert status_code >= 400
-        super(ResponseStatusAbstractInternalApiError, self).__init__(f'status code error :: {status_code} :: {[e.dict() for e in errors]}')
+        super(ResponseStatusAbstractInternalApiError, self).__init__(f'status code error :: {status_code} :: {[e.model_dump() for e in errors]}')
         self.status_code = status_code
         self.errors = errors
 
@@ -137,10 +135,18 @@ class ValidationListApiError(UserAbstractApiError):
         self.errors = errors
 
 
-class ValidateApiError(PydanticValueError, UserAbstractApiError):
-    code = "{code}"
-    location = ["{location}"]
-    msg_template = "{msg_template}"
+class ValidateApiError(UserAbstractApiError):
+    def __init__(self, code: str, location: list[Any], msg_template: str, input: Any = None):
+        self.code = code
+        self.location = location
+        self.msg_template = msg_template
+        self.input = input
+
+    def __str__(self):  # type: ignore
+        return (
+            f"{self.msg_template} (code={self.code}, location={self.location}, "
+            f"input={self.input})"
+        )
 
 
 class SimpleValidateApiError(UserAbstractApiError):

ul_api_utils/internal_api/internal_api_error.py

@@ -1,6 +1,6 @@
 from typing import Optional, Any, Dict, List, Tuple, Union
 
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 
 class InternalApiResponseErrorObj(BaseModel):
@@ -8,8 +8,10 @@ class InternalApiResponseErrorObj(BaseModel):
     error_message: str
     error_location: Optional[Union[List[str], str, Tuple[str, ...]]] = None
     error_kind: Optional[str] = None
+    error_input: Optional[Any] = None
     other: Optional[Dict[str, Any]] = None
 
-    class Config:
-        extra = Extra.ignore
-        allow_mutation = False
+    model_config = ConfigDict(
+        extra="ignore",
+        frozen=True,
+    )

ul_api_utils/modules/api_sdk.py

@@ -150,7 +150,7 @@ class ApiSdk:
 
         if db_config is not None and type(db_config).__name__ == 'DbConfig':
             from ul_db_utils.utils.waiting_for_postgres import waiting_for_postgres
-            from ul_db_utils.modules.postgres_modules.db import db       # type: ignore # yes, db already defined, but can not use two conigs
+            from ul_db_utils.modules.postgres_modules.db import db       # yes, db already defined, but can not use two conigs
             db_config._init_from_sdk_with_flask(self)
             waiting_for_postgres(db_config.uri)
             self._db = db
@@ -490,7 +490,7 @@ class ApiSdk:
                         elif api_resource._type == ApiResourceType.FILE:
                             result = api_resource.response_api_error(e)
                         else:
-                            result = api_resource.response_web_error(
+                            result = api_resource.response_web_error(  # type: ignore
                                 ResourceRuntimeApiError(f'unsupported type "{api_resource._type.value}" of error response'),
                             )
                         res = result.to_flask_response(d), result.status_code

ul_api_utils/modules/api_sdk_config.py

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import List, Optional, Callable, Union
 
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 from ul_api_utils.access import PermissionRegistry, PermissionDefinition
 from ul_api_utils.modules.api_sdk_jwt import ApiSdkJwt
@@ -56,8 +56,8 @@ class ApiSdkConfig(BaseModel):
 
     api_route_path_prefix: str = '/api'
 
-    class Config:
-        extra = Extra.forbid
-        allow_mutation = False
-        frozen = True
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        extra="forbid",
+        frozen=True,
+        arbitrary_types_allowed=True,
+    )

ul_api_utils/modules/worker_sdk_config.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 from ul_api_utils.resources.socketio import SocketIOConfig
 
@@ -6,8 +6,8 @@ from ul_api_utils.resources.socketio import SocketIOConfig
 class WorkerSdkConfig(BaseModel):
     socket_config: SocketIOConfig | None = None
 
-    class Config:
-        extra = Extra.forbid
-        allow_mutation = False
-        frozen = True
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(
+        extra="forbid",
+        frozen=True,
+        arbitrary_types_allowed=True,
+    )

ul_api_utils/resources/caching.py

@@ -3,7 +3,7 @@ import hashlib
 import inspect
 import itertools
 import logging
-from _hashlib import HASH   # type: ignore
+from _hashlib import HASH
 from collections import defaultdict
 from enum import Enum
 from typing import Optional, Callable, Dict, Tuple, List, Union, Literal, cast, TypeVar, Any, Set, TypedDict
@@ -65,7 +65,7 @@ class ULCache(Cache):
 
     @staticmethod
     def _has_common_elements(seq: Set[Tuple[str, ...]]) -> bool:
-        return bool(functools.reduce(set.intersection, map(set, seq)))      # type: ignore
+        return bool(functools.reduce(set.intersection, map(set, seq)))
 
     @staticmethod
     def _format_cache_key(parts: List[Any]) -> str:
@@ -77,8 +77,8 @@ class ULCache(Cache):
         source_check: bool,
         hash_method: Callable[[bytes], HASH],
     ) -> str:
-        cache_key_parts = [request.path]
-        cache_hash = None
+        cache_key_parts: List[str] = [request.path]
+        cache_hash: HASH | None = None
         if request.args:
             args_as_sorted_tuple = tuple(sorted(pair for pair in request.args.items(multi=True)))
 
@@ -93,8 +93,8 @@ class ULCache(Cache):
                 cache_hash.update(func_source_code.encode("utf-8"))
             else:
                 cache_hash = hash_method(func_source_code.encode("utf-8"))
-        cache_hash = str(cache_hash.hexdigest()) if cache_hash is not None else ''
-        cache_key_parts.append(cache_hash)
+        cache_hash_str = str(cache_hash.hexdigest()) if cache_hash is not None else ''
+        cache_key_parts.append(cache_hash_str)
 
         return self._format_cache_key(cache_key_parts)
 

ul_api_utils/resources/debugger_scripts.py

@@ -78,7 +78,7 @@ def load_debugger_static_scripts(sdk: 'ApiSdk') -> None:
         for req_url in reversed(body.requests_hierarchy):
             for k, api in internal_api_registry.items():
                 if req_url.startswith(k):
-                    api_body = body.dict()
+                    api_body = body.model_dump()
                     api_body['requests_hierarchy'] = []
                     api_result = api.request_post('/debugger-explain', v=ApiPathVersion.NO_VERSION, json=api_body).check().typed(DebuggerExplainResponse)
                     return api_resource.response_ok(api_result.payload)

ul_api_utils/resources/health_check/health_check.py

@@ -2,7 +2,7 @@ import time
 from enum import Enum, IntEnum
 from typing import List, Callable, Any, Optional, Dict, TYPE_CHECKING, Tuple, NamedTuple, Set, Union
 
-from pydantic import Field, BaseModel, parse_obj_as, PositiveInt, root_validator
+from pydantic import model_validator, ConfigDict, Field, BaseModel, PositiveInt, TypeAdapter
 from sqlalchemy.sql import text
 from unipipeline.errors import UniError
 from unipipeline.modules.uni import Uni
@@ -64,7 +64,7 @@ class HealthCheckStepType(Enum):
                 executed_result.check()
             except (Client4XXInternalApiError, Server5XXInternalApiError) as e:
                 error = e
-            payload = parse_obj_as(HealthCheckApiResponse, executed_result.payload_raw).checks
+            payload = TypeAdapter(HealthCheckApiResponse).validate_python(executed_result.payload_raw).checks
             if error:
                 if isinstance(error, Client4XXInternalApiError):
                     return HealthCheckResultStatus.WARN, '', payload
@@ -144,7 +144,7 @@ class HealthCheckStep(NamedTuple):
     type: HealthCheckStepType
     executable: Callable[..., Any]
     executable_args: Tuple[Any, ...] = tuple()
-    executable_kwargs: Any = Field(default_factory=dict)
+    executable_kwargs: Any = Field(default_factory=lambda: dict())
 
     def run(self) -> Tuple[HealthCheckResultStatus, float, str, List[HealthCheckResult]]:
         start_time = time.perf_counter()
@@ -380,8 +380,7 @@ class HealthCheckApiResponse(JsonApiResponsePayload):
     service_name: str
     checks: List[HealthCheckResult] = Field(default_factory=list)
 
-    class Config:
-        use_enum_values = True
+    model_config = ConfigDict(use_enum_values=True)
 
 
 class HealthCheckMessageQueueRange(BaseModel):
@@ -407,13 +406,13 @@ class HealthCheckMessageQueueRange(BaseModel):
         description="Maximum number of messages for queue to have in order to be classified with status WARN (400).",
     )
 
-    @root_validator()
-    def root_validate(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        ok, warn = values.get('ok'), values.get('warn')
+    @model_validator(mode='after')
+    def root_validate(self) -> 'HealthCheckMessageQueueRange':
+        ok, warn = self.ok, self.warn
         if ok is not None and warn is not None:
             if ok >= warn:
                 raise ValueError(f"OK attribute should be less than WARN attribute, but you provided {ok=}, {warn=}")
-        return values
+        return self
 
     def get_status(self, message_count: int) -> HealthCheckResultStatus:
         if message_count <= self.ok:
@@ -437,5 +436,4 @@ class HealthCheckQueueMessageCountStatus(BaseModel):
     queue_name: str
     message_count_status_map: Dict[range, HealthCheckResultStatus]
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)

ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_models.py

@@ -17,7 +17,7 @@ class SwaggerModel(ABC):
     def has_swagger_model_child_type(self, child_swagger_model_type) -> bool:  # type: ignore
         for swagger_model in self.swagger_models:
 
-            if type(swagger_model) == child_swagger_model_type:
+            if isinstance(swagger_model, child_swagger_model_type):
                 return True
 
         return False
@@ -27,7 +27,7 @@ class SwaggerModel(ABC):
 
         for swagger_model in self.swagger_models:
 
-            if type(swagger_model) == swagger_model_type:
+            if isinstance(swagger_model, swagger_model_type):
                 selection.append(swagger_model)
 
         return selection

ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py

@@ -6,8 +6,7 @@ from datetime import datetime
 from typing import Callable, List, Union, Any, Optional
 
 from pydantic import BaseModel
-from pydantic.fields import FieldInfo
-from pydantic.main import ModelMetaclass
+from pydantic.v1.fields import FieldInfo
 
 from ul_api_utils.access import PermissionDefinition
 from ul_api_utils.utils.flask_swagger_generator.exceptions import SwaggerGeneratorError
@@ -64,8 +63,8 @@ class SwaggerSchema(SwaggerModel):
         self.items = {}
         self.type = 'object'
 
-        if isinstance(schema, ModelMetaclass):
-            json_schema = schema.schema()
+        if isinstance(schema, type) and issubclass(schema, BaseModel):
+            json_schema = schema.model_json_schema()
             if '$ref' in json.dumps(json_schema):
                 while '$ref' in json.dumps(json_schema):
                     json_schema = replace_value_in_dict(json_schema.copy(), json_schema.copy())
@@ -507,7 +506,7 @@ class SwaggerPath(SwaggerModel):
                 if not parameters:
                     parameters = SwaggerParameters()  # type: ignore
                     swagger_request_type.add_swagger_model(parameters)
-                query_schema = query_model.schema()
+                query_schema = query_model.model_json_schema()
                 query_required_fields = set(query_schema.get('required')) if query_schema.get('required') is not None else set()
                 query_definitions = query_schema.get('definitions')
                 for parameter_name, parameter_spec in query_schema.get('properties').items():
@@ -723,7 +722,7 @@ class SwaggerThreeSpecifier(SwaggerModel, SwaggerSpecifier):
         self,
         function_name: str,
         status_code: int,
-        schema: Union[SwaggerSchema, ModelMetaclass],
+        schema: Union[SwaggerSchema, type[BaseModel]],
         description: str = "",
     ) -> None:
         if not isinstance(schema, SwaggerSchema):

ul_api_utils/utils/json_encoder.py

@@ -20,11 +20,11 @@ def to_dict(obj: 'TDictable') -> Optional[Dict[str, Any]]:
     if isinstance(obj, dict):
         return obj
     if isinstance(obj, tuple) and hasattr(obj, '_asdict'):  # NamedTuple
-        return obj._asdict()  # type: ignore
+        return obj._asdict()
     if dataclasses.is_dataclass(obj):
         return dataclasses.asdict(obj)
     if isinstance(obj, BaseModel):
-        return obj.dict()
+        return obj.model_dump()
     if has_already_imported_db():
         from ul_db_utils.modules.postgres_modules.db import DbModel
         from flask_sqlalchemy import BaseQuery, Model
@@ -57,7 +57,7 @@ class CustomJSONEncoder(JSONEncoder):
         if isinstance(obj, (decimal.Decimal)):
             return str(obj)
         if isinstance(obj, BaseModel):
-            return obj.dict()
+            return obj.model_dump()
         if isinstance(obj, datetime):
             return str(obj.isoformat())
         if isinstance(obj, date):
@@ -71,9 +71,9 @@ class CustomJSONEncoder(JSONEncoder):
         if isinstance(obj, frozendict):
             return dict(obj)
         if dataclasses.is_dataclass(obj):
-            return dataclasses.asdict(obj)
+            return dataclasses.asdict(obj)  # type: ignore
         if hasattr(obj, "__html__"):  # it needs for Flask ?
-            return str(obj.__html__())  # type: ignore
+            return str(obj.__html__())
 
         if has_already_imported_db():
             from ul_db_utils.model.base_model import BaseModel as DbBaseModel

ul_api_utils/utils/memory_db/repository.py

@@ -5,7 +5,7 @@ import redis
 import ormsgpack
 import collections
 
-from pydantic import ValidationError, parse_obj_as, BaseModel
+from pydantic import ValidationError, BaseModel, TypeAdapter
 from typing import Any, Type, overload, Iterator, KeysView, cast
 
 from ul_api_utils.utils.instance_checks import isinstance_namedtuple
@@ -14,7 +14,7 @@ from ul_api_utils.utils.memory_db.errors import CompositeKeyError, UnsupportedPa
 CompositeKeyT = tuple[str, Type[BaseModel]]
 AnyKeyT = str | CompositeKeyT
 AnyT = Any
-RedisClientT = redis.StrictRedis | redis.Redis
+RedisClientT = redis.StrictRedis[Any] | redis.Redis[Any]
 ExpiryT = int | timedelta | None
 
 
@@ -65,8 +65,8 @@ class BaseMemoryDbRepository(collections.abc.MutableMapping[str, AnyT]):
         value = ormsgpack.unpackb(self._db[composite_key_name])
         try:
             if isinstance(value, list):
-                return parse_obj_as(list[_parse_as_type], value)  # type: ignore
-            return parse_obj_as(_parse_as_type, value)
+                return TypeAdapter(list[_parse_as_type]).validate_python(value)  # type: ignore
+            return TypeAdapter(_parse_as_type).validate_python(value)
         except ValidationError:
             raise UnsupportedParsingType(f"Could not parse the value of key '{composite_key_name}' with type {_parse_as_type}") from None
 

ul_api_utils/utils/unwrap_typing.py

@@ -82,7 +82,7 @@ class UnwrappedOptionalObjOrListOfObj(Generic[TVal]):
         if isinstance(unwrapped_t, TypingType):
             value_type = unwrapped_t
         elif isinstance(unwrapped_t, TypingGeneric) and len(unwrapped_t.args) == 1:
-            if unwrapped_t.origin.value != list:
+            if unwrapped_t.origin.value != list:  # noqa: E721
                 return None
             if not isinstance(unwrapped_t.args[0], TypingType):
                 return None  # type: ignore
@@ -91,7 +91,7 @@ class UnwrappedOptionalObjOrListOfObj(Generic[TVal]):
         elif isinstance(unwrapped_t, TypingOptional):
             optional = True
             if isinstance(unwrapped_t.value, TypingGeneric):
-                if unwrapped_t.value.origin.value != list:
+                if unwrapped_t.value.origin.value != list:  # noqa: E721
                     return None
                 if len(unwrapped_t.value.args) != 1 or not isinstance(unwrapped_t.value.args[0], TypingType):
                     return None

ul_api_utils/validators/custom_fields.py

@@ -1,73 +1,22 @@
 import csv
-import re
+from typing import TypeVar, Generic, List, Union, Generator, Callable, Annotated, Any
 
-from ul_api_utils.const import CRON_EXPRESSION_VALIDATION_REGEX, MIN_UTC_OFFSET_SECONDS, MAX_UTC_OFFSET_SECONDS
-from typing import TypeVar, Generic, List, Union, Generator, Callable
-from pydantic import ValidationError, ConstrainedStr, ConstrainedInt, ConstrainedList
-from pydantic.fields import ModelField
-
-
-class NotEmptyList(ConstrainedList):
-    """Type that can be used in pydantic field, that will validate empty lists."""
-    min_items = 1
-
-
-class CronScheduleStr(ConstrainedStr):
-    """Type that can be used in pydantic field, that will validate cron-formatted strings."""
-    regex = re.compile(CRON_EXPRESSION_VALIDATION_REGEX)
-
-
-class WhiteSpaceStrippedStr(ConstrainedStr):
-    """Type that can be used in pydantic field, that will strip whitespaces strings."""
-    strip_whitespace = True
-
-
-class UTCOffsetSeconds(ConstrainedInt):
-    """Type that can be used for pydantic fields to represent the offset from UTC."""
-    ge = MIN_UTC_OFFSET_SECONDS
-    le = MAX_UTC_OFFSET_SECONDS
-
-
-class PgTypePasswordStr(ConstrainedStr):
-    """Type that can be used for pydantic fields to represent password with length from 6 to 72 characters."""
-    min_length = 6
-    max_length = 72
-
-
-class PgTypeShortStr(ConstrainedStr):
-    """Type that can be used for pydantic fields to represent short string with length from 0 to 255 characters."""
-    min_length = 0
-    max_length = 255
-
-
-class PgTypeLongStr(ConstrainedStr):
-    """Type that can be used for pydantic fields to represent short string with length from 0 to 1000 characters."""
-    min_length = 0
-    max_length = 1000
-
-
-class PgTypeInt32(ConstrainedInt):
-    """Type that can be used for pydantic fields to represent int32 number."""
-    ge = -2147483648
-    lt = 2147483648
-
-
-class PgTypePositiveInt32(ConstrainedInt):
-    """Type that can be used for pydantic fields to represent positive int32 number."""
-    ge = 0
-    lt = 2147483648
-
-
-class PgTypeInt16(ConstrainedInt):
-    """Type that can be used for pydantic fields to represent int16 (SMALLINT) number."""
-    ge = -32768
-    lt = 32768
+from pydantic import ValidationError, Field, StringConstraints
+from pydantic.v1.fields import ModelField
 
+from ul_api_utils.const import CRON_EXPRESSION_VALIDATION_REGEX, MIN_UTC_OFFSET_SECONDS, MAX_UTC_OFFSET_SECONDS
 
-class PgTypePositiveInt16(ConstrainedInt):
-    """Type that can be used for pydantic fields to represent positive int16 (SMALLINT) number."""
-    ge = 0
-    lt = 32768
+NotEmptyListAnnotation = Annotated[list[Any], Field(min_length=1)]
+CronScheduleAnnotation = Annotated[str, StringConstraints(pattern=CRON_EXPRESSION_VALIDATION_REGEX)]
+WhiteSpaceStrippedStrAnnotation = Annotated[str, StringConstraints(strip_whitespace=True)]
+UTCOffsetSecondsAnnotation = Annotated[int, Field(ge=MIN_UTC_OFFSET_SECONDS, le=MAX_UTC_OFFSET_SECONDS)]
+PgTypePasswordStrAnnotation = Annotated[str, StringConstraints(min_length=6, max_length=72)]
+PgTypeShortStrAnnotation = Annotated[str, StringConstraints(min_length=0, max_length=255)]
+PgTypeLongStrAnnotation = Annotated[str, StringConstraints(min_length=0, max_length=1000)]
+PgTypeInt32Annotation = Annotated[int, Field(ge=-2147483648, le=2147483648)]
+PgTypePositiveInt32Annotation = Annotated[int, Field(ge=0, le=2147483648)]
+PgTypeInt16Annotation = Annotated[int, Field(ge=-32768, le=32768)]
+PgTypePositiveInt16Annotation = Annotated[int, Field(ge=0, le=32768)]
 
 
 QueryParamsSeparatedListValueType = TypeVar('QueryParamsSeparatedListValueType')
@@ -109,6 +58,6 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
             if error:
                 errors.append(error)
         if errors:
-            raise ValidationError(errors, cls)  # type: ignore
+            raise ValidationError(errors, cls)
         # Validation passed without errors, modify string to a list and cast the right type for every element
         return [list_item.type_(value) for value in splitted]

{ul_api_utils-8.0.1a0.dist-info → ul_api_utils-8.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 8.0.1a0
+Version: 8.0.3
 Summary: Python api utils
 Author: Unic-lab
 Author-email: 
@@ -17,13 +17,11 @@ Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: unipipeline (==1.9.4)
-Requires-Dist: pydantic[mypy] (==2.10.6)
-Requires-Dist: pydantic-i18n (==0.2.3)
-Requires-Dist: jinja2 (==3.1.5)
-Requires-Dist: flask (==3.1.0)
-Requires-Dist: flask-wtf (==1.2.2)
-Requires-Dist: flask-limiter (==3.10.1)
-Requires-Dist: flask-caching (==2.3.0)
+Requires-Dist: jinja2 (==3.1.2)
+Requires-Dist: flask (==2.1.3)
+Requires-Dist: flask-wtf (==1.0.1)
+Requires-Dist: flask-limiter (==2.5.1)
+Requires-Dist: flask-caching (==2.1.0)
 Requires-Dist: flask-swagger-ui (==4.11.1)
 Requires-Dist: flask-monitoringdashboard (==3.1.2)
 Requires-Dist: pycryptodome (==3.15.0)
@@ -46,7 +44,7 @@ Requires-Dist: faker (==24.8.0)
 Requires-Dist: types-requests (==2.28.8)
 Requires-Dist: types-jinja2 (==2.11.9)
 Requires-Dist: xlsxwriter (==3.2.0)
-Requires-Dist: werkzeug (==3.1.3)
+Requires-Dist: werkzeug (==2.3.7)
 Requires-Dist: frozendict (==2.4.4)
 Requires-Dist: wtforms (==3.0.1)
 Requires-Dist: wtforms-alchemy (==0.18.0)

{ul_api_utils-8.0.1a0.dist-info → ul_api_utils-8.0.3.dist-info}/RECORD

@@ -7,7 +7,7 @@ example/rate_limit_load.py,sha256=U2Bgp8UztT4TNKdv9NVioxWfE68aCsC7uKz7xPCy6XM,22
 example/redis_repository.py,sha256=ew9Ixdn0rAAE5iUINdxLJ9BdbhoD09FJzigdc7cNFAc,504
 example/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-example/routes/api_some.py,sha256=rjguCsuDH8XpuM1gUcIe2dSbUnACR0sh-z6zQHBH0cM,13037
+example/routes/api_some.py,sha256=tTv30Qtgo1wicCxmhbliQrk8Arq6qFwHVyjKfIopnUI,13044
 example/sockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example/sockets/on_connect.py,sha256=3sluHnVT_-e2Oa4YsRZUJIc2L4VnMSJu5rgI_mkg8BQ,411
 example/sockets/on_disconnect.py,sha256=ev0uJutqmTSsbrBcQIRudBX-6g7uSmZj8Imuf6pVIMU,277
@@ -19,29 +19,29 @@ example/workers/worker.py,sha256=Bb0JZPWJ8X51iCo6tlQ3umpqjS1kL3oy-FW9MtWH7aA,969
 ul_api_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/conf.py,sha256=zLWsA0TTmekzxYrs5PbeqEkeylaNC_gIui3CGM9aZew,3487
 ul_api_utils/const.py,sha256=pzY-zRznCJjZ0mFlte6XEsQQCU7EydN2WweEsVHSE7k,2563
-ul_api_utils/errors.py,sha256=kmmgNXJtgVczOskVG8Ye1WSHbqSSAWC2OzUjPUGCkGo,8137
+ul_api_utils/errors.py,sha256=QQ3Zn7pRwr1q2JSogThAk4qIAveHif5_AN68vzK53bA,8404
 ul_api_utils/main.py,sha256=-0S7qYgyNnom9xUhqowi0ErrYz82m3Z4K_uVxarXhN8,922
 ul_api_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/sentry.py,sha256=UH_SwZCAoKH-Nw5B9CVQMoF-b1BJOp-ZTzwqUZ3Oq84,1801
-ul_api_utils/access/__init__.py,sha256=OD2UnvAi8ax40B_5JlaW2IAcOcZzk2Y15h8Xi_wEa0g,4526
+ul_api_utils/access/__init__.py,sha256=NUyRNvCVwfePrfdn5ATFVfHeSO3iq4-Syeup4IAZGzs,4526
 ul_api_utils/api_resource/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/api_resource/api_request.py,sha256=psVfLJqapV4PBL3YF0Bj22T3PDcCWQME87chtGBH3pw,3279
-ul_api_utils/api_resource/api_resource.py,sha256=mUaFWxYBfHemcM2SaBQBOtTb4T4fbvZ4CNmE2GwPtOg,17766
-ul_api_utils/api_resource/api_resource_config.py,sha256=_B7DNe5eLbRw0Spy1y5CatXjlz5M3wqgYIjnJemlY44,760
+ul_api_utils/api_resource/api_request.py,sha256=6Ag2trKIkenhYYPU2--hnfNJC5lLgBxVQ7jXj5D1eXM,3303
+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=OrmVFSuvqER5FwlhA6N6iaO3N99iPfTapBv_X_6xcbo,18224
+ul_api_utils/api_resource/api_resource_fn_typing.py,sha256=mKaeGzkOJ-FyDM6B55isUnr8sFsgSHeILQkxJd_tpI8,18343
 ul_api_utils/api_resource/api_resource_type.py,sha256=mgjSQI3swGpgpLI6y35LYtFrdN-kXyV5cQorwGW7h6g,462
-ul_api_utils/api_resource/api_response.py,sha256=jb5mKjouupDmctzPb2b7Z9_dpWVuxUHxVSevz-8sODI,9676
+ul_api_utils/api_resource/api_response.py,sha256=l3sQ34DkybP8nQWW8DSQulihfrB0Ai0RBaCrVZAHeSk,9695
 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=53dYTvKS2mCIgE3DvGcMUrpFIM1007s_d1mslj0gLDk,559
 ul_api_utils/api_resource/db_types.py,sha256=LFw7mnzY4e6WuEYkUzPSgs6b-aw2vnRSqYsJMEMWUhA,436
-ul_api_utils/api_resource/signature_check.py,sha256=CpUsV460P5f7gN4nyQtKoRsgm4ZqoqICbVxsM2xzhnc,1302
+ul_api_utils/api_resource/signature_check.py,sha256=jahhr7ttYEUKen_Wp2Eh1__oxqu7ZDoYgw0diK9CFzc,1266
 ul_api_utils/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/commands/cmd_enc_keys.py,sha256=-Tblh6lI7G6M5YVwbVQqZmXhBMiIpB3a7b0Lv1MFufk,8453
+ul_api_utils/commands/cmd_enc_keys.py,sha256=HvwihTrLMqhQO_nYA8U0oowqrTKsmUGzseRofuSCO9k,8488
 ul_api_utils/commands/cmd_gen_api_user_token.py,sha256=Vg7oEYHvof7DSLat9yJ_k5AYL9ZOC4Jvd38DBn5U-R0,2730
-ul_api_utils/commands/cmd_gen_new_api_user.py,sha256=ICZbKqz2D6DRvjwtNM08rNjIlWN3qClcUQw5L8FxRBY,4549
-ul_api_utils/commands/cmd_generate_api_docs.py,sha256=pafX88RjcSMFruSk6qy8Xfao3MXo1yolI4rkC_bmMSQ,9612
-ul_api_utils/commands/cmd_start.py,sha256=cd1PLHaB4LXNHwZBP1NyllHHSetuI-XUDZw2MGlbkWE,4717
+ul_api_utils/commands/cmd_gen_new_api_user.py,sha256=ungpVG_ecAl0hHcVdcKQ4TrJ5Iv0hLAkD_GRH8innqk,4556
+ul_api_utils/commands/cmd_generate_api_docs.py,sha256=LIAyBMyZD7oQRmuDrrqYBj8XHEpRKJy82ybuE6EXVZE,9643
+ul_api_utils/commands/cmd_start.py,sha256=Q0sKa4Uq73ZrKiAlfa4ZdraAWT1v47i5wDyjs8xSBzA,4731
 ul_api_utils/commands/cmd_worker_start.py,sha256=1tt4_mL8T8_q7i1bqnfjPSkSYlRNNNp8eJ-5rTYj36w,2593
 ul_api_utils/commands/start/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/commands/start/gunicorn.conf.local.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -50,7 +50,7 @@ ul_api_utils/commands/start/wsgi.py,sha256=ZBFx66XP8iNliK3vkB6yWRkCq2-ItgieweBmW
 ul_api_utils/conf/ul-debugger-main.js,sha256=XgzaH1AWAG4_PW9mRaoJGJOKeEA5T61j7yIouZjU65s,999747
 ul_api_utils/conf/ul-debugger-ui.js,sha256=bNwv6ntu8RjCrH33H5eTUtFXdBoMrgFt3P87ujbBmRU,2043
 ul_api_utils/debug/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/debug/debugger.py,sha256=1FovBJSPDZ79W6f0tpf8tZLqXM73elcWGdQ96b6k18E,3732
+ul_api_utils/debug/debugger.py,sha256=eBsYJjBjvUT2yfr8YuJSNSOETVlbz8jAvTPvIKTUvoY,3716
 ul_api_utils/debug/malloc.py,sha256=OvESxpn8sQMyAb64DxnYUAofRZdnJ1I199IUBWiIoa4,3274
 ul_api_utils/debug/stat.py,sha256=udlLLIopxj6SmHH8Scqz5fuNa_CucMlRx7qp88Fi5pY,14591
 ul_api_utils/encrypt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,24 +59,24 @@ ul_api_utils/encrypt/encrypt_decrypt_aes_xtea.py,sha256=Gj-X_CoYY2PPrczTcG9Ho_dg
 ul_api_utils/internal_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/internal_api/internal_api.py,sha256=gLlz4TYDgrmEF8S2XpNCKgAjLHsd21vs75kppHLoG6A,14067
 ul_api_utils/internal_api/internal_api_check_context.py,sha256=FJyYuyhp7AzvKSoyNrszw6vtUanSUKNNcDmlNH-UDI4,1709
-ul_api_utils/internal_api/internal_api_error.py,sha256=Y5PcKXIONSJZRc0XzvHwFtgrKML78Y3sdvX3vXRMmnQ,424
+ul_api_utils/internal_api/internal_api_error.py,sha256=sdm3V2VLSfFVBmxaeo2Wy2wkhmxWTXGsCCR-u08ChMg,471
 ul_api_utils/internal_api/internal_api_response.py,sha256=rNAqY82ezupcRSnWY1YO2T5QhwfOFrak0dp23shgUxY,11583
 ul_api_utils/internal_api/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/internal_api/__tests__/internal_api.py,sha256=X2iopeso6vryszeeA__lcqXQVtz3Nwt3ngH7M4OuN1U,1116
 ul_api_utils/internal_api/__tests__/internal_api_content_type.py,sha256=mfiYPkzKtfZKFpi4RSnWAoCd6mRijr6sFsa2TF-s5t8,749
 ul_api_utils/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/modules/api_sdk.py,sha256=AkakVkObpaJ0ldlhCtQIJTEQ9Ze0okBebdV5evTiu7o,26505
-ul_api_utils/modules/api_sdk_config.py,sha256=3r46W5jNKlx7K2MWP94QuM216fmQkhP6LtCRZ9KmNEs,2151
+ul_api_utils/modules/api_sdk.py,sha256=IKcQYnx22GHV2paH4qvJcCqsM5LXpUVIMfrl6bevTRE,26506
+ul_api_utils/modules/api_sdk_config.py,sha256=ZUR48tIJeFlPJTSjyXzKfXaCKPtfqeaA0mlLX42SSFY,2137
 ul_api_utils/modules/api_sdk_jwt.py,sha256=2XRfb0LxHUnldSL67S60v1uyoDpVPNaq4zofUtkeg88,15112
 ul_api_utils/modules/intermediate_state.py,sha256=7ZZ3Sypbb8LaSfrVhaXaWRDnj8oyy26NUbmFK7vr-y4,1270
 ul_api_utils/modules/worker_context.py,sha256=jGjopeuYuTtIDmsrqK7TcbTD-E81t8OWvWS1JpTC6b0,802
 ul_api_utils/modules/worker_sdk.py,sha256=4jObKYGAvZNrH0HWl3Wi7TXkNtlbC5PjkkrMLwDU17s,5144
-ul_api_utils/modules/worker_sdk_config.py,sha256=SAMKoY0AWE-As1afDCjsvVQCpU7ouRBwf0X298NoNMo,322
+ul_api_utils/modules/worker_sdk_config.py,sha256=7y-J1yHtoHQuRZyye--pY85yaJXKL6Vh9hODQHMESyU,308
 ul_api_utils/modules/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/modules/__tests__/test_api_sdk_jwt.py,sha256=9JJTtva2z4pjvTWQqo_0EOvzf4wBgvq0G77jM0SC3Bg,10719
 ul_api_utils/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/resources/caching.py,sha256=bboV5XGxW5hJ1NnKz92AsrF9jw8C80odxXsAO9y33IA,7516
-ul_api_utils/resources/debugger_scripts.py,sha256=qqf6zeJ1aE_STNYX1j9-ZfBgB_jcQoOaPX10-X3nPE8,5094
+ul_api_utils/resources/caching.py,sha256=gSMZp8C1GfTZeCOrlC56yBILkvBql5umEuOBg0_y3ec,7511
+ul_api_utils/resources/debugger_scripts.py,sha256=QWFDHrBJuptnl-XI-dbNdqKH5AoyylSvfIBwRHso6Sw,5100
 ul_api_utils/resources/not_implemented.py,sha256=OQE5LGA4KqZDwP5Wtub3Aw-icwzbqCSKcEFoFp4w7_k,973
 ul_api_utils/resources/permissions.py,sha256=8c8cEPkm69zxgXbDiwUkW6Mi_496-MZXbPOxHITetKs,1436
 ul_api_utils/resources/rate_limitter.py,sha256=QMpaLu1LoFbvtIEhxF8HbAZIAW4oGKTClt7XEUsqx98,3358
@@ -84,7 +84,7 @@ ul_api_utils/resources/socketio.py,sha256=oeQdULtBnslyMJkeqfZMWxtK6efLFX1LrfA2cB
 ul_api_utils/resources/swagger.py,sha256=fK8S9X4YCSqe_weCzV_BcMPoL_NR073BsGUzn2ImbHI,5391
 ul_api_utils/resources/health_check/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/resources/health_check/const.py,sha256=QzVZP_ZKmVKleUACiOGjzP-v54FD7tEN6NEF4Jb50Ow,78
-ul_api_utils/resources/health_check/health_check.py,sha256=bb_ONn3akNXxNFELIUcW6foqwiKqeinmr-Wl0fQ7Q4c,18449
+ul_api_utils/resources/health_check/health_check.py,sha256=rfbvwfsWaQgj-DP_En_-wPEYZdPq2K4-5wz6rjZG0oU,18478
 ul_api_utils/resources/health_check/health_check_template.py,sha256=Qih-sVoFVoVxfmDYBTzwlNSicCr7zNelUJLJMnM-C_Q,2572
 ul_api_utils/resources/health_check/resource.py,sha256=SPd9kMzBOVhFZgMVfV26bDpZya3BmwxTfOR4MZ2dL4o,4199
 ul_api_utils/resources/web_forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -111,11 +111,11 @@ 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=3ReY76A79Wg5yjNam8qTKyHAMb9uxyM1EV9Jberwcqo,4582
+ul_api_utils/utils/json_encoder.py,sha256=ra43WhkAadIvVpUY3uik_Nzg0LVXUXTGYvx4Gx7fD_g,4578
 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
-ul_api_utils/utils/unwrap_typing.py,sha256=fmkAv8bbyQrq1GWFpUlkdF5vPI3aw4ASv_fiYqpQtkY,4161
+ul_api_utils/utils/unwrap_typing.py,sha256=19jyhkRcb89v1gzR62YDsMO9zxR2PU5bjYZm1is8Aoo,4189
 ul_api_utils/utils/uuid_converter.py,sha256=OZMuySkoALrQQOe312_BHVWN20Sz5frKuH9KYziAGsU,565
 ul_api_utils/utils/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/utils/__tests__/api_path_version.py,sha256=n7VFVdwFqP_FS6PE3OUCS68oU3tG78xM4HxrKShLhNw,898
@@ -124,9 +124,9 @@ ul_api_utils/utils/flask_swagger_generator/__init__.py,sha256=47DEQpj8HBSa-_TImW
 ul_api_utils/utils/flask_swagger_generator/conf.py,sha256=ngnNoJUfBj14ICIH8TJnDakO9i2C5Ukb8x6n5oIgQws,110
 ul_api_utils/utils/flask_swagger_generator/exceptions.py,sha256=yA4IsUyxh5puyoYzuM8dyrXUVhWje66rrr2j2qMNtXU,168
 ul_api_utils/utils/flask_swagger_generator/specifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_models.py,sha256=eMRDP60GUbIuBGinFPfjp7VsnbgmzockTsIT-KadchA,1690
+ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_models.py,sha256=P52azB25Ncpp6I5j5bq4LLAJHDLSORFVJp9bHoXvpQk,1698
 ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_specifier.py,sha256=9Cf1ijk90IDYUDG8kTjK4cxjdxpYjWZz1tKJHPCeDAA,1513
-ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py,sha256=ReG74_qMT8yVLJAIDZBwcWRxWgACaEgmfxzc0p5dmyY,30828
+ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py,sha256=4zkH3P41DwPXsriJISc7aL0IYjKR7yKfoKAzf9arQW0,30837
 ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_version.py,sha256=A14IRG-e2KL2SlFbHep2FH0uMRIHPhfd7KLkYdtWrfA,1312
 ul_api_utils/utils/flask_swagger_generator/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/utils/flask_swagger_generator/utils/input_type.py,sha256=Ynp3zI5q1F0Tl_eTdNbWoCxRKPwBCJkwJOoeHE2pTRE,2533
@@ -140,17 +140,17 @@ ul_api_utils/utils/jinja/t_url_for.py,sha256=PG9W4UbkWv2pLXNMQiCt22vp4sDi-Uz5w2u
 ul_api_utils/utils/jinja/to_pretty_json.py,sha256=wcc_EJ6yM4lipE0Vr6cgYOB-rBk7_j_Wa7bijjI_bCs,302
 ul_api_utils/utils/memory_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/utils/memory_db/errors.py,sha256=Bw1O1Y_WTCeCRNgb9iwrGT1fst6iHORhrNstwxiaUu8,267
-ul_api_utils/utils/memory_db/repository.py,sha256=FDauZgcYiQWn-yYGCMsvaT4C2CES8WG2iSwcpVmmXu4,3715
+ul_api_utils/utils/memory_db/repository.py,sha256=xOnxEJyApGTglqjQ5fPKcEV5rHEkvKwcgrUfW4zJbHg,3754
 ul_api_utils/utils/memory_db/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/validators/custom_fields.py,sha256=iqDnAvO-Bs13ZtLtccAG8SdJ8jWDlVcW6_ckChrTdXQ,4023
+ul_api_utils/validators/custom_fields.py,sha256=zjusHZ4mOCAmn5MSRGnHkKkexw4r7x0vt5e4dQJctgg,3001
 ul_api_utils/validators/validate_empty_object.py,sha256=3Ck_iwyJE_M5e7l6s1i88aqb73zIt06uaLrMG2PAb0A,299
 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=QLZ7DFta01Z7DOK9Z5Iq4uf_CmvDkVReis-GAl_QN48,1447
-ul_api_utils-8.0.1a0.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-8.0.1a0.dist-info/METADATA,sha256=Qy2x9Cf3XuZkLP9GpgI8ZgR_oqJQZ-g4p6e7I_Qgw78,14827
-ul_api_utils-8.0.1a0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-8.0.1a0.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-8.0.1a0.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-8.0.1a0.dist-info/RECORD,,
+ul_api_utils-8.0.3.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
+ul_api_utils-8.0.3.dist-info/METADATA,sha256=gz25UoxRnq-cCOyZQ5qBxrwc8-OQ0MY2RsXr9xE3dYM,14744
+ul_api_utils-8.0.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ul_api_utils-8.0.3.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
+ul_api_utils-8.0.3.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
+ul_api_utils-8.0.3.dist-info/RECORD,,