ul-api-utils 8.1.3__tar.gz → 8.1.4__tar.gz

{ul-api-utils-8.1.3 → ul-api-utils-8.1.4}/PKG-INFO

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

{ul-api-utils-8.1.3 → ul-api-utils-8.1.4}/example/workers/worker.py

@@ -1,6 +1,6 @@
-from unipipeline.message.uni_message import UniMessage
-from unipipeline.worker.uni_worker import UniWorker
-from unipipeline.worker.uni_worker_consumer_message import UniWorkerConsumerMessage
+from ul_unipipeline.message.uni_message import UniMessage
+from ul_unipipeline.worker.uni_worker import UniWorker
+from ul_unipipeline.worker.uni_worker_consumer_message import UniWorkerConsumerMessage
 
 from ul_api_utils.modules.worker_context import WorkerContext
 from ul_api_utils.modules.worker_sdk import WorkerSdk

{ul-api-utils-8.1.3 → ul-api-utils-8.1.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.1.3',
+    version='8.1.4',
     description='Python api utils',
     author='Unic-lab',
     long_description=long_description,
@@ -48,7 +48,7 @@ setup(
     ],
     platforms='any',
     install_requires=[
-        "ul-unipipeline>=2.0.0",
+        "ul-unipipeline==2.0.5",
         "jinja2==3.1.2",
         "flask==2.1.3",
         "flask-wtf==1.0.1",

{ul-api-utils-8.1.3 → ul-api-utils-8.1.4}/ul_api_utils/modules/worker_sdk.py

@@ -4,9 +4,9 @@ from datetime import datetime
 from typing import TypeVar, Callable, Any, Union, Dict, Optional, Tuple, TYPE_CHECKING
 
 from flask import Flask
-from unipipeline.message.uni_message import UniMessage
-from unipipeline.worker.uni_worker import UniWorker
-from unipipeline.worker.uni_worker_consumer_message import UniWorkerConsumerMessage
+from ul_unipipeline.message.uni_message import UniMessage
+from ul_unipipeline.worker.uni_worker import UniWorker
+from ul_unipipeline.worker.uni_worker_consumer_message import UniWorkerConsumerMessage
 
 from ul_api_utils.conf import APPLICATION_START_DT
 from ul_api_utils.modules.intermediate_state import try_init, try_configure

{ul-api-utils-8.1.3 → ul-api-utils-8.1.4}/ul_api_utils/resources/health_check/health_check.py

@@ -4,8 +4,8 @@ from typing import List, Callable, Any, Optional, Dict, TYPE_CHECKING, Tuple, Na
 
 from pydantic import model_validator, ConfigDict, Field, BaseModel, PositiveInt, TypeAdapter
 from sqlalchemy.sql import text
-from unipipeline.errors import UniError
-from unipipeline.modules.uni import Uni
+from ul_unipipeline.errors import UniError
+from ul_unipipeline.modules.uni import Uni
 
 from ul_api_utils.api_resource.api_response import JsonApiResponsePayload
 from ul_api_utils.errors import Client4XXInternalApiError, Server5XXInternalApiError

{ul-api-utils-8.1.3 → ul-api-utils-8.1.4}/ul_api_utils/utils/broker_topics_message_count.py

@@ -1,7 +1,7 @@
 from typing import NamedTuple, List, Optional
 
-from unipipeline.errors import UniError
-from unipipeline.modules.uni import Uni
+from ul_unipipeline.errors import UniError
+from ul_unipipeline.modules.uni import Uni
 
 
 class DataStreamStats(NamedTuple):

{ul-api-utils-8.1.3 → ul-api-utils-8.1.4}/ul_api_utils/validators/custom_fields.py

@@ -1,12 +1,16 @@
 import csv
-from typing import TypeVar, Generic, List, Union, Generator, Callable, Annotated, Any
+from typing import TypeVar, Generic, List, Union, Generator, Callable, Annotated, Any, get_args
+from uuid import UUID
 
-from pydantic import ValidationError, Field, StringConstraints
-from pydantic.v1.fields import ModelField
+from pydantic import ValidationError, Field, StringConstraints, TypeAdapter
+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
 
 NotEmptyListAnnotation = Annotated[list[Any], Field(min_length=1)]
+NotEmptyListStrAnnotation = Annotated[list[str], Field(min_length=1)]
+NotEmptyListIntAnnotation = Annotated[list[int], Field(min_length=1)]
+NotEmptyListUUIDAnnotation = Annotated[list[UUID], Field(min_length=1)]
 CronScheduleAnnotation = Annotated[str, StringConstraints(pattern=CRON_EXPRESSION_VALIDATION_REGEX)]
 WhiteSpaceStrippedStrAnnotation = Annotated[str, StringConstraints(strip_whitespace=True)]
 UTCOffsetSecondsAnnotation = Annotated[int, Field(ge=MIN_UTC_OFFSET_SECONDS, le=MAX_UTC_OFFSET_SECONDS)]
@@ -42,24 +46,31 @@ class QueryParamsSeparatedList(Generic[QueryParamsSeparatedListValueType]):
         return f'QueryParamsSeparatedList({super().__repr__()})'
 
     @classmethod
-    def __get_validators__(cls) -> Generator[Callable[[Union[List[str], str], ModelField], Union[List[QueryParamsSeparatedListValueType], List[str]]], None, None]:
+    def __get_validators__(cls) -> Generator[Callable[[Union[List[str], str], ValidationInfo], List[QueryParamsSeparatedListValueType]], None, None]:
         yield cls.validate
 
     @classmethod
-    def validate(cls, query_param: Union[List[str], str], field: ModelField) -> Union[List[QueryParamsSeparatedListValueType], List[str]]:
-        if not isinstance(query_param, List):
+    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 not isinstance(query_param, list):
             query_param = [query_param]
+
         reader = csv.reader(query_param, skipinitialspace=True)
         splitted = next(reader)
-        if not field.sub_fields:
-            return splitted
-        list_item = field.sub_fields[0]  # retrieving info about data type of the list
+
+        adapter = TypeAdapter(get_args(cls)[0])
+
+        validated_items = []
         errors = []
+
         for value in splitted:
-            validated_list_item, error = list_item.validate(value, {}, loc="separated query param")
-            if error:
-                errors.append(error)
+            try:
+                validated_items.append(adapter.validate_python(value))
+            except ValidationError as e:
+                errors.append(e)
         if errors:
-            raise ValidationError(errors, cls)
-        # Validation passed without errors, modify string to a list and cast the right type for every element
-        return [list_item.type_(value) for value in splitted]
+            raise ValidationError(errors)
+
+        return validated_items

{ul-api-utils-8.1.3 → ul-api-utils-8.1.4}/ul_api_utils.egg-info/PKG-INFO

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

{ul-api-utils-8.1.3 → ul-api-utils-8.1.4}/ul_api_utils.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ul-unipipeline>=2.0.0
+ul-unipipeline==2.0.5
 jinja2==3.1.2
 flask==2.1.3
 flask-wtf==1.0.1