ul-api-utils 8.1.20__py3-none-any.whl → 8.1.21__py3-none-any.whl

ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py

@@ -68,8 +68,8 @@ class SwaggerSchema(SwaggerModel):
             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())
-            if 'definitions' in json_schema:
-                del json_schema['definitions']
+            if '$defs' in json_schema:
+                del json_schema['$defs']
             self.type = json_schema['type']
             if json_schema['type'] == 'object':
                 self.properties = json_schema.get('properties', dict())
@@ -508,7 +508,7 @@ class SwaggerPath(SwaggerModel):
                     swagger_request_type.add_swagger_model(parameters)
                 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')
+                query_definitions = query_schema.get('$defs')
                 for parameter_name, parameter_spec in query_schema.get('properties').items():
                     if parameter_spec.get('type') is not None:
                         parameter_models.add(SwaggerQueryParameter(

ul_api_utils/utils/flask_swagger_generator/utils/replace_in_dict.py

@@ -5,7 +5,7 @@ def replace_value_in_dict(item: Union[List, Dict], original_schema):  # type: ig
     if isinstance(item, list):
         return [replace_value_in_dict(i, original_schema) for i in item]
     elif isinstance(item, dict):
-        if list(item.keys()) == ['$ref']:
+        if '$ref' in list(item.keys()):
             definitions = item['$ref'][2:].split('/')
             res = original_schema.copy()
             for definition in definitions:

ul_api_utils/validators/__tests__/test_custom_fields.py

@@ -1,32 +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
+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/validators/custom_fields.py

@@ -1,10 +1,8 @@
 import csv
-from typing import TypeVar, Generic, List, Union, Generator, Callable, Annotated, Any
+from typing import TypeVar, Generic, List, Union, Annotated, Any, get_args
 from uuid import UUID
 
-from pydantic import Field, StringConstraints, TypeAdapter
-from pydantic_core import ValidationError, InitErrorDetails
-from pydantic_core.core_schema import ValidationInfo
+from pydantic import Field, StringConstraints, BeforeValidator
 
 from ul_api_utils.const import CRON_EXPRESSION_VALIDATION_REGEX, MIN_UTC_OFFSET_SECONDS, MAX_UTC_OFFSET_SECONDS
 
@@ -29,56 +27,34 @@ PgTypePositiveInt64Annotation = Annotated[int, Field(ge=0, le=922337203685477580
 QueryParamsSeparatedListValueType = TypeVar('QueryParamsSeparatedListValueType')
 
 
-class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
-    """
-    Supports cases when query parameters are being sent as a string, but you have to assume
-    that it is a list.
-
-    F.E. Query string is ?foo=1,2
+def validate_query_params(value: Union[str, List[str]], type_: type) -> List[QueryParamsSeparatedListValueType]:
+    def process_item(item: str) -> QueryParamsSeparatedListValueType:
+        return type_(item.strip())
 
-    Note:
-        Sent as a string, but interpreted as List.
-    """
-    _contains_type: Any = None
+    if isinstance(value, list):
+        result: list[QueryParamsSeparatedListValueType] = []
+        for item in value:
+            if isinstance(item, str):
+                reader = csv.reader([item], skipinitialspace=True)
+                result.extend(process_item(sub_item) for row in reader for sub_item in row)
+            else:
+                raise ValueError("List items must be strings")
+    elif isinstance(value, str):
+        reader = csv.reader([value], skipinitialspace=True)
+        result = [process_item(item) for row in reader for item in row]
+    else:
+        raise ValueError("Value must be a string or a list of strings")
 
-    @classmethod
-    def __class_getitem__(cls, item: Any) -> QueryParamsSeparatedListValueType:
-        new_cls = super().__class_getitem__(item)  # type: ignore
-        new_cls._contains_type = item
-        return new_cls
+    return result
 
-    @classmethod
-    def __get_validators__(cls) -> Generator[Callable[[Union[List[str], str], ValidationInfo], List[QueryParamsSeparatedListValueType]], None, None]:
-        yield cls.validate
 
+class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
     @classmethod
-    def validate(cls, query_param: Union[List[str], str], info: ValidationInfo) -> List[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)
-
-        validated_items = []
-        errors: List[InitErrorDetails] = []
-
-        for idx, value in enumerate(splitted):
-            try:
-                validated_items.append(adapter.validate_python(value))
-            except ValidationError as e:
-                for error in e.errors(include_url=False):
-                    error['loc'] = ('param', idx)
-                    errors.append(error)  # type: ignore
-
-        if errors:
-            raise ValidationError.from_exception_data("List validation error", errors)
-
-        return validated_items
+    def __get_pydantic_core_schema__(cls, source_type: type, handler: Any) -> Any:
+        inner_type = get_args(source_type)[0]
+        return handler(
+            Annotated[
+                List[inner_type],  # type: ignore
+                BeforeValidator(lambda x: validate_query_params(x, inner_type))
+            ]
+        )

{ul_api_utils-8.1.20.dist-info → ul_api_utils-8.1.21.dist-info}/METADATA

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

{ul_api_utils-8.1.20.dist-info → ul_api_utils-8.1.21.dist-info}/RECORD

@@ -126,12 +126,12 @@ ul_api_utils/utils/flask_swagger_generator/exceptions.py,sha256=yA4IsUyxh5puyoYz
 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=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=4zkH3P41DwPXsriJISc7aL0IYjKR7yKfoKAzf9arQW0,30837
+ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py,sha256=jPdy2zHAg9BjRzU0rrqiosfMir0pjdrPfrp1rEQHVj0,30819
 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
 ul_api_utils/utils/flask_swagger_generator/utils/parameter_type.py,sha256=bTE_kDUPNYL7Qr1AV_h4pXEWiLeiVYVFBxAWMkLYzPU,1557
-ul_api_utils/utils/flask_swagger_generator/utils/replace_in_dict.py,sha256=B8FyQDRGLL8wQ8e7maq3PfHLffNSGSMu-EOqX4YKrUE,744
+ul_api_utils/utils/flask_swagger_generator/utils/replace_in_dict.py,sha256=xGF78881vi8xAWbJ9eaqBzsuMFHSJGZNYlm6bmC-5jk,742
 ul_api_utils/utils/flask_swagger_generator/utils/request_type.py,sha256=fx4ltfODfYmXx3i31BTZGAtwzrMqYbk48VQavQirFa8,1504
 ul_api_utils/utils/flask_swagger_generator/utils/schema_type.py,sha256=NqFRHjSWZgg6fNYE-CG7vwLa57ie9WjooB2YfVTs4UM,294
 ul_api_utils/utils/flask_swagger_generator/utils/security_type.py,sha256=AcWOQZBbUPXZyyTbmGFRt5p4Jx1uwETuxNRtXXht16I,1148
@@ -143,14 +143,14 @@ ul_api_utils/utils/memory_db/errors.py,sha256=Bw1O1Y_WTCeCRNgb9iwrGT1fst6iHORhrN
 ul_api_utils/utils/memory_db/repository.py,sha256=0AI0-VA4Md54BrAuZLX0Lg7rxyyGv54aWiiNUPycGSA,3760
 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=LKmsn2R66BRPaDiZDqXmC7wCKxDK8OTD1Jk8fFj0_So,3778
+ul_api_utils/validators/custom_fields.py,sha256=6pNvwHMhup9pqGOvqp57UsPAfmgvVyLujBKooBY-C1I,2998
 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=20gLlnm1Ithsbbz3NIUXVAd92lW6YwVRSg_nETZhfaI,1442
-ul_api_utils-8.1.20.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-8.1.20.dist-info/METADATA,sha256=IONVhL5edzm6_2zC81Lpf6ZVfFotaansSZqSO_6v1Uw,14748
-ul_api_utils-8.1.20.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-8.1.20.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-8.1.20.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-8.1.20.dist-info/RECORD,,
+ul_api_utils/validators/__tests__/test_custom_fields.py,sha256=omXI_PPefDfCehEVJxEevep8phY6aySjLnpW_usT85U,1385
+ul_api_utils-8.1.21.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
+ul_api_utils-8.1.21.dist-info/METADATA,sha256=dvWXhY1fsuIeO5nNOuMcjrsAx8g0ySsgNhnN-j-CJmk,14748
+ul_api_utils-8.1.21.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ul_api_utils-8.1.21.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
+ul_api_utils-8.1.21.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
+ul_api_utils-8.1.21.dist-info/RECORD,,