Axsuarez/corebot updates

libraries/botbuilder-ai/botbuilder/ai/luis/__init__.py

@@ -1,19 +1,14 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from .intent_score import IntentScore
 from .luis_application import LuisApplication
 from .luis_prediction_options import LuisPredictionOptions
 from .luis_telemetry_constants import LuisTelemetryConstants
-from .recognizer_result import RecognizerResult, TopIntent
 from .luis_recognizer import LuisRecognizer
 
 __all__ = [
-    "IntentScore",
     "LuisApplication",
     "LuisPredictionOptions",
     "LuisRecognizer",
-    "LuisTelemetryConstants",
-    "RecognizerResult",
-    "TopIntent",
+    "LuisTelemetryConstants"
 ]

libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer.py

@@ -11,17 +11,17 @@
 from botbuilder.core import (
     BotAssert,
     BotTelemetryClient,
+    IntentScore,
     NullTelemetryClient,
+    RecognizerResult,
     TurnContext,
 )
 from botbuilder.schema import Activity, ActivityTypes, ChannelAccount
 
 from . import (
-    IntentScore,
     LuisApplication,
     LuisPredictionOptions,
     LuisTelemetryConstants,
-    RecognizerResult,
 )
 from .activity_util import ActivityUtil
 from .luis_util import LuisUtil

libraries/botbuilder-ai/botbuilder/ai/luis/luis_util.py

@@ -11,10 +11,10 @@
     EntityModel,
     LuisResult,
 )
+from botbuilder.core import IntentScore, RecognizerResult
 from msrest import Serializer
 
 from .. import __title__, __version__
-from . import IntentScore, RecognizerResult
 
 
 class LuisUtil:

libraries/botbuilder-ai/tests/luis/luis_recognizer_test.py

@@ -17,15 +17,12 @@
 from requests.models import Response
 
 from botbuilder.ai.luis import (
-    IntentScore,
     LuisApplication,
     LuisPredictionOptions,
     LuisRecognizer,
-    RecognizerResult,
-    TopIntent,
 )
 from botbuilder.ai.luis.luis_util import LuisUtil
-from botbuilder.core import BotAdapter, BotTelemetryClient, TurnContext
+from botbuilder.core import BotAdapter, BotTelemetryClient, IntentScore, RecognizerResult, TopIntent, TurnContext
 from botbuilder.core.adapters import TestAdapter
 from botbuilder.schema import (
     Activity,

libraries/botbuilder-ai/tests/luis/override_fill_recognizer.py

@@ -3,8 +3,8 @@
 
 from typing import Dict
 
-from botbuilder.ai.luis import LuisRecognizer, LuisTelemetryConstants, RecognizerResult
-from botbuilder.core import TurnContext
+from botbuilder.ai.luis import LuisRecognizer, LuisTelemetryConstants
+from botbuilder.core import RecognizerResult, TurnContext
 
 
 class OverrideFillRecognizer(LuisRecognizer):

libraries/botbuilder-ai/tests/luis/telemetry_override_recognizer.py

@@ -3,8 +3,8 @@
 
 from typing import Dict
 
-from botbuilder.ai.luis import LuisRecognizer, LuisTelemetryConstants, RecognizerResult
-from botbuilder.core import TurnContext
+from botbuilder.ai.luis import LuisRecognizer, LuisTelemetryConstants
+from botbuilder.core import RecognizerResult, TurnContext
 
 
 class TelemetryOverrideRecognizer(LuisRecognizer):

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

@@ -15,11 +15,14 @@
 from .bot_telemetry_client import BotTelemetryClient
 from .card_factory import CardFactory
 from .conversation_state import ConversationState
+from .intent_score import IntentScore
 from .invoke_response import InvokeResponse
 from .memory_storage import MemoryStorage
 from .message_factory import MessageFactory
 from .middleware_set import AnonymousReceiveMiddleware, Middleware, MiddlewareSet
 from .null_telemetry_client import NullTelemetryClient
+from .recognizer import Recognizer
+from .recognizer_result import RecognizerResult, TopIntent
 from .state_property_accessor import StatePropertyAccessor
 from .state_property_info import StatePropertyInfo
 from .storage import Storage, StoreItem, calculate_change_hash
@@ -39,16 +42,20 @@
            'CardFactory',
            'ConversationState',
            'conversation_reference_extension',
+           'IntentScore',
            'InvokeResponse',
            'MemoryStorage',
            'MessageFactory',
            'Middleware',
            'MiddlewareSet',
            'NullTelemetryClient',
+           'Recognizer',
+           'RecognizerResult',
            'StatePropertyAccessor',
            'StatePropertyInfo',
            'Storage',
            'StoreItem',
+           'TopIntent',
            'TurnContext',
            'UserState',
            'UserTokenProvider',

libraries/botbuilder-core/botbuilder/core/intent_score.py

@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from msrest.serialization import Model
+from typing import Dict
+
+
+class IntentScore(Model):
+    _attribute_map = {
+        'score': {'key': 'score', 'type': 'float'},
+        'properties': {'key': 'properties', 'type': '{object}'},
+    }
+
+    def __init__(self, score: float = None, properties: Dict[str, object] = {}, **kwargs):
+        super(IntentScore, self).__init__(**kwargs)
+        self.score = score
+        self.properties = properties

libraries/botbuilder-core/botbuilder/core/recognizer.py

@@ -0,0 +1,12 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from abc import ABC
+from .turn_context import TurnContext
+from .recognizer_result import RecognizerResult
+
+
+class Recognizer(ABC):
+    @staticmethod
+    async def recognize(turn_context: TurnContext) -> RecognizerResult:
+        raise NotImplementedError()

libraries/botbuilder-core/botbuilder/core/recognizer_result.py

@@ -0,0 +1,60 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from typing import Dict, NamedTuple
+
+from msrest.serialization import Model
+from botbuilder.core import IntentScore
+
+
+class TopIntent(NamedTuple):
+    """The top scoring intent and its score."""
+
+    intent: str
+    score: float
+
+
+class RecognizerResult(Model):
+    """Contains recognition results generated by a recognizer."""
+
+    _attribute_map = {
+        'text': {'key': 'text', 'type': 'str'},
+        'altered_text': {'key': 'alteredText', 'type': 'str'},
+        'intents': {'key': 'intents', 'type': '{IntentScore}'},
+        'entities': {'key': 'entities', 'type': '{object}'},
+        'properties': {'key': 'properties', 'type': '{object}'},
+    }
+
+    def __init__(self, *, text: str = None, altered_text: str = None, intents: Dict[str, IntentScore] = None,
+                 entities: Dict[str, object] = None, properties: Dict[str, object] = None, **kwargs):
+        super(RecognizerResult, self).__init__(**kwargs)
+        self.text = text
+        self.altered_text = altered_text or kwargs.get('alteredText')
+        self.intents = intents
+        self.entities = entities
+        self.properties = properties or {}
+
+    def convert(self, result: object):
+        self.text = result.text
+        self.altered_text = result.altered_text
+        self.intents = result.intents
+        self.entities = result.entities
+        self.properties = result.properties
+
+    def get_top_scoring_intent(self) -> TopIntent:
+        """Return the top scoring intent and its score.
+
+        :return: Intent and score.
+        :rtype: TopIntent
+        """
+
+        if self.intents is None:
+            raise TypeError("result.intents can't be None")
+
+        top_intent = TopIntent(intent="", score=0.0)
+        for intent_name, intent_score in self.intents.items():
+            score = intent_score.score
+            if score > top_intent[1]:
+                top_intent = TopIntent(intent_name, score)
+
+        return top_intent

samples/Core-Bot/adapter_with_error_handler.py

@@ -0,0 +1,27 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+import sys
+from botbuilder.core import (BotFrameworkAdapter, BotFrameworkAdapterSettings, ConversationState, MessageFactory,
+                             TurnContext)
+from botbuilder.schema import InputHints
+
+
+class AdapterWithErrorHandler(BotFrameworkAdapter):
+
+    def __init__(self, settings: BotFrameworkAdapterSettings, conversation_state: ConversationState):
+        super().__init__(settings)
+        self._conversation_state = conversation_state
+
+    # Catch-all for errors.
+    async def on_error(self, context: TurnContext, error: Exception):
+        # This check writes out errors to console log
+        # NOTE: In production environment, you should consider logging this to Azure
+        #       application insights.
+        print(f'\n [on_turn_error]: {error}', file=sys.stderr)
+
+        # Send a message to the user
+        error_message_text = 'Sorry, it looks like something went wrong.'
+        error_message = MessageFactory.text(error_message_text, error_message_text, InputHints.expecting_input)
+        await context.send_activity(error_message)
+        # Clear out state
+        await self._conversation_state.delete(context)

samples/Core-Bot/booking_details.py

@@ -1,8 +1,13 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+from typing import List
+
+
 class BookingDetails:
-    def __init__(self, destination: str = None, origin: str = None, travel_date: str = None):
+    def __init__(self, destination: str = None, origin: str = None, travel_date: str = None,
+                 unsupported_airports: List[str] = []):
         self.destination = destination
         self.origin = origin
-        self.travel_date = travel_date
+        self.travel_date = travel_date
+        self.unsupported_airports = unsupported_airports

samples/Core-Bot/bots/dialog_and_welcome_bot.py

@@ -6,13 +6,14 @@
 
 from typing import List
 from botbuilder.core import CardFactory
-from botbuilder.core import ActivityHandler, ConversationState, UserState, TurnContext
+from botbuilder.core import ActivityHandler, ConversationState, MessageFactory, UserState, TurnContext
 from botbuilder.dialogs import Dialog
 from botbuilder.schema import Activity, Attachment, ChannelAccount
-from helpers.activity_helper import create_activity_reply
+from helpers.dialog_helper import DialogHelper
 
 from .dialog_bot import DialogBot
 
+
 class DialogAndWelcomeBot(DialogBot):
 
     def __init__(self, conversation_state: ConversationState, user_state: UserState, dialog: Dialog):
@@ -24,19 +25,15 @@ async def on_members_added_activity(self, members_added: List[ChannelAccount], t
             # To learn more about Adaptive Cards, see https://aka.ms/msbot-adaptivecards for more details.
             if member.id != turn_context.activity.recipient.id:
                 welcome_card = self.create_adaptive_card_attachment()
-                response = self.create_response(turn_context.activity, welcome_card)
+                response = MessageFactory.attachment(welcome_card)
                 await turn_context.send_activity(response)
-
-    # Create an attachment message response.
-    def create_response(self, activity: Activity, attachment: Attachment):
-        response = create_activity_reply(activity)
-        response.attachments = [attachment]
-        return response
+                await DialogHelper.run_dialog(self.dialog, turn_context,
+                                              self.conversation_state.create_property("DialogState"))
 
     # Load attachment from file.
     def create_adaptive_card_attachment(self):
         relative_path = os.path.abspath(os.path.dirname(__file__))
-        path = os.path.join(relative_path, "resources/welcomeCard.json")
+        path = os.path.join(relative_path, "../cards/welcomeCard.json")
         with open(path) as f:
             card = json.load(f)
 

samples/Core-Bot/bots/dialog_bot.py

@@ -7,6 +7,7 @@
 from botbuilder.dialogs import Dialog
 from helpers.dialog_helper import DialogHelper
 
+
 class DialogBot(ActivityHandler):
 
     def __init__(self, conversation_state: ConversationState, user_state: UserState, dialog: Dialog):
@@ -24,7 +25,7 @@ def __init__(self, conversation_state: ConversationState, user_state: UserState,
     async def on_turn(self, turn_context: TurnContext):
         await super().on_turn(turn_context)
 
-        # Save any state changes that might have occured during the turn.
+        # Save any state changes that might have occurred during the turn.
         await self.conversation_state.save_changes(turn_context, False)
         await self.user_state.save_changes(turn_context, False)