Skip to content

Skills: Cancel dialogs only if EOC is coming from parent. #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
axelsrz merged 3 commits into from
Mar 12, 2020
Merged

Skills: Cancel dialogs only if EOC is coming from parent. #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06a998b
Skills: Cancel dialogs only if EOC is coming from parent.
tracyboehrer Mar 12, 2020
5b7c92c
Updating __is_eoc_coming_from_parent condition
axelsrz Mar 12, 2020
90e2ee0
modify activity.caller_id in bfhttpclient
axelsrz Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ async def run_dialog(
if (
turn_context.activity.type == ActivityTypes.end_of_conversation
and dialog_context.stack
and DialogExtensions.__is_eoc_coming_from_parent(turn_context)
):
remote_cancel_text = "Skill was canceled through an EndOfConversation activity from the parent."
await turn_context.send_trace_activity(
f"Extension {Dialog.__name__}.run_dialog", label=remote_cancel_text,
)

await dialog_context.cancel_all_dialogs()
else:
# Process a reprompt event sent from the parent.
Expand Down Expand Up @@ -75,3 +81,9 @@ async def run_dialog(
results = await dialog_context.continue_dialog()
if results.status == DialogTurnStatus.Empty:
await dialog_context.begin_dialog(dialog.id)

@staticmethod
def __is_eoc_coming_from_parent(turn_context: TurnContext) -> bool:
# To determine the direction we check callerId property which is set to the parent bot
# by the BotFrameworkHttpClient on outgoing requests.
return bool(turn_context.activity.caller_id)
2 changes: 1 addition & 1 deletion ...otbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ async def post_activity(
)
activity.conversation.id = conversation_id
activity.service_url = service_url
activity.caller_id = from_bot_id
activity.caller_id = f"urn:botframework:aadappid:{from_bot_id}"

headers_dict = {
"Content-type": "application/json; charset=utf-8",
Expand Down