explicit-python-dlq 1.2.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

explicit/dlq/config.py

@@ -7,10 +7,6 @@ from typing import (
     TYPE_CHECKING,
 )
 
-from pydantic import (
-    ConfigDict,
-)
-
 from explicit.dlq.domain import (
     commands,
 )
@@ -35,8 +31,6 @@ if TYPE_CHECKING:
 class DLQConfig:
     """Конфигурация DLQ."""
 
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
     bus: 'MessageBus'
     repository: 'AbstractDLQRepository'
     message_dispatcher: 'DLQMessageDispatcher'

explicit/dlq/contrib/django/adapters/db.py

@@ -1,9 +1,10 @@
 """Адаптеры для работы с Dead Letter Queue (DLQ) в базе данных."""
 
+from collections.abc import (
+    Iterator,
+)
 from typing import (
     TYPE_CHECKING,
-    Iterator,
-    Union,
 )
 
 from django.core.exceptions import (
@@ -95,7 +96,7 @@ class Repository(AbstractDLQRepository):
         for db_instance in self._base_qs.iterator():
             yield self._to_domain(db_instance)
 
-    def get_object_by_id(self, identifier: 'Union[UUID, str]') -> DeadLetter:
+    def get_object_by_id(self, identifier: 'UUID | str') -> DeadLetter:
         """Получить сообщение по идентификатору."""
         try:
             db_instance = self._base_qs.get(pk=identifier)

explicit/dlq/contrib/django/models.py

@@ -12,8 +12,12 @@ from django.db import (
 )
 
 from explicit.dlq.domain.model import (
+    TOPIC_MAX_LENGTH,
     DeadLetter as DomainDeadLetter,
 )
+from explicit.domain import (
+    get_field_title,
+)
 
 
 if DJANGO_VERSION >= (4, 0):
@@ -27,12 +31,18 @@ else:
 class DeadLetter(models.Model):
     """Недоставленное/необработанное сообщение."""
 
-    id = models.UUIDField(primary_key=True, default=uuid4, editable=False, verbose_name=DomainDeadLetter.id.title)
-    raw_message_value = models.BinaryField(verbose_name=DomainDeadLetter.raw_message_value.title)
-    raw_message_key = models.BinaryField(verbose_name=DomainDeadLetter.raw_message_key.title, null=True, blank=True)
-    topic = models.CharField(verbose_name=DomainDeadLetter.topic.title, max_length=DomainDeadLetter.topic.max_length)
-    attempts = JSONField(verbose_name=DomainDeadLetter.attempts.title)
-    processed_at = models.DateTimeField(verbose_name=DomainDeadLetter.processed_at.title, null=True, blank=True)
+    id = models.UUIDField(
+        primary_key=True, default=uuid4, editable=False, verbose_name=get_field_title(DomainDeadLetter, 'id')
+    )
+    raw_message_value = models.BinaryField(verbose_name=get_field_title(DomainDeadLetter, 'raw_message_value'))
+    raw_message_key = models.BinaryField(
+        verbose_name=get_field_title(DomainDeadLetter, 'raw_message_key'), null=True, blank=True
+    )
+    topic = models.CharField(verbose_name=get_field_title(DomainDeadLetter, 'topic'), max_length=TOPIC_MAX_LENGTH)
+    attempts = JSONField(verbose_name=get_field_title(DomainDeadLetter, 'attempts'))
+    processed_at = models.DateTimeField(
+        verbose_name=get_field_title(DomainDeadLetter, 'processed_at'), null=True, blank=True
+    )
 
     # служебные поля используемые для фильтрации и сортировки, чтобы не лезть в json
     _first_attempted_at = models.DateTimeField(db_index=True)

explicit/dlq/domain/commands.py

@@ -1,12 +1,13 @@
 """Команды DLQ."""
 
-from typing import (
-    Optional,
-)
 from uuid import (
     UUID,
 )
 
+from pydantic import (
+    ConfigDict,
+)
+
 from explicit.messagebus.commands import (
     Command,
 )
@@ -15,14 +16,13 @@ from explicit.messagebus.commands import (
 class RegisterDeadLetter(Command):
     """Зарегистрировать сообщение, которое не удалось обработать."""
 
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     topic: str
     raw_message_value: bytes
-    raw_message_key: Optional[bytes] = None
+    raw_message_key: bytes | None = None
     exception: Exception
 
-    class Config:  # noqa: D106
-        arbitrary_types_allowed = True
-
 
 class ProcessDeadLetter(Command):
     """Выполнить попытку обработки сообщения."""

explicit/dlq/domain/factories.py

@@ -5,9 +5,6 @@ from datetime import (
     datetime,
     timezone,
 )
-from typing import (
-    Union,
-)
 
 from explicit.domain import (
     Str,
@@ -21,9 +18,6 @@ from explicit.domain.model import (
     Unset,
     unset,
 )
-from explicit.domain.types import (
-    NoneStr,
-)
 
 from .model import (
     Attempt,
@@ -34,7 +28,7 @@ from .model import (
 class AttemptDTO(DTOBase):
     """Объект передачи данных о попытке обработки сообщения."""
 
-    failed_at: Union[datetime, Unset] = unset
+    failed_at: datetime | Unset = unset
     error_message: Str = unset
     traceback: Str = unset
 
@@ -43,11 +37,11 @@ class DeadLetterDTO(DTOBase):
     """Объект передачи данных о необработанном сообщении."""
 
     id: UnsetUUID = unset
-    raw_message_value: Union[bytes, Unset] = unset
-    raw_message_key: NoneStr = unset
+    raw_message_value: bytes | Unset = unset
+    raw_message_key: bytes | None | Unset = unset
     topic: Str = unset
-    attempts: Union[list[AttemptDTO], Unset] = unset
-    processed_at: Union[datetime, None, Unset] = unset
+    attempts: list[AttemptDTO] | Unset = unset
+    processed_at: datetime | None | Unset = unset
 
 
 class Factory(AbstractDomainFactory):
@@ -55,7 +49,7 @@ class Factory(AbstractDomainFactory):
 
     def create(self, data: DeadLetterDTO) -> DeadLetter:
         """Создать DLQ из DTO."""
-        params = data.dict()
+        params = data.model_dump()
 
         return DeadLetter(**params)
 
@@ -68,7 +62,7 @@ class Factory(AbstractDomainFactory):
         )
 
     def create_from_exception(
-        self, raw_message_value: bytes, raw_message_key: Union[bytes, None], topic: str, exception: Exception
+        self, raw_message_value: bytes, raw_message_key: bytes | None, topic: str, exception: Exception
     ) -> DeadLetter:
         """Создать DLQ из исключения."""
         attempt = self.create_attempt_from_exception(exception)

explicit/dlq/domain/model.py

@@ -7,13 +7,11 @@ from datetime import (
 )
 from typing import (
     TYPE_CHECKING,
-    Optional,
-    Union,
 )
 
 from pydantic import (
     Field,
-    validator,
+    field_validator,
 )
 
 from explicit.contrib.domain.model import (
@@ -22,9 +20,16 @@ from explicit.contrib.domain.model import (
 
 
 if TYPE_CHECKING:
-    from dataclasses import dataclass  # noqa
+    from dataclasses import (
+        dataclass,
+    )
 else:
-    from pydantic.dataclasses import dataclass  # noqa
+    from pydantic.dataclasses import (
+        dataclass,
+    )
+
+
+TOPIC_MAX_LENGTH = 256
 
 
 class DeadLetterNotFound(Exception):  # noqa: N818
@@ -49,12 +54,14 @@ class DeadLetter:
 
     id: uuid.UUID = uuid_identifier()
     raw_message_value: bytes = Field(title='Содержимое сообщения')
-    raw_message_key: Union[bytes, None] = Field(title='Ключ сообщения', default=None)
-    topic: str = Field(title='Топик сообщения', max_length=256)
-    attempts: tuple[Attempt, ...] = Field(default_factory=tuple, title='Попытки обработки сообщения')
-    processed_at: Optional[datetime] = Field(default=None, title='Время успешной обработки сообщения')
-
-    @validator('attempts', always=True)
+    raw_message_key: bytes | None = Field(title='Ключ сообщения', default=None)
+    topic: str = Field(title='Топик сообщения', max_length=TOPIC_MAX_LENGTH)
+    attempts: tuple[Attempt, ...] = Field(
+        default_factory=tuple, validate_default=True, title='Попытки обработки сообщения'
+    )
+    processed_at: datetime | None = Field(default=None, title='Время успешной обработки сообщения')
+
+    @field_validator('attempts')
     @classmethod
     def _validate_attempts(cls, value):
         if not value:

explicit/dlq/domain/services.py

@@ -1,9 +1,5 @@
 """Сервисы предметной области для работы с DLQ."""
 
-from typing import (
-    Optional,
-)
-
 from explicit.unit_of_work import (
     AbstractUnitOfWork,
 )
@@ -19,7 +15,7 @@ from .model import (
 
 def register_dead_letter(
     raw_message_value: bytes,
-    raw_message_key: Optional[bytes],
+    raw_message_key: bytes | None,
     topic: str,
     exception: Exception,
     uow: 'AbstractUnitOfWork',

explicit/dlq/infrastructure/handlers.py

@@ -3,9 +3,6 @@
 from contextlib import (
     AbstractContextManager,
 )
-from typing import (
-    Optional,
-)
 
 from explicit.dlq.domain.commands import (
     RegisterDeadLetter,
@@ -40,7 +37,7 @@ class RegisterInDLQOnFailure(AbstractContextManager):
         bus: 'MessageBus',
         topic: str,
         raw_message_value: bytes,
-        raw_message_key: Optional[bytes] = None,
+        raw_message_key: bytes | None = None,
     ):
         self._bus = bus
         self._topic = topic

{explicit_python_dlq-1.2.0.dist-info → explicit_python_dlq-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: explicit-python-dlq
-Version: 1.2.0
+Version: 2.0.0
 Summary: Набор компонентов реализующих DQL для систем на базе explicit
 Author-email: "АО \"БАРС Груп\"" <education_dev@bars-open.ru>
 Classifier: Intended Audience :: Developers
@@ -8,18 +8,18 @@ Classifier: Environment :: Web Environment
 Classifier: Natural Language :: Russian
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: explicit-python<3,>=2.2.1
+Requires-Dist: explicit-python<4,>=3
 Provides-Extra: dev
 Requires-Dist: freezegun; extra == "dev"
 Provides-Extra: django
-Requires-Dist: explicit-python-django<2.0,>=1.0.2; extra == "django"
+Requires-Dist: explicit-python-django<3,>=2; extra == "django"
 Provides-Extra: rest
 Requires-Dist: djangorestframework>=3.13.0; extra == "rest"
 Requires-Dist: django_filter>=23.3; extra == "rest"

{explicit_python_dlq-1.2.0.dist-info → explicit_python_dlq-2.0.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 explicit/dlq/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-explicit/dlq/config.py,sha256=zpZrXqpIWPNzr6TBqvZ5Gs2tDwRVh0U43E1nIRGCm-E,1488
+explicit/dlq/config.py,sha256=GcB6tJop2CYC49IlgEPBmE7iISLaNpuhJ5Qmk9oV7hY,1385
 explicit/dlq/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 explicit/dlq/types.py,sha256=aVqdsdKZ-U_5TD3dpLtzksyL3jVedIhJnu7IihW3vh4,544
 explicit/dlq/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,9 +8,9 @@ explicit/dlq/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 explicit/dlq/contrib/django/README.md,sha256=TE9tt1M1qDQIgMegeQgesVeyLC1ajBbVjINGYDxpJcI,1266
 explicit/dlq/contrib/django/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 explicit/dlq/contrib/django/apps.py,sha256=WDloauYls-krHbJOp_brpS8WifMyK8O59eUTSQDZROU,263
-explicit/dlq/contrib/django/models.py,sha256=Zh9MTkkXaL1Pt5kwh9IFYnE29HXrd6QJxYWClxtyz6o,1772
+explicit/dlq/contrib/django/models.py,sha256=eu_sobtXL1Q1xrJ9St7HiT-N6_JGgd0aEwMBRGXg_vE,1956
 explicit/dlq/contrib/django/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-explicit/dlq/contrib/django/adapters/db.py,sha256=6ta3IRLknO_J5vwvF1mJWVZqCziqmy7cfbhiiM8cjDk,3309
+explicit/dlq/contrib/django/adapters/db.py,sha256=IdJGnbtzRNyTcClLR5Gf3S5-HkCFRDJs9SPddh06iHs,3324
 explicit/dlq/contrib/django/migrations/0001_initial.py,sha256=sDjCDZl1RvR_oOhBvftbW3LvRf6FbuLmRF_eQ-dauhM,2133
 explicit/dlq/contrib/django/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 explicit/dlq/contrib/drf/README.md,sha256=0VlBusFcswT8i9FnCV_llkhDJlFCHQ7ih0qFb_hc7FU,747
@@ -18,15 +18,15 @@ explicit/dlq/contrib/drf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 explicit/dlq/contrib/drf/serializers.py,sha256=zNASKGtXbw5unWqMJgDaqITwtVAsW54liJsXoK4FRBU,1774
 explicit/dlq/contrib/drf/views.py,sha256=xBRUSzBbZ10PL8bHktZLosR-Tw-Q9jgN1n76oQmqLa4,2099
 explicit/dlq/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-explicit/dlq/domain/commands.py,sha256=v94uHQvGd-rX08_Paq9FEC-RSmsBaZMS9qxu6dHfzTo,803
-explicit/dlq/domain/factories.py,sha256=5tNLTTggBA4JGm66wtiSjGrUGvvdh9ZZB6DXp5ax0pY,2270
-explicit/dlq/domain/model.py,sha256=GBiDRGk4wpDZQqawZwNEtpHwS25YL_idvvkFNpajFvA,2291
-explicit/dlq/domain/services.py,sha256=2HUZb3aL3ZAH01_lpvRcGLffVjdmiB0VV-ZxX5m8x60,2051
+explicit/dlq/domain/commands.py,sha256=X94H6DrUtaArdGArUR-VxQQNpfHvg9u5hRnwgMboG58,794
+explicit/dlq/domain/factories.py,sha256=7p3niFzPeghhAY6Vk1F6DlUahGk66o-PNVJzg4sfKw0,2175
+explicit/dlq/domain/model.py,sha256=YUtLtLvtsXR_mxxopVv4XtEOO7n_EQwMZ6AxxwMj2l0,2349
+explicit/dlq/domain/services.py,sha256=DCuTZXPGQLBhWQMYRyO_RiUlYLd71QCVRtOeCDUET5A,2010
 explicit/dlq/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-explicit/dlq/infrastructure/handlers.py,sha256=_1ZP8XtxkKgtDvLFZHVePHMkwtz1vhzNQJv2611pgfQ,2324
+explicit/dlq/infrastructure/handlers.py,sha256=uQ05w0_9RyOfh8HQB4GtNcgENfWXSa-3h4IsLa6BwzE,2284
 explicit/dlq/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 explicit/dlq/services/handlers.py,sha256=U6y4ElqXi1VocS3SE3SvwK69MMApAXILJes-xDbk_Ps,3232
-explicit_python_dlq-1.2.0.dist-info/METADATA,sha256=E3J7G9xlD8efhqtMiqTlqzDGyhb5xf-BiyV-uCN5YOQ,5490
-explicit_python_dlq-1.2.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-explicit_python_dlq-1.2.0.dist-info/top_level.txt,sha256=tt6T8l4Yji4ww87qZQcD4CbcwTIHy7NAPmU7QAfMcpY,9
-explicit_python_dlq-1.2.0.dist-info/RECORD,,
+explicit_python_dlq-2.0.0.dist-info/METADATA,sha256=Z9SM9ki1Yg5c_J4oNi3L7gFx6_NIEQlCdXb7FSuaTVo,5482
+explicit_python_dlq-2.0.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+explicit_python_dlq-2.0.0.dist-info/top_level.txt,sha256=tt6T8l4Yji4ww87qZQcD4CbcwTIHy7NAPmU7QAfMcpY,9
+explicit_python_dlq-2.0.0.dist-info/RECORD,,