Fix git push error for protected CLA branch

.openpublishing.publish.config.json

@@ -97,6 +97,12 @@
          "url":"https://github.com/Microsoft/BotBuilder-Samples",
          "branch":"master",
          "branch_mapping":{}
+      },
+       {
+         "path_to_root":"botbuilder-python",
+         "url":"https://github.com/microsoft/BotBuilder-Samples",
+         "branch":"master",
+         "branch_mapping":{}
       }
    ],
    "branch_target_mapping":{

.openpublishing.redirection.json

@@ -595,11 +595,6 @@
       "redirect_url": "https://docs.microsoft.com/azure/bot-service/nodejs/bot-builder-nodejs-overview",
       "redirect_document_id": true 
     },
-    {
-      "source_path": "articles/python/bot-builder-python-quickstart.md",
-      "redirect_url": "https://github.com/Microsoft/botbuilder-python/wiki",
-      "redirect_document_id": true 
-    },
     {
       "source_path": "articles/rest-api/bot-framework-rest-direct-line-concepts.md",
       "redirect_url": "https://docs.microsoft.com/azure/bot-service/rest-api/bot-framework-rest-direct-line-3-0-concepts",
@@ -706,4 +701,4 @@
       "redirect_document_id": true   
     }
   ]
-}
+}

art-source/nomnoml/03.welcome-users.md

@@ -26,4 +26,35 @@ Flow Diagram for sample 03.welcome-users, used in HowTo \ Develop \ **Send welco
     [welcomedUserProperty]->[sendIntroCard]
 ]
 
+
 ```
+
+## Python
+
+```nomnoml
+
+#font: Segoe UI
+#fontSize: 12
+#lineWidth: 1
+#arrowSize: 1
+#bendSize:0.3
+#edges: rounded
+#padding: 8
+#spacing: 23
+#fill: #def; #acf
+
+[WelcomeUserBot|
+    [WelcomeUserBot]->[on_message_activity()]
+    [on_message_activity()]->[welcome_user_state]
+    [welcome_user_state]->[welcome_message]
+    [welcome_user_state]->False[send_activity()]
+    [welcome_user_state]->True[__send_intro_card()]
+    [WelcomeUserBot]->[on_members_added_activity()]
+    [on_members_added_activity()]--[welcome_message]
+    [welcome_message]--[info_message]
+    [info_message]--[pattern_message]
+    [__send_intro_card()]--[hero_cards]
+    [send_activity()]--[first_message]
+]
+
+```

art-source/nomnoml/05.multi-turn-prompt.md

@@ -13,10 +13,6 @@ Diagrams for sample 05.multi-turn-prompt, used in **Implement sequential convers
 #spacing: 16
 #fill: #def; #acf
 
-[DialogExtensions|
-    [Run]
-]
-
 [DialogBot<T>|
     [OnTurnAsync]
     [OnMessageActivityAsync]
@@ -26,12 +22,13 @@ Diagrams for sample 05.multi-turn-prompt, used in **Implement sequential convers
     [TransportStepAsync]->[NameStepAsync]
     [NameStepAsync]->[NameConfirmStepAsync]
     [NameConfirmStepAsync]->[AgeStepAsync]
-    [AgeStepAsync]->[ConfirmStepAsync]
+    [AgeStepAsync]->[PictureStepAsync]
+    [PictureStepAsync]->[ConfirmStepAsync]
     [ConfirmStepAsync]->[SummaryStepAsync]
     [AgePromptValidatorAsync]
+    [PicturePromptValidatorAsync]
 ]
 
-[DialogBot<T>]->[DialogExtensions]
 [DialogBot<T>]->[UserProfileDialog]
 ```
 
@@ -58,10 +55,47 @@ Diagrams for sample 05.multi-turn-prompt, used in **Implement sequential convers
     [transportStep]->[nameStep]
     [nameStep]->[nameConfirmStep]
     [nameConfirmStep]->[ageStep]
-    [ageStep]->[confirmStep]
+    [ageStep]->[pictureStep]
+    [pictureStep]->[confirmStep]
     [confirmStep]->[summaryStep]
     [agePromptValidator]
+    [picturePromptValidator]
+]
+
+[DialogBot]->[UserProfileDialog]
+```
+
+## Python
+
+```nomnoml
+#font: Segoe UI
+#fontSize: 9
+#lineWidth: 1
+#arrowSize: 1
+#bendSize:0.3
+#edges: rounded
+#padding: 8
+#spacing: 16
+#fill: #def; #acf
+
+[DialogHelper|
+    [run_dialog]
 ]
 
+[DialogBot|
+    [on_turn]
+    [on_message_activity]
+]
+
+[UserProfileDialog|
+    [transport_step]->[name_step]
+    [name_step]->[name_confirm_step]
+    [name_confirm_step]->[age_step]
+    [age_step]->[confirm_step]
+    [confirm_step]->[summary_step]
+    [age_prompt_validator]
+]
+
+[DialogBot]->[DialogHelper]
 [DialogBot]->[UserProfileDialog]
-```
+```

art-source/nomnoml/11.qnamaker.md

@@ -32,3 +32,31 @@ Flow Diagram for sample 11.qnamaker, used in HowTo \ Develop \ **Use QnA Maker t
 
 
 ```
+
+## Python
+
+```nomnoml
+
+#font: Segoe UI
+#fontSize: 14
+#lineWidth: 1
+#arrowSize: 1
+#bendSize:0.3
+#edges: rounded
+#padding: 8
+#spacing: 16
+#fill: #def; #acf
+
+    [QnABot|
+        [on_message_activity]
+        [qna_maker|
+            [get_answers]
+        ]
+        [on_message_activity]->[qna_maker]
+    ]
+    [qnamaker.ai|
+        knowledgebase
+    ]
+    [QnABot]->[qnamaker.ai]
+
+```

art-source/nomnoml/13.core-bot.md

@@ -46,3 +46,50 @@ Diagrams for sample 13.core-bot, used in **Add natural language understanding to
 [FlightBookingRecognizer]--[bookingDetails]
 
 ```
+
+## Python
+
+```nomnoml
+#font: Segoe UI
+#fontSize: 8
+#lineWidth: 1
+#arrowSize: 1
+#bendSize:0.3
+#edges: rounded
+#padding: 8
+#spacing: 45
+#fill: #def; #acf
+
+[DialogAndWelcomeBot|
+    [on_members_added_activity]
+]
+
+[DialogBot|
+	[on_message_activity]
+    [on_turn]->[conversation_state]
+    [on_turn]->[user_state]
+]
+
+[DialogHelper|
+	[run_dialog]]
+
+[LuisHelper|
+    [execute_luis_query]
+]
+
+[BookingDetails|
+    [destination]
+    [origin]
+    [travel_date]
+]
+
+[DialogAndWelcomeBot]->[DialogBot]
+[DialogAndWelcomeBot]->[MainDialog]
+[MainDialog]->[BookingDialog]
+[MainDialog]->[BookingDetails]
+[LuisHelper]->[BookingDetails]
+[MainDialog]->[LuisHelper]
+[BookingDialog]->[BookingDetails]
+[DialogBot]->[DialogHelper]
+
+```

art-source/nomnoml/14.nlp-with-dispatch.md

@@ -21,3 +21,24 @@ Flow Diagram for sample 14.nlp-with-dispatch, used in HowTo \ Develop \ **Use mu
     [DispatchToTopIntentAsync]->[processSampleQnA]
 ]
 ```
+
+## Python
+
+```nomnoml
+#font: Segoe UI
+#fontSize: 9
+#lineWidth: 1
+#arrowSize: 1
+#bendSize:0.3
+#edges: rounded
+#padding: 8
+#spacing: 16
+#fill: #def; #acf
+
+[DialogBot|
+    [on_message_activity]->[_dispatch_to_top_intent]
+    [_dispatch_to_top_intent]->[_process_home_automation]
+    [_dispatch_to_top_intent]->[_process_weather]
+    [_dispatch_to_top_intent]->[_process_sample_qna]
+]
+```

art-source/nomnoml/18.bot-authentication.md

@@ -3,6 +3,7 @@ Diagrams for sample 18.bot-authentication, used in **Add authentication to your
 ## JavaScript
 
 ```nomnoml
+
 #font: Segoe UI
 #fontSize: 9
 #lineWidth: 1
@@ -27,4 +28,35 @@ Diagrams for sample 18.bot-authentication, used in **Add authentication to your
 [AuthBot]-:>[DialogBot]
 [AuthBot]->[MainDialog]
 [MainDialog]-:>[LogoutDialog]
+
+```
+
+## Python
+
+```nomnoml
+
+#font: Segoe UI
+#fontSize: 12
+#lineWidth: 1
+#arrowSize: 1
+#bendSize:0.3
+#edges: rounded
+#padding: 8
+#spacing: 16
+#fill: #def; #acf
+
+[DialogBot|
+    [on_turn]
+    [on_message_activity]
+]
+
+[LogoutDialog|
+    [on_begin_dialog]->[_interrupt]
+    [on_continue_dialog]->[_interrupt]
+    [_interrupt]--[connectionName]
+]
+[AuthBot]-:>[DialogBot]
+[AuthBot]->[MainDialog]
+[MainDialog]-:>[LogoutDialog]
+
 ```

art-source/nomnoml/43.complex-dialog.md

@@ -90,4 +90,52 @@ Diagrams for sample 43.complex-dialog, used in *Create advanced conversation flo
 [DialogBot]->[MainDialog]
 [MainDialog]->[TopLevelDialog]
 [TopLevelDialog]->[ReviewSelectionDialog]
+```
+
+## Python
+
+```nomnoml
+#font: Segoe UI
+#fontSize: 9
+#lineWidth: 1
+#arrowSize: 1
+#bendSize:0.3
+#edges: rounded
+#padding: 8
+#spacing: 16
+#fill: #def; #acf
+
+[DialogHelper|
+    [run_dialog]
+]
+
+[DialogBot|
+    [on_turn]
+    [on_message_activity]
+]
+
+[DialogAndWelcomeBot|
+    [on_members_added_activity]
+]
+
+[MainDialog|
+    [initial_step]->[final_step]
+]
+
+[TopLevelDialog|
+    [name_step]->[age_step]
+    [age_step]->[start_selection_step]
+    [start_selection_step]->[acknowledgement_step]
+]
+
+[ReviewSelectionDialog|
+    [selection_step]->[loop_step]
+    [selection_step]--[company_options]
+]
+
+[DialogAndWelcomeBot]-:>[DialogBot]
+[DialogBot]->[DialogHelper]
+[DialogBot]->[MainDialog]
+[MainDialog]->[TopLevelDialog]
+[TopLevelDialog]->[ReviewSelectionDialog]
 ```

art-source/nomnoml/44.bot-builder-primitive-prompts.md

@@ -38,3 +38,29 @@ Flow Diagram for sample 44.prompt-users-for-input, used in HowTo \ Develop \ **C
 ]
 
 ```
+## Python
+
+```nomnoml
+#font: Segoe UI
+#fontSize: 9
+#lineWidth: 1
+#arrowSize: 1
+#bendSize:0.3
+#edges: rounded
+#padding: 8
+#spacing: 16
+#fill: #def; #acf
+
+[CustomPromptBot]->[UserProfile]
+[CustomPromptBot]->[ConversationFlow]
+[UserProfile|
+    	[name]
+        [age]
+        [date]]
+[ConversationFlow|
+[last_question_asked]->[Question|
+[NAME]
+[AGE]
+[DATE]
+[NONE]]]
+```