updated references from Watson Conversation to Watson Assistant due t…

…o the rebranding of that service
jweisz · Jun 13, 2018 · f43c8ae · f43c8ae
1 parent f3f461a
commit f43c8ae
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 28 deletions.
diff --git a/...ts/Chapters/Chapter2.playgroundchapter/Pages/Page3_Software.playgroundpage/Contents.swift b/...ts/Chapters/Chapter2.playgroundchapter/Pages/Page3_Software.playgroundpage/Contents.swift
@@ -42,12 +42,12 @@
  * Callout(😈 What's a "daemon"?):
  A daemon is a computer program that runs as a background process, rather than being under the direct control of the user. The TJBot daemon runs in the background on your TJBot listening for commands from your iPad.
 
- 2. Log in to your [IBM Bluemix](https://bluemix.net) account and create instances of the following Watson services: Conversation, Language Translator, Speech to Text, Text to Speech, Tone Analyzer, and Visual Recognition.
+ 2. Log in to your [IBM Bluemix](https://bluemix.net) account and create instances of the following Watson services: Assistant, Language Translator, Speech to Text, Text to Speech, Tone Analyzer, and Visual Recognition.
 
  3. Copy the authentication credentials for each service into the `config.js` file in tjbot-daemon folder. The default location for this folder is on your Desktop.
 
  * Callout(🤖 TJBot and Watson):
- TJBot uses a number of [Watson services](https://www.ibm.com/watson/developercloud/services-catalog.html) to come to life. Each service requires an authentication credential, which you can obtain from [IBM Bluemix](https://bluemix.net). The TJBot bootstrap script provides instructions for how to create a Bluemix account, how to create instances of the Watson services needed by TJBot, and how to obtain the authentication credentials for each service. These authentication credentials are needed for the TJBot daemon and are stored on your TJBot in the `tjbot-daemon/config.js` file, not in this Playground.
+ TJBot uses a number of [Watson services](https://www.ibm.com/watson/products-services/) to come to life. Each service requires an authentication credential, which you can obtain from [IBM Bluemix](https://bluemix.net). The TJBot bootstrap script provides instructions for how to create a Bluemix account, how to create instances of the Watson services needed by TJBot, and how to obtain the authentication credentials for each service. These authentication credentials are needed for the TJBot daemon and are stored on your TJBot in the `tjbot-daemon/config.js` file, not in this Playground.
 
  If you run into trouble with the tests and can't figure out what's wrong, please [open an issue on GitHub](https://github.com/ibmtjbot/tjbot/issues) and we'll do our best to help you out!
 

diff --git a/...apter3.playgroundchapter/Pages/Intro.cutscenepage/PrivateResources/en.lproj/cutscene.html b/...apter3.playgroundchapter/Pages/Intro.cutscenepage/PrivateResources/en.lproj/cutscene.html
@@ -44,7 +44,7 @@
 	<div style="display:none" aria-hidden=true>
 
 		<div></div>
-		<div>With Watson Conversation,
+		<div>With Watson Assistant,
 I can chat with you!
 </div>
 		<div>2 of 4

diff --git a/...tro.cutscenepage/PrivateResources/en.lproj/cutscene.hyperesources/494BFC-restorable.plist b/...tro.cutscenepage/PrivateResources/en.lproj/cutscene.hyperesources/494BFC-restorable.plist
diff --git a/...nepage/PrivateResources/en.lproj/cutscene.hyperesources/cutscene_hype_generated_script.js b/...nepage/PrivateResources/en.lproj/cutscene.hyperesources/cutscene_hype_generated_script.js
diff --git a/...hapter3.playgroundchapter/Pages/Page7_Conversing_with_TJBot.playgroundpage/Contents.swift b/...hapter3.playgroundchapter/Pages/Page7_Conversing_with_TJBot.playgroundpage/Contents.swift
@@ -14,15 +14,15 @@ PlaygroundPage.current.needsIndefiniteExecution = true
  * Callout(🤖 TJBot Hardware):
  In order to complete this exercise, please ensure your TJBot has a microphone and a speaker.
 
- Did you know you can turn TJBot into a chatbot? TJBot has the ability to engage in a back-and-forth conversation using the [Watson Conversation](https://www.ibm.com/watson/developercloud/conversation.html) service.
+ Did you know you can turn TJBot into a chatbot? TJBot has the ability to engage in a back-and-forth conversation using the [Watson Assistant](https://www.ibm.com/watson/developercloud/conversation.html) service.
 
  * Callout(⚠️ Prerequisite):
- In order to complete this exercise, you will need to define a conversation flow in the [Watson Conversation tool](https://www.ibmwatsonconversation.com/login). Step-by-step instructions for how to do this can be found in this [Instructable](http://www.instructables.com/id/Build-a-Talking-Robot-With-Watson-and-Raspberry-Pi/) (step 6). Log into the [Watson Conversation tool](https://www.ibmwatsonconversation.com/login) tool to create a conversation flow, and take note of the Workspace ID. Note that you need a [Bluemix](http://bluemix.net) account to be able to use the Watson Conversation tool.
+ In order to complete this exercise, you will need to define a conversation flow in the [Watson Assistant tool](https://www.ibmwatsonconversation.com/login). Step-by-step instructions for how to do this can be found in this [Instructable](http://www.instructables.com/id/Build-a-Talking-Robot-With-Watson-and-Raspberry-Pi/) (step 6). Log into the [Watson Assistant tool](https://www.ibmwatsonconversation.com/login) tool to create a conversation flow, and take note of the Workspace ID. Note that you need a [Bluemix](http://bluemix.net) account to be able to use the Watson Assistant tool.
 
  **Goal**: Engage in a conversation with TJBot using the `tj.converse(workspaceId:message:)`, `tj.listen(_:)`, and `tj.speak(_:)` methods.
 
  * Callout(💡 Tip):
- If you are near your computer, you can import a sample TJBot conversation flow into the Watson Conversation tool. Check out the [Conversation recipe](https://github.com/ibmtjbot/tjbot/tree/master/recipes/conversation) in TJBot's [GitHub repository](https://github.com/ibmtjbot/tjbot). It has a sample conversation file you can use to get started.
+ If you are near your computer, you can import a sample TJBot conversation flow into the Watson Assistant tool. Check out the [Conversation recipe](https://github.com/ibmtjbot/tjbot/tree/master/recipes/conversation) in TJBot's [GitHub repository](https://github.com/ibmtjbot/tjbot). It has a sample conversation file you can use to get started.
 
  The `tj.converse(workspaceId:message:)` method returns a `ConversationResponse` object. This object contains the `text` response that TJBot should speak.
 
@@ -41,14 +41,6 @@ let tj = PhysicalTJBot()
 let workspaceId = /*#-editable-code*/""/*#-end-editable-code*/
 
 //#-editable-code
-tj.listen { (message) in
-    let response = tj.converse(workspaceId: workspaceId, message: message)
-    if let error = response.error {
-        tj.speak("I'm not sure how to respond to that.")
-    } else if let text = response.text {
-        tj.speak(text)
-    }
-}
 //#-end-editable-code
 
 //: [Next page: TJBot's Adventures with You](@next)
diff --git a/...er/Pages/Page7_Conversing_with_TJBot.playgroundpage/PrivateResources/en.lproj/Hints.plist b/...er/Pages/Page7_Conversing_with_TJBot.playgroundpage/PrivateResources/en.lproj/Hints.plist
@@ -6,11 +6,11 @@
 	<array>
 		<dict>
 			<key>Content</key>
-			<string>Before completing this exercise, you will need to define a conversation in the Watson Conversation tool. Please refer to the Prerequisite section for instructions on how to do this.</string>
+			<string>Before completing this exercise, you will need to define a conversation in the Watson Assistant tool. Please refer to the Prerequisite section for instructions on how to do this.</string>
 		</dict>
 		<dict>
 			<key>Content</key>
-			<string>Use the `tj.converse(workspaceId:message:)` method to send a message to the Watson Conversation service and receive the response.</string>
+			<string>Use the `tj.converse(workspaceId:message:)` method to send a message to the Watson Assistant service and receive the response.</string>
 		</dict>
 		<dict>
 			<key>Content</key>

diff --git a/TJBot (Solutions).playgroundbook/Contents/Manifest.plist b/TJBot (Solutions).playgroundbook/Contents/Manifest.plist
@@ -11,7 +11,7 @@
 	<key>ContentIdentifier</key>
 	<string>com.ibm.research.tjbot</string>
 	<key>ContentVersion</key>
-	<string>2.1</string>
+	<string>2.3</string>
 	<key>DeploymentTarget</key>
 	<string>ios10.0</string>
 	<key>DevelopmentRegion</key>

diff --git a/...ts/Chapters/Chapter2.playgroundchapter/Pages/Page3_Software.playgroundpage/Contents.swift b/...ts/Chapters/Chapter2.playgroundchapter/Pages/Page3_Software.playgroundpage/Contents.swift
@@ -42,12 +42,12 @@
  * Callout(😈 What's a "daemon"?):
  A daemon is a computer program that runs as a background process, rather than being under the direct control of the user. The TJBot daemon runs in the background on your TJBot listening for commands from your iPad.
 
- 2. Log in to your [IBM Bluemix](https://bluemix.net) account and create instances of the following Watson services: Conversation, Language Translator, Speech to Text, Text to Speech, Tone Analyzer, and Visual Recognition.
+ 2. Log in to your [IBM Bluemix](https://bluemix.net) account and create instances of the following Watson services: Assistant, Language Translator, Speech to Text, Text to Speech, Tone Analyzer, and Visual Recognition.
 
  3. Copy the authentication credentials for each service into the `config.js` file in tjbot-daemon folder. The default location for this folder is on your Desktop.
 
  * Callout(🤖 TJBot and Watson):
- TJBot uses a number of [Watson services](https://www.ibm.com/watson/developercloud/services-catalog.html) to come to life. Each service requires an authentication credential, which you can obtain from [IBM Bluemix](https://bluemix.net). The TJBot bootstrap script provides instructions for how to create a Bluemix account, how to create instances of the Watson services needed by TJBot, and how to obtain the authentication credentials for each service. These authentication credentials are needed for the TJBot daemon and are stored on your TJBot in the `tjbot-daemon/config.js` file, not in this Playground.
+ TJBot uses a number of [Watson services](https://www.ibm.com/watson/products-services/) to come to life. Each service requires an authentication credential, which you can obtain from [IBM Bluemix](https://bluemix.net). The TJBot bootstrap script provides instructions for how to create a Bluemix account, how to create instances of the Watson services needed by TJBot, and how to obtain the authentication credentials for each service. These authentication credentials are needed for the TJBot daemon and are stored on your TJBot in the `tjbot-daemon/config.js` file, not in this Playground.
 
  If you run into trouble with the tests and can't figure out what's wrong, please [open an issue on GitHub](https://github.com/ibmtjbot/tjbot/issues) and we'll do our best to help you out!
 

diff --git a/...apter3.playgroundchapter/Pages/Intro.cutscenepage/PrivateResources/en.lproj/cutscene.html b/...apter3.playgroundchapter/Pages/Intro.cutscenepage/PrivateResources/en.lproj/cutscene.html
@@ -44,7 +44,7 @@
 	<div style="display:none" aria-hidden=true>
 
 		<div></div>
-		<div>With Watson Conversation,
+		<div>With Watson Assistant,
 I can chat with you!
 </div>
 		<div>2 of 4

diff --git a/...tro.cutscenepage/PrivateResources/en.lproj/cutscene.hyperesources/494BFC-restorable.plist b/...tro.cutscenepage/PrivateResources/en.lproj/cutscene.hyperesources/494BFC-restorable.plist
diff --git a/...nepage/PrivateResources/en.lproj/cutscene.hyperesources/cutscene_hype_generated_script.js b/...nepage/PrivateResources/en.lproj/cutscene.hyperesources/cutscene_hype_generated_script.js
diff --git a/...hapter3.playgroundchapter/Pages/Page7_Conversing_with_TJBot.playgroundpage/Contents.swift b/...hapter3.playgroundchapter/Pages/Page7_Conversing_with_TJBot.playgroundpage/Contents.swift
@@ -14,15 +14,15 @@ PlaygroundPage.current.needsIndefiniteExecution = true
  * Callout(🤖 TJBot Hardware):
  In order to complete this exercise, please ensure your TJBot has a microphone and a speaker.
 
- Did you know you can turn TJBot into a chatbot? TJBot has the ability to engage in a back-and-forth conversation using the [Watson Conversation](https://www.ibm.com/watson/developercloud/conversation.html) service.
+ Did you know you can turn TJBot into a chatbot? TJBot has the ability to engage in a back-and-forth conversation using the [Watson Assistant](https://www.ibm.com/watson/developercloud/conversation.html) service.
 
  * Callout(⚠️ Prerequisite):
- In order to complete this exercise, you will need to define a conversation flow in the [Watson Conversation tool](https://www.ibmwatsonconversation.com/login). Step-by-step instructions for how to do this can be found in this [Instructable](http://www.instructables.com/id/Build-a-Talking-Robot-With-Watson-and-Raspberry-Pi/) (step 6). Log into the [Watson Conversation tool](https://www.ibmwatsonconversation.com/login) tool to create a conversation flow, and take note of the Workspace ID. Note that you need a [Bluemix](http://bluemix.net) account to be able to use the Watson Conversation tool.
+ In order to complete this exercise, you will need to define a conversation flow in the [Watson Assistant tool](https://www.ibmwatsonconversation.com/login). Step-by-step instructions for how to do this can be found in this [Instructable](http://www.instructables.com/id/Build-a-Talking-Robot-With-Watson-and-Raspberry-Pi/) (step 6). Log into the [Watson Assistant tool](https://www.ibmwatsonconversation.com/login) tool to create a conversation flow, and take note of the Workspace ID. Note that you need a [Bluemix](http://bluemix.net) account to be able to use the Watson Assistant tool.
 
  **Goal**: Engage in a conversation with TJBot using the `tj.converse(workspaceId:message:)`, `tj.listen(_:)`, and `tj.speak(_:)` methods.
 
  * Callout(💡 Tip):
- If you are near your computer, you can import a sample TJBot conversation flow into the Watson Conversation tool. Check out the [Conversation recipe](https://github.com/ibmtjbot/tjbot/tree/master/recipes/conversation) in TJBot's [GitHub repository](https://github.com/ibmtjbot/tjbot). It has a sample conversation file you can use to get started.
+ If you are near your computer, you can import a sample TJBot conversation flow into the Watson Assistant tool. Check out the [Conversation recipe](https://github.com/ibmtjbot/tjbot/tree/master/recipes/conversation) in TJBot's [GitHub repository](https://github.com/ibmtjbot/tjbot). It has a sample conversation file you can use to get started.
 
  The `tj.converse(workspaceId:message:)` method returns a `ConversationResponse` object. This object contains the `text` response that TJBot should speak.
 

diff --git a/...er/Pages/Page7_Conversing_with_TJBot.playgroundpage/PrivateResources/en.lproj/Hints.plist b/...er/Pages/Page7_Conversing_with_TJBot.playgroundpage/PrivateResources/en.lproj/Hints.plist
@@ -6,11 +6,11 @@
 	<array>
 		<dict>
 			<key>Content</key>
-			<string>Before completing this exercise, you will need to define a conversation in the Watson Conversation tool. Please refer to the Prerequisite section for instructions on how to do this.</string>
+			<string>Before completing this exercise, you will need to define a conversation in the Watson Assistant tool. Please refer to the Prerequisite section for instructions on how to do this.</string>
 		</dict>
 		<dict>
 			<key>Content</key>
-			<string>Use the `tj.converse(workspaceId:message:)` method to send a message to the Watson Conversation service and receive the response.</string>
+			<string>Use the `tj.converse(workspaceId:message:)` method to send a message to the Watson Assistant service and receive the response.</string>
 		</dict>
 		<dict>
 			<key>Content</key>

diff --git a/TJBot.playgroundbook/Contents/Manifest.plist b/TJBot.playgroundbook/Contents/Manifest.plist
@@ -11,7 +11,7 @@
 	<key>ContentIdentifier</key>
 	<string>com.ibm.research.tjbot</string>
 	<key>ContentVersion</key>
-	<string>2.1</string>
+	<string>2.3</string>
 	<key>DeploymentTarget</key>
 	<string>ios10.0</string>
 	<key>DevelopmentRegion</key>