explicit-python 2.5.0__py3-none-any.whl → 3.0.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- explicit/adapters/db.py +8 -5
- explicit/adapters/fs.py +4 -2
- explicit/adapters/messaging.py +5 -3
- explicit/contrib/domain/model/__init__.py +5 -2
- explicit/contrib/domain/model/fields.py +11 -10
- explicit/contrib/messagebus/event_registry.py +19 -13
- explicit/domain/__init__.py +46 -22
- explicit/domain/factories.py +8 -8
- explicit/domain/fields.py +31 -4
- explicit/domain/model.py +66 -58
- explicit/domain/types.py +17 -13
- explicit/domain/validation/exceptions.py +31 -20
- explicit/messagebus/__init__.py +3 -1
- explicit/messagebus/commands.py +24 -34
- explicit/messagebus/dependency_injection.py +13 -13
- explicit/messagebus/events.py +47 -47
- explicit/messagebus/exceptions.py +3 -1
- explicit/messagebus/messagebus.py +24 -15
- explicit/messagebus/queries.py +15 -16
- explicit/unit_of_work.py +15 -25
- {explicit_python-2.5.0.dist-info → explicit_python-3.0.0.dist-info}/METADATA +10 -9
- explicit_python-3.0.0.dist-info/RECORD +31 -0
- explicit_python-2.5.0.dist-info/RECORD +0 -31
- {explicit_python-2.5.0.dist-info → explicit_python-3.0.0.dist-info}/WHEEL +0 -0
- {explicit_python-2.5.0.dist-info → explicit_python-3.0.0.dist-info}/licenses/LICENSE +0 -0
- {explicit_python-2.5.0.dist-info → explicit_python-3.0.0.dist-info}/top_level.txt +0 -0
explicit/adapters/db.py
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"""Абстракции адаптера СУБД."""
|
|
2
|
-
from abc import ABCMeta
|
|
3
|
-
from abc import abstractmethod
|
|
4
|
-
from typing import Any
|
|
5
2
|
|
|
3
|
+
from abc import (
|
|
4
|
+
ABCMeta,
|
|
5
|
+
abstractmethod,
|
|
6
|
+
)
|
|
7
|
+
from typing import (
|
|
8
|
+
Any,
|
|
9
|
+
)
|
|
6
10
|
|
|
7
|
-
class AbstractSpecification(metaclass=ABCMeta):
|
|
8
11
|
|
|
12
|
+
class AbstractSpecification(metaclass=ABCMeta):
|
|
9
13
|
"""Набор условий для проверки соответствия объекта этим условиям."""
|
|
10
14
|
|
|
11
15
|
@abstractmethod
|
|
@@ -18,7 +22,6 @@ class AbstractSpecification(metaclass=ABCMeta):
|
|
|
18
22
|
|
|
19
23
|
|
|
20
24
|
class AbstractRepository(metaclass=ABCMeta):
|
|
21
|
-
|
|
22
25
|
"""Репозиторий - абстракция над хранилищем данных (БД).
|
|
23
26
|
|
|
24
27
|
Должен содержать методы получения объектов со всеми вариантами выборки:
|
explicit/adapters/fs.py
CHANGED
explicit/adapters/messaging.py
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"""Абстракции адаптера обмена сообщениями."""
|
|
2
|
-
from abc import ABC
|
|
3
|
-
from abc import abstractmethod
|
|
4
2
|
|
|
3
|
+
from abc import (
|
|
4
|
+
ABC,
|
|
5
|
+
abstractmethod,
|
|
6
|
+
)
|
|
5
7
|
|
|
6
|
-
class AbstractAdapter(ABC):
|
|
7
8
|
|
|
9
|
+
class AbstractAdapter(ABC):
|
|
8
10
|
@abstractmethod
|
|
9
11
|
def publish(self, message, *args, **kwargs):
|
|
10
12
|
raise NotImplementedError()
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"""Поля модели предметной области."""
|
|
2
|
-
from uuid import uuid4
|
|
3
2
|
|
|
4
|
-
from
|
|
3
|
+
from uuid import (
|
|
4
|
+
uuid4,
|
|
5
|
+
)
|
|
6
|
+
|
|
7
|
+
from pydantic.fields import (
|
|
8
|
+
Field,
|
|
9
|
+
)
|
|
5
10
|
|
|
6
11
|
|
|
7
12
|
def identifier(**kwargs):
|
|
@@ -9,12 +14,10 @@ def identifier(**kwargs):
|
|
|
9
14
|
None,
|
|
10
15
|
title='Идентификатор',
|
|
11
16
|
description=(
|
|
12
|
-
'Идентификатор записи. '
|
|
13
|
-
'Может отсутствовать у создаваемых объектов, '
|
|
14
|
-
'но обязан присутствовать у существующих.'
|
|
17
|
+
'Идентификатор записи. Может отсутствовать у создаваемых объектов, но обязан присутствовать у существующих.'
|
|
15
18
|
),
|
|
16
19
|
gt=0,
|
|
17
|
-
**kwargs
|
|
20
|
+
**kwargs,
|
|
18
21
|
)
|
|
19
22
|
|
|
20
23
|
|
|
@@ -23,9 +26,7 @@ def uuid_identifier(**kwargs):
|
|
|
23
26
|
default_factory=uuid4,
|
|
24
27
|
title='Идентификатор UUID',
|
|
25
28
|
description=(
|
|
26
|
-
'Идентификатор записи. '
|
|
27
|
-
'Может отсутствовать у создаваемых объектов, '
|
|
28
|
-
'но обязан присутствовать у существующих.'
|
|
29
|
+
'Идентификатор записи. Может отсутствовать у создаваемых объектов, но обязан присутствовать у существующих.'
|
|
29
30
|
),
|
|
30
|
-
**kwargs
|
|
31
|
+
**kwargs,
|
|
31
32
|
)
|
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
"""Реестр событий по топикам."""
|
|
2
|
-
|
|
3
|
-
from dataclasses import dataclass
|
|
4
|
-
from typing import TYPE_CHECKING
|
|
5
|
-
from typing import Dict
|
|
6
|
-
from typing import Type
|
|
7
|
-
from typing import Union
|
|
2
|
+
|
|
8
3
|
import logging
|
|
4
|
+
from collections import (
|
|
5
|
+
defaultdict,
|
|
6
|
+
)
|
|
7
|
+
from dataclasses import (
|
|
8
|
+
dataclass,
|
|
9
|
+
)
|
|
10
|
+
from typing import (
|
|
11
|
+
TYPE_CHECKING,
|
|
12
|
+
)
|
|
9
13
|
|
|
10
14
|
|
|
11
15
|
if TYPE_CHECKING:
|
|
12
|
-
from explicit.messagebus.events import
|
|
16
|
+
from explicit.messagebus.events import (
|
|
17
|
+
Event,
|
|
18
|
+
)
|
|
13
19
|
|
|
14
20
|
logger = logging.getLogger(__name__)
|
|
15
21
|
logger.setLevel(logging.INFO)
|
|
@@ -28,21 +34,21 @@ class Message:
|
|
|
28
34
|
|
|
29
35
|
|
|
30
36
|
class Registry:
|
|
31
|
-
|
|
32
37
|
"""Реестр событий по топикам."""
|
|
33
38
|
|
|
34
|
-
_registry:
|
|
39
|
+
_registry: dict[str, list[type['Event']]]
|
|
35
40
|
|
|
36
41
|
def __init__(self):
|
|
37
42
|
self._registry = defaultdict(list)
|
|
38
43
|
|
|
39
|
-
def register(self, topic: str, *events:
|
|
44
|
+
def register(self, topic: str, *events: type['Event']) -> None:
|
|
40
45
|
"""Регистрирует сопоставление топика с типом события."""
|
|
41
46
|
self._registry[topic].extend(events)
|
|
42
47
|
|
|
43
|
-
def resolve(self, message: Message) ->
|
|
44
|
-
"""
|
|
45
|
-
|
|
48
|
+
def resolve(self, message: Message) -> 'Event | None':
|
|
49
|
+
"""Определяет подходящий тип события.
|
|
50
|
+
|
|
51
|
+
Возвращает экземпляр для передачи на обработку в шину событий либо None.
|
|
46
52
|
"""
|
|
47
53
|
event = None
|
|
48
54
|
|
explicit/domain/__init__.py
CHANGED
|
@@ -1,28 +1,52 @@
|
|
|
1
1
|
"""Объекты предметной области."""
|
|
2
|
-
|
|
3
|
-
from .factories import
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
from .
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
from .
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
from .types import
|
|
19
|
-
|
|
20
|
-
|
|
2
|
+
|
|
3
|
+
from .factories import (
|
|
4
|
+
AbstractDomainFactory,
|
|
5
|
+
DTOBase,
|
|
6
|
+
)
|
|
7
|
+
from .fields import (
|
|
8
|
+
Field,
|
|
9
|
+
get_field_title,
|
|
10
|
+
)
|
|
11
|
+
from .model import (
|
|
12
|
+
HasUnsetValues,
|
|
13
|
+
Unset,
|
|
14
|
+
asdict,
|
|
15
|
+
is_unset,
|
|
16
|
+
unset,
|
|
17
|
+
)
|
|
18
|
+
from .types import (
|
|
19
|
+
Bool,
|
|
20
|
+
Date,
|
|
21
|
+
Int,
|
|
22
|
+
NoneBool,
|
|
23
|
+
NoneDate,
|
|
24
|
+
NoneInt,
|
|
25
|
+
NoneStr,
|
|
26
|
+
NoneUnsetUUID,
|
|
27
|
+
Str,
|
|
28
|
+
UnsetUUID,
|
|
29
|
+
)
|
|
21
30
|
|
|
22
31
|
|
|
23
32
|
__all__ = [
|
|
24
|
-
'AbstractDomainFactory',
|
|
25
|
-
'
|
|
33
|
+
'AbstractDomainFactory',
|
|
34
|
+
'DTOBase',
|
|
35
|
+
'Unset',
|
|
36
|
+
'unset',
|
|
37
|
+
'is_unset',
|
|
38
|
+
'HasUnsetValues',
|
|
39
|
+
'asdict',
|
|
26
40
|
'Field',
|
|
27
|
-
'
|
|
41
|
+
'get_field_title',
|
|
42
|
+
'UnsetUUID',
|
|
43
|
+
'Bool',
|
|
44
|
+
'Date',
|
|
45
|
+
'Int',
|
|
46
|
+
'NoneBool',
|
|
47
|
+
'NoneDate',
|
|
48
|
+
'NoneInt',
|
|
49
|
+
'NoneStr',
|
|
50
|
+
'NoneUnsetUUID',
|
|
51
|
+
'Str',
|
|
28
52
|
]
|
explicit/domain/factories.py
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
"""Объекты передачи данных."""
|
|
2
|
-
|
|
3
|
-
from abc import
|
|
2
|
+
|
|
3
|
+
from abc import (
|
|
4
|
+
ABCMeta,
|
|
5
|
+
abstractmethod,
|
|
6
|
+
)
|
|
4
7
|
|
|
5
8
|
from pydantic.main import BaseModel # pylint: disable=no-name-in-module
|
|
6
9
|
|
|
7
|
-
from .model import
|
|
10
|
+
from .model import (
|
|
11
|
+
HasUnsetValues,
|
|
12
|
+
)
|
|
8
13
|
|
|
9
14
|
|
|
10
15
|
class DTOBase(HasUnsetValues, BaseModel):
|
|
11
|
-
|
|
12
16
|
"""Базовый объект передачи данных.
|
|
13
17
|
|
|
14
18
|
.. code-block::python
|
|
@@ -18,12 +22,8 @@ class DTOBase(HasUnsetValues, BaseModel):
|
|
|
18
22
|
|
|
19
23
|
"""
|
|
20
24
|
|
|
21
|
-
class Config:
|
|
22
|
-
arbitrary_types_allowed = False
|
|
23
|
-
|
|
24
25
|
|
|
25
26
|
class AbstractDomainFactory(metaclass=ABCMeta):
|
|
26
|
-
|
|
27
27
|
@abstractmethod
|
|
28
28
|
def create(self, data):
|
|
29
29
|
"""Сборка объекта модели предметной области из переданных данных.
|
explicit/domain/fields.py
CHANGED
|
@@ -1,9 +1,36 @@
|
|
|
1
1
|
"""Набор полей объектов предметной области."""
|
|
2
|
-
from functools import partial
|
|
3
2
|
|
|
4
|
-
from
|
|
3
|
+
from functools import (
|
|
4
|
+
partial,
|
|
5
|
+
)
|
|
5
6
|
|
|
6
|
-
from
|
|
7
|
+
from pydantic import (
|
|
8
|
+
Field as DefaultField,
|
|
9
|
+
)
|
|
7
10
|
|
|
11
|
+
from .model import (
|
|
12
|
+
unset,
|
|
13
|
+
)
|
|
8
14
|
|
|
9
|
-
|
|
15
|
+
|
|
16
|
+
Field = partial(DefaultField, default=unset) # pylint: disable=invalid-name
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
def get_field_title(cls: type, name: str) -> str:
|
|
20
|
+
"""Возвращает заголовок поля pydantic-модели или pydantic-датакласса.
|
|
21
|
+
|
|
22
|
+
Если заголовок не задан, возвращает имя поля.
|
|
23
|
+
|
|
24
|
+
.. code-block:: python
|
|
25
|
+
|
|
26
|
+
@dataclass
|
|
27
|
+
class User:
|
|
28
|
+
username: str = Field(title='Логин')
|
|
29
|
+
email: str
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
get_field_title(User, 'username') == 'Логин'
|
|
33
|
+
get_field_title(User, 'email') == 'email'
|
|
34
|
+
|
|
35
|
+
"""
|
|
36
|
+
return cls.__pydantic_fields__[name].title or name # type: ignore[attr-defined]
|
explicit/domain/model.py
CHANGED
|
@@ -1,21 +1,34 @@
|
|
|
1
1
|
"""Вспомогательные утилиты и типы предметной области."""
|
|
2
|
-
from dataclasses import asdict as asdict_
|
|
3
|
-
from typing import TYPE_CHECKING
|
|
4
|
-
from typing import Any
|
|
5
|
-
from typing import ClassVar
|
|
6
|
-
from typing import Dict
|
|
7
|
-
from typing import Generic
|
|
8
|
-
from typing import Protocol
|
|
9
|
-
from typing import TypeVar
|
|
10
|
-
from typing import Union
|
|
11
2
|
|
|
12
|
-
from
|
|
13
|
-
|
|
14
|
-
|
|
3
|
+
from typing import (
|
|
4
|
+
TYPE_CHECKING,
|
|
5
|
+
Any,
|
|
6
|
+
ClassVar,
|
|
7
|
+
Generic,
|
|
8
|
+
Protocol,
|
|
9
|
+
TypeVar,
|
|
10
|
+
)
|
|
11
|
+
|
|
12
|
+
from pydantic import (
|
|
13
|
+
ConfigDict,
|
|
14
|
+
GetCoreSchemaHandler,
|
|
15
|
+
SerializerFunctionWrapHandler,
|
|
16
|
+
TypeAdapter,
|
|
17
|
+
model_serializer,
|
|
18
|
+
)
|
|
19
|
+
from pydantic.main import (
|
|
20
|
+
BaseModel,
|
|
21
|
+
)
|
|
22
|
+
from pydantic_core import (
|
|
23
|
+
CoreSchema,
|
|
24
|
+
core_schema,
|
|
25
|
+
)
|
|
15
26
|
|
|
16
27
|
|
|
17
28
|
if TYPE_CHECKING:
|
|
18
|
-
from pydantic.
|
|
29
|
+
from pydantic.main import (
|
|
30
|
+
IncEx,
|
|
31
|
+
)
|
|
19
32
|
|
|
20
33
|
|
|
21
34
|
class __IsDataclass(Protocol): # pylint: disable=invalid-name
|
|
@@ -23,15 +36,15 @@ class __IsDataclass(Protocol): # pylint: disable=invalid-name
|
|
|
23
36
|
|
|
24
37
|
Лучший из известных способов сделать соответствующую подсказку.
|
|
25
38
|
"""
|
|
26
|
-
|
|
39
|
+
|
|
40
|
+
__dataclass_fields__: ClassVar[dict]
|
|
27
41
|
|
|
28
42
|
|
|
29
43
|
T = TypeVar('T')
|
|
30
44
|
|
|
31
45
|
|
|
32
46
|
class __SingletonMeta(type, Generic[T]): # pylint: disable=invalid-name
|
|
33
|
-
|
|
34
|
-
_instances: 'Dict[__SingletonMeta[T], T]' = {} # pylint: disable=invalid-sequence-index
|
|
47
|
+
_instances: 'dict[__SingletonMeta[T], T]' = {} # pylint: disable=invalid-sequence-index
|
|
35
48
|
|
|
36
49
|
def __call__(cls: '__SingletonMeta', *args, **kwargs):
|
|
37
50
|
if cls not in cls._instances:
|
|
@@ -64,31 +77,43 @@ class Unset(metaclass=__SingletonMeta):
|
|
|
64
77
|
def __repr__(self):
|
|
65
78
|
return '<unset>'
|
|
66
79
|
|
|
80
|
+
def __reduce__(self):
|
|
81
|
+
"""Сериализация экземпляра.
|
|
67
82
|
|
|
68
|
-
|
|
83
|
+
Возвращает имя глобальной переменной модуля, поэтому copy, deepcopy
|
|
84
|
+
и pickle возвращают тот же экземпляр, а не его копию.
|
|
69
85
|
|
|
86
|
+
Например:
|
|
70
87
|
|
|
71
|
-
|
|
72
|
-
|
|
88
|
+
assert deepcopy(unset) is unset
|
|
89
|
+
assert pickle.loads(pickle.dumps(unset)) is unset
|
|
73
90
|
|
|
91
|
+
"""
|
|
92
|
+
return 'unset'
|
|
74
93
|
|
|
75
|
-
|
|
76
|
-
|
|
94
|
+
@classmethod
|
|
95
|
+
def __get_pydantic_core_schema__( # pylint: disable=unused-argument
|
|
96
|
+
cls, source_type: Any, handler: GetCoreSchemaHandler
|
|
97
|
+
) -> CoreSchema:
|
|
98
|
+
return core_schema.is_instance_schema(cls)
|
|
77
99
|
|
|
78
100
|
|
|
79
|
-
|
|
101
|
+
unset = Unset() # Sentinel value
|
|
80
102
|
|
|
81
103
|
|
|
82
|
-
|
|
104
|
+
def is_unset(obj) -> bool:
|
|
105
|
+
return isinstance(obj, Unset)
|
|
106
|
+
|
|
83
107
|
|
|
108
|
+
class HasUnsetValues(BaseModel):
|
|
84
109
|
"""Примесь к моделям, значения которых могут быть не заданы."""
|
|
85
110
|
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
return v
|
|
111
|
+
# Вложенные модели сериализуются по фактическому типу, а не по объявленному в аннотации поля.
|
|
112
|
+
model_config = ConfigDict(polymorphic_serialization=True)
|
|
89
113
|
|
|
90
|
-
|
|
91
|
-
|
|
114
|
+
@model_serializer(mode='wrap')
|
|
115
|
+
def _drop_unset(self, handler: SerializerFunctionWrapHandler) -> dict[str, Any]:
|
|
116
|
+
"""Отбрасывает не установленные значения при сериализации, в т.ч. во вложенных моделях.
|
|
92
117
|
|
|
93
118
|
.. code-block:: python
|
|
94
119
|
|
|
@@ -96,32 +121,29 @@ class HasUnsetValues(BaseModel):
|
|
|
96
121
|
series = unset
|
|
97
122
|
number = unser
|
|
98
123
|
|
|
99
|
-
|
|
124
|
+
|
|
125
|
+
DocumentDTO(number='1').model_dump() == {'number': '1'}
|
|
100
126
|
|
|
101
127
|
"""
|
|
102
|
-
return
|
|
103
|
-
(k, v)
|
|
104
|
-
for k, v in super().dict(*args, **kwargs).items()
|
|
105
|
-
if not is_unset(v)
|
|
106
|
-
)
|
|
128
|
+
return {k: v for k, v in handler(self).items() if not is_unset(v)}
|
|
107
129
|
|
|
108
130
|
|
|
109
131
|
def filter_unset(d: Any):
|
|
110
132
|
if not isinstance(d, dict):
|
|
111
133
|
return d
|
|
112
134
|
|
|
113
|
-
return dict(
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
135
|
+
return dict((k, filter_unset(v)) for k, v in d.items() if not is_unset(v))
|
|
136
|
+
|
|
137
|
+
|
|
138
|
+
# Разворачивает в словари модели и датаклассы на любом уровне вложенности, в т.ч. модели внутри датаклассов.
|
|
139
|
+
_any_adapter = TypeAdapter(Any)
|
|
117
140
|
|
|
118
141
|
|
|
119
142
|
def asdict(
|
|
120
|
-
obj:
|
|
121
|
-
include:
|
|
122
|
-
exclude:
|
|
143
|
+
obj: __IsDataclass | HasUnsetValues,
|
|
144
|
+
include: 'IncEx | None' = None,
|
|
145
|
+
exclude: 'IncEx | None' = None,
|
|
123
146
|
) -> dict:
|
|
124
|
-
|
|
125
147
|
"""Формирует словарь из данных объекта, отбрасывая не установленные значения.
|
|
126
148
|
|
|
127
149
|
.. code-block:: python
|
|
@@ -131,22 +153,8 @@ def asdict(
|
|
|
131
153
|
series = unset
|
|
132
154
|
number = unser
|
|
133
155
|
|
|
156
|
+
|
|
134
157
|
asdict(Document(number='1')) == {'number': '1'}
|
|
135
158
|
|
|
136
159
|
"""
|
|
137
|
-
|
|
138
|
-
if isinstance(obj, BaseModel):
|
|
139
|
-
data = obj.dict(exclude=exclude, include=include)
|
|
140
|
-
|
|
141
|
-
else:
|
|
142
|
-
unfiltered_data = asdict_(obj)
|
|
143
|
-
data = dict(
|
|
144
|
-
(k, v)
|
|
145
|
-
for k, v in unfiltered_data.items()
|
|
146
|
-
if (
|
|
147
|
-
k in (include or unfiltered_data) and
|
|
148
|
-
k not in (exclude or ())
|
|
149
|
-
)
|
|
150
|
-
)
|
|
151
|
-
|
|
152
|
-
return filter_unset(data)
|
|
160
|
+
return filter_unset(_any_adapter.dump_python(obj, include=include, exclude=exclude))
|
explicit/domain/types.py
CHANGED
|
@@ -13,24 +13,28 @@
|
|
|
13
13
|
snils_num: NoneStr = Field(alias='snils')
|
|
14
14
|
|
|
15
15
|
"""
|
|
16
|
-
|
|
17
|
-
from uuid import UUID as UUID_
|
|
16
|
+
|
|
18
17
|
import datetime
|
|
18
|
+
from uuid import (
|
|
19
|
+
UUID as UUID_,
|
|
20
|
+
)
|
|
19
21
|
|
|
20
|
-
from .model import
|
|
22
|
+
from .model import (
|
|
23
|
+
Unset,
|
|
24
|
+
)
|
|
21
25
|
|
|
22
26
|
|
|
23
|
-
Bool =
|
|
24
|
-
NoneBool =
|
|
27
|
+
Bool = bool | Unset
|
|
28
|
+
NoneBool = Bool | None
|
|
25
29
|
|
|
26
|
-
Str =
|
|
27
|
-
NoneStr =
|
|
30
|
+
Str = str | Unset
|
|
31
|
+
NoneStr = Str | None
|
|
28
32
|
|
|
29
|
-
Int =
|
|
30
|
-
NoneInt =
|
|
33
|
+
Int = int | Unset
|
|
34
|
+
NoneInt = Int | None
|
|
31
35
|
|
|
32
|
-
Date =
|
|
33
|
-
NoneDate =
|
|
36
|
+
Date = datetime.date | Unset
|
|
37
|
+
NoneDate = Date | None
|
|
34
38
|
|
|
35
|
-
UnsetUUID =
|
|
36
|
-
NoneUnsetUUID =
|
|
39
|
+
UnsetUUID = UUID_ | Unset # pylint: disable=invalid-name
|
|
40
|
+
NoneUnsetUUID = UnsetUUID | None # pylint: disable=invalid-name
|
|
@@ -1,21 +1,28 @@
|
|
|
1
1
|
"""Исключения предметной области."""
|
|
2
|
-
from collections import defaultdict
|
|
3
|
-
from functools import wraps
|
|
4
|
-
from typing import List
|
|
5
|
-
from typing import Mapping
|
|
6
2
|
|
|
7
|
-
from
|
|
3
|
+
from collections import (
|
|
4
|
+
defaultdict,
|
|
5
|
+
)
|
|
6
|
+
from collections.abc import (
|
|
7
|
+
Mapping,
|
|
8
|
+
)
|
|
9
|
+
from functools import (
|
|
10
|
+
wraps,
|
|
11
|
+
)
|
|
12
|
+
|
|
13
|
+
from pydantic import (
|
|
14
|
+
ValidationError as PydanticValidationError,
|
|
15
|
+
)
|
|
8
16
|
|
|
9
17
|
|
|
10
18
|
NON_FIELD_ERRORS = '__all__'
|
|
11
19
|
|
|
12
20
|
|
|
13
|
-
def init_messages_dict() -> Mapping[str,
|
|
21
|
+
def init_messages_dict() -> Mapping[str, list[str]]:
|
|
14
22
|
return defaultdict(list)
|
|
15
23
|
|
|
16
24
|
|
|
17
25
|
class DomainValidationError(Exception):
|
|
18
|
-
|
|
19
26
|
"""Ошибка валидации данных модели предметной области.
|
|
20
27
|
|
|
21
28
|
.. code-block:: python
|
|
@@ -32,9 +39,9 @@ class DomainValidationError(Exception):
|
|
|
32
39
|
"""
|
|
33
40
|
|
|
34
41
|
def __init__(self, message, code=None, params=None):
|
|
35
|
-
"""
|
|
36
|
-
|
|
37
|
-
dictionary
|
|
42
|
+
"""The `message` argument can be a single error, a list of errors, or a dictionary.
|
|
43
|
+
|
|
44
|
+
The dictionary maps field names to lists of errors.
|
|
38
45
|
|
|
39
46
|
What we define as an "error" can be either a simple string or an
|
|
40
47
|
instance of DomainValidationError with its message attribute set, and
|
|
@@ -50,9 +57,7 @@ class DomainValidationError(Exception):
|
|
|
50
57
|
elif not hasattr(message, 'message'):
|
|
51
58
|
message = message.error_list
|
|
52
59
|
else:
|
|
53
|
-
message, code, params = (
|
|
54
|
-
message.message, message.code, message.params
|
|
55
|
-
)
|
|
60
|
+
message, code, params = (message.message, message.code, message.params)
|
|
56
61
|
|
|
57
62
|
if isinstance(message, dict):
|
|
58
63
|
self.error_dict = {}
|
|
@@ -69,8 +74,7 @@ class DomainValidationError(Exception):
|
|
|
69
74
|
if not isinstance(sub_message, DomainValidationError):
|
|
70
75
|
sub_message = DomainValidationError(sub_message)
|
|
71
76
|
if hasattr(sub_message, 'error_dict'):
|
|
72
|
-
self.error_list.extend(
|
|
73
|
-
sum(sub_message.error_dict.values(), []))
|
|
77
|
+
self.error_list.extend(sum(sub_message.error_dict.values(), []))
|
|
74
78
|
else:
|
|
75
79
|
self.error_list.extend(sub_message.error_list)
|
|
76
80
|
|
|
@@ -123,7 +127,6 @@ class DomainValidationError(Exception):
|
|
|
123
127
|
|
|
124
128
|
|
|
125
129
|
def handle_pydantic_validation_error(fn):
|
|
126
|
-
|
|
127
130
|
"""Конвертирует PydanticValidationError в DomainValidationError.
|
|
128
131
|
|
|
129
132
|
.. code-block:: python
|
|
@@ -138,11 +141,19 @@ def handle_pydantic_validation_error(fn):
|
|
|
138
141
|
try:
|
|
139
142
|
return fn(*args, **kwargs)
|
|
140
143
|
except PydanticValidationError as error:
|
|
144
|
+
errors = error.errors()
|
|
145
|
+
# Ошибки варианта Unset в Union[X, Unset] и теги вариантов в loc не нужны в ответе.
|
|
146
|
+
unset_unions = {e['loc'][:-1] for e in errors if e.get('ctx', {}).get('class') == 'Unset'}
|
|
141
147
|
errors_dict = defaultdict(list)
|
|
142
|
-
for
|
|
143
|
-
|
|
144
|
-
|
|
148
|
+
for e in errors:
|
|
149
|
+
if e.get('ctx', {}).get('class') == 'Unset':
|
|
150
|
+
continue
|
|
151
|
+
loc = [item for i, item in enumerate(e['loc']) if e['loc'][:i] not in unset_unions]
|
|
152
|
+
msg = str(e['ctx']['error']) if e['type'] in ('value_error', 'assertion_error') else e['msg']
|
|
153
|
+
for field in loc or ['__root__']:
|
|
154
|
+
errors_dict[field].append(msg)
|
|
145
155
|
if errors_dict:
|
|
146
156
|
raise DomainValidationError(errors_dict) from error
|
|
147
|
-
|
|
157
|
+
raise
|
|
158
|
+
|
|
148
159
|
return wrapper
|