|
1 | 1 | import logging
|
2 |
| -from typing import List, Optional, Any, Dict, Iterable |
| 2 | +from typing import Any, Dict, Iterable, List, Optional |
3 | 3 |
|
4 | 4 | import aio_pika.abc
|
5 | 5 | import aiohttp.web_ws
|
6 |
| -from aiohttp import web, WSMsgType |
7 |
| -from aleph_message.models import MessageType, ItemHash, Chain |
8 |
| -from pydantic import BaseModel, Field, validator, ValidationError, root_validator |
9 |
| - |
10 | 6 | import aleph.toolkit.json as aleph_json
|
| 7 | +from aiohttp import WSMsgType, web |
11 | 8 | from aleph.db.accessors.messages import (
|
12 |
| - get_matching_messages, |
13 | 9 | count_matching_messages,
|
14 |
| - get_message_status, |
15 |
| - get_message_by_item_hash, |
16 | 10 | get_forgotten_message,
|
| 11 | + get_matching_messages, |
| 12 | + get_message_by_item_hash, |
| 13 | + get_message_status, |
17 | 14 | get_rejected_message,
|
18 | 15 | )
|
19 | 16 | from aleph.db.accessors.pending_messages import get_pending_messages
|
20 |
| -from aleph.db.models import MessageStatusDb, MessageDb |
| 17 | +from aleph.db.models import MessageDb, MessageStatusDb |
21 | 18 | from aleph.schemas.api.messages import (
|
22 |
| - format_message, |
| 19 | + AlephMessage, |
| 20 | + ForgottenMessage, |
| 21 | + ForgottenMessageStatus, |
23 | 22 | MessageWithStatus,
|
| 23 | + PendingMessage, |
24 | 24 | PendingMessageStatus,
|
25 | 25 | ProcessedMessageStatus,
|
26 |
| - ForgottenMessageStatus, |
27 |
| - ForgottenMessage, |
28 | 26 | RejectedMessageStatus,
|
29 |
| - PendingMessage, |
30 |
| - AlephMessage, |
| 27 | + format_message, |
31 | 28 | format_message_dict,
|
32 | 29 | )
|
33 | 30 | from aleph.toolkit.shield import shielded
|
34 |
| -from aleph.types.db_session import DbSessionFactory, DbSession |
| 31 | +from aleph.types.db_session import DbSession, DbSessionFactory |
35 | 32 | from aleph.types.message_status import MessageStatus
|
36 |
| -from aleph.types.sort_order import SortOrder, SortBy |
| 33 | +from aleph.types.sort_order import SortBy, SortOrder |
37 | 34 | from aleph.web.controllers.app_state_getters import (
|
38 |
| - get_session_factory_from_request, |
39 | 35 | get_config_from_request,
|
40 | 36 | get_mq_ws_channel_from_request,
|
| 37 | + get_session_factory_from_request, |
41 | 38 | )
|
42 | 39 | from aleph.web.controllers.utils import (
|
43 | 40 | DEFAULT_MESSAGES_PER_PAGE,
|
44 | 41 | DEFAULT_PAGE,
|
45 |
| -) |
46 |
| -from aleph.web.controllers.utils import ( |
47 | 42 | LIST_FIELD_SEPARATOR,
|
48 | 43 | mq_make_aleph_message_topic_queue,
|
49 | 44 | )
|
| 45 | +from aleph_message.models import Chain, ItemHash, MessageType |
| 46 | +from pydantic import BaseModel, Field, ValidationError, root_validator, validator |
50 | 47 |
|
51 | 48 | LOGGER = logging.getLogger(__name__)
|
52 | 49 |
|
@@ -140,6 +137,9 @@ def split_str(cls, v):
|
140 | 137 | return v.split(LIST_FIELD_SEPARATOR)
|
141 | 138 | return v
|
142 | 139 |
|
| 140 | + class Config: |
| 141 | + allow_population_by_field_name = True |
| 142 | + |
143 | 143 |
|
144 | 144 | class MessageQueryParams(BaseMessageQueryParams):
|
145 | 145 | pagination: int = Field(
|
|
0 commit comments