Added timex parsing to luis_helper & corrected ambiguous date logic (#299)

Author: Zerryth

samples/13.core-bot/dialogs/date_resolver_dialog.py

@@ -56,7 +56,7 @@ async def initial_step(
                 PromptOptions(prompt=prompt_msg, retry_prompt=reprompt_msg),
             )
         # We have a Date we just need to check it is unambiguous.
-        if "definite" in Timex(timex).types:
+        if "definite" not in Timex(timex).types:
             # This is essentially a "reprompt" of the data we were given up front.
             return await step_context.prompt(
                 DateTimePrompt.__name__, PromptOptions(prompt=reprompt_msg)

samples/13.core-bot/dialogs/main_dialog.py

@@ -1,17 +1,13 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from datetime import datetime
-from typing import Dict
 from botbuilder.dialogs import (
     ComponentDialog,
-    DialogSet,
-    DialogTurnStatus,
     WaterfallDialog,
     WaterfallStepContext,
     DialogTurnResult,
 )
-from botbuilder.dialogs.prompts import TextPrompt, ConfirmPrompt, PromptOptions
+from botbuilder.dialogs.prompts import TextPrompt, PromptOptions
 from botbuilder.core import MessageFactory, TurnContext
 from botbuilder.schema import InputHints
 
@@ -76,9 +72,8 @@ async def act_step(self, step_context: WaterfallStepContext) -> DialogTurnResult
             self._luis_recognizer, step_context.context
         )
 
-        # top_intent = cognitive_models_helper.top_intent(luis_result['intents'])
-
         if intent == Intent.BOOK_FLIGHT.value and luis_result:
+            # Show a warning for Origin and Destination if we can't resolve them.
             await MainDialog._show_warning_for_unsupported_cities(
                 step_context.context, luis_result
             )

samples/13.core-bot/helpers/luis_helper.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 from enum import Enum
 from typing import Dict
-from botbuilder.ai.luis import LuisRecognizer, LuisApplication
+from botbuilder.ai.luis import LuisRecognizer
 from botbuilder.core import IntentScore, TopIntent, TurnContext
 
 from booking_details import BookingDetails
@@ -32,6 +32,9 @@ class LuisHelper:
     async def execute_luis_query(
         luis_recognizer: LuisRecognizer, turn_context: TurnContext
     ) -> (Intent, object):
+        """
+        Returns an object with preformatted LUIS results for the bot's dialogs to consume.
+        """
         result = None
         intent = None
 
@@ -78,13 +81,20 @@ async def execute_luis_query(
                             from_entities[0]["text"].capitalize()
                         )
 
-                # TODO: This value will be a TIMEX. And we are only interested in a Date so grab the first result and drop the Time part.
+                # This value will be a TIMEX. And we are only interested in a Date so grab the first result and drop the Time part.
                 # TIMEX is a format that represents DateTime expressions that include some ambiguity. e.g. missing a Year.
-                date_entities = recognizer_result.entities.get("$instance", {}).get(
-                    "datetime", []
-                )
-                if len(date_entities) > 0:
-                    result.travel_date = None  # TODO: Set when we get a timex format
+                date_entities = recognizer_result.entities.get("datetime", [])
+                if date_entities:
+                    timex = date_entities[0]["timex"]
+
+                    if timex:
+                        datetime = timex[0].split("T")[0]
+
+                        result.travel_date = datetime
+
+                else:
+                    result.travel_date = None
+
         except Exception as e:
             print(e)