Merge branch 'master' of github.com:watson-developer-cloud/speech-javascript-sdk into update-dep-2

Author: germanattanasio

README.md

@@ -9,7 +9,7 @@ Allows you to easily add voice recognition and synthesis to any web app with min
 ### Built for Browsers
 This library is primarily intended for use in web browsers. Check out [watson-developer-cloud](https://www.npmjs.com/package/watson-developer-cloud) to use Watson services (speech and others) from Node.js.
 
-However, a **server-side component is required to generate auth tokens**. The examples/ folder includes example Node.js and Python servers, and SDKs are available for [Node.js](https://github.com/watson-developer-cloud/node-sdk#authorization), [Java](https://github.com/watson-developer-cloud/java-sdk), [Python](https://github.com/watson-developer-cloud/python-sdk/blob/master/examples/authorization_v1.py), and there is also a [REST API](https://www.ibm.com/watson/developercloud/doc/common/getting-started-tokens.html).
+However, a **server-side component is required to generate auth tokens**. The `examples/` folder includes example Node.js and Python servers, and SDKs are available for [Node.js](https://github.com/watson-developer-cloud/node-sdk#authorization), [Java](https://github.com/watson-developer-cloud/java-sdk), [Python](https://github.com/watson-developer-cloud/python-sdk/blob/master/examples/authorization_v1.py), and there is also a [REST API](https://www.ibm.com/watson/developercloud/doc/common/getting-started-tokens.html).
 
 
 ### Installation - standalone
@@ -39,7 +39,7 @@ var recognizeMic = require('watson-speech/speech-to-text/recognize-microphone');
 
 This SDK _CAN_ be used in the browser with services that use IAM for authentication. This does require a server-side component - an endpoint used to retrieve the token. An example can be found [here](https://github.com/watson-developer-cloud/speech-javascript-sdk/blob/master/examples/server.js#L92).
 
-In a local environment you should set only the TEXT_TO_SPEECH_IAM_APIKEY and SPEECH_TO_TEXT_IAM_APIKEY in your .env file, see example file [here](https://github.com/watson-developer-cloud/speech-javascript-sdk/blob/master/examples/.env.example).
+In a local environment you should set only the `TEXT_TO_SPEECH_IAM_APIKEY` and `SPEECH_TO_TEXT_IAM_APIKEY` in your `.env` file, see example file [here](https://github.com/watson-developer-cloud/speech-javascript-sdk/blob/master/examples/.env.example).
 
 Once that is set up, the token can be used in your SDK request with the parameter `access_token`. See [this example](https://github.com/watson-developer-cloud/speech-javascript-sdk/blob/master/examples/static/microphone-streaming.html#L36).
 

examples/readme.md

@@ -27,7 +27,7 @@ Setup - Node.js
 Setup - Python
 --------------
 
-1. `cd` into the `examples/` directory and run `pip install watson_developer_cloud flask` (or `easy_install...`) to install python dependencies
+1. `cd` into the `examples/` directory and run `pip install watson_developer_cloud flask python-dotenv pyopenssl` (or `easy_install...`) to install python dependencies.
 2. run `bower install` to install client-side dependencies
 3. edit `server.py` to include your service credentials (or create a `.env` file)
 4. run `python server.py`

examples/server.js

@@ -89,25 +89,21 @@ var sttAuthService = new AuthorizationV1(
     {
       username: process.env.SPEECH_TO_TEXT_USERNAME, // or hard-code credentials here
       password: process.env.SPEECH_TO_TEXT_PASSWORD,
-      iam_apikey: process.env.SPEECH_TO_TEXT_IAM_APIKEY // if using an RC service
+      iam_apikey: process.env.SPEECH_TO_TEXT_IAM_APIKEY, // if using an RC service
+      url: process.env.SPEECH_TO_TEXT_URL ? process.env.SPEECH_TO_TEXT_URL : SpeechToTextV1.URL
     },
     vcapServices.getCredentials('speech_to_text') // pulls credentials from environment in bluemix, otherwise returns {}
   )
 );
 app.use('/api/speech-to-text/token', function(req, res) {
-  sttAuthService.getToken(
-    {
-      url: SpeechToTextV1.URL
-    },
-    function(err, token) {
-      if (err) {
-        console.log('Error retrieving token: ', err);
-        res.status(500).send('Error retrieving token');
-        return;
-      }
-      res.send(token);
+  sttAuthService.getToken({}, function(err, token) {
+    if (err) {
+      console.log('Error retrieving token: ', err);
+      res.status(500).send('Error retrieving token');
+      return;
     }
-  );
+    res.send(token);
+  });
 });
 
 // text to speech token endpoint
@@ -116,25 +112,21 @@ var ttsAuthService = new AuthorizationV1(
     {
       username: process.env.TEXT_TO_SPEECH_USERNAME, // or hard-code credentials here
       password: process.env.TEXT_TO_SPEECH_PASSWORD,
-      iam_apikey: process.env.TEXT_TO_SPEECH_IAM_APIKEY // if using an RC service
+      iam_apikey: process.env.TEXT_TO_SPEECH_IAM_APIKEY, // if using an RC service
+      url: process.env.TEXT_TO_SPEECH_URL ? process.env.TEXT_TO_SPEECH_URL : TextToSpeechV1.URL
     },
     vcapServices.getCredentials('text_to_speech') // pulls credentials from environment in bluemix, otherwise returns {}
   )
 );
 app.use('/api/text-to-speech/token', function(req, res) {
-  ttsAuthService.getToken(
-    {
-      url: TextToSpeechV1.URL
-    },
-    function(err, token) {
-      if (err) {
-        console.log('Error retrieving token: ', err);
-        res.status(500).send('Error retrieving token');
-        return;
-      }
-      res.send(token);
+  ttsAuthService.getToken({}, function(err, token) {
+    if (err) {
+      console.log('Error retrieving token: ', err);
+      res.status(500).send('Error retrieving token');
+      return;
     }
-  );
+    res.send(token);
+  });
 });
 
 const port = process.env.PORT || process.env.VCAP_APP_PORT || 3000;

examples/server.py

@@ -1,6 +1,7 @@
 import os, json
 from flask import Flask
 from watson_developer_cloud import AuthorizationV1 as Authorization
+from watson_developer_cloud import IAMTokenManager
 from watson_developer_cloud import SpeechToTextV1 as SpeechToText
 from watson_developer_cloud import TextToSpeechV1 as TextToSpeech
 from dotenv import load_dotenv
@@ -9,21 +10,29 @@
 load_dotenv('.env')
 
 # Text to Speech
-TTS_USERNAME = os.environ.get('TTS_USERNAME'); # '<Text to Speech username>'
-TTS_PASSWORD = os.environ.get('TTS_PASSWORD'); # '<Text to Speech password'
+TTS_USERNAME = os.environ.get('TEXT_TO_SPEECH_USERNAME') 	# '<Text to Speech username>'
+TTS_PASSWORD = os.environ.get('TEXT_TO_SPEECH_PASSWORD') 	# '<Text to Speech password'
+TTS_APIKEY = os.environ.get('TEXT_TO_SPEECH_IAM_APIKEY') 	# '<Text to Speech IAM API key'
+TTS_URL = os.environ.get('TEXT_TO_SPEECH_URL')	 			# '<Text to Speech URL>'
 
 # Speech to Text
-STT_USERNAME = os.environ.get('STT_USERNAME'); # '<Speech to Text username>'
-STT_PASSWORD = os.environ.get('STT_PASSWORD'); # '<Speech to Text password>'
+STT_USERNAME = os.environ.get('SPEECH_TO_TEXT_USERNAME') 	# '<Speech to Text username>'
+STT_PASSWORD = os.environ.get('SPEECH_TO_TEXT_PASSWORD') 	# '<Speech to Text password>'
+STT_APIKEY = os.environ.get('SPEECH_TO_TEXT_IAM_APIKEY') 	# '<Speech to Text IAM API key>'
+STT_URL = os.environ.get('SPEECH_TO_TEXT_URL')	 			# '<Speech to Text URL>'
 
 # on bluemix, automatically pull credentials from environment
 if 'VCAP_SERVICES' in os.environ:
 	stt = json.loads(os.environ['VCAP_SERVICES'])['speech_to_text'][0]
 	STT_USERNAME = stt["credentials"]["username"]
 	STT_PASSWORD = stt["credentials"]["password"]
+	STT_APIKEY = stt["credentials"]["apikey"]
+	STT_URL = stt["credentials"]["url"] if stt["credentials"]["url"] else SpeechToText.default_url
 	tts = json.loads(os.environ['VCAP_SERVICES'])['text_to_speech'][0]
 	TTS_USERNAME = tts["credentials"]["username"]
 	TTS_PASSWORD = tts["credentials"]["password"]
+	TTS_APIKEY = tts["credentials"]["apikey"]
+	TTS_URL = tts["credentials"]["url"] if tts["credentials"]["url"] else TextToSpeech.default_url
 
 app = Flask(__name__, static_url_path='')
 
@@ -33,13 +42,24 @@ def root():
 
 @app.route('/api/speech-to-text/token')
 def getSttToken():
-	print(STT_USERNAME)
-	authorization = Authorization(username=STT_USERNAME, password=STT_PASSWORD)
-	return authorization.get_token(url=SpeechToText.default_url)
+	if (STT_APIKEY):
+		iamTokenManager = IAMTokenManager(iam_apikey=STT_APIKEY)
+		token = iamTokenManager.get_token()
+	else:
+		authorization = Authorization(username=STT_USERNAME, password=STT_PASSWORD)
+		token = authorization.get_token(url=STT_URL)
+	return token
 
 @app.route('/api/text-to-speech/token')
 def getTtsToken():
-	authorization = Authorization(username=TTS_USERNAME, password=TTS_PASSWORD)
-	return authorization.get_token(url=TextToSpeech.default_url)
+	if (TTS_APIKEY):
+		iamTokenManager = IAMTokenManager(iam_apikey=TTS_APIKEY)
+		token = iamTokenManager.get_token()
+	else:
+		authorization = Authorization(username=TTS_USERNAME, password=TTS_PASSWORD)
+		token = authorization.get_token(url=TTS_URL)
+	return token
 
-app.run(debug=True)
+# NOTE: ssl_context='adhoc' fixes response encoding (Flask 400 BAD_REQUEST) errors over SSL
+if __name__ == '__main__':
+    app.run(ssl_context='adhoc', debug=True)