10000 cleaning up names (#510) · guptarohan41/botbuilder-python@a1a4ed6 · GitHub
[go: up one dir, main page]
Skip to content

Commit a1a4ed6

Browse files
Virtual-JoshVirtual-Josh
authored
cleaning up names (microsoft#510)
* cleaning up names * black updates * adding copyright * adding types * black updates * removing unneeded serialization cast * black
1 parent 0b34d0e commit a1a4ed6

File tree

16 files changed

+106
-80
lines changed

16 files changed

+106
-80
lines changed

‎libraries/botbuilder-core/botbuilder/core/activity_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ async def on_turn(self, turn_context: TurnContext):
3333
elif turn_context.activity.type == ActivityTypes.event:
3434
await self.on_event_activity(turn_context)
3535
elif turn_context.activity.type == ActivityTypes.end_of_conversation:
36-
await self.on_end_of_conversation(turn_context)
36+
await self.on_end_of_conversation_activity(turn_context)
3737
else:
3838
await self.on_unrecognized_activity_type(turn_context)
3939

@@ -106,7 +106,7 @@ async def on_event( # pylint: disable=unused-argument
106106
):
107107
return
108108

109-
async def on_end_of_conversation( # pylint: disable=unused-argument
109+
async def on_end_of_conversation_activity( # pylint: disable=unused-argument
110110
self, turn_context: TurnContext
111111
):
112112
return

‎libraries/botbuilder-core/botbuilder/core/auto_save_state_middleware.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
14
from typing import Awaitable, Callable, List, Union
25

36
from .bot_state import BotState

‎libraries/botbuilder-core/botbuilder/core/bot_state_set.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
14
from asyncio import wait
25
from typing import List
36
from .bot_state import BotState

‎libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
14
from aiohttp.web import (
25
middleware,
36
HTTPNotImplemented,

‎libraries/botbuilder-core/botbuilder/core/private_conversation_state.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
14
from .bot_state import BotState
25
from .turn_context import TurnContext
36
from .storage import Storage

‎libraries/botbuilder-core/botbuilder/core/show_typing_middleware.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
14
import time
25
from functools import wraps
36
from typing import Awaitable, Callable

‎libraries/botbuilder-core/botbuilder/core/teams/teams_activity_extensions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
14
from botbuilder.schema import Activity
25
from botbuilder.schema.teams import NotificationInfo, TeamsChannelData, TeamInfo
36

‎libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ async def on_invoke_activity(self, turn_context: TurnContext) -> InvokeResponse:
5858
not turn_context.activity.name
5959
and turn_context.activity.channel_id == Channels.ms_teams
6060
):
61-
return await self.on_teams_card_action_invoke_activity(turn_context)
61+
return await self.on_teams_card_action_invoke(turn_context)
6262

6363
if turn_context.activity.name == "signin/verifyState":
6464
await self.on_teams_signin_verify_state(turn_context)
@@ -174,7 +174,7 @@ async def on_invoke_activity(self, turn_context: TurnContext) -> InvokeResponse:
174174
except _InvokeResponseException as err:
175175
return err.create_invoke_response()
176176

177-
async def on_teams_card_action_invoke_activity(
177+
async def on_teams_card_action_invoke(
178178
self, turn_context: TurnContext
179179
) -> InvokeResponse:
180180
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
@@ -188,13 +188,13 @@ async def on_teams_file_consent(
188188
file_consent_card_response: FileConsentCardResponse,
189189
) -> InvokeResponse:
190190
if file_consent_card_response.action == "accept":
191-
await self.on_teams_file_consent_accept_activity(
191+
await self.on_teams_file_consent_accept(
192192
turn_context, file_consent_card_response
193193
)
194194
return self._create_invoke_response()
195195

196196
if file_consent_card_response.action == "decline":
197-
await self.on_teams_file_consent_decline_activity(
197+
await self.on_teams_file_consent_decline(
198198
turn_context, file_consent_card_response
199199
)
200200
return self._create_invoke_response()
@@ -204,14 +204,14 @@ async def on_teams_file_consent(
204204
f"{file_consent_card_response.action} is not a supported Action.",
205205
)
206206

207-
async def on_teams_file_consent_accept_activity( # pylint: disable=unused-argument
207+
async def on_teams_file_consent_accept( # pylint: disable=unused-argument
208208
self,
209209
turn_context: TurnContext,
210210
file_consent_card_response: FileConsentCardResponse,
211211
):
212212
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
213213

214-
async def on_teams_file_consent_decline_activity( # pylint: disable=unused-argument
214+
async def on_teams_file_consent_decline( # pylint: disable=unused-argument
215215
self,
216216
turn_context: TurnContext,
217217
file_consent_card_response: FileConsentCardResponse,
@@ -242,17 +242,17 @@ async def on_teams_messaging_extension_submit_action_dispatch(
242242
self, turn_context: TurnContext, action: MessagingExtensionAction
243243
) -> MessagingExtensionActionResponse:
244244
if not action.bot_message_preview_action:
245-
return await self.on_teams_messaging_extension_submit_action_activity(
245+
return await self.on_teams_messaging_extension_submit_action(
246246
turn_context, action
247247
)
248248

249249
if action.bot_message_preview_action == "edit":
250-
return await self.on_teams_messaging_extension_bot_message_preview_edit_activity(
250+
return await self.on_teams_messaging_extension_bot_message_preview_edit(
251251
turn_context, action
252252
)
253253

254254
if action.bot_message_preview_action == "send":
255-
return await self.on_teams_messaging_extension_bot_message_preview_send_activity(
255+
return await self.on_teams_messaging_extension_bot_message_preview_send(
256256
turn_context, action
257257
)
258258

@@ -261,17 +261,17 @@ async def on_teams_messaging_extension_submit_action_dispatch(
261261
body=f"{action.bot_message_preview_action} is not a supported BotMessagePreviewAction",
262262
)
263263

264-
async def on_teams_messaging_extension_bot_message_preview_edit_activity( # pylint: disable=unused-argument
265-
self, turn_context: TurnContext, action
264+
async def on_teams_messaging_extension_bot_message_preview_edit( # pylint: disable=unused-argument
265+
self, turn_context: TurnContext, action: MessagingExtensionAction
266266
) -> MessagingExtensionActionResponse:
267267
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
268268

269-
async def on_teams_messaging_extension_bot_message_preview_send_activity( # pylint: disable=unused-argument
270-
self, turn_context: TurnContext, action
269+
async def on_teams_messaging_extension_bot_message_preview_send( # pylint: disable=unused-argument
270+
self, turn_context: TurnContext, action: MessagingExtensionAction
271271
) -> MessagingExtensionActionResponse:
272272
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
273273

274-
async def on_teams_messaging_extension_submit_action_activity( # pylint: disable=unused-argument
274+
async def on_teams_messaging_extension_submit_action( # pylint: disable=unused-argument
275275
self, turn_context: TurnContext, action: MessagingExtensionAction
276276
) -> MessagingExtensionActionResponse:
277277
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
@@ -313,41 +313,40 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):
313313
turn_context.activity.channel_data
314314
)
315315
if turn_context.activity.members_added:
316-
return await self.on_teams_members_added_dispatch_activity(
316+
return await self.on_teams_members_added_dispatch(
317317
turn_context.activity.members_added, channel_data.team, turn_context
318318
)
319319

320320
if turn_context.activity.members_removed:
321-
return await self.on_teams_members_removed_dispatch_activity(
321+
return await self.on_teams_members_removed_dispatch(
322322
turn_context.activity.members_removed,
323323
channel_data.team,
324324
turn_context,
325325
)
326326

327327
if channel_data:
328328
if channel_data.event_type == "channelCreated":
329-
return await self.on_teams_channel_created_activity(
329+
return await self.on_teams_channel_created(
330330
ChannelInfo().deserialize(channel_data.channel),
331331
channel_data.team,
332332
turn_context,
333333
)
334334
if channel_data.event_type == "channelDeleted":
335-
return await self.on_teams_channel_deleted_activity(
335+
return await self.on_teams_channel_deleted(
336336
channel_data.channel, channel_data.team, turn_context
337337
)
338338
if channel_data.event_type == "channelRenamed":
339-
return await self.on_teams_channel_renamed_activity(
339+
return await self.on_teams_channel_renamed(
340340
channel_data.channel, channel_data.team, turn_context
341341
)
342342
if channel_data.event_type == "teamRenamed":
343343
return await self.on_teams_team_renamed_activity(
344344
channel_data.team, turn_context
345345
)
346-
return await super().on_conversation_update_activity(turn_context)
347346

348347
return await super().on_conversation_update_activity(turn_context)
349348

350-
async def on_teams_channel_created_activity( # pylint: disable=unused-argument
349+
async def on_teams_channel_created( # pylint: disable=unused-argument
351350
self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
352351
):
353352
return
@@ -357,7 +356,7 @@ async def on_teams_team_renamed_activity( # pylint: disable=unused-argument
357356
):
358357
return
359358

360-
async def on_teams_members_added_dispatch_activity( # pylint: disable=unused-argument
359+
async def on_teams_members_added_dispatch( # pylint: disable=unused-argument
361360
self,
362361
members_added: [ChannelAccount],
363362
team_info: TeamInfo,
@@ -387,11 +386,11 @@ async def on_teams_members_added_dispatch_activity( # pylint: disable=unused-ar
387386
)
388387
team_members_added.append(new_teams_channel_account)
389388

390-
return await self.on_teams_members_added_activity(
389+
return await self.on_teams_members_added(
391390
team_members_added, team_info, turn_context
392391
)
393392

394-
async def on_teams_members_added_activity( # pylint: disable=unused-argument
393+
async def on_teams_members_added( # pylint: disable=unused-argument
395394
self,
396395
teams_members_added: [TeamsChannelAccount],
397396
team_info: TeamInfo,
@@ -405,7 +404,7 @@ async def on_teams_members_added_activity( # pylint: disable=unused-argument
405404
teams_members_added, turn_context
406405
)
407406

408-
async def on_teams_members_removed_dispatch_activity( # pylint: disable=unused-argument
407+
async def on_teams_members_removed_dispatch( # pylint: disable=unused-argument
409408
self,
410409
members_removed: [ChannelAccount],
411410
team_info: TeamInfo,
@@ -421,11 +420,9 @@ async def on_teams_members_removed_dispatch_activity( # pylint: disable=unused-
421420
TeamsChannelAccount().deserialize(new_account_json)
422421
)
423422

424-
return await self.on_teams_members_removed_activity(
425-
teams_members_removed, turn_context
426-
)
423+
return await self.on_teams_members_removed(teams_members_removed, turn_context)
427424

428-
async def on_teams_members_removed_activity(
425+
async def on_teams_members_removed(
429426
self, teams_members_removed: [TeamsChannelAccount], turn_context: TurnContext
430427
):
431428
members_removed = [
@@ -434,12 +431,12 @@ async def on_teams_members_removed_activity(
434431
]
435432
return await super().on_members_removed_activity(members_removed, turn_context)
436433

437-
async def on_teams_channel_deleted_activity( # pylint: disable=unused-argument
434+
async def on_teams_channel_deleted( # pylint: disable=unused-argument
438435
self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
439436
):
440437
return # Task.CompleteTask
441438

442-
async def on_teams_channel_renamed_activity( # pylint: disable=unused-argument
439+
async def on_teams_channel_renamed( # pylint: disable=unused-argument
443440
self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
444441
):
445442
return # Task.CompleteTask

‎libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
14
from inspect import getmembers
25
from typing import Type
36
from enum import Enum

0 commit comments

Comments
 (0)
0