From 6dae2e98e4fbe745a8d465e9929e07f8846a9515 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Thu, 12 Dec 2019 13:03:35 -0800 Subject: [PATCH 1/4] adding return types --- .../core/teams/teams_activity_handler.py | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index 30035ae34..e4a550281 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -16,8 +16,11 @@ TeamsChannelAccount, MessagingExtensionAction, MessagingExtensionQuery, + MessagingExtensionActionResponse, + MessagingExtensionResponse, O365ConnectorCardActionQuery, TaskModuleRequest, + TaskModuleResponse, ) from botframework.connector import Channels @@ -49,7 +52,7 @@ async def on_turn(self, turn_context: TurnContext): await super().on_turn(turn_context) - async def on_invoke_activity(self, turn_context: TurnContext): + async def on_invoke_activity(self, turn_context: TurnContext) -> InvokeResponse: try: if ( not turn_context.activity.name @@ -171,7 +174,9 @@ async def on_invoke_activity(self, turn_context: TurnContext): except _InvokeResponseException as err: return err.create_invoke_response() - async def on_teams_card_action_invoke_activity(self, turn_context: TurnContext): + async def on_teams_card_action_invoke_activity( + self, turn_context: TurnContext + ) -> InvokeResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_signin_verify_state(self, turn_context: TurnContext): @@ -181,7 +186,7 @@ async def on_teams_file_consent( self, turn_context: TurnContext, file_consent_card_response: FileConsentCardResponse, - ): + ) -> InvokeResponse: if file_consent_card_response.action == "accept": await self.on_teams_file_consent_accept_activity( turn_context, file_consent_card_response @@ -220,22 +225,22 @@ async def on_teams_o365_connector_card_action( # pylint: disable=unused-argumen async def on_teams_app_based_link_query( # pylint: disable=unused-argument self, turn_context: TurnContext, query: AppBasedLinkQuery - ): + ) -> MessagingExtensionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_messaging_extension_query( # pylint: disable=unused-argument self, turn_context: TurnContext, query: MessagingExtensionQuery - ): + ) -> MessagingExtensionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_messaging_extension_select_item( # pylint: disable=unused-argument self, turn_context: TurnContext, query - ): + ) -> MessagingExtensionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_messaging_extension_submit_action_dispatch( self, turn_context: TurnContext, action: MessagingExtensionAction - ): + ) -> MessagingExtensionActionResponse: if not action.bot_message_preview_action: return await self.on_teams_messaging_extension_submit_action_activity( turn_context, action @@ -258,27 +263,27 @@ async def on_teams_messaging_extension_submit_action_dispatch( async def on_teams_messaging_extension_bot_message_preview_edit_activity( # pylint: disable=unused-argument self, turn_context: TurnContext, action - ): + ) -> MessagingExtensionActionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_messaging_extension_bot_message_send_activity( # pylint: disable=unused-argument self, turn_context: TurnContext, action - ): + ) -> MessagingExtensionActionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_messaging_extension_submit_action_activity( # pylint: disable=unused-argument self, turn_context: TurnContext, action: MessagingExtensionAction - ): + ) -> MessagingExtensionActionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_messaging_extension_fetch_task( # pylint: disable=unused-argument self, turn_context: TurnContext, action: MessagingExtensionAction - ): + ) -> MessagingExtensionActionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_messaging_extension_configuration_query_settings_url( # pylint: disable=unused-argument self, turn_context: TurnContext, query: MessagingExtensionQuery - ): + ) -> MessagingExtensionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_messaging_extension_configuration_setting( # pylint: disable=unused-argument @@ -293,12 +298,12 @@ async def on_teams_messaging_extension_card_button_clicked( # pylint: disable=u async def on_teams_task_module_fetch( # pylint: disable=unused-argument self, turn_context: TurnContext, task_module_request: TaskModuleRequest - ): + ) -> TaskModuleResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_teams_task_module_submit( # pylint: disable=unused-argument self, turn_context: TurnContext, task_module_request: TaskModuleRequest - ): + ) -> TaskModuleResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) async def on_conversation_update_activity(self, turn_context: TurnContext): From ba67cafa32258e0feeb6940c7dacff3989574e7f Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Thu, 12 Dec 2019 13:36:55 -0800 Subject: [PATCH 2/4] updating method name --- .../botbuilder/core/teams/teams_activity_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index e4a550281..ff7b3b1b8 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -252,7 +252,7 @@ async def on_teams_messaging_extension_submit_action_dispatch( ) if action.bot_message_preview_action == "send": - return await self.on_teams_messaging_extension_bot_message_send_activity( + return await self.on_teams_messaging_extension_bot_message_preview_send_activity( turn_context, action ) @@ -266,7 +266,7 @@ async def on_teams_messaging_extension_bot_message_preview_edit_activity( # pyl ) -> MessagingExtensionActionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) - async def on_teams_messaging_extension_bot_message_send_activity( # pylint: disable=unused-argument + async def on_teams_messaging_extension_bot_message_preview_send_activity( # pylint: disable=unused-argument self, turn_context: TurnContext, action ) -> MessagingExtensionActionResponse: raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED) From ff97aeb91cca0173d1760ec18097aefe68aaa259 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Thu, 12 Dec 2019 13:46:57 -0800 Subject: [PATCH 3/4] updating tests --- .../tests/teams/test_teams_activity_handler.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py index f65a861d5..a7f135466 100644 --- a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py +++ b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py @@ -171,11 +171,11 @@ async def on_teams_messaging_extension_bot_message_preview_edit_activity( turn_context, action ) - async def on_teams_messaging_extension_bot_message_send_activity( + async def on_teams_messaging_extension_bot_message_preview_send_activity( self, turn_context: TurnContext, action: MessagingExtensionAction ): - self.record.append("on_teams_messaging_extension_bot_message_send_activity") - return await super().on_teams_messaging_extension_bot_message_send_activity( + self.record.append("on_teams_messaging_extension_bot_message_preview_send_activity") + return await super().on_teams_messaging_extension_bot_message_preview_send_activity( turn_context, action ) @@ -531,7 +531,7 @@ async def test_on_teams_messaging_extension_bot_message_send_activity(self): assert len(bot.record) == 3 assert bot.record[0] == "on_invoke_activity" assert bot.record[1] == "on_teams_messaging_extension_submit_action_dispatch" - assert bot.record[2] == "on_teams_messaging_extension_bot_message_send_activity" + assert bot.record[2] == "on_teams_messaging_extension_bot_message_preview_send_activity" async def test_on_teams_messaging_extension_bot_message_send_activity_with_none( self, From 20efa133eb19089492c6820f37526ee90e77fd30 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Thu, 12 Dec 2019 13:59:00 -0800 Subject: [PATCH 4/4] fixing black --- .../tests/teams/test_teams_activity_handler.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py index a7f135466..d9eabcb68 100644 --- a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py +++ b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py @@ -174,7 +174,9 @@ async def on_teams_messaging_extension_bot_message_preview_edit_activity( async def on_teams_messaging_extension_bot_message_preview_send_activity( self, turn_context: TurnContext, action: MessagingExtensionAction ): - self.record.append("on_teams_messaging_extension_bot_message_preview_send_activity") + self.record.append( + "on_teams_messaging_extension_bot_message_preview_send_activity" + ) return await super().on_teams_messaging_extension_bot_message_preview_send_activity( turn_context, action ) @@ -531,7 +533,10 @@ async def test_on_teams_messaging_extension_bot_message_send_activity(self): assert len(bot.record) == 3 assert bot.record[0] == "on_invoke_activity" assert bot.record[1] == "on_teams_messaging_extension_submit_action_dispatch" - assert bot.record[2] == "on_teams_messaging_extension_bot_message_preview_send_activity" + assert ( + bot.record[2] + == "on_teams_messaging_extension_bot_message_preview_send_activity" + ) async def test_on_teams_messaging_extension_bot_message_send_activity_with_none( self,