ul-api-utils 8.1.5__tar.gz → 8.1.7__tar.gz

{ul-api-utils-8.1.5 → ul-api-utils-8.1.7}/PKG-INFO

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

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

{ul-api-utils-8.1.5 → ul-api-utils-8.1.7}/ul_api_utils/api_resource/api_response.py

@@ -171,7 +171,7 @@ class DictJsonApiResponsePayload(RootJsonApiResponsePayload[Dict[str, Any]]):
 TProxyPayload = TypeVar('TProxyPayload', bound=Union[JsonApiResponsePayload, List[JsonApiResponsePayload], None])
 
 
-class ProxyJsonApiResponse(EmptyJsonApiResponse, Generic[TProxyPayload]):
+class ProxyJsonApiResponse(Generic[TProxyPayload], EmptyJsonApiResponse):
     response: Dict[str, Any]
 
     @classmethod
@@ -194,7 +194,7 @@ class ProxyJsonApiResponse(EmptyJsonApiResponse, Generic[TProxyPayload]):
 TJsonObjApiResponsePayload = TypeVar('TJsonObjApiResponsePayload')
 
 
-class RootJsonApiResponse(EmptyJsonApiResponse, Generic[TJsonObjApiResponsePayload]):
+class RootJsonApiResponse(Generic[TJsonObjApiResponsePayload], EmptyJsonApiResponse):
     root: TJsonObjApiResponsePayload
 
     @classmethod
@@ -272,7 +272,7 @@ class AnyJsonApiResponse(ApiResponse):
         return JsonApiResponse(ok=False, total_count=0, payload=[], status_code=status_code, errors=errors)
 
 
-class JsonApiResponse(AnyJsonApiResponse, Generic[TJsonObjApiResponsePayload]):
+class JsonApiResponse(Generic[TJsonObjApiResponsePayload], AnyJsonApiResponse):
 
     @classmethod
     def _internal_use__mk_schema(cls, inner_type: Optional[Type[BaseModel]]) -> Type[BaseModel]:

ul-api-utils-8.1.7/ul_api_utils/validators/__tests__/test_custom_fields.py

@@ -0,0 +1,32 @@
+# import pytest
+#
+# from pydantic import BaseModel
+# from typing import Union, List
+# from ul_api_utils.validators.custom_fields import QueryParamsSeparatedList
+#
+#
+# class ModelStr(BaseModel):
+#     param: QueryParamsSeparatedList[str]
+#
+#
+# class ModelInt(BaseModel):
+#     param: QueryParamsSeparatedList[int]
+#
+#
+# @pytest.mark.parametrize(
+#     "model, input_data, expected_output",
+#     [
+#         pytest.param(ModelStr, "first_array_element,second,third,this", ["first_array_element", "second", "third", "this"]),
+#         pytest.param(ModelStr, ["first_array_element,second,third,this"], ["first_array_element", "second", "third", "this"]),
+#         pytest.param(ModelInt, ["1,2,3,4,5"], [1, 2, 3, 4, 5]),
+#         pytest.param(ModelStr, 'first_array_element,"second,third",this', ["first_array_element", "second,third", "this"]),
+#         pytest.param(ModelStr, ['first_array_element,"second,third",this'], ["first_array_element", "second,third", "this"]),
+#         pytest.param(ModelStr, '"first_array_element,second,third",this, "1,2"', ["first_array_element,second,third", "this", "1,2"]),
+#     ],
+# )
+# def test__query_params_separated_list(
+#     model: Union[ModelStr, ModelInt], input_data: Union[List[str], str], expected_output: List[Union[str, int]],
+# ) -> None:
+#     instance = model(param=input_data)  # type: ignore
+#     assert isinstance(instance.param, list)
+#     assert instance.param == expected_output

{ul-api-utils-8.1.5 → ul-api-utils-8.1.7}/ul_api_utils/validators/custom_fields.py

@@ -1,8 +1,9 @@
 import csv
-from typing import TypeVar, Generic, List, Union, Generator, Callable, Annotated, Any, get_args
+from typing import TypeVar, Generic, List, Union, Generator, Callable, Annotated, Any
 from uuid import UUID
 
-from pydantic import ValidationError, Field, StringConstraints, TypeAdapter
+from pydantic import Field, StringConstraints, TypeAdapter
+from pydantic_core import ValidationError, InitErrorDetails
 from pydantic_core.core_schema import ValidationInfo
 
 from ul_api_utils.const import CRON_EXPRESSION_VALIDATION_REGEX, MIN_UTC_OFFSET_SECONDS, MAX_UTC_OFFSET_SECONDS
@@ -38,12 +39,13 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
     Note:
         Sent as a string, but interpreted as List.
     """
+    _contains_type: Any = None
 
-    def __init__(self, contains_type: QueryParamsSeparatedListValueType) -> None:
-        self.contains_type = contains_type
-
-    def __repr__(self) -> str:
-        return f'QueryParamsSeparatedList({super().__repr__()})'
+    @classmethod
+    def __class_getitem__(cls, item: Any) -> QueryParamsSeparatedListValueType:
+        new_cls = super().__class_getitem__(item)  # type: ignore
+        new_cls._contains_type = item
+        return new_cls
 
     @classmethod
     def __get_validators__(cls) -> Generator[Callable[[Union[List[str], str], ValidationInfo], List[QueryParamsSeparatedListValueType]], None, None]:
@@ -54,23 +56,29 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
         """
         Validate and convert the query parameter string into a list of the specified type.
         """
+        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]
 
         reader = csv.reader(query_param, skipinitialspace=True)
         splitted = next(reader)
 
-        adapter = TypeAdapter(get_args(cls)[0])
-
         validated_items = []
-        errors = []
+        errors: List[InitErrorDetails] = []
 
-        for value in splitted:
+        for idx, value in enumerate(splitted):
             try:
                 validated_items.append(adapter.validate_python(value))
             except ValidationError as e:
-                errors.append(e)
+                for error in e.errors(include_url=False):
+                    error['loc'] = ('param', idx)
+                    errors.append(error)  # type: ignore
+
         if errors:
-            raise ValidationError(errors)
+            raise ValidationError.from_exception_data("List validation error", errors)
 
         return validated_items

{ul-api-utils-8.1.5 → ul-api-utils-8.1.7}/ul_api_utils.egg-info/PKG-INFO

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

ul-api-utils-8.1.5/ul_api_utils/validators/__tests__/test_custom_fields.py

@@ -1,33 +0,0 @@
-import pytest
-
-from pydantic import BaseModel
-from typing import Union, List
-from ul_api_utils.validators.custom_fields import QueryParamsSeparatedList
-
-
-class ModelStr(BaseModel):
-    param: QueryParamsSeparatedList[str]
-
-
-class ModelInt(BaseModel):
-    param: QueryParamsSeparatedList[int]
-
-
-@pytest.mark.parametrize(
-    "model, input_data, expected_output",
-    [
-        pytest.param(ModelStr, "first_array_element,second,third,this", ["first_array_element", "second", "third", "this"]),
-        pytest.param(ModelStr, ["first_array_element,second,third,this"], ["first_array_element", "second", "third", "this"]),
-        pytest.param(ModelInt, "1,2,3,4,5", [1, 2, 3, 4, 5]),
-        pytest.param(ModelInt, ["1,2,3,4,5"], [1, 2, 3, 4, 5]),
-        pytest.param(ModelStr, 'first_array_element,"second,third",this', ["first_array_element", "second,third", "this"]),
-        pytest.param(ModelStr, ['first_array_element,"second,third",this'], ["first_array_element", "second,third", "this"]),
-        pytest.param(ModelStr, '"first_array_element,second,third",this, "1,2"', ["first_array_element,second,third", "this", "1,2"]),
-    ],
-)
-def test__query_params_separated_list(
-    model: Union[ModelStr, ModelInt], input_data: Union[List[str], str], expected_output: List[Union[str, int]],
-) -> None:
-    instance = model(param=input_data)  # type: ignore
-    assert isinstance(instance.param, list)
-    assert instance.param == expected_output