ul-api-utils 8.0.2__py3-none-any.whl → 8.0.3__py3-none-any.whl

ul_api_utils/api_resource/api_request.py

@@ -43,6 +43,7 @@ class ApiRequestQuery(BaseModel):
     page: Optional[int] = None
 
     @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_response.py

@@ -4,7 +4,7 @@ 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 ConfigDict
+from pydantic import ConfigDict, RootModel
 from pydantic import BaseModel
 from werkzeug import Response as BaseResponse
 
@@ -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])

ul_api_utils/validators/custom_fields.py

@@ -1,87 +1,23 @@
 import csv
 from typing import TypeVar, Generic, List, Union, Generator, Callable, Annotated, Any
 
-from pydantic import ValidationError, Field, BaseModel, \
-    StringConstraints
+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
 
 NotEmptyListAnnotation = Annotated[list[Any], Field(min_length=1)]
-
-class NotEmptyList(BaseModel):
-    """Type that can be used in pydantic field, that will validate empty lists."""
-    not_empty_list: NotEmptyListAnnotation
-
-
 CronScheduleAnnotation = Annotated[str, StringConstraints(pattern=CRON_EXPRESSION_VALIDATION_REGEX)]
-
-class CronScheduleStr(BaseModel):
-    """Type that can be used in pydantic field, that will validate cron-formatted strings."""
-    cron_schedule_str: CronScheduleAnnotation
-
-
 WhiteSpaceStrippedStrAnnotation = Annotated[str, StringConstraints(strip_whitespace=True)]
-
-class WhiteSpaceStrippedStr(BaseModel):
-    """Type that can be used in pydantic field, that will strip whitespaces strings."""
-    white_space_stripped_str: WhiteSpaceStrippedStrAnnotation
-
-
 UTCOffsetSecondsAnnotation = Annotated[int, Field(ge=MIN_UTC_OFFSET_SECONDS, le=MAX_UTC_OFFSET_SECONDS)]
-
-class UTCOffsetSeconds(BaseModel):
-    """Type that can be used for pydantic fields to represent the offset from UTC."""
-    utc_offset: UTCOffsetSecondsAnnotation
-
 PgTypePasswordStrAnnotation = Annotated[str, StringConstraints(min_length=6, max_length=72)]
-
-class PgTypePasswordStr(BaseModel):
-    """Type that can be used for pydantic fields to represent password with length from 6 to 72 characters."""
-    pg_type_password_str: PgTypePasswordStrAnnotation
-
-
 PgTypeShortStrAnnotation = Annotated[str, StringConstraints(min_length=0, max_length=255)]
-
-class PgTypeShortStr(BaseModel):
-    """Type that can be used for pydantic fields to represent short string with length from 0 to 255 characters."""
-    pg_type_short_str: PgTypeShortStrAnnotation
-
-
 PgTypeLongStrAnnotation = Annotated[str, StringConstraints(min_length=0, max_length=1000)]
-
-class PgTypeLongStr(BaseModel):
-    """Type that can be used for pydantic fields to represent short string with length from 0 to 1000 characters."""
-    pg_type_long_str: PgTypeLongStrAnnotation
-
-
 PgTypeInt32Annotation = Annotated[int, Field(ge=-2147483648, le=2147483648)]
-
-class PgTypeInt32(BaseModel):
-    """Type that can be used for pydantic fields to represent int32 number."""
-    pg_type_int32: PgTypeInt32Annotation
-
-
 PgTypePositiveInt32Annotation = Annotated[int, Field(ge=0, le=2147483648)]
-
-class PgTypePositiveInt32(BaseModel):
-    """Type that can be used for pydantic fields to represent positive int32 number."""
-    pg_type_positive_int32: PgTypePositiveInt32Annotation
-
-
 PgTypeInt16Annotation = Annotated[int, Field(ge=-32768, le=32768)]
-
-class PgTypeInt16(BaseModel):
-    """Type that can be used for pydantic fields to represent int16 (SMALLINT) number."""
-    pg_type_int16: PgTypeInt16Annotation
-
-
 PgTypePositiveInt16Annotation = Annotated[int, Field(ge=0, le=32768)]
 
-class PgTypePositiveInt16(BaseModel):
-    """Type that can be used for pydantic fields to represent positive int16 (SMALLINT) number."""
-    pg_type_positive_int16_annotation: PgTypePositiveInt16Annotation
-
 
 QueryParamsSeparatedListValueType = TypeVar('QueryParamsSeparatedListValueType')
 

{ul_api_utils-8.0.2.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.2
+Version: 8.0.3
 Summary: Python api utils
 Author: Unic-lab
 Author-email: 

{ul_api_utils-8.0.2.dist-info → ul_api_utils-8.0.3.dist-info}/RECORD

@@ -25,13 +25,13 @@ 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=NUyRNvCVwfePrfdn5ATFVfHeSO3iq4-Syeup4IAZGzs,4526
 ul_api_utils/api_resource/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/api_resource/api_request.py,sha256=shKTSI3SdyJl1i7nGouflMW4Qtf67OIlKUf4icZfm8Q,3286
+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=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=I3J8qyiegFxwZNnVe2LJyWTXEtux0wwzd8EGT69aO_o,9701
+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
@@ -143,14 +143,14 @@ ul_api_utils/utils/memory_db/errors.py,sha256=Bw1O1Y_WTCeCRNgb9iwrGT1fst6iHORhrN
 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=nb9ElW4XauSSxj6XHvHaCnplU7IHXhMdT4bYa3P7-hc,5027
+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.2.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-8.0.2.dist-info/METADATA,sha256=niCxGm0OM5O03QxcYVgWvvPR0zrTDqw2tQf9uUPAJ9U,14744
-ul_api_utils-8.0.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-8.0.2.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-8.0.2.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-8.0.2.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,,