Merge pull request #1413 from microsoft/axsuarez/SupportUpdateAndDeleteFromSkills

Support update and delete from skills

Author: tracyboehrer

libraries/botbuilder-core/botbuilder/core/skills/skill_handler.py

@@ -62,9 +62,9 @@ async def on_send_to_conversation(
         This method allows you to send an activity to the end of a conversation.
 
         This is slightly different from ReplyToActivity().
-        * SendToConversation(conversationId) - will append the activity to the end
+        * SendToConversation(conversation_id) - will append the activity to the end
         of the conversation according to the timestamp or semantics of the channel.
-        * ReplyToActivity(conversationId,ActivityId) - adds the activity as a reply
+        * ReplyToActivity(conversation_id,ActivityId) - adds the activity as a reply
         to another activity, if the channel supports it. If the channel does not
         support nested replies, ReplyToActivity falls back to SendToConversation.
 
@@ -97,9 +97,9 @@ async def on_reply_to_activity(
         This method allows you to reply to an activity.
 
         This is slightly different from SendToConversation().
-        * SendToConversation(conversationId) - will append the activity to the end
+        * SendToConversation(conversation_id) - will append the activity to the end
         of the conversation according to the timestamp or semantics of the channel.
-        * ReplyToActivity(conversationId,ActivityId) - adds the activity as a reply
+        * ReplyToActivity(conversation_id,ActivityId) - adds the activity as a reply
         to another activity, if the channel supports it. If the channel does not
         support nested replies, ReplyToActivity falls back to SendToConversation.
 
@@ -111,6 +111,8 @@ async def on_reply_to_activity(
         :type claims_identity: :class:`botframework.connector.auth.ClaimsIdentity`
         :param conversation_id:The conversation ID.
         :type conversation_id: str
+        :param activity_id: Activity ID to send.
+        :type activity_id: str
         :param activity: Activity to send.
         :type activity: Activity
         :return:
@@ -119,13 +121,66 @@ async def on_reply_to_activity(
             claims_identity, conversation_id, activity_id, activity,
         )
 
-    async def _process_activity(
+    async def on_delete_activity(
+        self, claims_identity: ClaimsIdentity, conversation_id: str, activity_id: str
+    ):
+        skill_conversation_reference = await self._get_skill_conversation_reference(
+            conversation_id
+        )
+
+        async def callback(turn_context: TurnContext):
+            turn_context.turn_state[
+                self.SKILL_CONVERSATION_REFERENCE_KEY
+            ] = skill_conversation_reference
+            await turn_context.delete_activity(activity_id)
+
+        await self._adapter.continue_conversation(
+            skill_conversation_reference.conversation_reference,
+            callback,
+            claims_identity=claims_identity,
+            audience=skill_conversation_reference.oauth_scope,
+        )
+
+    async def on_update_activity(
         self,
         claims_identity: ClaimsIdentity,
         conversation_id: str,
-        reply_to_activity_id: str,
+        activity_id: str,
         activity: Activity,
     ) -> ResourceResponse:
+        skill_conversation_reference = await self._get_skill_conversation_reference(
+            conversation_id
+        )
+
+        resource_response: ResourceResponse = None
+
+        async def callback(turn_context: TurnContext):
+            nonlocal resource_response
+            turn_context.turn_state[
+                self.SKILL_CONVERSATION_REFERENCE_KEY
+            ] = skill_conversation_reference
+            activity.apply_conversation_reference(
+                skill_conversation_reference.conversation_reference
+            )
+            turn_context.activity.id = activity_id
+            turn_context.activity.caller_id = (
+                f"{CallerIdConstants.bot_to_bot_prefix}"
+                f"{JwtTokenValidation.get_app_id_from_claims(claims_identity.claims)}"
+            )
+            resource_response = await turn_context.update_activity(activity)
+
+        await self._adapter.continue_conversation(
+            skill_conversation_reference.conversation_reference,
+            callback,
+            claims_identity=claims_identity,
+            audience=skill_conversation_reference.oauth_scope,
+        )
+
+        return resource_response or ResourceResponse(id=str(uuid4()).replace("-", ""))
+
+    async def _get_skill_conversation_reference(
+        self, conversation_id: str
+    ) -> SkillConversationReference:
         # Get the SkillsConversationReference
         conversation_reference_result = await self._conversation_id_factory.get_conversation_reference(
             conversation_id
@@ -135,11 +190,10 @@ async def _process_activity(
         # or a ConversationReference (the old way, but still here for compatibility).  If a
         # ConversationReference is returned, build a new SkillConversationReference to simplify
         # the remainder of this method.
-        skill_conversation_reference: SkillConversationReference = None
         if isinstance(conversation_reference_result, SkillConversationReference):
-            skill_conversation_reference = conversation_reference_result
+            skill_conversation_reference: SkillConversationReference = conversation_reference_result
         else:
-            skill_conversation_reference = SkillConversationReference(
+            skill_conversation_reference: SkillConversationReference = SkillConversationReference(
                 conversation_reference=conversation_reference_result,
                 oauth_scope=(
                     GovernmentConstants.TO_CHANNEL_FROM_BOT_OAUTH_SCOPE
@@ -154,6 +208,19 @@ async def _process_activity(
         if not skill_conversation_reference.conversation_reference:
             raise KeyError("conversationReference not found")
 
+        return skill_conversation_reference
+
+    async def _process_activity(
+        self,
+        claims_identity: ClaimsIdentity,
+        conversation_id: str,
+        reply_to_activity_id: str,
+        activity: Activity,
+    ) -> ResourceResponse:
+        skill_conversation_reference = await self._get_skill_conversation_reference(
+            conversation_id
+        )
+
         # If an activity is sent, return the ResourceResponse
         resource_response: ResourceResponse = None