Skip to content

Commit b540306

Browse files
committed
CAIP-9 fix missing files
1 parent 2f3a773 commit b540306

4 files changed

Lines changed: 24 additions & 69 deletions

File tree

examples/services/streams.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ async def run():
2020
streams = bdk.streams()
2121

2222
await streams.create_im(13056700579872)
23-
await streams.create_room(
24-
V3RoomAttributes(name="New fancy room", description="test room")
25-
)
23+
await streams.create_room(V3RoomAttributes(name="New fancy room", description="test room"))
2624

2725
logging.debug(await streams.get_stream(stream_id))
2826
await streams.add_member_to_room(13056700579859, stream_id)

symphony/bdk/core/auth/auth_session.py

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ async def key_manager_token(self):
7979
return ""
8080

8181
if self._key_manager_token is None:
82-
self._key_manager_token = (
83-
await self._authenticator.retrieve_key_manager_token()
84-
)
82+
self._key_manager_token = await self._authenticator.retrieve_key_manager_token()
8583
return self._key_manager_token
8684

8785
@session_token.setter
@@ -125,8 +123,7 @@ def __init__(self, authenticator, user_id: int = None, username: str = None):
125123
super().__init__(authenticator)
126124
if user_id is not None and username is not None:
127125
raise AuthInitializationError(
128-
"Username and user id for OBO authentication should not be defined at "
129-
"a same time."
126+
"Username and user id for OBO authentication should not be defined at a same time."
130127
)
131128
if user_id is None and username is None:
132129
raise AuthInitializationError(
@@ -138,16 +135,12 @@ def __init__(self, authenticator, user_id: int = None, username: str = None):
138135
async def refresh(self):
139136
"""Trigger re-authentication to refresh the OBO session token."""
140137
if self.user_id is not None:
141-
self._session_token = (
142-
await self._authenticator.retrieve_obo_session_token_by_user_id(
143-
self.user_id
144-
)
138+
self._session_token = await self._authenticator.retrieve_obo_session_token_by_user_id(
139+
self.user_id
145140
)
146141
if self.username is not None:
147-
self._session_token = (
148-
await self._authenticator.retrieve_obo_session_token_by_username(
149-
self.username
150-
)
142+
self._session_token = await self._authenticator.retrieve_obo_session_token_by_username(
143+
self.username
151144
)
152145

153146
@property
@@ -188,9 +181,7 @@ async def refresh(self) -> None:
188181
189182
:return: None
190183
"""
191-
app_tokens = await self._authenticator.authenticate_and_retrieve_tokens(
192-
self._app_token
193-
)
184+
app_tokens = await self._authenticator.authenticate_and_retrieve_tokens(self._app_token)
194185
self._symphony_token = app_tokens.symphony_token
195186
self._app_token = app_tokens.app_token
196187
self._expire_at = app_tokens.expire_at

symphony/bdk/core/service/message/message_service.py

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ async def send_message(
7878
message_object = (
7979
message
8080
if isinstance(message, Message)
81-
else Message(
82-
content=message, data=data, version=version, attachments=attachment
83-
)
81+
else Message(content=message, data=data, version=version, attachments=attachment)
8482
)
8583
return await self._send_message(
8684
stream_id,
@@ -125,17 +123,11 @@ async def _send_message(
125123
"version": version,
126124
}
127125
if attachment is not None:
128-
params["attachment"] = (
129-
attachment if isinstance(attachment, list) else [attachment]
130-
)
126+
params["attachment"] = attachment if isinstance(attachment, list) else [attachment]
131127
if preview is not None:
132128
params["preview"] = preview if isinstance(preview, list) else [preview]
133129

134-
return (
135-
await self._messages_api.v4_stream_sid_multi_attachment_message_create_post(
136-
**params
137-
)
138-
)
130+
return await self._messages_api.v4_stream_sid_multi_attachment_message_create_post(**params)
139131

140132
@retry
141133
async def suppress_message(self, message_id: str) -> MessageSuppressionResponse:
@@ -238,9 +230,7 @@ async def blast_message(
238230
message_object = (
239231
message
240232
if isinstance(message, Message)
241-
else Message(
242-
content=message, data=data, version=version, attachments=attachment
243-
)
233+
else Message(content=message, data=data, version=version, attachments=attachment)
244234
)
245235
return await self._blast_message(
246236
stream_ids,
@@ -285,9 +275,7 @@ async def _blast_message(
285275
"version": version,
286276
}
287277
if attachment is not None:
288-
params["attachment"] = (
289-
attachment if isinstance(attachment, list) else [attachment]
290-
)
278+
params["attachment"] = attachment if isinstance(attachment, list) else [attachment]
291279
if preview is not None:
292280
params["preview"] = preview if isinstance(preview, list) else [preview]
293281

@@ -309,9 +297,7 @@ def __init__(
309297
auth_session: AuthSession,
310298
retry_config: BdkRetryConfig,
311299
):
312-
super().__init__(
313-
messages_api, message_suppression_api, pod_api, auth_session, retry_config
314-
)
300+
super().__init__(messages_api, message_suppression_api, pod_api, auth_session, retry_config)
315301
self._message_api = message_api
316302
self._message_suppression_api = message_suppression_api
317303
self._streams_api = streams_api
@@ -345,9 +331,7 @@ async def list_messages(
345331
return message_list.value
346332

347333
@retry
348-
async def import_messages(
349-
self, messages: List[V4ImportedMessage]
350-
) -> [V4ImportResponse]:
334+
async def import_messages(self, messages: List[V4ImportedMessage]) -> [V4ImportResponse]:
351335
"""Imports a list of messages to Symphony.
352336
See: `Import Message <https://developers.symphony.com/restapi/reference/import-message-v4>`_
353337
@@ -364,9 +348,7 @@ async def import_messages(
364348
import_response_list = await self._messages_api.v4_message_import_post(**params)
365349
return import_response_list.value
366350

367-
async def get_attachment(
368-
self, stream_id: str, message_id: str, attachment_id: str
369-
) -> str:
351+
async def get_attachment(self, stream_id: str, message_id: str, attachment_id: str) -> str:
370352
"""Downloads the attachment body by the stream ID, message ID and attachment ID.
371353
See: `Attachment <https://developers.symphony.com/restapi/reference/attachment>`_
372354
@@ -451,15 +433,11 @@ async def list_attachments(
451433
params["since"] = since
452434
if to is not None:
453435
params["to"] = to
454-
attachment_list = await self._streams_api.v1_streams_sid_attachments_get(
455-
**params
456-
)
436+
attachment_list = await self._streams_api.v1_streams_sid_attachments_get(**params)
457437
return attachment_list.value
458438

459439
@retry
460-
async def list_message_receipts(
461-
self, message_id: str
462-
) -> MessageReceiptDetailResponse:
440+
async def list_message_receipts(self, message_id: str) -> MessageReceiptDetailResponse:
463441
"""Fetches receipts details from a specific message.
464442
See: `List Message Receipts <https://developers.symphony.com/restapi/reference/list-message-receipts>`_
465443
@@ -472,14 +450,10 @@ async def list_message_receipts(
472450
"message_id": message_id,
473451
"session_token": await self._auth_session.session_token,
474452
}
475-
return await self._default_api.v1_admin_messages_message_id_receipts_get(
476-
**params
477-
)
453+
return await self._default_api.v1_admin_messages_message_id_receipts_get(**params)
478454

479455
@retry
480-
async def get_message_relationships(
481-
self, message_id: str
482-
) -> MessageMetadataResponse:
456+
async def get_message_relationships(self, message_id: str) -> MessageMetadataResponse:
483457
"""Gets the message metadata relationship.
484458
This API allows users to track the relationship between a message and all the forwards and replies of that
485459
message.

symphony/bdk/core/service/stream/stream_service.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,17 +191,13 @@ async def search_all_rooms(
191191
"""
192192

193193
async def search_rooms_one_page(skip, limit):
194-
result = await self.search_rooms(
195-
query, skip, limit, include_non_discoverable
196-
)
194+
result = await self.search_rooms(query, skip, limit, include_non_discoverable)
197195
return result.rooms if result.rooms else None
198196

199197
return offset_based_pagination(search_rooms_one_page, chunk_size, max_number)
200198

201199
@retry
202-
async def update_room(
203-
self, room_id: str, room_attributes: V3RoomAttributes
204-
) -> V3RoomDetail:
200+
async def update_room(self, room_id: str, room_attributes: V3RoomAttributes) -> V3RoomDetail:
205201
"""Updates the attributes of an existing chatroom.
206202
Wraps the `Update Room V3 <https://developers.symphony.com/restapi/reference/update-room-v3>`_ endpoint.
207203
@@ -411,9 +407,7 @@ async def list_streams_admin_one_page(skip, limit):
411407
result = await self.list_streams_admin(stream_filter, skip, limit)
412408
return result.streams.value if result.streams else None
413409

414-
return offset_based_pagination(
415-
list_streams_admin_one_page, chunk_size, max_number
416-
)
410+
return offset_based_pagination(list_streams_admin_one_page, chunk_size, max_number)
417411

418412
@retry
419413
async def list_user_streams_admin(
@@ -498,9 +492,7 @@ async def list_stream_members_one_page(skip, limit):
498492
members = await self.list_stream_members(stream_id, skip, limit)
499493
return members.members.value if members.members else None
500494

501-
return offset_based_pagination(
502-
list_stream_members_one_page, chunk_size, max_number
503-
)
495+
return offset_based_pagination(list_stream_members_one_page, chunk_size, max_number)
504496

505497
@retry
506498
async def list_room_members(self, room_id: str) -> MembershipList:

0 commit comments

Comments
 (0)