ul-api-utils 8.0.2__tar.gz → 8.0.4__tar.gz

{ul-api-utils-8.0.2 → ul-api-utils-8.0.4}/PKG-INFO

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

{ul-api-utils-8.0.2 → ul-api-utils-8.0.4}/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.0.2',
+    version='8.0.4',
     description='Python api utils',
     author='Unic-lab',
     long_description=long_description,
@@ -88,7 +88,7 @@ setup(
         # "opentelemetry-instrumentation-requests==0.27b0",
         # "opentelemetry-exporter-jaeger==1.8.0",
         # "opentelemetry-instrumentation-sqlalchemy==0.27b0",
-        # "ul-db-utils==3.3.7",        # ACTUALIZE, BUT DO NOT UNCOMMENT PLEASE
+        # "ul-db-utils==4.0.2",        # ACTUALIZE, BUT DO NOT UNCOMMENT PLEASE
         # "ul-py-tool==2.1.2",        # ACTUALIZE, BUT DO NOT UNCOMMENT PLEASE
     ],
 )

{ul-api-utils-8.0.2 → ul-api-utils-8.0.4}/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-8.0.2 → ul-api-utils-8.0.4}/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-8.0.2 → ul-api-utils-8.0.4}/ul_api_utils/api_resource/api_response_payload_alias.py

@@ -1,6 +1,7 @@
 from datetime import datetime
+from types import NoneType
 
-from pydantic import UUID4
+from pydantic import UUID4, RootModel
 
 from ul_api_utils.api_resource.api_response import JsonApiResponsePayload
 
@@ -21,5 +22,5 @@ class ApiBaseUserModelPayloadResponse(JsonApiResponsePayload):
     is_alive: bool
 
 
-class ApiEmptyResponse(JsonApiResponsePayload):
-    __root__: None
+class ApiEmptyResponse(RootModel[NoneType]):  # type: ignore
+    pass

{ul-api-utils-8.0.2 → ul-api-utils-8.0.4}/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 → ul-api-utils-8.0.4}/ul_api_utils.egg-info/PKG-INFO

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