removed prompt circular dependency

Author: Zerryth

libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/__init__.py

@@ -7,6 +7,7 @@
 
 from .activity_prompt import ActivityPrompt
 from .attachment_prompt import AttachmentPrompt
+from .choice_prompt import ChoicePrompt
 from .confirm_prompt import ConfirmPrompt
 from .datetime_prompt import DateTimePrompt
 from .datetime_resolution import DateTimeResolution
@@ -21,6 +22,7 @@
 __all__ = [
     "ActivityPrompt",
     "AttachmentPrompt",
+    "ChoicePrompt",
     "ConfirmPrompt",
     "DateTimePrompt",
     "DateTimeResolution",

libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py

@@ -6,12 +6,16 @@
 
 from botbuilder.core import TurnContext
 from botbuilder.dialogs.choices import Choice, ChoiceFactory, ChoiceFactoryOptions, ChoiceRecognizers, FindChoicesOptions, ListStyle
-from botbuilder.dialogs.prompts import Prompt, PromptOptions, PromptValidatorContext, PromptRecognizerResult
 from botbuilder.schema import Activity, ActivityTypes
 
+from .prompt import Prompt
+from .prompt_options import PromptOptions
+from .prompt_validator_context import PromptValidatorContext
+from .prompt_recognizer_result import PromptRecognizerResult
+
 class ChoicePrompt(Prompt):
     """
-    Prompts a user to select froma list of choices.
+    Prompts a user to select from a list of choices.
 
     By default the prompt will return to the calling dialog a `FoundChoice` object containing the choice that was selected.
     """
@@ -20,7 +24,7 @@ class ChoicePrompt(Prompt):
         Culture.Dutch: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' of ', include_numbers = True),
         Culture.English: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' or ', include_numbers = True),
         Culture.French: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' ou ', include_numbers = True),
-        Culture.German: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' oder ', include_numbers = True),
+        'de-de': ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' oder ', include_numbers = True),
         Culture.Japanese: ChoiceFactoryOptions(inline_separator = '、 ', inline_or = ' または ', include_numbers = True),
         Culture.Portuguese: ChoiceFactoryOptions(inline_separator = ', ', inline_or = ' ou ', include_numbers = True),
         Culture.Chinese: ChoiceFactoryOptions(inline_separator = '， ', inline_or = ' 要么 ', include_numbers = True),
@@ -93,7 +97,7 @@ async def on_recognize(
         if not turn_context:
             raise TypeError('ChoicePrompt.on_recognize(): turn_context cannot be None.')
 
-        choices: List[Choice] = options.choices if options.choices else []
+        choices: List[Choice] = options.choices if (options and options.choices) else []
         result: PromptRecognizerResult = PromptRecognizerResult()
 
         if turn_context.activity.type == ActivityTypes.message:
@@ -107,4 +111,5 @@ async def on_recognize(
                 result.succeeded = True
                 result.value = results[0].resolution
 
-        return result
+        return result
+        

libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/prompt.py

@@ -119,6 +119,22 @@ async def on_recognize(self, turn_context: TurnContext, state: Dict[str, object]
     # TODO: Fix style to use ListStyle when ported.
     # TODO: Fix options to use ChoiceFactoryOptions object when ported.
     def append_choices(self, prompt: Activity, channel_id: str, choices: object, style: object, options : object = None ) -> Activity:
+        """
+        Helper function to compose an output activity containing a set of choices.
+
+        Parameters:
+        -----------
+        
+        prompt: The prompt to append the user's choice to.
+
+        channel_id: ID of the channel the prompt is being sent to.
+
+        choices: List of choices to append.
+
+        style: Configured style for the list of choices.
+
+        options: (Optional) options to configure the underlying `ChoiceFactory` call.
+        """
         # Get base prompt text (if any)
         text = prompt.text if prompt != None and not prompt.text == False else ''
 

libraries/botbuilder-dialogs/tests/test_choice_prompt.py

@@ -0,0 +1,68 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from typing import List
+
+import aiounittest
+
+from botbuilder.core import ConversationState, MemoryStorage
+from botbuilder.dialogs.choices import Choice
+from botbuilder.dialogs.prompts import ChoicePrompt
+
+_color_choices: List[Choice] = [
+    Choice(value='red'),
+    Choice(value='green'),
+    Choice(value='blue')
+]
+
+class ChoicePromptTest(aiounittest.AsyncTestCase):
+
+    def test_choice_prompt_with_empty_id_should_fail(self):
+        empty_id = ''
+
+        with self.assertRaises(TypeError):
+            ChoicePrompt(empty_id)
+    
+    def test_choice_prompt_with_none_id_should_fail(self):
+        none_id = None
+
+        with self.assertRaises(TypeError):
+            ChoicePrompt(none_id)
+    
+    async def test_choice_prompt_with_card_action_and_no_value_should_not_fail(self):
+        # convo_state = ConversationState(MemoryStorage())
+        # dialog_state = convo_state.create_property('dialogState')
+        pass
+    
+    async def test_should_send_prompt(self):
+        pass
+    
+    async def test_should_send_prompt_as_an_inline_list(self):
+        pass
+    
+    async def test_should_send_prompt_as_a_numbered_list(self):
+        pass
+    
+    async def test_should_send_prompt_using_suggested_actions(self):
+        pass
+    
+    async def test_should_send_prompt_using_hero_card(self):
+        pass
+    
+    async def test_should_send_prompt_without_adding_a_list(self):
+        pass
+    
+    async def test_should_send_prompt_without_adding_a_list_but_adding_ssml(self):
+        pass
+    
+    async def test_should_recognize_a_choice(self):
+        pass
+    
+    async def test_shold_not_recognize_other_text(self):
+        pass
+    
+    async def test_should_call_custom_validator(self):
+        pass
+    
+    async def test_should_use_choice_style_if_present(self):
+        pass