Axsuarez/skill dialog (#757)

* initial changes for skill dialog

* Skill dialog

* Initial echo skill with dialog

* pylint: Initial echo skill with dialog

* made integration package for aiohttp, dialog root bot for testing

* pylint: made integration package for aiohttp, dialog root bot for testing

* pylint: made integration package for aiohttp, dialog root bot for testing

* pylint: made integration package for aiohttp, dialog root bot for testing

* Initial dialog skill bot

* Changes to skill bot

* Updates for dialog interruption and buffered response. Pending to move some classes to botbuilder.integration.aiohttp

* Relates to in post_activity in BotFrameworkHttpClient

* fix on BeginSkillDialogOptions

* Moved SkillHttpClient to correct library with corresponding tests. Fix SkillDialog.

* black: Moved SkillHttpClient to correct library with corresponding tests. Fix SkillDialog.

* relative import fix

* Removed unused import

* Modified TurnContext.send_trace_activity to default args.

* Removed argument checks that didn't exist in C#.  Fixed bug in SkillDialog.begin_dialog

* Added initial SkillDialog unit test.

* Added remainder of SkillDialog unit tests

* Updates on dialog-root-bot

* Updated buffered_replies to expect_replies

* Using HTTPStatus defines.

* Skill OAuth only change card action for emulator

* black

* skill root bot updated

* skill root bot updated

* Removed old import in dialog root bot

* Dialog-to-dialog work

* Ummm... the actual dialog-to-dialog work

* Corrected dialog-skill-bot AcitivyRouterDialog to actually have a WaterfallDialog step.

* dialog-to-dialog test bot changes: dialog-echo-skill-bot, corrected missing async on ComponentDialog

* dialog-to-dialog: Handling messages with values (serialization and whatnot)

* Memory storage does not validate e_tag integrity anymore, following the same behavior as C#

* pylint: Memory storage does not validate e_tag integrity anymore, following the same behavior as C#

* pylint: Memory storage does not validate e_tag integrity anymore, following the same behavior as C#

* Removing samples from product code PR

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>

Author: axelsrz

ci-pr-pipeline.yml

@@ -53,6 +53,7 @@ jobs:
       pip install -e ./libraries/botbuilder-testing
       pip install -e ./libraries/botbuilder-integration-applicationinsights-aiohttp
       pip install -e ./libraries/botbuilder-adapters-slack
+      pip install -e ./libraries/botbuilder-integration-aiohttp
       pip install -r ./libraries/botframework-connector/tests/requirements.txt
       pip install -r ./libraries/botbuilder-core/tests/requirements.txt
       pip install coveralls

libraries/botbuilder-core/botbuilder/core/__init__.py

@@ -22,7 +22,6 @@
 from .extended_user_token_provider import ExtendedUserTokenProvider
 from .intent_score import IntentScore
 from .invoke_response import InvokeResponse
-from .bot_framework_http_client import BotFrameworkHttpClient
 from .memory_storage import MemoryStorage
 from .memory_transcript_store import MemoryTranscriptStore
 from .message_factory import MessageFactory
@@ -63,7 +62,6 @@
     "ExtendedUserTokenProvider",
     "IntentScore",
     "InvokeResponse",
-    "BotFrameworkHttpClient",
     "MemoryStorage",
     "MemoryTranscriptStore",
     "MessageFactory",

libraries/botbuilder-core/botbuilder/core/adapters/test_adapter.py

@@ -241,7 +241,9 @@ async def receive_activity(self, activity):
         return await self.run_pipeline(context, self.logic)
 
     def get_next_activity(self) -> Activity:
-        return self.activity_buffer.pop(0)
+        if len(self.activity_buffer) > 0:
+            return self.activity_buffer.pop(0)
+        return None
 
     async def send(self, user_says) -> object:
         """

libraries/botbuilder-core/botbuilder/core/bot_adapter.py

@@ -14,7 +14,7 @@
 
 class BotAdapter(ABC):
     BOT_IDENTITY_KEY = "BotIdentity"
-    BOT_OAUTH_SCOPE_KEY = "OAuthScope"
+    BOT_OAUTH_SCOPE_KEY = "botbuilder.core.BotAdapter.OAuthScope"
     BOT_CONNECTOR_CLIENT_KEY = "ConnectorClient"
     BOT_CALLBACK_HANDLER_KEY = "BotCallbackHandler"
 

libraries/botbuilder-core/botbuilder/core/memory_storage.py

@@ -73,10 +73,14 @@ async def write(self, changes: Dict[str, StoreItem]):
                         "Etag conflict.\nOriginal: %s\r\nCurrent: %s"
                         % (new_value_etag, old_state_etag)
                     )
-                if isinstance(new_state, dict):
-                    new_state["e_tag"] = str(self._e_tag)
-                else:
-                    new_state.e_tag = str(self._e_tag)
+
+                # If the original object didn't have an e_tag, don't set one (C# behavior)
+                if old_state_etag:
+                    if isinstance(new_state, dict):
+                        new_state["e_tag"] = str(self._e_tag)
+                    else:
+                        new_state.e_tag = str(self._e_tag)
+
                 self._e_tag += 1
                 self.memory[key] = deepcopy(new_state)
 

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

@@ -6,13 +6,15 @@
 # --------------------------------------------------------------------------
 
 from .bot_framework_skill import BotFrameworkSkill
+from .bot_framework_client import BotFrameworkClient
 from .conversation_id_factory import ConversationIdFactoryBase
 from .skill_handler import SkillHandler
 from .skill_conversation_id_factory_options import SkillConversationIdFactoryOptions
 from .skill_conversation_reference import SkillConversationReference
 
 __all__ = [
     "BotFrameworkSkill",
+    "BotFrameworkClient",
     "ConversationIdFactoryBase",
     "SkillConversationIdFactoryOptions",
     "SkillConversationReference",

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

@@ -0,0 +1,20 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from abc import ABC
+
+from botbuilder.schema import Activity
+from botbuilder.core import InvokeResponse
+
+
+class BotFrameworkClient(ABC):
+    def post_activity(
+        self,
+        from_bot_id: str,
+        to_bot_id: str,
+        to_url: str,
+        service_url: str,
+        conversation_id: str,
+        activity: Activity,
+    ) -> InvokeResponse:
+        raise NotImplementedError()

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

@@ -13,26 +13,6 @@ def __init__(
         activity: Activity,
         bot_framework_skill: BotFrameworkSkill,
     ):
-        if from_bot_oauth_scope is None:
-            raise TypeError(
-                "SkillConversationIdFactoryOptions(): from_bot_oauth_scope cannot be None."
-            )
-
-        if from_bot_id is None:
-            raise TypeError(
-                "SkillConversationIdFactoryOptions(): from_bot_id cannot be None."
-            )
-
-        if activity is None:
-            raise TypeError(
-                "SkillConversationIdFactoryOptions(): activity cannot be None."
-            )
-
-        if bot_framework_skill is None:
-            raise TypeError(
-                "SkillConversationIdFactoryOptions(): bot_framework_skill cannot be None."
-            )
-
         self.from_bot_oauth_scope = from_bot_oauth_scope
         self.from_bot_id = from_bot_id
         self.activity = activity

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

@@ -9,13 +9,5 @@ class SkillConversationReference:
     """
 
     def __init__(self, conversation_reference: ConversationReference, oauth_scope: str):
-        if conversation_reference is None:
-            raise TypeError(
-                "SkillConversationReference(): conversation_reference cannot be None."
-            )
-
-        if oauth_scope is None:
-            raise TypeError("SkillConversationReference(): oauth_scope cannot be None.")
-
         self.conversation_reference = conversation_reference
         self.oauth_scope = oauth_scope

libraries/botbuilder-core/botbuilder/core/turn_context.py

@@ -295,7 +295,7 @@ async def next_handler():
         return await logic
 
     async def send_trace_activity(
-        self, name: str, value: object, value_type: str, label: str
+        self, name: str, value: object = None, value_type: str = None, label: str = None
     ) -> ResourceResponse:
         trace_activity = Activity(
             type=ActivityTypes.trace,