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

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

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

{ul-api-utils-8.1.16 → ul-api-utils-8.1.18}/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.16',
+    version='8.1.18',
     description='Python api utils',
     author='Unic-lab',
     long_description=long_description,

{ul-api-utils-8.1.16 → ul-api-utils-8.1.18}/ul_api_utils/api_resource/api_resource.py

@@ -16,8 +16,9 @@ from ul_api_utils.api_resource.api_resource_error_handling import WEB_EXCEPTION_
     ProcessingExceptionsParams, WEB_UNKNOWN_ERROR_PARAMS
 from ul_api_utils.api_resource.api_resource_fn_typing import ApiResourceFnTyping
 from ul_api_utils.api_resource.api_resource_type import ApiResourceType
-from ul_api_utils.api_resource.api_response import JsonApiResponse, HtmlApiResponse, FileApiResponse, JsonApiResponsePayload, EmptyJsonApiResponse, \
-    RedirectApiResponse, ProxyJsonApiResponse, RootJsonApiResponse
+from ul_api_utils.api_resource.api_response import JsonApiResponse, HtmlApiResponse, FileApiResponse, \
+    JsonApiResponsePayload, EmptyJsonApiResponse, \
+    RedirectApiResponse, ProxyJsonApiResponse, RootJsonApiResponse, RootJsonApiResponsePayload
 from ul_api_utils.conf import APPLICATION_ENV, APPLICATION_JWT_PUBLIC_KEY, APPLICATION_DEBUG
 from ul_api_utils.const import REQUEST_HEADER__X_FORWARDED_FOR, \
     RESPONSE_HEADER__WWW_AUTH, OOPS, REQUEST_HEADER__USER_AGENT
@@ -38,7 +39,7 @@ TPayload = TypeVar('TPayload')
 
 
 T = TypeVar('T')
-TResp = TypeVar('TResp', bound=JsonApiResponsePayload)
+TResp = TypeVar('TResp', bound=Union[JsonApiResponsePayload, RootJsonApiResponsePayload[Any]])
 
 
 class ApiResource:

{ul-api-utils-8.1.16 → ul-api-utils-8.1.18}/ul_api_utils/api_resource/api_resource_fn_typing.py

@@ -25,7 +25,7 @@ if TYPE_CHECKING:
 FN_SYSTEM_PROPS = {"api_resource", "query", "body", "return", "body_validation_error", "query_validation_error"}
 
 
-def _is_complex_type(annotation):
+def _is_complex_type(annotation: Any) -> bool:
     origin = get_origin(annotation)
 
     # Optional[type_] is typing.Union
@@ -165,8 +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-8.1.16 → ul-api-utils-8.1.18}/ul_api_utils/api_resource/api_response.py

@@ -168,7 +168,7 @@ class DictJsonApiResponsePayload(RootJsonApiResponsePayload[Dict[str, Any]]):
     pass
 
 
-TProxyPayload = TypeVar('TProxyPayload', bound=Union[JsonApiResponsePayload, List[JsonApiResponsePayload], None])
+TProxyPayload = TypeVar('TProxyPayload', bound=Union[JsonApiResponsePayload, List[JsonApiResponsePayload], RootJsonApiResponsePayload[Any], List[RootJsonApiResponsePayload[Any]], None])
 
 
 class ProxyJsonApiResponse(Generic[TProxyPayload], EmptyJsonApiResponse):

{ul-api-utils-8.1.16 → ul-api-utils-8.1.18}/ul_api_utils/internal_api/internal_api_response.py

@@ -7,7 +7,7 @@ from typing import Any, Optional, List, Generic, Type, TypeVar, Union, Dict, Nam
 import requests
 from pydantic import ValidationError
 
-from ul_api_utils.api_resource.api_response import JsonApiResponsePayload
+from ul_api_utils.api_resource.api_response import JsonApiResponsePayload, RootJsonApiResponsePayload
 from ul_api_utils.api_resource.signature_check import set_model
 from ul_api_utils.const import RESPONSE_PROP_DEBUG_STATS, RESPONSE_PROP_PAYLOAD, RESPONSE_PROP_OK, RESPONSE_PROP_ERRORS, RESPONSE_PROP_TOTAL, RESPONSE_PROP_COUNT, MIME__JSON, \
     RESPONSE_HEADER__CONTENT_TYPE
@@ -18,7 +18,7 @@ from ul_api_utils.utils.api_format import ApiFormat
 from ul_api_utils.internal_api.internal_api_error import InternalApiResponseErrorObj
 from ul_api_utils.utils.unwrap_typing import UnwrappedOptionalObjOrListOfObj
 
-TPyloadType = TypeVar('TPyloadType', bound=Union[JsonApiResponsePayload, List[JsonApiResponsePayload], None])
+TPyloadType = TypeVar('TPyloadType', bound=Union[JsonApiResponsePayload, List[JsonApiResponsePayload], RootJsonApiResponsePayload[Any], List[RootJsonApiResponsePayload[Any]], None])
 TResp = TypeVar('TResp', bound='InternalApiResponse[Any]')
 
 
@@ -73,17 +73,17 @@ class InternalApiResponse(Generic[TPyloadType]):
 
         self._parsed_schema: Optional[InternalApiResponseSchema] = None
         self._parsed_json: Any = None
-        self._parsed_payload: Union[None, JsonApiResponsePayload, List[JsonApiResponsePayload]] = None
+        self._parsed_payload: Union[None, JsonApiResponsePayload, List[JsonApiResponsePayload], RootJsonApiResponsePayload[Any], List[RootJsonApiResponsePayload[Any]]] = None
 
         self._status_checked = False
         self._info = info
 
         if payload_type is not None:
-            self._payload_type = UnwrappedOptionalObjOrListOfObj.parse(payload_type, JsonApiResponsePayload)
+            self._payload_type = UnwrappedOptionalObjOrListOfObj.parse(payload_type, JsonApiResponsePayload) or UnwrappedOptionalObjOrListOfObj.parse(payload_type, RootJsonApiResponsePayload)
             if self._payload_type is None:
-                tn = JsonApiResponsePayload.__name__
+                tn1, tn2 = JsonApiResponsePayload.__name__, RootJsonApiResponsePayload.__name__
                 raise ValueError(
-                    f'payload_typing is invalid. must be Union[Type[{tn}], Optional[Type[{tn}]], List[Type[{tn}]], Optional[List[Type[{tn}]]]]. {payload_type} was given',
+                    f'payload_typing is invalid. must be Union[Type[{tn1} | {tn2}], Optional[Type[{tn1} | {tn2}]], List[Type[{tn1} | {tn2}]], Optional[List[Type[{tn1} | {tn2}]]]]. {payload_type} was given',
                 )
 
     def typed(self, payload_type: Type[TPyloadType]) -> 'InternalApiResponse[TPyloadType]':

{ul-api-utils-8.1.16 → ul-api-utils-8.1.18}/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.16 → ul-api-utils-8.1.18}/ul_api_utils/utils/unwrap_typing.py

@@ -2,6 +2,8 @@ from dataclasses import dataclass
 from types import NoneType
 from typing import NamedTuple, Type, Tuple, _GenericAlias, _UnionGenericAlias, Any, Union, Optional, TypeVar, Generic, Callable  # type: ignore
 
+from ul_api_utils.api_resource.api_response import RootJsonApiResponsePayload
+
 
 class TypingType(NamedTuple):
     value: Type[Any]
@@ -47,6 +49,7 @@ def unwrap_typing(t: Type[Any]) -> Union[TypingGeneric, TypingUnion, TypingType,
 
 T = TypeVar('T')
 TVal = TypeVar('TVal')
+TValRoot = TypeVar('TValRoot', bound=RootJsonApiResponsePayload[Any])
 
 
 def default_constructor(value_type: Type[TVal], data: Any) -> TVal:
@@ -72,7 +75,7 @@ class UnwrappedOptionalObjOrListOfObj(Generic[TVal]):
         return constructor(self.value_type, payload)  # type: ignore
 
     @staticmethod
-    def parse(t: Type[Any], type_constraint: Optional[Type[TVal]]) -> 'Optional[UnwrappedOptionalObjOrListOfObj[TVal]]':
+    def parse(t: Type[Any], type_constraint: Optional[Type[TVal | TValRoot]]) -> 'Optional[UnwrappedOptionalObjOrListOfObj[TVal]]':
         unwrapped_t = unwrap_typing(t)
 
         many = False

{ul-api-utils-8.1.16 → ul-api-utils-8.1.18}/ul_api_utils/validators/custom_fields.py

@@ -59,8 +59,6 @@ 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]
 
@@ -72,7 +70,14 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
 
         for idx, value in enumerate(splitted):
             try:
-                validated_items.append(adapter.validate_python(value))
+                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))
             except ValidationError as e:
                 for error in e.errors(include_url=False):
                     error['loc'] = ('param', idx)
@@ -81,4 +86,4 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
         if errors:
             raise ValidationError.from_exception_data("List validation error", errors)
 
-        return validated_items
+        return validated_items  # type: ignore

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

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