From a6f7365769de35d8cd1fa75a6aeca753f5ddca98 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Mon, 5 Jun 2017 20:04:00 +0100
Subject: [PATCH 01/20] Allow endpoint to be specified in Conversation Node

---
 services/conversation/v1.html | 49 ++++++++++++++++++++++++++---------
 services/conversation/v1.js   | 42 +++++++++++++++++++++---------
 2 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/services/conversation/v1.html b/services/conversation/v1.html
index 1bc8c353..8867b43a 100644
--- a/services/conversation/v1.html
+++ b/services/conversation/v1.html
@@ -1,4 +1,4 @@
-<!--
+default-endpoint<!--
   Copyright 2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +15,17 @@
 -->
 
 <script type="text/x-red" data-template-name="watson-conversation-v1">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+
     <div id="credentials-check" class="form-row">
         <div class="form-tips">
             <i class="fa fa-question-circle"></i><b> Please wait: </b> Checking for bound service credentials...
         </div>
     </div>
+
     <div class="form-row credentials" style="display: none;">
         <label for="node-input-username"><i class="fa fa-user"></i> Username</label>
         <input type="text" id="node-input-username" placeholder="Username">
@@ -28,10 +34,17 @@
         <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="Password">
     </div>
+
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
+        <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/conversation/api">
     </div>
+
     <div class="form-row">
         <label for="node-input-workspaceid"><i class="fa fa-tag"></i> Workspace ID</label>
         <input type="text" id="node-input-workspaceid" placeholder="WorkspaceID">
@@ -71,6 +84,7 @@
     <br/>
     <li><code>msg.params.username</code> : If provided will be used as the username credential for the Conversation service.</li>
     <li><code>msg.params.password</code> : If provided will be used as the password credential for the Conversation service.</li>
+    <li><code>msg.params.endpoint</code> : If provided will be used as the url for the Conversation service.</li>
     </ul>
     <p>See <a href="http://www.ibm.com/watson/developercloud/conversation/api/v1/#send_input" target="_blank">Conversation API documentation</a> for details.</p>
     <p>All Results will made available at <code>msg.payload</code> in JSON format. Check the  <a href="http://www.ibm.com/watson/developercloud/conversation/api/v1/#send_input" target="_blank">documentation</a> for details.</p>
@@ -98,6 +112,15 @@
                 $('#conversation-form-tips').hide();
             }
         });
+        $('input#node-input-default-endpoint').change(function () {
+            var checked = $('input#node-input-default-endpoint').prop('checked')
+            if (checked) {
+                $('#node-input-service-endpoint').parent().hide();
+            } else {
+                $('#node-input-service-endpoint').parent().show();
+            }
+        });
+
         $.getJSON('watson-conversation/vcap/')
             .done(function (service) {
               $('.credentials').toggle(!service);
@@ -114,25 +137,27 @@
         RED.nodes.registerType('watson-conversation-v1', {
             category: 'IBM Watson',
             defaults: {
-              name: {value: ""},
-              workspaceid: {value: ""},
+              name: {value: ''},
+              workspaceid: {value: ''},
               multiuser: {value: false},
-              context: {value: true}
+              context: {value: true},
+              'default-endpoint' :{value: true},
+              'service-endpoint' :{value: 'https://gateway.watsonplatform.net/conversation/api'},
             },
             credentials: {
-              username: {type:"text"},
-              password: {type:"password"}
+              username: {type:'text'},
+              password: {type:'password'}
             },
             color: 'rgb(84,149,230)',
             inputs: 1,
             outputs: 1,
-            icon: "conversation-v1-25x25.png",
-            paletteLabel: "conversation",
+            icon: 'conversation-v1-25x25.png',
+            paletteLabel: 'conversation',
             label: function() {
-                return this.name || "conversation";
+                return this.name || 'conversation';
             },
             labelStyle: function() {
-                return this.name ? "node_label_italic" : "";
+                return this.name ? 'node_label_italic' : '';
             },
             oneditprepare: oneditprepare
         });
diff --git a/services/conversation/v1.js b/services/conversation/v1.js
index 73cc5e99..864e0d48 100644
--- a/services/conversation/v1.js
+++ b/services/conversation/v1.js
@@ -101,7 +101,7 @@ module.exports = function(RED) {
 
     // workspaceid can be either configured in the node,
     // or sent into msg.params.workspace_id
-    if (config.workspaceid && config.workspaceid) {
+    if (config.workspaceid) {
       params.workspace_id = config.workspaceid;
     }
     if (msg.params && msg.params.workspace_id) {
@@ -129,13 +129,24 @@ module.exports = function(RED) {
   }
 
 
-  function verifyServiceCredentials(node, msg) {
+  function verifyServiceCredentials(node, msg, config) {
     // If it is present the newly provided user entered key
     // takes precedence over the existing one.
     // If msg.params contain credentials then these will Overridde
     // the bound or configured credentials.
+    const serviceSettings = {
+      //username: userName,
+      //password: passWord,
+      version_date: '2017-05-26',
+      //url:'https://gateway-fra.watsonplatform.net/conversation/api',
+      headers: {
+        'User-Agent': pkg.name + '-' + pkg.version
+      }
+    };
+
     var userName = sUsername || node.credentials.username,
-      passWord = sPassword || node.credentials.password;
+      passWord = sPassword || node.credentials.password,
+      endpoint = '';
 
     if (!(userName || msg.params.username) ||
       !(passWord || msg.params.password)) {
@@ -157,14 +168,21 @@ module.exports = function(RED) {
       }
     }
 
-    node.service = new ConversationV1({
-      username: userName,
-      password: passWord,
-      version_date: '2017-02-03',
-      headers: {
-        'User-Agent': pkg.name + '-' + pkg.version
-      }
-    });
+    if (!config['default-endpoint'] && config['service-endpoint']) {
+      endpoint = config['service-endpoint'];
+    }
+    if (msg.params && msg.params.endpoint) {
+      endpoint = msg.params.endpoint;
+    }
+
+    if (endpoint) {
+      serviceSettings.url = endpoint;
+    }
+
+    serviceSettings.username = userName;
+    serviceSettings.password = passWord;
+
+    node.service = new ConversationV1(serviceSettings);
     return true;
   }
 
@@ -227,7 +245,7 @@ module.exports = function(RED) {
       if (!b) {
         return;
       }
-      b = verifyServiceCredentials(node, msg);
+      b = verifyServiceCredentials(node, msg, config);
       if (!b) {
         return;
       }

From 51b9c356004840faf3e1cc0f5b8a6474f49ac945 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Mon, 5 Jun 2017 20:36:10 +0100
Subject: [PATCH 02/20] Allow endpoint to be specified in Conversation Node

---
 services/conversation/v1.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/conversation/v1.js b/services/conversation/v1.js
index 864e0d48..caf640f5 100644
--- a/services/conversation/v1.js
+++ b/services/conversation/v1.js
@@ -135,10 +135,7 @@ module.exports = function(RED) {
     // If msg.params contain credentials then these will Overridde
     // the bound or configured credentials.
     const serviceSettings = {
-      //username: userName,
-      //password: passWord,
       version_date: '2017-05-26',
-      //url:'https://gateway-fra.watsonplatform.net/conversation/api',
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
@@ -168,6 +165,9 @@ module.exports = function(RED) {
       }
     }
 
+    if (service) {
+      endpoint = service.url;
+    }
     if (!config['default-endpoint'] && config['service-endpoint']) {
       endpoint = config['service-endpoint'];
     }

From 6a9c2dac3d7ea7552f527212952219265cb63334 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Mon, 5 Jun 2017 21:40:23 +0100
Subject: [PATCH 03/20] Allow endpoint to be specified in Conversation
 Workspace Manager Node

---
 .../conversation/v1-workspace-manager.html    | 25 +++++++++++++--
 services/conversation/v1-workspace-manager.js | 32 +++++++++++++------
 services/conversation/v1.html                 | 14 ++++----
 3 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/services/conversation/v1-workspace-manager.html b/services/conversation/v1-workspace-manager.html
index eb7d2a2d..cd2f5788 100644
--- a/services/conversation/v1-workspace-manager.html
+++ b/services/conversation/v1-workspace-manager.html
@@ -38,6 +38,15 @@
         <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="Password"></input>
     </div>
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-cwm-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-cwm-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-cwm-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-cwm-service-endpoint" placeholder="https://gateway.watsonplatform.net/conversation/api">
+    </div>
 
     <div class="form-row">
         <label for="node-input-cwm-custom-mode"><i class="fa fa-book"></i> Detect: </label>
@@ -215,6 +224,7 @@
   // moved in if there is a clash with other nodes.
   var cv1wm = new CV1WM();
   cv1wm.mode_selected = null;
+  cv1wm.endpoint_required = false;
 
   cv1wm.showSelectedFields = function(fields) {
     for (i = 0; i < fields.length; i++) {
@@ -236,7 +246,8 @@
     fields.push('#node-input-cwm-workspace-id'
                      + ', #node-input-cwm-intent'
                      + ', #node-input-cwm-example'
-                     + ', #node-input-cwm-export-content');
+                     + ', #node-input-cwm-export-content'
+                     + ', #node-input-cwm-service-endpoint');
 
     cv1wm.hideSelectedFields(fields);
   }
@@ -284,6 +295,9 @@
       case 'createWorkspace':
         break;
     }
+    if (cv1wm.endpoint_required) {
+      fields.push('#node-input-cwm-service-endpoint');
+    }
     cv1wm.showSelectedFields(fields);
   }
 
@@ -293,6 +307,10 @@
       cv1wm.mode_selected = $('#node-input-cwm-custom-mode').val();
       cv1wm.processSelectedMethod(cv1wm.mode_selected);
     });
+    $('#node-input-cwm-default-endpoint').change(function () {
+      cv1wm.endpoint_required = ! $('#node-input-cwm-default-endpoint').prop('checked');
+      cv1wm.processSelectedMethod(cv1wm.mode_selected);
+    });
   }
 
   // This is the on edit prepare function, which will be invoked everytime the dialog
@@ -327,7 +345,10 @@
                 'cwm-workspace-id': {value:""},
                 'cwm-intent': {value:""},
                 'cwm-example': {value:""},
-                'cwm-export-content': {value:false}
+                'cwm-export-content': {value:false},
+                'cwm-default-endpoint' :{value: true},
+                'cwm-service-endpoint' :{value: 'https://gateway.watsonplatform.net/conversation/api'}
+
             },
             credentials: {
               username: {type:'text'},
diff --git a/services/conversation/v1-workspace-manager.js b/services/conversation/v1-workspace-manager.js
index 62816853..0da4bbad 100644
--- a/services/conversation/v1-workspace-manager.js
+++ b/services/conversation/v1-workspace-manager.js
@@ -23,7 +23,8 @@ module.exports = function (RED) {
     payloadutils = require('../../utilities/payload-utils'),
     ConversationV1 = require('watson-developer-cloud/conversation/v1'),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
-    username = '', password = '', sUsername = '', sPassword = '';
+    username = '', password = '', sUsername = '', sPassword = '',
+    endpoint = '', sEndpoint;
 
   temp.track();
 
@@ -40,6 +41,7 @@ module.exports = function (RED) {
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
   function executeListWorkspaces(node, conv, params, msg) {
@@ -281,14 +283,21 @@ module.exports = function (RED) {
   }
 
   function executeMethod(node, method, params, msg) {
-    var conv = new ConversationV1({
-      username: username,
-      password: password,
-      version_date: '2017-02-03',
-      headers: {
-        'User-Agent': pkg.name + '-' + pkg.version
-      }
-    });
+    var conv = null,
+      serviceSettings = {
+        username: username,
+        password: password,
+        version_date: '2017-02-03',
+        headers: {
+          'User-Agent': pkg.name + '-' + pkg.version
+        }
+      };
+
+    if (endpoint) {
+      serviceSettings.url = endpoint;
+    }
+
+    conv = new ConversationV1(serviceSettings);
 
     node.status({fill:'blue', shape:'dot', text:'executing'});
 
@@ -622,6 +631,11 @@ module.exports = function (RED) {
       username = sUsername || this.credentials.username;
       password = sPassword || this.credentials.password || config.password;
 
+      endpoint = sEndpoint;
+      if ((!config['cwm-default-endpoint']) && config['cwm-service-endpoint']) {
+        endpoint = config['cwm-service-endpoint'];
+      }
+
       node.status({});
       initialCheck(username, password, method)
         .then(function(){
diff --git a/services/conversation/v1.html b/services/conversation/v1.html
index 8867b43a..52cd75c2 100644
--- a/services/conversation/v1.html
+++ b/services/conversation/v1.html
@@ -1,4 +1,4 @@
-default-endpoint<!--
+<!--
   Copyright 2016 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,17 +15,17 @@
 -->
 
 <script type="text/x-red" data-template-name="watson-conversation-v1">
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-
     <div id="credentials-check" class="form-row">
         <div class="form-tips">
             <i class="fa fa-question-circle"></i><b> Please wait: </b> Checking for bound service credentials...
         </div>
     </div>
 
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+
     <div class="form-row credentials" style="display: none;">
         <label for="node-input-username"><i class="fa fa-user"></i> Username</label>
         <input type="text" id="node-input-username" placeholder="Username">
@@ -142,7 +142,7 @@
               multiuser: {value: false},
               context: {value: true},
               'default-endpoint' :{value: true},
-              'service-endpoint' :{value: 'https://gateway.watsonplatform.net/conversation/api'},
+              'service-endpoint' :{value: 'https://gateway.watsonplatform.net/conversation/api'}
             },
             credentials: {
               username: {type:'text'},

From 5bea730eae34da8d31019d05761a273ea6cf1706 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Mon, 5 Jun 2017 21:43:10 +0100
Subject: [PATCH 04/20] bump version number

---
 README.md                                     | 6 +++++-
 package.json                                  | 4 ++--
 services/language_translator_identify/v2.html | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b963d62c..99169d92 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,13 @@ Node-RED Watson Nodes for IBM Bluemix
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.5.9
+- Endpoint can now be specified in Conversation,
+and Conversation Workspace Manager nodes. 
+
 ### New in version 0.5.8
 - Visual Reconition Node, now accepts readstream on msg.payload
-- Add passages parameter to Discovery Node 
+- Add passages parameter to Discovery Node
 
 ### New in version 0.5.7
 - Fix to Tone Analyzer to allow JSON as input
diff --git a/package.json b/package.json
index 82cdfef6..33e45b4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "alchemy-api": "^1.3.0",
@@ -14,7 +14,7 @@
     "watson-developer-cloud": "^2.32.1",
     "kuromoji": "^0.0.5",
     "is-docx": "^0.0.3",
-    "stream-to-array" : "^2.3.0" 
+    "stream-to-array" : "^2.3.0"
   },
   "repository": {
     "type": "git",
diff --git a/services/language_translator_identify/v2.html b/services/language_translator_identify/v2.html
index 61b938e1..27be9725 100644
--- a/services/language_translator_identify/v2.html
+++ b/services/language_translator_identify/v2.html
@@ -35,7 +35,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-language-translator-identify">
-    <p>Packaged in with release 0.5.7 of node-red-node-watson</p>
+    <p>Packaged in with release 0.5.9 of node-red-node-watson</p>
     <p>The Watson Language Translator service can be used to identify languages used in a text input. <p>
     <p>Node input : </p>
     <ul>

From 4b29ced683bad303f3cbca057a09a6580b2cc536 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Tue, 6 Jun 2017 08:21:45 +0100
Subject: [PATCH 05/20] Allow Endpoint to be specified in Language Indentify
 Node

---
 README.md                                     |  2 +-
 .../conversation/v1-workspace-manager.html    |  1 -
 services/language_translator_identify/v2.html | 65 +++++++++++++------
 services/language_translator_identify/v2.js   | 23 +++++--
 4 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 99169d92..1947e888 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Node-RED Watson Nodes for IBM Bluemix
 
 ### New in version 0.5.9
 - Endpoint can now be specified in Conversation,
-and Conversation Workspace Manager nodes. 
+Conversation Workspace Manager and Language Identify nodes. 
 
 ### New in version 0.5.8
 - Visual Reconition Node, now accepts readstream on msg.payload
diff --git a/services/conversation/v1-workspace-manager.html b/services/conversation/v1-workspace-manager.html
index cd2f5788..1da24fc4 100644
--- a/services/conversation/v1-workspace-manager.html
+++ b/services/conversation/v1-workspace-manager.html
@@ -348,7 +348,6 @@
                 'cwm-export-content': {value:false},
                 'cwm-default-endpoint' :{value: true},
                 'cwm-service-endpoint' :{value: 'https://gateway.watsonplatform.net/conversation/api'}
-
             },
             credentials: {
               username: {type:'text'},
diff --git a/services/language_translator_identify/v2.html b/services/language_translator_identify/v2.html
index 27be9725..a32693b7 100644
--- a/services/language_translator_identify/v2.html
+++ b/services/language_translator_identify/v2.html
@@ -24,6 +24,7 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+
     <div class="form-row credentials" style="display: none;">
         <label for="node-input-username"><i class="fa fa-user"></i> Username</label>
         <input type="text" id="node-input-username" placeholder="Username">
@@ -32,6 +33,16 @@
         <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="Password">
     </div>
+
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-cwm-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-cwm-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/language-translator/api">
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="watson-language-translator-identify">
@@ -52,38 +63,54 @@
 </script>
 
 <script type="text/javascript">
+
+// This is the on edit prepare function, which will be invoked everytime the dialog
+// is shown.
+  function li2oneditprepare() {
+    $('#node-input-default-endpoint').change(function () {
+      var checked = $('#node-input-default-endpoint').prop('checked')
+      if (checked) {
+        $('#node-input-service-endpoint').parent().hide();
+      } else {
+        $('#node-input-service-endpoint').parent().show();
+      }
+    });
+
+    $.getJSON('watson-language-translator-identify/vcap/')
+      .done(function (service) {
+        $('.credentials').toggle(!service);
+      })
+      .fail(function () {
+        $('.credentials').show();
+      }).always(function () {
+        $('#credentials-check').hide();
+      });
+  }
+
     (function() {
         RED.nodes.registerType('watson-language-translator-identify', {
             category: 'IBM Watson',
             defaults: {
-                name: {value: ""}
+                name: {value: ''},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/language-translator/api'}
             },
             credentials: {
-              username: {type:"text"},
-              password: {type:"password"}
+              username: {type:'text'},
+              password: {type:'password'}
             },
-            color: "rgb(84,149,230)",
+            color: 'rgb(84,149,230)',
             inputs: 1,
             outputs: 1,
-            icon: "LanguageTranslator25x25.png",
-            paletteLabel: "language identify",
+            icon: 'LanguageTranslator25x25.png',
+            paletteLabel: 'language identify',
             label: function() {
-                return this.name || "language identify";
+                return this.name || 'language identify';
             },
             labelStyle: function() {
-                return this.name ? "node_label_italic" : "";
+                return this.name ? 'node_label_italic' : '';
             },
-            oneditprepare: function() {
-                $.getJSON('watson-language-translator-identify/vcap/')
-                  .done(function (service) {
-                    $('.credentials').toggle(!service);
-                  })
-                  .fail(function () {
-                    $('.credentials').show();
-                  }).always(function () {
-                    $('#credentials-check').hide();
-                  })
-            }
+            oneditprepare: li2oneditprepare
         });
     })();
 </script>
diff --git a/services/language_translator_identify/v2.js b/services/language_translator_identify/v2.js
index 13b9b317..4ef867ba 100644
--- a/services/language_translator_identify/v2.js
+++ b/services/language_translator_identify/v2.js
@@ -26,11 +26,13 @@ module.exports = function (RED) {
     password = null,
     sUsername = null,
     sPassword = null,
-    endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
+    endpoint = '', sEndpoint;
+    //endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
 
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
   RED.httpAdmin.get('/watson-language-translator-identify/vcap', function (req, res) {
@@ -38,7 +40,7 @@ module.exports = function (RED) {
   });
 
   function Node (config) {
-    var node = this;
+    var node = this, serviceSettings = {};
     RED.nodes.createNode(this, config);
 
     this.on('input', function (msg) {
@@ -57,15 +59,26 @@ module.exports = function (RED) {
         return;
       }
 
-      var language_translator = new LanguageTranslatorV2({
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
+
+      serviceSettings = {
         username: username,
         password: password,
         version: 'v2',
-        url: endpointUrl,
+        //url: endpointUrl,
         headers: {
           'User-Agent': pkg.name + '-' + pkg.version
         }
-      });
+      };
+
+      if (endpoint) {
+        serviceSettings.url = endpoint;
+      }
+
+      var language_translator = new LanguageTranslatorV2(serviceSettings);
 
       node.status({fill:'blue', shape:'dot', text:'requesting'});
       language_translator.identify({text: msg.payload}, function (err, response) {

From 72097834ea7e38e214f6b1f6c43400f9df73e6f0 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Tue, 6 Jun 2017 08:48:02 +0100
Subject: [PATCH 06/20] Migrate Language Indentifier Node to promises

---
 services/language_translator_identify/v2.js | 93 +++++++++++++--------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/services/language_translator_identify/v2.js b/services/language_translator_identify/v2.js
index 4ef867ba..000ce0ff 100644
--- a/services/language_translator_identify/v2.js
+++ b/services/language_translator_identify/v2.js
@@ -18,9 +18,8 @@ module.exports = function (RED) {
   const SERVICE_IDENTIFIER = 'language-translator';
   var pkg = require('../../package.json'),
     LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
-    //cfenv = require('cfenv'),
+    payloadutils = require('../../utilities/payload-utils'),
     serviceutils = require('../../utilities/service-utils'),
-    //service = cfenv.getAppEnv().getServiceCreds(/language translator/i),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
     username = null,
     password = null,
@@ -35,36 +34,23 @@ module.exports = function (RED) {
     sEndpoint = service.url;
   }
 
-  RED.httpAdmin.get('/watson-language-translator-identify/vcap', function (req, res) {
-    res.json(service ? {bound_service: true} : null);
-  });
-
-  function Node (config) {
-    var node = this, serviceSettings = {};
-    RED.nodes.createNode(this, config);
-
-    this.on('input', function (msg) {
-      if (!msg.payload) {
-        var message = 'Missing property: msg.payload';
-        node.error(message, msg);
-        return;
-      }
-
-      username = sUsername || this.credentials.username;
-      password = sPassword || this.credentials.password;
-
-      if (!username || !password) {
-        var message = 'Missing Watson Language Translator service credentials';
-        node.error(message, msg);
-        return;
-      }
+  function initialCheck(u, p) {
+    if (!u || !p) {
+      return Promise.reject('Missing Watson Language Translator service credentials');
+    }
+    return Promise.resolve();
+  }
 
-      endpoint = sEndpoint;
-      if ((!config['default-endpoint']) && config['service-endpoint']) {
-        endpoint = config['service-endpoint'];
-      }
+  function payloadCheck(msg) {
+    if (!msg.payload) {
+      return Promise.reject('Missing property: msg.payload');
+    }
+    return Promise.resolve();
+  }
 
-      serviceSettings = {
+  function execute(node, msg) {
+    var p = new Promise(function resolver(resolve, reject){
+      var serviceSettings = {
         username: username,
         password: password,
         version: 'v2',
@@ -72,25 +58,60 @@ module.exports = function (RED) {
         headers: {
           'User-Agent': pkg.name + '-' + pkg.version
         }
-      };
-
+      };;
       if (endpoint) {
         serviceSettings.url = endpoint;
       }
 
       var language_translator = new LanguageTranslatorV2(serviceSettings);
 
-      node.status({fill:'blue', shape:'dot', text:'requesting'});
       language_translator.identify({text: msg.payload}, function (err, response) {
-        node.status({})
         if (err) {
-          node.error(err, msg);
+          reject(err);
         } else {
           msg.languages = response.languages
           msg.lang = response.languages[0];
+          resolve();
         }
-        node.send(msg);
       });
+
+    });
+    return p;
+  }
+
+  RED.httpAdmin.get('/watson-language-translator-identify/vcap', function (req, res) {
+    res.json(service ? {bound_service: true} : null);
+  });
+
+  function Node (config) {
+    var node = this;
+    RED.nodes.createNode(this, config);
+
+    this.on('input', function (msg) {
+      username = sUsername || this.credentials.username;
+      password = sPassword || this.credentials.password;
+
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
+
+      node.status({});
+      initialCheck(username, password)
+        .then(function(){
+          return payloadCheck(msg);
+        })
+        .then(function(){
+          node.status({fill:'blue', shape:'dot', text:'requesting'});
+          return execute(node, msg);
+        })
+        .then(function(){
+          node.status({});
+          node.send(msg);
+        })
+        .catch(function(err){
+          payloadutils.reportError(node,msg,err);
+        });
     });
   }
   RED.nodes.registerType('watson-language-translator-identify', Node, {

From 9b2f2c1ebd602218ae2d372f104c2d6bbe734ea4 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Tue, 6 Jun 2017 10:09:55 +0100
Subject: [PATCH 07/20] Allow Endpoint to be specified in Language Translator
 Node

---
 README.md                                   |  2 +-
 services/language_translator/v2.html        | 27 +++++++++++++++--
 services/language_translator/v2.js          | 32 +++++++++++++++------
 services/language_translator_identify/v2.js |  2 +-
 4 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 1947e888..3ae6533a 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Node-RED Watson Nodes for IBM Bluemix
 
 ### New in version 0.5.9
 - Endpoint can now be specified in Conversation,
-Conversation Workspace Manager and Language Identify nodes. 
+Conversation Workspace Manager Language Identify and Language Translation nodes. 
 
 ### New in version 0.5.8
 - Visual Reconition Node, now accepts readstream on msg.payload
diff --git a/services/language_translator/v2.html b/services/language_translator/v2.html
index d045630b..2cbd70f4 100644
--- a/services/language_translator/v2.html
+++ b/services/language_translator/v2.html
@@ -39,6 +39,16 @@
         <input type="password" id="node-input-password" placeholder="Password"/>
     </div>
 
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-cwm-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-cwm-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/language-translator/api">
+    </div>
+
     <div class="form-row">
         <label for="node-input-action"><i class="fa fa-cog"></i> Mode</label>
         <select type="text" id="node-input-action" style="display: inline-block; vertical-align:middle; width: 70%;">
@@ -281,8 +291,9 @@
   tor.checkModels = function () {
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
+    var e = $('#node-input-service-endpoint').val();
 
-    $.getJSON('watson-translator/models/', {un: u, pwd: p}).done(function (data) {
+    $.getJSON('watson-translator/models/', {un: u, pwd: p, e: e}).done(function (data) {
       if (data.models) {
         tor.models = data.models;
         tor.have_credentials = true;
@@ -590,6 +601,15 @@
       lg_parameters_selected = $('#node-input-lgparams2').val();
     });
 
+    $('#node-input-default-endpoint').change(function () {
+      var checked = $('#node-input-default-endpoint').prop('checked')
+      if (checked) {
+        $('#node-input-service-endpoint').parent().hide();
+      } else {
+        $('#node-input-service-endpoint').parent().show();
+      }
+    });
+
   }
 
   // The dynamic nature of the selection fields in this node has caused problems.
@@ -690,7 +710,10 @@
                 filetype: {value: 'forcedglossary'},
                 trainid: {value: ''},
                 lgparams2: {value: 'lparams'},
-                ldparamshidden2: {value: ''}
+                ldparamshidden2: {value: ''},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/language-translator/api'}
+
             },
             credentials: {
               username: {type: 'text'}
diff --git a/services/language_translator/v2.js b/services/language_translator/v2.js
index 2512d224..797ac7c7 100644
--- a/services/language_translator/v2.js
+++ b/services/language_translator/v2.js
@@ -35,14 +35,16 @@ module.exports = function (RED) {
     sPassword = null,
     //service = cfenv.getAppEnv().getServiceCreds(/language translator/i),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
-    endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
+    endpoint = '',
+    sEndpoint = 'https://gateway-fra.watsonplatform.net/language-translator/api';
+    //endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
 
   temp.track();
 
-
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
   // These are APIs that the node has created to allow it to dynamically fetch Bluemix
@@ -56,11 +58,13 @@ module.exports = function (RED) {
 
   // API used by widget to fetch available models
   RED.httpAdmin.get('/watson-translator/models', function (req, res) {
+    endpoint = sEndpoint ? sEndpoint : req.query.e;
+
     var lt = new LanguageTranslatorV2({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
       version: 'v2',
-      url: endpointUrl,
+      url: endpoint,
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
@@ -96,28 +100,40 @@ module.exports = function (RED) {
     // is a request to refresh the model list.
     // Credentials are needed for each of the modes.
 
-    username = sUsername || this.credentials.username;
-    password = sPassword || this.credentials.password || config.password;
 
     // The node has received an input as part of a flow, need to determine
     // what the request is for, and based on that if the required fields
     // have been provided.
     this.on('input', function (msg) {
+      username = sUsername || this.credentials.username;
+      password = sPassword || this.credentials.password || config.password;
 
       var message = '',
         action = msg.action || config.action,
         globalContext = this.context().global,
         tmpmodel_id = globalContext.get('g_model_id'),
         result = '',
-        language_translator = new LanguageTranslatorV2({
+        language_translator = null,
+        serviceSettings = {
           username: username,
           password: password,
           version: 'v2',
-          url: endpointUrl,
+          //url: sEndpoint,
           headers: {
             'User-Agent': pkg.name + '-' + pkg.version
           }
-        });
+        };
+
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
+
+      if (endpoint) {
+        serviceSettings.url = endpoint;
+      }
+
+      language_translator = new LanguageTranslatorV2(serviceSettings);
 
       if (!username || !password) {
         message = 'Missing Watson Language Translator service credentials';
diff --git a/services/language_translator_identify/v2.js b/services/language_translator_identify/v2.js
index 000ce0ff..372a0acf 100644
--- a/services/language_translator_identify/v2.js
+++ b/services/language_translator_identify/v2.js
@@ -25,7 +25,7 @@ module.exports = function (RED) {
     password = null,
     sUsername = null,
     sPassword = null,
-    endpoint = '', sEndpoint;
+    endpoint = '', sEndpoint = '';
     //endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
 
   if (service) {

From a37a0459dbaf52b7174ebbe0111cbf8fa52b7003 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Tue, 6 Jun 2017 15:46:47 +0100
Subject: [PATCH 08/20] Migrate Language Translator to promises

---
 services/conversation/v1-workspace-manager.js |   4 +-
 services/language_translator/v2.js            | 541 +++++++++---------
 2 files changed, 281 insertions(+), 264 deletions(-)

diff --git a/services/conversation/v1-workspace-manager.js b/services/conversation/v1-workspace-manager.js
index 0da4bbad..82f8d13c 100644
--- a/services/conversation/v1-workspace-manager.js
+++ b/services/conversation/v1-workspace-manager.js
@@ -24,7 +24,7 @@ module.exports = function (RED) {
     ConversationV1 = require('watson-developer-cloud/conversation/v1'),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
     username = '', password = '', sUsername = '', sPassword = '',
-    endpoint = '', sEndpoint;
+    endpoint = '', sEndpoint = '';
 
   temp.track();
 
@@ -661,10 +661,12 @@ module.exports = function (RED) {
           return executeMethod(node, method, params, msg);
         })
         .then(function(){
+          temp.cleanup();
           node.status({});
           node.send(msg);
         })
         .catch(function(err){
+          temp.cleanup();
           payloadutils.reportError(node,msg,err);
         });
 
diff --git a/services/language_translator/v2.js b/services/language_translator/v2.js
index 797ac7c7..168e6579 100644
--- a/services/language_translator/v2.js
+++ b/services/language_translator/v2.js
@@ -26,6 +26,7 @@ module.exports = function (RED) {
   var pkg = require('../../package.json'),
     LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
     //cfenv = require('cfenv'),
+    payloadutils = require('../../utilities/payload-utils'),
     serviceutils = require('../../utilities/service-utils'),
     fs = require('fs'),
     temp = require('temp'),
@@ -36,7 +37,7 @@ module.exports = function (RED) {
     //service = cfenv.getAppEnv().getServiceCreds(/language translator/i),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
     endpoint = '',
-    sEndpoint = 'https://gateway-fra.watsonplatform.net/language-translator/api';
+    sEndpoint = 'https://gateway.watsonplatform.net/language-translator/api';
     //endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
 
   temp.track();
@@ -95,61 +96,36 @@ module.exports = function (RED) {
     RED.nodes.createNode(this, config);
     var node = this;
 
-    // The dynamic nature of this node has caused problems with the password field. it is
-    // hidden but not a credential. If it is treated as a credential, it gets lost when there
-    // is a request to refresh the model list.
-    // Credentials are needed for each of the modes.
 
-
-    // The node has received an input as part of a flow, need to determine
-    // what the request is for, and based on that if the required fields
-    // have been provided.
-    this.on('input', function (msg) {
-      username = sUsername || this.credentials.username;
-      password = sPassword || this.credentials.password || config.password;
-
-      var message = '',
-        action = msg.action || config.action,
-        globalContext = this.context().global,
-        tmpmodel_id = globalContext.get('g_model_id'),
-        result = '',
-        language_translator = null,
-        serviceSettings = {
-          username: username,
-          password: password,
-          version: 'v2',
-          //url: sEndpoint,
-          headers: {
-            'User-Agent': pkg.name + '-' + pkg.version
-          }
-        };
-
-      endpoint = sEndpoint;
-      if ((!config['default-endpoint']) && config['service-endpoint']) {
-        endpoint = config['service-endpoint'];
+    function initialCheck(u, p) {
+      if (!u || !p) {
+        return Promise.reject('Missing Watson Language Translator service credentials');
       }
+      return Promise.resolve();
+    }
 
-      if (endpoint) {
-        serviceSettings.url = endpoint;
-      }
-
-      language_translator = new LanguageTranslatorV2(serviceSettings);
-
-      if (!username || !password) {
-        message = 'Missing Watson Language Translator service credentials';
-        node.error(message, msg);
-        return;
+    function payloadCheck(msg) {
+      if (!msg.payload) {
+        return Promise.reject('Missing property: msg.payload');
       }
+      return Promise.resolve();
+    }
 
+    function checkForAction(action) {
       if (!action) {
-        node.warn('Missing action, please select one');
-        node.send(msg);
-        return;
+        return Promise.reject('Missing action, please select one');
       }
+      return Promise.resolve();
+    }
 
-      // checkbox option
+    function checkForGlobalOverides(msg) {
+      // If the selection is to use global overrides then
+      // look for them
       if (config.lgparams2 === false) {
-        if (tmpmodel_id.length > 1) {
+        var globalContext = this.context().global,
+          tmpmodel_id = globalContext.get('g_model_id');
+
+        if (tmpmodel_id && tmpmodel_id.length > 1) {
           result = tmpmodel_id.split('-');
           //msg.model_id = tmpmodel_id;
           msg.domain = result[2];
@@ -157,21 +133,13 @@ module.exports = function (RED) {
           msg.destlang = result[1];
         }
       }
+      return Promise.resolve();
+    }
 
-      // These are var functions that have been initialised here, so that
-      // they are available for the instance of this node to use.
-      // Tried to make these protoypes, but couldn't get them to be
-      // invokedd. So instead have opted to go for vars.
-
-      // If a translation is requested, then the model id will have been
-      // built by the calling function based on source, target and domain.
-      var doTranslate = function(msg, model_id){
-        node.status({
-          fill: 'blue',
-          shape: 'dot',
-          text: 'requesting'
-        });
-
+    // If a translation is requested, then the model id will have been
+    // built by the calling function based on source, target and domain.
+    function doTranslate(language_translator, msg, model_id) {
+      var p = new Promise(function resolver(resolve, reject){
         // Please be careful when reading the below. The first parameter is
         // a structure, and the tabbing enforced by codeacy imho obfuscates
         // the code, rather than making it clearer. I would have liked an
@@ -181,112 +149,161 @@ module.exports = function (RED) {
           model_id: model_id
         },
         function (err, response) {
-          node.status({});
           if (err) {
-            node.error(err, msg);
-            console.log('err:', err);
+            reject(err);
           } else {
             msg.translation = {};
             msg.translation.response = response;
             msg.payload = response.translations[0].translation;
+            resolve();
           }
-          node.send(msg);
-        });
-      };
-
-      // If training is requested then the glossary will be a file input. We are using temp
-      // to sync up the fetch of the file input stream, before invoking the train service.
-      // If the file comes from a file-inject then the file will not have a filename assoicated
-      // with it. In this case a temporary filename is given to the file. The file name submitted
-      // to the service cannot have a '.' else it will throw a 400 error.
-      var doTrain = function(msg, model_id, filetype){
-        node.status({
-          fill: 'blue',
-          shape: 'dot',
-          text: 'processing data buffer for training request'
         });
 
+      });
+      return p;
+    }
+
+    function determineModelId(msg) {
+      var domain = msg.domain || config.domain,
+        srclang = msg.srclang || config.srclang,
+        destlang = msg.destlang || config.destlang,
+        model_id = '';
+
+      if (!domain) {
+        return Promise.reject('Missing translation domain, message not translated');
+      }
+      if (!srclang) {
+        return Promise.reject('Missing source language, message not translated');
+      }
+      if (!destlang) {
+        return Promise.reject('Missing target language, message not translated');
+      }
+
+      model_id = srclang + '-' + destlang;
+      if (domain !== 'news') {
+        model_id += ('-' + domain);
+      }
+      return Promise.resolve(model_id);
+    }
+
+    function determineCustomModelId(msg) {
+      var custom = msg.custom || config.custom;
+      if (!custom) {
+        return Promise.reject('Missing customised model, message not translated');
+      }
+      return Promise.resolve(custom);
+    }
+
+    function performTrainPreChecks(msg) {
+      var basemodel = msg.basemodel || config.basemodel,
+        filetype = msg.filetype || config.filetype;
+
+      if (!basemodel) {
+        return Promise.reject('Base Model needs must be set for train mode');
+      }
+      if (!filetype) {
+        return Promise.reject('Filetype needs must be set for train mode');
+      }
+      return Promise.resolve({ basemodel:basemodel, filetype:filetype})
+    }
+
+    function loadFile() {
+      var p = new Promise(function resolver(resolve, reject){
         temp.open({
           suffix: '.xml'
         }, function(err, info) {
           if (err) {
-            node.status({
-              fill: 'red',
-              shape: 'dot',
-              text: 'Error receiving the data buffer for training'
-            });
-            throw err;
+            reject(err);
+          } else {
+            resolve(info);
           }
+        });
+      });
+      return p;
+    }
 
-          // Syncing up the asynchronous nature of the stream
-          // so that the full file can be sent to the API.
-          fs.writeFile(info.path, msg.payload, function(err) {
-            if (err) {
-              node.status({
-                fill: 'red',
-                shape: 'dot',
-                text: 'Error processing data buffer for training'
-              });
-              throw err;
-            }
+    function syncFile(msg, info) {
+      var p = new Promise(function resolver(resolve, reject){
+        // Syncing up the asynchronous nature of the stream
+        // so that the full file can be sent to the API.
+        fs.writeFile(info.path, msg.payload, function(err) {
+          if (err) {
+            reject(err);
+          } else {
+            resolve();
+          }
+        });
+      });
+      return p;
+    }
 
-            var params = {};
+    function setTrainParams(msg, info, td) {
+      var params = {};
 
-            // only letters and numbers allowed in the submitted file name
-            // Default the name to a string representing now
-            params.name = (new Date()).toString().replace(/[^0-9a-z]/gi, '');
-            if (msg.filename) {
-              params.name = msg.filename.replace(/[^0-9a-z]/gi, '');
-            }
-            params.base_model_id = model_id;
-            switch (filetype) {
-            case 'forcedglossary':
-              params.forced_glossary = fs.createReadStream(info.path);
-              break;
-            case 'parallelcorpus':
-              params.parallel_corpus = fs.createReadStream(info.path);
-              break;
-            case 'monolingualcorpus':
-              params.monolingual_corpus = fs.createReadStream(info.path);
-              break;
+      // only letters and numbers allowed in the submitted file name
+      // Default the name to a string representing now
+      params.name = (new Date()).toString().replace(/[^0-9a-z]/gi, '');
+      if (msg.filename) {
+        params.name = msg.filename.replace(/[^0-9a-z]/gi, '');
+      }
+      params.base_model_id = td.basemodel;
+
+      switch (td.filetype) {
+      case 'forcedglossary':
+        params.forced_glossary = fs.createReadStream(info.path);
+        break;
+      case 'parallelcorpus':
+        params.parallel_corpus = fs.createReadStream(info.path);
+        break;
+      case 'monolingualcorpus':
+        params.monolingual_corpus = fs.createReadStream(info.path);
+        break;
+      }
+
+      return Promise.resolve(params);
+    }
+
+    function doTrain(language_translator, msg, params) {
+      var p = new Promise(function resolver(resolve, reject){
+        language_translator.createModel(params,
+          function(err, model){
+            if (err) {
+              reject(err);
+            } else {
+              msg.payload = 'Model ' + model.name + ' successfully sent for training with id: ' + model.model_id;
+              msg.trained_model_id = model.model_id;
+              resolve();
             }
+          });
+      });
+      return p;
+    }
 
-            language_translator.createModel(params,
-              function (err, model) {
-                node.status({});
-                if (err) {
-                  node.status({
-                    fill: 'red',
-                    shape: 'ring',
-                    text: 'call to translation service failed'
-                  });
-                  node.error(err, msg);
-                } else {
-                  node.status({
-                    fill: 'green',
-                    shape: 'dot',
-                    text: 'model submitted for training'
-                  });
-                  msg.payload = 'Model ' + model.name + ' successfully sent for training with id: ' + model.model_id;
-                  msg.trained_model_id = model.model_id;
-                  node.send(msg);
-                  node.status({});
-                }
+    function executeDelete(language_translator, msg) {
+      var p = new Promise(function resolver(resolve, reject) {
+        var trainid = msg.trainid || config.trainid;
+        language_translator.deleteModel (
+          {
+            model_id: trainid,
+          },
+          function (err) {
+              if (err) {
+                reject(err);
+              } else {
+                msg.payload = 'Model ' + trainid + ' has been deleted';
+                resolve();
               }
-            );
           });
-        });
-      };
-
+      });
+      return p;
+    }
 
-      // Fetch the status of the trained model. It can only be used if the model is available. This
-      // will also return any training errors. The full error reason is returned in msg.translation
-      var doGetStatus = function (msg, trainid) {
-        node.status({
-          fill: 'blue',
-          shape: 'dot',
-          text: 'requesting status for model ' + trainid,
-        });
+    // Fetch the status of the trained model. It can only be used if the model
+    // is available. This will also return any training errors.
+    // The full error reason is returned in msg.translation
+    function executeGetStatus(language_translator, msg) {
+      var p = new Promise(function resolver(resolve, reject) {
+        var trainid = msg.trainid || config.trainid;
 
         language_translator.getModel(
           {
@@ -294,151 +311,149 @@ module.exports = function (RED) {
           },
           function (err, model) {
             if (err) {
-              node.status({
-                fill: 'red',
-                shape: 'ring',
-                text: 'call to translation service failed'
-              });
-              node.error(err, msg);
+              reject(err);
             } else {
               msg.payload = model.status;
               msg.translation = model;
-              node.send(msg);
-              node.status({});
+              resolve();
             }
           }
         );
-        node.status({});
-      };
-
-      // This removes the trained corpus
-      var doDelete = function (msg, trainid) {
-        node.status({
-          fill: 'blue',
-          shape: 'dot',
-          text: 'deleting model ' + trainid,
-        });
+      });
+      return p;
+    }
 
-        language_translator.deleteModel(
-          {
-            model_id: trainid,
-          },
-          function (err) {
-            if (err) {
-              node.status({
-                fill: 'red',
-                shape: 'ring',
-                text: 'delete failed'
-              });
-              node.error(err, msg);
-            } else {
-              msg.payload = 'Model ' + trainid + ' has been deleted';
-              node.send(msg);
-              node.status({});
-            }
-          }
-        );
-        node.status({});
-      };
+    function executeTrain(language_translator, msg) {
+      var trainingData = {}, p = null, info = null;
+
+      p = performTrainPreChecks(msg)
+        .then(function(td){
+          trainingData = td;
+          return loadFile();
+        })
+        .then(function(i){
+          info = i;
+          return syncFile(msg, info);
+        })
+        .then(function(){
+          return setTrainParams(msg, info, trainingData);
+        })
+        .then(function(params){
+          return doTrain(language_translator, msg, params);
+        })
+
+      return p;
+    }
+
+    function executeCustomTranslate(language_translator, msg) {
+      var p = determineCustomModelId(msg)
+        .then(function(model_id){
+          return doTranslate(language_translator, msg, model_id);
+        })
+      return p;
+    }
 
-      // Now that the do functions have been defined, can now determine what action this node
-      // is configured for.
 
-      if (!msg.payload) {
-        message = 'Missing property: msg.payload';
-        node.error(message, msg);
-        return;
+    function executeTranslate(language_translator, msg) {
+      var p = determineModelId(msg)
+        .then(function(model_id){
+          return doTranslate(language_translator, msg, model_id);
+        })
+      return p;
+    }
+
+    function executeAction(msg, action) {
+      var p = null,
+        language_translator = null,
+        serviceSettings = {
+          username: username,
+          password: password,
+          version: 'v2',
+          headers: {
+            'User-Agent': pkg.name + '-' + pkg.version
+          }
+        };
+
+      if (endpoint) {
+        serviceSettings.url = endpoint;
       }
 
+      language_translator = new LanguageTranslatorV2(serviceSettings);
+
       // We have credentials, and know the mode. Further required fields checks
       // are specific to the requested action.
       // The required fields are checked, before the relevant function is invoked.
       switch (action) {
       case 'translate':
-
-        var domain = msg.domain || config.domain;
-
-        if (!domain) {
-          node.warn('Missing translation domain, message not translated');
-          node.send(msg);
-          return;
-        }
-
-        var srclang = msg.srclang || config.srclang;
-
-        if (!srclang) {
-          node.warn('Missing source language, message not translated');
-          node.send(msg);
-          return;
-        }
-
-        var destlang = msg.destlang || config.destlang;
-
-        if (!destlang) {
-          node.warn('Missing target language, message not translated');
-          node.send(msg);
-          return;
-        }
-
-        var model_id = '';
-
-        model_id = srclang + '-' + destlang;
-        if (domain !== 'news') {
-          model_id += ('-' + domain);
-        }
-        doTranslate(msg, model_id);
+        p = executeTranslate(language_translator, msg);
         break;
-
       case 'custom':
-        var custom = msg.custom || config.custom;
-
-        if (!custom) {
-          node.warn('Missing customised model, message not translated');
-          node.send(msg);
-          return;
-        }
-        doTranslate(msg, custom);
+        p = executeCustomTranslate(language_translator, msg);
         break;
-
       case 'train':
-        var basemodel = msg.basemodel || config.basemodel;
-
-        if (!basemodel) {
-          node.warn('Base Model needs must be set for train mode');
-          node.send(msg);
-        }
-
-        var filetype = msg.filetype || config.filetype;
+        p = executeTrain(language_translator, msg);
+        break;
+      case 'getstatus':
+        p = executeGetStatus(language_translator, msg);
+        break;
+      case 'delete':
+        p = executeDelete(language_translator, msg);
+        break;
+      default:
+        p = Promise.reject('Unexpected Mode');
+        break;
+      }
 
-        if (!filetype) {
-          node.warn('Filetype needs must be set for train mode');
-          node.send(msg);
-        }
-        doTrain(msg, basemodel, filetype);
+      //p = Promise.reject('Still Implementing');
 
-        break;
+      return p;
+    }
 
-      case 'getstatus':
-        var trainid = msg.trainid || config.trainid;
 
-        doGetStatus(msg, trainid);
-        break;
+    // The node has received an input as part of a flow, need to determine
+    // what the request is for, and based on that if the required fields
+    // have been provided.
+    this.on('input', function (msg) {
+      var action = msg.action || config.action;
 
-      case 'delete':
-        var d_trainid = msg.trainid || config.trainid;
+      // The dynamic nature of this node has caused problems with the password field. it is
+      // hidden but not a credential. If it is treated as a credential, it gets lost when there
+      // is a request to refresh the model list.
+      // Credentials are needed for each of the modes.
+      username = sUsername || this.credentials.username;
+      password = sPassword || this.credentials.password || config.password;
 
-        doDelete(msg, d_trainid);
-        break;
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
 
-      default:
-        message = 'Unexpected Mode';
-        node.status({
-          fill: 'blue',
-          shape: 'dot',
-          text: message
+      node.status({});
+
+      initialCheck(username, password)
+        .then(function(){
+          return payloadCheck(msg);
+        })
+        .then(function(){
+          return checkForAction(action);
+        })
+        .then(function(){
+          return checkForGlobalOverides(msg);
+        })
+        .then(function(){
+          node.status({fill:'blue', shape:'dot', text:'executing'});
+          return executeAction(msg, action);
+        })
+        .then(function(){
+          //temp.cleanup();
+          node.status({});
+          node.send(msg);
+        })
+        .catch(function(err){
+          //temp.cleanup();
+          payloadutils.reportError(node,msg,err);
+          node.send(msg);
         });
-        node.error(message, msg);
-      }
     });
   }
 

From b2c96b612da5ec19dbac85346cf8b5d12950782d Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Tue, 6 Jun 2017 16:21:37 +0100
Subject: [PATCH 09/20] Allow Endpoint to be specified in Language Translator
 Util Node

---
 services/language_translator_util/v2.html | 24 +++++++++++++++-
 services/language_translator_util/v2.js   | 35 ++++++++++++++++-------
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/services/language_translator_util/v2.html b/services/language_translator_util/v2.html
index 4b71b6c9..89da9341 100644
--- a/services/language_translator_util/v2.html
+++ b/services/language_translator_util/v2.html
@@ -32,6 +32,17 @@
         <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="Password">
     </div>
+
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-cwm-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-cwm-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/language-translator/api">
+    </div>
+
 </script>
 
 <script type="text/x-red" data-help-name="watson-translator-util">
@@ -58,7 +69,9 @@
         RED.nodes.registerType('watson-translator-util', {
             category: 'IBM Watson',
             defaults: {
-                name: {value: ""}
+                name: {value: ""},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/language-translator/api'}
             },
             credentials: {
               username: {type:"text"},
@@ -76,6 +89,15 @@
                 return this.name ? "node_label_italic" : "";
             },
             oneditprepare: function() {
+                $('#node-input-default-endpoint').change(function () {
+                    var checked = $('#node-input-default-endpoint').prop('checked')
+                    if (checked) {
+                        $('#node-input-service-endpoint').parent().hide();
+                    } else {
+                        $('#node-input-service-endpoint').parent().show();
+                    }
+                });
+                
                 $.getJSON('watson-translator-util/vcap/')
                   .done(function (service) {
                     $('.credentials').toggle(!service);
diff --git a/services/language_translator_util/v2.js b/services/language_translator_util/v2.js
index 37c28dfe..dfc491c9 100644
--- a/services/language_translator_util/v2.js
+++ b/services/language_translator_util/v2.js
@@ -20,11 +20,15 @@ module.exports = function (RED) {
     cfenv = require('cfenv'),
     username = null, password = null, sUsername = null, sPassword = null,
     service = cfenv.getAppEnv().getServiceCreds(/language translator/i),
-    endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
+    endpoint = '',
+    sEndpoint = 'https://gateway.watsonplatform.net/language-translator/api';
+
+    //endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
 
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
   // These are APIs that the node has created to allow it to dynamically fetch Bluemix
@@ -62,7 +66,16 @@ module.exports = function (RED) {
     // what the request is for, and based on that if the required fields
     // have been provided.
     this.on('input', function (msg) {
-      var message = '';
+
+      var message = '',
+        serviceSettings = {
+          username: username,
+          password: password,
+          version: 'v2',
+          headers: {
+            'User-Agent': pkg.name + '-' + pkg.version
+          }
+        };
 
       if (!username || !password) {
         message = 'Missing Language Translation service credentials';
@@ -70,15 +83,15 @@ module.exports = function (RED) {
         return;
       }
 
-      var lt = new LanguageTranslatorV2({
-        username: username,
-        password: password,
-        version: 'v2',
-        url: endpointUrl,
-        headers: {
-          'User-Agent': pkg.name + '-' + pkg.version
-        }
-      });
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
+      if (endpoint) {
+        serviceSettings.url = endpoint;
+      }
+
+      var lt = new LanguageTranslatorV2(serviceSettings);
 
       // set global variable in order to make them accessible for the tranlsation node
       var globalContext = this.context().global;

From 09b340bd46f432155d556c34f17a4fa999d3b20b Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Tue, 6 Jun 2017 17:31:24 +0100
Subject: [PATCH 10/20] Migrate PI Node to make use of Promises

---
 services/language_translator/v2.js  |   4 +-
 services/personality_insights/v3.js | 144 ++++++++++++++++------------
 2 files changed, 87 insertions(+), 61 deletions(-)

diff --git a/services/language_translator/v2.js b/services/language_translator/v2.js
index 168e6579..077e7c98 100644
--- a/services/language_translator/v2.js
+++ b/services/language_translator/v2.js
@@ -445,12 +445,12 @@ module.exports = function (RED) {
           return executeAction(msg, action);
         })
         .then(function(){
-          //temp.cleanup();
+          temp.cleanup();
           node.status({});
           node.send(msg);
         })
         .catch(function(err){
-          //temp.cleanup();
+          temp.cleanup();
           payloadutils.reportError(node,msg,err);
           node.send(msg);
         });
diff --git a/services/personality_insights/v3.js b/services/personality_insights/v3.js
index 40e14306..e25c7ab2 100644
--- a/services/personality_insights/v3.js
+++ b/services/personality_insights/v3.js
@@ -40,6 +40,41 @@ module.exports = function (RED) {
     res.json(service ? {bound_service: true} : null);
   });
 
+
+  function payloadCheck(msg) {
+    if (!msg.payload) {
+      return Promise.reject('Missing property: msg.payload');
+    }
+    if ('string' !== typeof(msg.payload)) {
+      return Promise.reject('submitted msg.payload is not text');
+    }
+    return Promise.resolve();
+  }
+
+  function wordcountCheck(msg, config) {
+    var p = new Promise(function resolver(resolve, reject) {
+      var wc = payloadutils.word_count(config.inputlang);
+      wc(msg.payload, function (length) {
+        if (length < 100) {
+          reject('Personality insights requires a minimum of one hundred words.' +
+                            ' Only ' + length + ' submitted');
+        } else {
+          resolve();
+        }
+      });
+    });
+    return p;
+  }
+
+  function credentialsCheck(node) {
+    username = sUsername || node.credentials.username;
+    password = sPassword || node.credentials.password;
+
+    if (!username || !password) {
+      return Promise.reject('Missing Personality Insights service credentials');
+    }
+  }
+
   // This function prepares the params object for the
   // call to Personality Insights
   function prepareParams(msg, config) {
@@ -69,7 +104,34 @@ module.exports = function (RED) {
       }
     };
 
-    return params;
+    return Promise.resolve(params);
+  }
+
+  function executeService(msg, params) {
+    var p = new Promise(function resolver(resolve, reject) {
+      var personality_insights = null,
+        serviceSettings = {
+          username: username,
+          password: password,
+          version_date: '2016-10-20',
+          headers: {
+            'User-Agent': pkg.name + '-' + pkg.version
+          }
+        };
+
+      personality_insights = new PersonalityInsightsV3(serviceSettings);
+
+      personality_insights.profile(params, function(err, response){
+        if (err) {
+          reject(err);
+        } else {
+          msg.insights = response;
+          resolve();
+        }
+      });
+
+    });
+    return p;
   }
 
   // This is the start of the Node Code. In this case only on input
@@ -77,68 +139,32 @@ module.exports = function (RED) {
   function Node(config) {
     RED.nodes.createNode(this,config);
     var node = this,
-      wc = payloadutils.word_count(config.inputlang),
       message = '';
 
     this.on('input', function (msg) {
-      //var self = this;
-
-      if (!msg.payload) {
-        message = 'Missing property: msg.payload';
-        node.status({fill:'red', shape:'ring', text:'missing payload'});
-        node.error(message, msg);
-        return;
-      }
-
-      if ('string' !== typeof(msg.payload)) {
-        message = 'submitted msg.payload is not text';
-        node.status({fill:'red', shape:'ring', text:'payload is not text'});
-        node.error(message, msg);
-        return;
-      }
-
-      wc(msg.payload, function (length) {
-        if (length < 100) {
-          message = 'Personality insights requires a minimum of one hundred words.' +
-                            ' Only ' + length + ' submitted';
-          node.status({fill:'red', shape:'ring', text:'insufficient words submitted'});
-          node.error(message, msg);
-          return;
-        }
-
-        username = sUsername || node.credentials.username;
-        password = sPassword || node.credentials.password;
-
-        if (!username || !password) {
-          message = 'Missing Personality Insights service credentials';
-          node.status({fill:'red', shape:'ring', text:'missing credentials'});
-          node.error(message, msg);
-          return;
-        }
-
-        var params = prepareParams(msg, config),
-          personality_insights = new PersonalityInsightsV3({
-            username: username,
-            password: password,
-            version_date: '2016-10-20',
-            headers: {
-              'User-Agent': pkg.name + '-' + pkg.version
-            }
-          });
-
+      node.status({});
+
+      payloadCheck(msg)
+      .then(function(){
+        return wordcountCheck(msg, config);
+      })
+      .then(function(){
+        return credentialsCheck(node);
+      })
+      .then(function(){
+        return prepareParams(msg, config);
+      })
+      .then(function(params){
         node.status({fill:'blue', shape:'dot', text:'requesting'});
-        personality_insights.profile(params, function(err, response){
-          node.status({});
-          if (err) {
-            node.status({fill:'red', shape:'ring', text:'processing error'});
-            node.error(err, msg);
-          } else{
-            msg.insights = response;
-          }
-
-          node.send(msg);
-        });
-
+        return executeService(msg, params);
+      })
+      .then(function(){
+        node.status({});
+        node.send(msg);
+      })
+      .catch(function(err){
+        payloadutils.reportError(node, msg, err);
+        node.send(msg);
       });
     });
   }

From 2ce5032787a61cad6fbe2ffe238559d6c72e644f Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Tue, 6 Jun 2017 17:49:58 +0100
Subject: [PATCH 11/20] Allow Endpoint to be specified in Personality Insights
 Node

---
 README.md                             |  3 ++-
 services/personality_insights/v3.html | 24 +++++++++++++++++++++++-
 services/personality_insights/v3.js   | 20 +++++++++++++++++++-
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3ae6533a..85f2f01b 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,8 @@ Node-RED Watson Nodes for IBM Bluemix
 
 ### New in version 0.5.9
 - Endpoint can now be specified in Conversation,
-Conversation Workspace Manager Language Identify and Language Translation nodes. 
+Conversation Workspace Manager Language Identify, Language Translation, 
+and Personality Insight nodes.
 
 ### New in version 0.5.8
 - Visual Reconition Node, now accepts readstream on msg.payload
diff --git a/services/personality_insights/v3.html b/services/personality_insights/v3.html
index 543503b6..b4e7dae5 100644
--- a/services/personality_insights/v3.html
+++ b/services/personality_insights/v3.html
@@ -32,6 +32,17 @@
         <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="Password">
     </div>
+
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-cwm-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-cwm-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/personality-insights/api">
+    </div>
+
     <div class="form-row">
         <label for="node-input-inputlang"><i class="fa fa-language"></i> Input Text Language</label>
         <select type="text" id="node-input-inputlang" style="display: inline-block; width: 70%;" >
@@ -107,7 +118,9 @@
                 inputlang: {value: "en"},
                 outputlang: {value: "en"},
                 rawscores: {value: false},
-                consumption: {value: false}
+                consumption: {value: false},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/personality-insights/api'}                
             },
             credentials: {
               username: {type:"text"},
@@ -125,6 +138,15 @@
                 return this.name ? "node_label_italic" : "";
             },
             oneditprepare: function() {
+                $('#node-input-default-endpoint').change(function () {
+                  var checked = $('#node-input-default-endpoint').prop('checked')
+                  if (checked) {
+                    $('#node-input-service-endpoint').parent().hide();
+                  } else {
+                    $('#node-input-service-endpoint').parent().show();
+                  }
+                });
+
                 $.getJSON('watson-personality-insights-v3/vcap/')
                   .done(function (service) {
                     $('.credentials').toggle(!service);
diff --git a/services/personality_insights/v3.js b/services/personality_insights/v3.js
index e25c7ab2..082b43d4 100644
--- a/services/personality_insights/v3.js
+++ b/services/personality_insights/v3.js
@@ -25,6 +25,8 @@ module.exports = function (RED) {
     password = null,
     sUsername = null,
     sPassword = null,
+    endpoint = '',
+    sEndpoint = 'https://gateway.watsonplatform.net/personality-insights/api',
 
     VALID_INPUT_LANGUAGES = ['ar','en','es','ja'],
     VALID_RESPONSE_LANGUAGES = ['ar','de','en','es','fr','it','ja','ko','pt-br','zh-cn','zh-tw'];
@@ -32,6 +34,7 @@ module.exports = function (RED) {
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
   // This HTTP GET REST request is used by the browser side of the node to
@@ -107,6 +110,14 @@ module.exports = function (RED) {
     return Promise.resolve(params);
   }
 
+  function setEndPoint(config) {
+    endpoint = sEndpoint;
+    if ((!config['default-endpoint']) && config['service-endpoint']) {
+      endpoint = config['service-endpoint'];
+    }
+    return Promise.resolve();
+  }
+
   function executeService(msg, params) {
     var p = new Promise(function resolver(resolve, reject) {
       var personality_insights = null,
@@ -119,6 +130,10 @@ module.exports = function (RED) {
           }
         };
 
+      if (endpoint) {
+        serviceSettings.url = endpoint;
+      }
+
       personality_insights = new PersonalityInsightsV3(serviceSettings);
 
       personality_insights.profile(params, function(err, response){
@@ -152,8 +167,11 @@ module.exports = function (RED) {
         return credentialsCheck(node);
       })
       .then(function(){
-        return prepareParams(msg, config);
+        return setEndPoint(config);
       })
+      .then(function(){
+        return prepareParams(msg, config);
+      })      
       .then(function(params){
         node.status({fill:'blue', shape:'dot', text:'requesting'});
         return executeService(msg, params);

From 0b2dcd1a827e486fddb12ece94bbb22b08f53715 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Tue, 6 Jun 2017 18:27:25 +0100
Subject: [PATCH 12/20] Allow Endpoint to be specified in Tone Analyzer Node

---
 services/tone_analyzer/v3.html | 24 ++++++++++++++++++++++--
 services/tone_analyzer/v3.js   | 19 +++++++++++++++++--
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/services/tone_analyzer/v3.html b/services/tone_analyzer/v3.html
index 5aa6113d..b371f1f3 100644
--- a/services/tone_analyzer/v3.html
+++ b/services/tone_analyzer/v3.html
@@ -33,6 +33,16 @@
         <input type="password" id="node-input-password" placeholder="Password">
     </div>
 
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-cwm-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-cwm-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/tone-analyzer/api">
+    </div>
+
     <div class="form-row">
         <label for="node-input-tone-method"><i class="fa fa-book"></i> Method: </label>
         <select type="text" id="node-input-tone-method" style="display: inline-block; width: 70%;">
@@ -127,6 +137,15 @@
       var method = $('#node-input-tone-method').val();
       ToneV3.processSelectedMethod(method);
     });
+
+    $('#node-input-default-endpoint').change(function () {
+      var checked = $('#node-input-default-endpoint').prop('checked')
+      if (checked) {
+        $('#node-input-service-endpoint').parent().hide();
+      } else {
+        $('#node-input-service-endpoint').parent().show();
+      }
+    });
   }
 
   ToneV3.checkForPrepare = function () {
@@ -148,7 +167,6 @@
       })
   }
 
-
     (function() {
         RED.nodes.registerType('watson-tone-analyzer-v3', {
             category: 'IBM Watson',
@@ -157,7 +175,9 @@
                 tones: {value: "all"},
                 sentences: {value: "true"},
                 contentType: {value: "false"},
-                "tone-method": {value:"generalTone"}
+                "tone-method": {value:"generalTone"},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/tone-analyzer/api'}
             },
             credentials: {
               username: {type:"text"},
diff --git a/services/tone_analyzer/v3.js b/services/tone_analyzer/v3.js
index 134e78cf..74e6f05b 100644
--- a/services/tone_analyzer/v3.js
+++ b/services/tone_analyzer/v3.js
@@ -22,6 +22,8 @@ module.exports = function (RED) {
     payloadutils = require('../../utilities/payload-utils'),
     toneutils = require('../../utilities/tone-utils'),
     username = '', password = '', sUsername = '', sPassword = '',
+    endpoint = '',
+    sEndpoint = 'https://gateway.watsonplatform.net/tone-analyzer/api',
     service = null;
 
   // Require the Cloud Foundry Module to pull credentials from bound service
@@ -37,6 +39,7 @@ module.exports = function (RED) {
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
   // Node RED Admin - fetch and set vcap services
@@ -86,15 +89,27 @@ module.exports = function (RED) {
     }
   };
 
+
   function invokeService(config, options, settings) {
-    const tone_analyzer = new ToneAnalyzerV3({
+    var serviceSettings = {
       'username': settings.username,
       'password': settings.password,
       version_date: '2016-05-19',
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
-    });
+    };
+
+    endpoint = sEndpoint;
+    if ((!config['default-endpoint']) && config['service-endpoint']) {
+      endpoint = config['service-endpoint'];
+    }
+
+    if (endpoint) {
+      serviceSettings.url = endpoint;
+    }
+
+    const tone_analyzer = new ToneAnalyzerV3(serviceSettings);
 
     var p = new Promise(function resolver(resolve, reject){
       var m = 'tone';

From 612221d2ea833f8b22936c9cfc40702d0bb1bc14 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Wed, 7 Jun 2017 11:34:31 +0100
Subject: [PATCH 13/20] Migrate STT Node to Promises

---
 README.md                     |   4 +-
 services/speech_to_text/v1.js | 374 +++++++++++++++-------------------
 2 files changed, 170 insertions(+), 208 deletions(-)

diff --git a/README.md b/README.md
index 85f2f01b..b2dea20f 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ Node-RED Watson Nodes for IBM Bluemix
 
 ### New in version 0.5.9
 - Endpoint can now be specified in Conversation,
-Conversation Workspace Manager Language Identify, Language Translation, 
-and Personality Insight nodes.
+Conversation Workspace Manager Language Identify, Language Translation,
+Personality Insight and Tone Analyzer nodes.
 
 ### New in version 0.5.8
 - Visual Reconition Node, now accepts readstream on msg.payload
diff --git a/services/speech_to_text/v1.js b/services/speech_to_text/v1.js
index 2984b5fc..7fb2fe35 100644
--- a/services/speech_to_text/v1.js
+++ b/services/speech_to_text/v1.js
@@ -24,6 +24,7 @@ module.exports = function (RED) {
     fs = require('fs'),
     fileType = require('file-type'),
     serviceutils = require('../../utilities/service-utils'),
+    payloadutils = require('../../utilities/payload-utils'),
     sttV1 = require('watson-developer-cloud/speech-to-text/v1'),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER);
 
@@ -44,11 +45,9 @@ module.exports = function (RED) {
     sPassword = service.password;
   }
 
-
   // temp is being used for file streaming to allow the file to arrive so it can be processed.
   temp.track();
 
-
   // These are APIs that the node has created to allow it to dynamically fetch Bluemix
   // credentials, and also translation models. This allows the node to keep up to
   // date with new tranlations, without the need for a code update of this node.
@@ -58,7 +57,6 @@ module.exports = function (RED) {
     res.json(service ? {bound_service: true} : null);
   });
 
-
   // API used by widget to fetch available models
   RED.httpAdmin.get('/watson-speech-to-text/models', function (req, res) {
     var stt = new sttV1({
@@ -98,194 +96,57 @@ module.exports = function (RED) {
   });
 
 
-  // Utility function to perform a URL validation check
-  function urlCheck(str) {
-    var parsed = url.parse(str);
-
-    return (!!parsed.hostname && !!parsed.protocol && str.indexOf(' ') < 0);
-  }
-
-  // Function that is syncing up the asynchronous nature of the stream
-  // so that the full file can be sent to the API.
-  var stream_buffer = function(file, contents, cb) {
-    fs.writeFile(file, contents, function (err) {
-      if (err) throw err;
-      cb(fileType(contents).ext);
-    });
-  };
-
-
-  // Function that is syncing up the asynchronous nature of the stream
-  // so that the full file can be sent to the API.
-  var stream_url = function(file, url, cb) {
-    var wstream = fs.createWriteStream(file);
-
-    wstream.on('finish', function () {
-      fs.readFile(file, function (err, buf) {
-        var fmt = null;
-        var error = null;
-
-        if (err) {
-          error = err;
-        }
-        if (fileType(buf)) {
-          fmt = fileType(buf).ext;
-        } else {
-          error = 'Unrecognised file format';
-        }
-        cb(error, fmt);
-      });
-    });
-
-    request(url).pipe(wstream);
-  };
-
   // This is the Speech to Text Node
 
   function Node (config) {
     RED.nodes.createNode(this, config);
     var node = this;
 
-    this.on('input', function (msg) {
-
-      // This section is for var functions that will be called, in context with
-      // msg, when the input stream has been received.
-
-      // This is the callback after the call to the speech to text service.
-      // Set up as a var within this scope, so it has access to node, msg etc.
-      var actionComplete = function(err, data) {
-        if (err || data.status === 'ERROR') {
-          node.status({fill:'red', shape:'ring', text:'call to speech to text service failed'});
-          node.error(err, msg);
-        } else {
-          var r = data.results;
-
-          msg.transcription = '';
-          if (r) {
-            if (r.length && r[0].alternatives.length) {
-              msg.fullresult = r;
-            }
-            msg.transcription = '';
-            r.forEach(function(a){
-              a.alternatives.forEach(function(t){
-                msg.transcription += t.transcript;
-              });
-            });
-          }
-          node.send(msg);
-        }
-      };
-
-
-      // Utility function that performs the speech to text service call.
-      // the cleanup removes the temp storage, and I am not sure whether
-      // it should be called here or after the service returns and passed
-      // control back to cbdone.
-      function performAction(audio, format, cbdone, cbcleanup) {
-        var speech_to_text = new sttV1({
-          username: username,
-          password: password,
-          headers: {
-            'User-Agent': pkg.name + '-' + pkg.version
-          }
-        });
-
-        // If we get to here then the audio is in one of the supported formats.
-        if (format === 'ogg') {
-          format += ';codecs=opus';
-        }
-
-        var model = config.lang + '_' + config.band;
-
-        var params = {
-          audio: audio,
-          content_type: 'audio/' + format,
-          model: model,
-          continuous: config.continuous ? config.continuous : false,
-          speaker_labels: config.speakerlabels ? config.speakerlabels : false,
-        };
-
-        // Check the params for customisation options
-        if (config.langcustom && 'NoCustomisationSetting' !== config.langcustom) {
-          params.customization_id = config.langcustom;
-        }
-
-        node.status({fill:'blue', shape:'dot', text:'requesting'});
-
-        // Everything is now in place to invoke the service
-        speech_to_text.recognize(params, function (err, res) {
-          node.status({});
-          cbdone(err,res);
-          if (cbcleanup) {
-            cbcleanup();
-          }
-        });
-
+    function initialCheck(username, password) {
+      if (!username || !password) {
+        return Promise.reject('Missing Speech To Text service credentials');
       }
+      return Promise.resolve();
+    }
 
-
-      // The functions have now been defined, and will be within the context
-      // of the config.
-      // Now perform checks on the input and parameters, to make sure that all
-      // is in place before the service is invoked.
-
+    function configCheck() {
       var message = '';
 
-      // Credentials are needed for the service. They will either be bound or
-      // specified by the user in the dialog.
-      username = sUsername || this.credentials.username;
-      password = sPassword || this.credentials.password || config.password;
-
-      if (!username || !password) {
-        var message_err_credentials = 'Missing Speech To Text service credentials';
-
-        node.error(message_err_credentials, msg);
-        return;
-      }
-
       if (!config.lang) {
-        var message_err_lang = 'Missing audio language configuration, unable to process speech.';
-
-        node.error(message_err_lang, msg);
-        return;
-      }
-
-      if (!config.band) {
-        var message_err_band = 'Missing audio quality configuration, unable to process speech.';
-
-        node.error(message_err_band, msg);
-        return;
+        message = 'Missing audio language configuration, unable to process speech.';
+      } else if (!config.band) {
+        message = 'Missing audio quality configuration, unable to process speech.';
+      } else if (!config.continuous) {
+        // Has to be there, as its a checkbox, but flows switching from the old (frankly
+        // unbeliveable) select might not have it set.
+        message = 'Missing continuous details, unable to process speech.';
       }
 
-      // Has to be there, as its a checkbox, but flows switching from the old (frankly
-      // unbeliveable) select might not have it set.
-      if (!config.continuous) {
-        var message_err_continuous = 'Missing continuous details, unable to process speech.';
-
-        node.error(message_err_continuous, msg);
-        return;
+      if (message) {
+        return Promise.reject(message);
       }
+      return Promise.resolve();
+    }
 
+    function payloadCheck(msg) {
+      var message = '';
       // The input comes in on msg.payload, and can either be an audio file or a string
       // representing a URL.
       if (!msg.payload instanceof Buffer || !typeof msg.payload === 'string') {
         message = 'Invalid property: msg.payload, can only be a URL or a Buffer.';
-
-        node.error(message, msg);
-        return;
-      }
-
-      // This check is repeated just before the call to the service, but
-      // its also performed here as a double check.
-      if (!(msg.payload instanceof Buffer)) {
-        if (typeof msg.payload === 'string' && !urlCheck(msg.payload)) {
+      } else if (!(msg.payload instanceof Buffer)) {
+        // This check is repeated just before the call to the service, but
+        // its also performed here as a double check.
+        if (typeof msg.payload === 'string' && !payloadutils.urlCheck(msg.payload)) {
           message = 'Invalid URL.';
-
-          node.error(message, msg)
-          return;
         }
       } else {
-        var f = fileType(msg.payload).ext;
+        var f = 'txt', ft = '';
+
+        ft = fileType(msg.payload);
+        if (ft) {
+          f = ft.ext;
+        }
 
         switch (f) {
         case 'wav':
@@ -293,64 +154,165 @@ module.exports = function (RED) {
         case 'ogg':
           break;
         default:
-          var message_err_format
+          message
               = 'Audio format (' + f + ') not supported, must be encoded as WAV, FLAC or OGG.';
-
-          node.error(message_err_format, msg);
-          return;
         }
       }
+      if (message) {
+        return Promise.reject(message);
+      }
+      return Promise.resolve();
+    }
 
-      // We are now ready to process the input data
-      // If its a buffer then need to read it all before invoking the service
-      if (msg.payload instanceof Buffer) {
+    function processInputBuffer(msg) {
+      var p = new Promise(function resolver(resolve, reject){
         temp.open({suffix: '.' + fileType(msg.payload).ext}, function (err, info) {
           if (err) {
-            node.status({fill:'red', shape:'ring', text:'unable to open audio stream'});
-            message = 'Node has been unable to open the audio stream';
-
-            node.error(message, msg);
-            return;
+            reject(err);
           }
+          payloadutils.stream_buffer(info.path, msg.payload, function (format) {
+            var audioData = {},
+              audio = fs.createReadStream(info.path);
 
-          stream_buffer(info.path, msg.payload, function (format) {
-            var audio = fs.createReadStream(info.path);
-
-            performAction(audio, format, actionComplete, temp.cleanup);
+            audioData.audio = audio;
+            audioData.format = format;
+            resolve(audioData);
           });
         });
-      } else if (urlCheck(msg.payload)) {
+      });
+      return p;
+    }
+
+    function processInputURL(msg) {
+      var p = new Promise(function resolver(resolve, reject){
         temp.open({suffix: '.audio'}, function(err, info){
           if (err) {
-            node.status({fill:'red', shape:'ring',
-              text:'unable to open url audio stream'});
-            message = 'Node has been unable to open the url audio stream';
-
-            node.error(message, msg);
-            return;
+            reject(err);
           }
-
-          stream_url(info.path, msg.payload, function (err, format) {
+          payloadutils.stream_url(info.path, msg.payload, function (err, format) {
             if (err) {
-              node.status({fill:'red', shape:'ring',
-                text:'url stream not recognised as audio'});
-                message = 'Node did not recognise the url audio stream as audio';
+              reject(err);
+            }
+            var audioData = {},
+              audio = fs.createReadStream(info.path);
 
-              node.error(message, msg);
-              return;
+            audioData.audio = audio;
+            audioData.format = format;
+            resolve(audioData);
+          });
+        });
+      });
+      return p;
+    }
+
+    function processInput(msg) {
+      // We are now ready to process the input data
+      // If its a buffer then need to read it all before invoking the service
+      if (msg.payload instanceof Buffer) {
+        return processInputBuffer(msg);
+      } else if (payloadutils.urlCheck(msg.payload)) {
+        return processInputURL(msg);
+      }
+      return Promise.reject('Payload must be either an audio buffer or a string representing a url');
+    }
+
+    function performSTT(audioData) {
+      var p = new Promise(function resolver(resolve, reject){
+        var model = config.lang + '_' + config.band;
+          params = {};
+          speech_to_text = new sttV1({
+            username: username,
+            password: password,
+            headers: {
+              'User-Agent': pkg.name + '-' + pkg.version
             }
-            var audio = fs.createReadStream(info.path);
+          });
+
+        // If we get to here then the audio is in one of the supported formats.
+        if (audioData.format === 'ogg') {
+          audioData.format += ';codecs=opus';
+        }
 
-            performAction(audio, format, actionComplete, temp.cleanup);
+        params = {
+          audio: audioData.audio,
+          content_type: 'audio/' + audioData.format,
+          model: model,
+          continuous: config.continuous ? config.continuous : false,
+          speaker_labels: config.speakerlabels ? config.speakerlabels : false,
+        };
+
+        // Check the params for customisation options
+        if (config.langcustom && 'NoCustomisationSetting' !== config.langcustom) {
+          params.customization_id = config.langcustom;
+        }
+
+        // Everything is now in place to invoke the service
+        speech_to_text.recognize(params, function (err, res) {
+          if (err) {
+            reject(err);
+          } else {
+            resolve(res);
+          }
+        });
+      });
+      return p;
+    }
+
+    function processResponse(msg, data) {
+      var r = data.results;
+
+      msg.transcription = '';
+      if (r) {
+        if (r.length && r[0].alternatives.length) {
+          msg.fullresult = r;
+        }
+        msg.transcription = '';
+        r.forEach(function(a){
+          a.alternatives.forEach(function(t){
+            msg.transcription += t.transcript;
           });
         });
-      } else {
-        node.status({fill:'red', shape:'ring', text:'payload is invalid'});
-        message = 'Payload must be either an audio buffer or a string representing a url';
-        node.error(message, msg);
-        return;
       }
 
+      return Promise.resolve();
+    }
+
+    this.on('input', function (msg) {
+      // Credentials are needed for the service. They will either be bound or
+      // specified by the user in the dialog.
+      username = sUsername || this.credentials.username;
+      password = sPassword || this.credentials.password || config.password;
+
+      node.status({});
+
+      // Now perform checks on the input and parameters, to make sure that all
+      // is in place before the service is invoked.
+      initialCheck(username, password)
+      .then(function(){
+        return configCheck();
+      })
+      .then(function(){
+        return payloadCheck(msg);
+      })
+      .then(function(){
+        return processInput(msg);
+      })
+      .then(function(audioData){
+        node.status({fill:'blue', shape:'dot', text:'requesting'});
+        return performSTT(audioData);
+      })
+      .then(function(data){
+        return processResponse(msg, data);
+      })
+      .then(function(){
+        temp.cleanup();
+        node.status({});
+        node.send(msg);
+      })
+      .catch(function(err){
+        temp.cleanup();
+        payloadutils.reportError(node,msg,err);
+      });
 
     });
   }

From 76eb4b4f85f346c26bd644242be84e47a794c611 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Wed, 7 Jun 2017 12:47:53 +0100
Subject: [PATCH 14/20] Allow Endpoint to be specified

---
 README.md                            |  4 +--
 services/language_translator/v2.html | 12 +++++--
 services/language_translator/v2.js   |  3 +-
 services/speech_to_text/v1.html      | 47 +++++++++++++++++++++++-----
 services/speech_to_text/v1.js        | 34 ++++++++++++++++----
 5 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index b2dea20f..545f05da 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ Node-RED Watson Nodes for IBM Bluemix
 
 ### New in version 0.5.9
 - Endpoint can now be specified in Conversation,
-Conversation Workspace Manager Language Identify, Language Translation,
-Personality Insight and Tone Analyzer nodes.
+Conversation Workspace Manager Language Identify, Language Translator,
+Speech to Text, Personality Insight and Tone Analyzer nodes.
 
 ### New in version 0.5.8
 - Visual Reconition Node, now accepts readstream on msg.payload
diff --git a/services/language_translator/v2.html b/services/language_translator/v2.html
index 2cbd70f4..3e80bd7f 100644
--- a/services/language_translator/v2.html
+++ b/services/language_translator/v2.html
@@ -42,10 +42,10 @@
     <div class="form-row credentials">
         <label>&nbsp;</label>
         <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-cwm-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
     </div>
     <div class="form-row">
-        <label for="node-input-cwm-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
         <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/language-translator/api">
     </div>
 
@@ -292,8 +292,14 @@
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
     var e = $('#node-input-service-endpoint').val();
+    var creds = {un: u, pwd: p};
 
-    $.getJSON('watson-translator/models/', {un: u, pwd: p, e: e}).done(function (data) {
+    if (! $('#node-input-default-endpoint').prop('checked')) {
+      creds.e = e;
+    }
+
+    $.getJSON('watson-translator/models/', creds)
+    .done(function (data) {
       if (data.models) {
         tor.models = data.models;
         tor.have_credentials = true;
diff --git a/services/language_translator/v2.js b/services/language_translator/v2.js
index 077e7c98..7a266635 100644
--- a/services/language_translator/v2.js
+++ b/services/language_translator/v2.js
@@ -59,7 +59,8 @@ module.exports = function (RED) {
 
   // API used by widget to fetch available models
   RED.httpAdmin.get('/watson-translator/models', function (req, res) {
-    endpoint = sEndpoint ? sEndpoint : req.query.e;
+    //endpoint = sEndpoint ? sEndpoint : req.query.e;
+    endpoint = req.query.e ? req.query.e : sEndpoint;
 
     var lt = new LanguageTranslatorV2({
       username: sUsername ? sUsername : req.query.un,
diff --git a/services/speech_to_text/v1.html b/services/speech_to_text/v1.html
index 5adff536..3fe129a0 100644
--- a/services/speech_to_text/v1.html
+++ b/services/speech_to_text/v1.html
@@ -39,6 +39,17 @@
         <input type="password" id="node-input-password" placeholder="Password"></input>
     </div>
 
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://stream.watsonplatform.net/speech-to-text/api">
+    </div>
+
+
     <div class="form-row">
         <label for="node-input-lang"><i class="fa fa-language"></i> Language</label>
         <select type="text" id="node-input-lang" style="display: inline-block; width: 70%;">
@@ -296,6 +307,15 @@
       stt.band_selected = $('#node-input-band').val();
       stt.populateCustoms();
     });
+
+    $('#node-input-default-endpoint').change(function () {
+      var checked = $('#node-input-default-endpoint').prop('checked')
+      if (checked) {
+        $('#node-input-service-endpoint').parent().hide();
+      } else {
+        $('#node-input-service-endpoint').parent().show();
+      }
+    });
   }
 
   // Function to fetch the customisations, should only be done once
@@ -303,10 +323,15 @@
     if (!stt.customisations) {
       var u = $('#node-input-username').val();
       var p = $('#node-input-password').val();
+      var e = $('#node-input-service-endpoint').val();
+      var creds = {un: u, pwd: p};
+
+      if (! $('#node-input-default-endpoint').prop('checked')) {
+        creds.e = e;
+      }
 
-      $.getJSON('watson-speech-to-text/customs',
-                 {un: u, pwd: p}
-      ).done(function (data) {
+      $.getJSON('watson-speech-to-text/customs', creds)
+      .done(function (data) {
         $('label#node-label-message').parent().hide();
         if (data.error) {
           $('label#node-label-message').parent().show();
@@ -342,14 +367,19 @@
   stt.getModels = function (haveCredentials) {
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
+    var e = $('#node-input-service-endpoint').val();
+    var creds = {un: u, pwd: p};
+
+    if (! $('#node-input-default-endpoint').prop('checked')) {
+      creds.e = e;
+    }
 
-    $.getJSON('watson-speech-to-text/models/', {un: u, pwd: p}).done(function (data) {
+    $.getJSON('watson-speech-to-text/models/', creds)
+    .done(function (data) {
       if (data.error) {
         $('label#node-label-message').parent().show();
         $('label#node-label-message').text(data.error);
       } else if (data.models) {
-        console.log('models found');
-        console.log(data.models);
         stt.models = data.models;
         //have_credentials = true;
         stt.postModelCheck();
@@ -455,7 +485,10 @@
                 langcustomhidden: {value: ''},
                 band: {value: ''},
                 bandhidden: {value: ''},
-                password: {value: ''}
+                password: {value: ''},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://stream.watsonplatform.net/speech-to-text/api'
+              }
             },
             credentials: {
               username: {type:'text'} //,
diff --git a/services/speech_to_text/v1.js b/services/speech_to_text/v1.js
index 7fb2fe35..36c79ad2 100644
--- a/services/speech_to_text/v1.js
+++ b/services/speech_to_text/v1.js
@@ -26,6 +26,9 @@ module.exports = function (RED) {
     serviceutils = require('../../utilities/service-utils'),
     payloadutils = require('../../utilities/payload-utils'),
     sttV1 = require('watson-developer-cloud/speech-to-text/v1'),
+    username = '', password = '', sUsername = '', sPassword = '',
+    endpoint = '',
+    sEndpoint = 'https://stream.watsonplatform.net/speech-to-text/api',
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER);
 
   // Require the Cloud Foundry Module to pull credentials from bound service
@@ -38,11 +41,10 @@ module.exports = function (RED) {
   // user who, when he errenously enters bad credentials, can't figure out why
   // the edited ones are not being taken.
 
-  var username, password, sUsername, sPassword;
-
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
   // temp is being used for file streaming to allow the file to arrive so it can be processed.
@@ -59,9 +61,13 @@ module.exports = function (RED) {
 
   // API used by widget to fetch available models
   RED.httpAdmin.get('/watson-speech-to-text/models', function (req, res) {
+    //endpoint = sEndpoint ? sEndpoint : req.query.e;
+    endpoint = req.query.e ? req.query.e : sEndpoint;
+
     var stt = new sttV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
+      url: endpoint,
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
@@ -78,9 +84,13 @@ module.exports = function (RED) {
 
   // API used by widget to fetch available customisations
   RED.httpAdmin.get('/watson-speech-to-text/customs', function (req, res) {
+    //endpoint = sEndpoint ? sEndpoint : req.query.e;
+    endpoint = req.query.e ? req.query.e : sEndpoint;
+
     var stt = new sttV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
+      url: endpoint,
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
@@ -218,15 +228,22 @@ module.exports = function (RED) {
 
     function performSTT(audioData) {
       var p = new Promise(function resolver(resolve, reject){
-        var model = config.lang + '_' + config.band;
-          params = {};
-          speech_to_text = new sttV1({
+        var model = config.lang + '_' + config.band,
+          params = {},
+          speech_to_text = null;
+          serviceSettings = {
             username: username,
             password: password,
             headers: {
               'User-Agent': pkg.name + '-' + pkg.version
             }
-          });
+          };
+
+        if (endpoint) {
+          serviceSettings.url = endpoint;
+        }
+
+        speech_to_text = new sttV1(serviceSettings);
 
         // If we get to here then the audio is in one of the supported formats.
         if (audioData.format === 'ogg') {
@@ -283,6 +300,11 @@ module.exports = function (RED) {
       username = sUsername || this.credentials.username;
       password = sPassword || this.credentials.password || config.password;
 
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
+
       node.status({});
 
       // Now perform checks on the input and parameters, to make sure that all

From a424fc9dff86f3d45b691ed13dcbe316d9ee294e Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Wed, 7 Jun 2017 13:47:26 +0100
Subject: [PATCH 15/20] Allow Endpoint to be specified

---
 README.md                                     |  3 +-
 services/language_translator/v2.html          |  1 -
 .../speech_to_text/v1-corpus-builder.html     | 31 ++++++++++++-
 services/speech_to_text/v1-corpus-builder.js  | 44 +++++++++++--------
 services/speech_to_text/v1.html               |  4 +-
 5 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 545f05da..fc13ff1d 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,8 @@ Node-RED Watson Nodes for IBM Bluemix
 ### New in version 0.5.9
 - Endpoint can now be specified in Conversation,
 Conversation Workspace Manager Language Identify, Language Translator,
-Speech to Text, Personality Insight and Tone Analyzer nodes.
+Speech to Text, STT Corpus Builder, Personality Insights
+and Tone Analyzer nodes.
 
 ### New in version 0.5.8
 - Visual Reconition Node, now accepts readstream on msg.payload
diff --git a/services/language_translator/v2.html b/services/language_translator/v2.html
index 3e80bd7f..63127311 100644
--- a/services/language_translator/v2.html
+++ b/services/language_translator/v2.html
@@ -719,7 +719,6 @@
                 ldparamshidden2: {value: ''},
                 'default-endpoint' :{value: true},
                 'service-endpoint' :{value: 'https://gateway.watsonplatform.net/language-translator/api'}
-
             },
             credentials: {
               username: {type: 'text'}
diff --git a/services/speech_to_text/v1-corpus-builder.html b/services/speech_to_text/v1-corpus-builder.html
index f85557e2..7489d5b9 100644
--- a/services/speech_to_text/v1-corpus-builder.html
+++ b/services/speech_to_text/v1-corpus-builder.html
@@ -39,6 +39,16 @@
         <input type="password" id="node-input-password" placeholder="Password"></input>
     </div>
 
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://stream.watsonplatform.net/speech-to-text/api">
+    </div>
+
     <div class="form-row">
         <label for="node-input-stt-custom-mode"><i class="fa fa-book"></i> Detect: </label>
         <select type="text" id="node-input-stt-custom-mode" style="display: inline-block; width: 70%;">
@@ -286,6 +296,15 @@
     $('#node-input-stt-base-model').change(function (val) {
       sttv1qbb.model_selected = $('#node-input-stt-base-model').val();
     });
+
+    $('#node-input-default-endpoint').change(function () {
+      var checked = $('#node-input-default-endpoint').prop('checked')
+      if (checked) {
+        $('#node-input-service-endpoint').parent().hide();
+      } else {
+        $('#node-input-service-endpoint').parent().show();
+      }
+    });
   }
 
   // Called to complete the models table
@@ -336,8 +355,14 @@
   sttv1qbb.getModels = function (haveCredentials) {
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
+    var e = $('#node-input-service-endpoint').val();
+    var creds = {un: u, pwd: p};
 
-    $.getJSON('watson-speech-to-text-v1-query-builder/models/', {un: u, pwd: p}).done(function (data) {
+    if (! $('#node-input-default-endpoint').prop('checked')) {
+      creds.e = e;
+    }
+    $.getJSON('watson-speech-to-text-v1-query-builder/models/', creds)
+    .done(function (data) {
       if (data.error) {
         $('label#node-label-message').parent().show();
         $('label#node-label-message').text(data.error);
@@ -395,7 +420,9 @@
                 'stt-custom-model-description' : {value: ''},
                 'stt-custom-id' : {value: ''},
                 'stt-corpus-name' : {value: ''},
-                'stt-allow-overwrite' : {value: false}
+                'stt-allow-overwrite' : {value: false},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://stream.watsonplatform.net/speech-to-text/api'}
             },
             credentials: {
               username: {type:'text'} //,
diff --git a/services/speech_to_text/v1-corpus-builder.js b/services/speech_to_text/v1-corpus-builder.js
index c331d5fd..0a992c58 100644
--- a/services/speech_to_text/v1-corpus-builder.js
+++ b/services/speech_to_text/v1-corpus-builder.js
@@ -27,7 +27,9 @@ module.exports = function (RED) {
     payloadutils = require('../../utilities/payload-utils'),
     STTV1 = require('watson-developer-cloud/speech-to-text/v1'),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
-    username = '', password = '', sUsername = '', sPassword = '';
+    username = '', password = '', sUsername = '', sPassword = '',
+    endpoint = '',
+    sEndpoint = 'https://stream.watsonplatform.net/speech-to-text/api';
 
   temp.track();
 
@@ -44,18 +46,9 @@ module.exports = function (RED) {
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
-/*
-  function reportError (node, msg, message) {
-    var messageTxt = message.error ? message.error : message;
-    msg.stterror = messageTxt;
-
-    node.status({fill:'red', shape:'dot', text: messageTxt});
-    node.error(messageTxt, msg);
-  }
-*/
-
   function executeCreateCustomisation(node, stt, params, msg) {
     stt.createCustomization(params, function (err, response) {
       node.status({});
@@ -180,13 +173,20 @@ module.exports = function (RED) {
   }
 
   function executeMethod(node, method, params, msg) {
-    var stt = new STTV1({
-      username: username,
-      password: password,
-      headers: {
-        'User-Agent': pkg.name + '-' + pkg.version
-      }
-    });
+    var stt = null,
+      serviceSettings = {
+        username: username,
+        password: password,
+        headers: {
+          'User-Agent': pkg.name + '-' + pkg.version
+        }
+      };
+
+    if (endpoint) {
+      serviceSettings.url = endpoint;
+    }
+
+    stt = new STTV1(serviceSettings);
 
     node.status({fill:'blue', shape:'dot', text:'executing'});
 
@@ -362,9 +362,12 @@ module.exports = function (RED) {
 
    // API used by widget to fetch available models
   RED.httpAdmin.get('/watson-speech-to-text-v1-query-builder/models', function (req, res) {
+    endpoint = req.query.e ? req.query.e : sEndpoint;
+
     var stt = new STTV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
+      url: endpoint,
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
@@ -393,6 +396,11 @@ module.exports = function (RED) {
       username = sUsername || this.credentials.username;
       password = sPassword || this.credentials.password || config.password;
 
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
+
       if (!username || !password) {
         message = 'Missing Watson Speech to Text service credentials';
       } else if (!method || '' === method) {
diff --git a/services/speech_to_text/v1.html b/services/speech_to_text/v1.html
index 3fe129a0..5b39c077 100644
--- a/services/speech_to_text/v1.html
+++ b/services/speech_to_text/v1.html
@@ -49,7 +49,6 @@
         <input type="text" id="node-input-service-endpoint" placeholder="https://stream.watsonplatform.net/speech-to-text/api">
     </div>
 
-
     <div class="form-row">
         <label for="node-input-lang"><i class="fa fa-language"></i> Language</label>
         <select type="text" id="node-input-lang" style="display: inline-block; width: 70%;">
@@ -487,8 +486,7 @@
                 bandhidden: {value: ''},
                 password: {value: ''},
                 'default-endpoint' :{value: true},
-                'service-endpoint' :{value: 'https://stream.watsonplatform.net/speech-to-text/api'
-              }
+                'service-endpoint' :{value: 'https://stream.watsonplatform.net/speech-to-text/api'}
             },
             credentials: {
               username: {type:'text'} //,

From 415e8a1f824cb1b253efe6d5e78cfd0b7c162226 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Wed, 7 Jun 2017 19:34:25 +0100
Subject: [PATCH 16/20] Allow Endpoint to be specified

---
 README.md                       |   3 +-
 services/text_to_speech/v1.html |  46 ++++++++++--
 services/text_to_speech/v1.js   | 120 +++++++++++++++++++++++++-------
 3 files changed, 137 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index fc13ff1d..899fd58c 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,10 @@ Node-RED Watson Nodes for IBM Bluemix
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
 ### New in version 0.5.9
+- Text to Speech speech on payload option.
 - Endpoint can now be specified in Conversation,
 Conversation Workspace Manager Language Identify, Language Translator,
-Speech to Text, STT Corpus Builder, Personality Insights
+Speech to Text, STT Corpus Builder, Text to Speech, Personality Insights
 and Tone Analyzer nodes.
 
 ### New in version 0.5.8
diff --git a/services/text_to_speech/v1.html b/services/text_to_speech/v1.html
index 4a01421d..15e7acaf 100644
--- a/services/text_to_speech/v1.html
+++ b/services/text_to_speech/v1.html
@@ -29,6 +29,7 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+
     <div class="form-row credentials" style="display: none;">
         <label for="node-input-username"><i class="fa fa-user"></i> Username</label>
         <input type="text" id="node-input-username" placeholder="Username">
@@ -37,6 +38,17 @@
         <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
         <input type="password" id="node-input-password" placeholder="Password">
     </div>
+
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://stream.watsonplatform.net/text-to-speech/api">
+    </div>
+
     <div class="form-row">
         <label for="node-input-lang"><i class="fa fa-language"></i> Language</label>
         <select type="text" id="node-input-lang" style="display: inline-block; width: 70%;" >
@@ -216,14 +228,19 @@
     if (!tts.customisations) {
       var u = $('#node-input-username').val();
       var p = $('#node-input-password').val();
+      var e = $('#node-input-service-endpoint').val();
+      var creds = {un: u, pwd: p};
 
-      $.getJSON('watson-text-to-speech/customs',
-                 {un: u, pwd: p}
-      ).done(function (data) {
+      if (! $('#node-input-default-endpoint').prop('checked')) {
+        creds.e = e;
+      }
+      $.getJSON('watson-text-to-speech/customs', creds)
+      .done(function (data) {
         $('label#node-label-message').parent().hide();
         if (data.error) {
           $('label#node-label-message').parent().show();
-          $('label#node-label-message').text(data.error);        }
+          $('label#node-label-message').text(data.error);
+        }
         else {
           tts.customisations = data.customizations;
           tts.populateCustoms();
@@ -256,8 +273,15 @@
   tts.getVoices = function (){
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
+    var e = $('#node-input-service-endpoint').val();
+    var creds = {un: u, pwd: p};
+
+    if (! $('#node-input-default-endpoint').prop('checked')) {
+      creds.e = e;
+    }
 
-    $.getJSON('watson-text-to-speech/voices/', {un: u, pwd: p}).done(function (data) {
+    $.getJSON('watson-text-to-speech/voices/', creds)
+    .done(function (data) {
       if (data.error) {
         $('label#node-label-message').parent().show();
         $('label#node-label-message').text(data.error);
@@ -389,6 +413,14 @@
     $('#node-input-langcustom').change(function (val) {
       tts.custom_selected = $('#node-input-langcustom').val();
     });
+    $('#node-input-default-endpoint').change(function () {
+      var checked = $('#node-input-default-endpoint').prop('checked')
+      if (checked) {
+        $('#node-input-service-endpoint').parent().hide();
+      } else {
+        $('#node-input-service-endpoint').parent().show();
+      }
+    });
   }
 
   // Function to be used at the start, as don't want to expose any fields, unless the models are
@@ -442,7 +474,9 @@
                 voice: {value: ""},
                 voicehidden: {value: ""},
                 format: {value: "audio/wav"},
-                password: {value: ''}
+                password: {value: ''},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://stream.watsonplatform.net/text-to-speech/api'}
             },
             credentials: {
               username: {type:"text"},
diff --git a/services/text_to_speech/v1.js b/services/text_to_speech/v1.js
index 1268aad9..ef7bdf35 100644
--- a/services/text_to_speech/v1.js
+++ b/services/text_to_speech/v1.js
@@ -18,8 +18,11 @@ module.exports = function(RED) {
   const SERVICE_IDENTIFIER = 'text-to-speech';
   var pkg = require('../../package.json'),
     TextToSpeechV1 = require('watson-developer-cloud/text-to-speech/v1');
-    serviceutils = require('../../utilities/service-utils');
-
+    serviceutils = require('../../utilities/service-utils'),
+    payloadutils = require('../../utilities/payload-utils'),
+    endpoint = '',
+    sEndpoint = 'https://stream.watsonplatform.net/text-to-speech/api',
+    username = '', password = '', sUsername = '', sPassword = '';
   // Require the Cloud Foundry Module to pull credentials from bound service
   // If they are found then the username and password will be stored in
   // the variables sUsername and sPassword.
@@ -30,13 +33,12 @@ module.exports = function(RED) {
   // user who, when he errenously enters bad credentials, can't figure out why
   // the edited ones are not being taken.
 
-  var username, password, sUsername, sPassword;
-
   var service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER);
 
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
   // Node RED Admin - fetch and set vcap services
@@ -46,9 +48,11 @@ module.exports = function(RED) {
 
   // API used by widget to fetch available models
   RED.httpAdmin.get('/watson-text-to-speech/voices', function (req, res) {
+    endpoint = req.query.e ? req.query.e : sEndpoint;
     var tts = new TextToSpeechV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
+      url: endpoint,
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
@@ -68,9 +72,11 @@ module.exports = function(RED) {
 
   // API used by widget to fetch available customisations
   RED.httpAdmin.get('/watson-text-to-speech/customs', function (req, res) {
+    endpoint = req.query.e ? req.query.e : sEndpoint;
     var tts = new TextToSpeechV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
+      url: endpoint,
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
@@ -89,30 +95,21 @@ module.exports = function(RED) {
     RED.nodes.createNode(this, config);
     var node = this;
 
-    this.on('input', function(msg) {
-      if (!msg.payload) {
-        var message = 'Missing property: msg.payload';
-        node.error(message, msg);
-        return;
-      }
-
-      username = sUsername || this.credentials.username;
-      password = sPassword || this.credentials.password || config.password;
-
+    function initialCheck(username, password) {
       if (!username || !password) {
-        var message = 'Missing Text To Speech service credentials';
-        node.error(message, msg);
-        return;
+        return Promise.reject('Missing Text To Speech service credentials');
       }
+      return Promise.resolve();
+    }
 
-      var text_to_speech = new TextToSpeechV1({
-        username: username,
-        password: password,
-        headers: {
-          'User-Agent': pkg.name + '-' + pkg.version
-        }
-      });
+    function payloadCheck(msg) {
+      if (!msg.payload) {
+        return Promise.reject('Missing property: msg.payload');
+      }
+      return Promise.resolve();
+    }
 
+    function buildParams(msg) {
       var params = {
         text: msg.payload,
         voice: msg.voice || config.voice,
@@ -123,8 +120,78 @@ module.exports = function(RED) {
       if (config.langcustom && 'NoCustomisationSetting' !== config.langcustom) {
         params.customization_id = config.langcustom;
       }
+      return Promise.resolve(params);
+    }
+
+    function performTTS(msg, params) {
+      var p = new Promise(function resolver(resolve, reject) {
+        var text_to_speech  = null;
+          serviceSettings = {
+            username: username,
+            password: password,
+            headers: {
+              'User-Agent': pkg.name + '-' + pkg.version
+            }
+          };
+
+          if (endpoint) {
+            serviceSettings.url = endpoint;
+          }
+
+        text_to_speech = new TextToSpeechV1(serviceSettings);
+        text_to_speech.synthesize(params, function (err, body, response) {
+          if (err) {
+            reject(err);
+          } else {
+            resolve(body);
+          }
+        });
+      });
+      return p;
+    }
+
+    function processResponse(msg, body) {
+      msg.speech = body;
+      return Promise.resolve();
+    }
+
+    this.on('input', function(msg) {
+
+      username = sUsername || this.credentials.username;
+      password = sPassword || this.credentials.password || config.password;
+
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
+
+      node.status({});
+
+      initialCheck(username, password)
+      .then(function(){
+        return payloadCheck(msg);
+      })
+      .then(function(){
+        return buildParams(msg);
+      })
+      .then(function(params){
+        node.status({fill:"blue", shape:"dot", text:"requesting"});
+        return performTTS(msg, params);
+      })
+      .then(function(body){
+        return processResponse(msg, body);
+      })
+      .then(function(){
+        node.status({});
+        node.send(msg);
+      })
+      .catch(function(err){
+        payloadutils.reportError(node,msg,err);
+      });
+
+/*
+
 
-      node.status({fill:"blue", shape:"dot", text:"requesting"});
       text_to_speech.synthesize(params, function (err, body, response) {
         node.status({})
         if (err) {
@@ -134,6 +201,9 @@ module.exports = function(RED) {
         }
         node.send(msg);
       })
+
+*/
+
     })
   }
   RED.nodes.registerType("watson-text-to-speech", Node, {

From e300d795a632bdafa26cabcc8cc8adc71168f5a3 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Wed, 7 Jun 2017 19:54:15 +0100
Subject: [PATCH 17/20] Added simplified response on msg.payload option to TTS
 and STT Nodes

---
 README.md                       |  3 ++-
 services/speech_to_text/v1.html | 18 ++++++++++++------
 services/speech_to_text/v1.js   |  3 +++
 services/text_to_speech/v1.html |  7 +++++++
 services/text_to_speech/v1.js   |  3 +++
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 899fd58c..37f5e80a 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,8 @@ Node-RED Watson Nodes for IBM Bluemix
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
 ### New in version 0.5.9
-- Text to Speech speech on payload option.
+- Text to Speech speech on msg.payload option.
+- Speech to Text transcription on msg.payload option
 - Endpoint can now be specified in Conversation,
 Conversation Workspace Manager Language Identify, Language Translator,
 Speech to Text, STT Corpus Builder, Text to Speech, Personality Insights
diff --git a/services/speech_to_text/v1.html b/services/speech_to_text/v1.html
index 5b39c077..ecdbf378 100644
--- a/services/speech_to_text/v1.html
+++ b/services/speech_to_text/v1.html
@@ -77,16 +77,21 @@
     </div>
 
     <div class="form-row">
-        <label for="node-input-continuous"><i class="fa fa-audio-o"></i> Continuous</label>
-        <input type="checkbox" id="node-input-continuous"></input>
-        </select>
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-continuous" style="display: inline-block; width: auto; vertical-align: top;"></input>
+        <label for="node-input-continuous" style="width: 70%;"><i class="fa fa-audio-o"></i> Continuous</label>
     </div>
     <div class="form-row">
-        <label for="node-input-speakerlabels"><i class="fa fa-audio-o"></i> Speaker Labels</label>
-        <input type="checkbox" id="node-input-speakerlabels"></input>
-        </select>
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-speakerlabels"style="display: inline-block; width: auto; vertical-align: top;"></input>
+        <label for="node-input-speakerlabels" style="width: 70%;"><i class="fa fa-audio-o"></i> Speaker Labels</label>
     </div>
 
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-payload-response" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-payload-response" style="width: 70%;"> Place output on msg.payload</label>
+    </div>
 
 </script>
 
@@ -485,6 +490,7 @@
                 band: {value: ''},
                 bandhidden: {value: ''},
                 password: {value: ''},
+                'payload-response' :{value: false},
                 'default-endpoint' :{value: true},
                 'service-endpoint' :{value: 'https://stream.watsonplatform.net/speech-to-text/api'}
             },
diff --git a/services/speech_to_text/v1.js b/services/speech_to_text/v1.js
index 36c79ad2..2b9b81ef 100644
--- a/services/speech_to_text/v1.js
+++ b/services/speech_to_text/v1.js
@@ -290,6 +290,9 @@ module.exports = function (RED) {
           });
         });
       }
+      if (config['payload-response']) {
+        msg.payload = msg.transcription;
+      }
 
       return Promise.resolve();
     }
diff --git a/services/text_to_speech/v1.html b/services/text_to_speech/v1.html
index 15e7acaf..1435ad11 100644
--- a/services/text_to_speech/v1.html
+++ b/services/text_to_speech/v1.html
@@ -84,6 +84,12 @@
         </select>
     </div>
 
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-payload-response" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-payload-response" style="width: 70%;"> Place output on msg.payload</label>
+    </div>
+
 </script>
 
 <script type="text/x-red" data-help-name="watson-text-to-speech">
@@ -475,6 +481,7 @@
                 voicehidden: {value: ""},
                 format: {value: "audio/wav"},
                 password: {value: ''},
+                'payload-response' :{value: false},
                 'default-endpoint' :{value: true},
                 'service-endpoint' :{value: 'https://stream.watsonplatform.net/text-to-speech/api'}
             },
diff --git a/services/text_to_speech/v1.js b/services/text_to_speech/v1.js
index ef7bdf35..707b4f25 100644
--- a/services/text_to_speech/v1.js
+++ b/services/text_to_speech/v1.js
@@ -152,6 +152,9 @@ module.exports = function(RED) {
 
     function processResponse(msg, body) {
       msg.speech = body;
+      if (config['payload-response']) {
+        msg.payload = body;
+      } 
       return Promise.resolve();
     }
 

From 23b9c8ce83618bc052b45b601ad574d76fbec5dc Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Wed, 7 Jun 2017 20:10:16 +0100
Subject: [PATCH 18/20] Allow Endpoint to be specified

---
 README.md                                     |  4 +-
 .../text_to_speech/v1-corpus-builder.html     | 32 +++++++++++++--
 services/text_to_speech/v1-corpus-builder.js  | 41 +++++++++++--------
 3 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 37f5e80a..72ee26b6 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ Node-RED Watson Nodes for IBM Bluemix
 - Speech to Text transcription on msg.payload option
 - Endpoint can now be specified in Conversation,
 Conversation Workspace Manager Language Identify, Language Translator,
-Speech to Text, STT Corpus Builder, Text to Speech, Personality Insights
-and Tone Analyzer nodes.
+Speech to Text, STT Corpus Builder, Text to Speech, TTS Corpus Builder,
+Personality Insights and Tone Analyzer nodes.
 
 ### New in version 0.5.8
 - Visual Reconition Node, now accepts readstream on msg.payload
diff --git a/services/text_to_speech/v1-corpus-builder.html b/services/text_to_speech/v1-corpus-builder.html
index c76a927e..e4000a9d 100644
--- a/services/text_to_speech/v1-corpus-builder.html
+++ b/services/text_to_speech/v1-corpus-builder.html
@@ -39,6 +39,16 @@
         <input type="password" id="node-input-password" placeholder="Password"></input>
     </div>
 
+    <div class="form-row credentials">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
+    </div>
+    <div class="form-row">
+        <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
+        <input type="text" id="node-input-service-endpoint" placeholder="https://stream.watsonplatform.net/text-to-speech/api">
+    </div>
+
     <div class="form-row">
         <label for="node-input-tts-custom-mode"><i class="fa fa-book"></i> Detect: </label>
         <select type="text" id="node-input-tts-custom-mode" style="display: inline-block; width: 70%;">
@@ -360,7 +370,14 @@
       }
     });
 
-
+    $('#node-input-default-endpoint').change(function () {
+      var checked = $('#node-input-default-endpoint').prop('checked')
+      if (checked) {
+        $('#node-input-service-endpoint').parent().hide();
+      } else {
+        $('#node-input-service-endpoint').parent().show();
+      }
+    });
   }
 
   // The dynamic nature of the selection fields in this node has caused problems.
@@ -463,9 +480,14 @@
   ttsv1qbb.getVoices = function (){
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
+    var e = $('#node-input-service-endpoint').val();
+    var creds = {un: u, pwd: p};
 
-    $.getJSON('watson-text-to-speech-v1-query-builder/voices/',
-    {un: u, pwd: p}).done(function (data) {
+    if (! $('#node-input-default-endpoint').prop('checked')) {
+      creds.e = e;
+    }
+    $.getJSON('watson-text-to-speech-v1-query-builder/voices/',creds)
+    .done(function (data) {
       if (data.error) {
         $('label#node-label-message').parent().show();
         $('label#node-label-message').text(data.error);
@@ -528,7 +550,9 @@
                 'tts-custom-format' : {value: ''},
                 'tts-voice-or-custom' : {value: ''},
                 'tts-voice': {value: ""},
-                'tts-voicehidden': {value: ""}
+                'tts-voicehidden': {value: ""},
+                'default-endpoint' :{value: true},
+                'service-endpoint' :{value: 'https://stream.watsonplatform.net/text-to-speech/api'}                
             },
             credentials: {
               username: {type:'text'} //,
diff --git a/services/text_to_speech/v1-corpus-builder.js b/services/text_to_speech/v1-corpus-builder.js
index 3599875c..a413c42a 100644
--- a/services/text_to_speech/v1-corpus-builder.js
+++ b/services/text_to_speech/v1-corpus-builder.js
@@ -26,6 +26,8 @@ module.exports = function (RED) {
     payloadutils = require('../../utilities/payload-utils'),
     TextToSpeechV1 = require('watson-developer-cloud/text-to-speech/v1'),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
+    endpoint = '',
+    sEndpoint = 'https://stream.watsonplatform.net/text-to-speech/api',
     username = '', password = '', sUsername = '', sPassword = '';
 
   temp.track();
@@ -43,18 +45,9 @@ module.exports = function (RED) {
   if (service) {
     sUsername = service.username;
     sPassword = service.password;
+    sEndpoint = service.url;
   }
 
-/*
-  function reportError (node, msg, message) {
-    var messageTxt = message.error ? message.error : message;
-    msg.watsonerror = messageTxt;
-
-    node.status({fill:'red', shape:'dot', text: messageTxt});
-    node.error(messageTxt, msg);
-  }
-*/
-
   function executeCreateCustomisation(node, tts, params, msg) {
     tts.createCustomization(params, function (err, response) {
       node.status({});
@@ -149,13 +142,20 @@ module.exports = function (RED) {
   }
 
   function executeMethod(node, method, params, msg) {
-    var tts = new TextToSpeechV1({
-      username: username,
-      password: password,
-      headers: {
-        'User-Agent': pkg.name + '-' + pkg.version
-      }
-    });
+    var tts = null,
+      serviceSettings = {
+        username: username,
+        password: password,
+        headers: {
+          'User-Agent': pkg.name + '-' + pkg.version
+        }
+      };
+
+    if (endpoint) {
+      serviceSettings.url = endpoint;
+    }
+
+    tts = new TextToSpeechV1(serviceSettings);
 
     node.status({fill:'blue', shape:'dot', text:'executing'});
 
@@ -320,9 +320,11 @@ module.exports = function (RED) {
 
   // API used by widget to fetch available voices
   RED.httpAdmin.get('/watson-text-to-speech-v1-query-builder/voices', function (req, res) {
+    endpoint = req.query.e ? req.query.e : sEndpoint;
     var tts = new TextToSpeechV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
+      url: endpoint,
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
@@ -353,6 +355,11 @@ module.exports = function (RED) {
       username = sUsername || this.credentials.username;
       password = sPassword || this.credentials.password || config.password;
 
+      endpoint = sEndpoint;
+      if ((!config['default-endpoint']) && config['service-endpoint']) {
+        endpoint = config['service-endpoint'];
+      }
+
       if (!username || !password) {
         message = 'Missing Watson Text to Speech service credentials';
       } else if (!method || '' === method) {

From d692b33aeb91e5b0e4a64a16594bfc0ed5acf1e2 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Wed, 7 Jun 2017 20:34:12 +0100
Subject: [PATCH 19/20] Code Tidy

---
 services/language_translator/v2.js          | 18 +++++++++---------
 services/language_translator_identify/v2.js | 21 +++++++++++----------
 services/personality_insights/v3.js         |  3 ++-
 services/speech_to_text/v1.js               |  2 +-
 services/text_to_speech/v1.js               | 12 ++++++------
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/services/language_translator/v2.js b/services/language_translator/v2.js
index 7a266635..ea46129a 100644
--- a/services/language_translator/v2.js
+++ b/services/language_translator/v2.js
@@ -127,7 +127,7 @@ module.exports = function (RED) {
           tmpmodel_id = globalContext.get('g_model_id');
 
         if (tmpmodel_id && tmpmodel_id.length > 1) {
-          result = tmpmodel_id.split('-');
+          var result = tmpmodel_id.split('-');
           //msg.model_id = tmpmodel_id;
           msg.domain = result[2];
           msg.srclang = result[0];
@@ -205,7 +205,7 @@ module.exports = function (RED) {
       if (!filetype) {
         return Promise.reject('Filetype needs must be set for train mode');
       }
-      return Promise.resolve({ basemodel:basemodel, filetype:filetype})
+      return Promise.resolve({ basemodel:basemodel, filetype:filetype});
     }
 
     function loadFile() {
@@ -288,12 +288,12 @@ module.exports = function (RED) {
             model_id: trainid,
           },
           function (err) {
-              if (err) {
-                reject(err);
-              } else {
-                msg.payload = 'Model ' + trainid + ' has been deleted';
-                resolve();
-              }
+            if (err) {
+              reject(err);
+            } else {
+              msg.payload = 'Model ' + trainid + ' has been deleted';
+              resolve();
+            }
           });
       });
       return p;
@@ -341,7 +341,7 @@ module.exports = function (RED) {
         })
         .then(function(params){
           return doTrain(language_translator, msg, params);
-        })
+        });
 
       return p;
     }
diff --git a/services/language_translator_identify/v2.js b/services/language_translator_identify/v2.js
index 372a0acf..36f85a9a 100644
--- a/services/language_translator_identify/v2.js
+++ b/services/language_translator_identify/v2.js
@@ -50,20 +50,21 @@ module.exports = function (RED) {
 
   function execute(node, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      var serviceSettings = {
-        username: username,
-        password: password,
-        version: 'v2',
-        //url: endpointUrl,
-        headers: {
-          'User-Agent': pkg.name + '-' + pkg.version
-        }
-      };;
+      var language_translator = null,
+        serviceSettings = {
+          username: username,
+          password: password,
+          version: 'v2',
+          headers: {
+            'User-Agent': pkg.name + '-' + pkg.version
+          }
+        };
+
       if (endpoint) {
         serviceSettings.url = endpoint;
       }
 
-      var language_translator = new LanguageTranslatorV2(serviceSettings);
+      language_translator = new LanguageTranslatorV2(serviceSettings);
 
       language_translator.identify({text: msg.payload}, function (err, response) {
         if (err) {
diff --git a/services/personality_insights/v3.js b/services/personality_insights/v3.js
index 082b43d4..99e6a111 100644
--- a/services/personality_insights/v3.js
+++ b/services/personality_insights/v3.js
@@ -76,6 +76,7 @@ module.exports = function (RED) {
     if (!username || !password) {
       return Promise.reject('Missing Personality Insights service credentials');
     }
+    return Promise.resolve();
   }
 
   // This function prepares the params object for the
@@ -171,7 +172,7 @@ module.exports = function (RED) {
       })
       .then(function(){
         return prepareParams(msg, config);
-      })      
+      })
       .then(function(params){
         node.status({fill:'blue', shape:'dot', text:'requesting'});
         return executeService(msg, params);
diff --git a/services/speech_to_text/v1.js b/services/speech_to_text/v1.js
index 2b9b81ef..4e9d0a44 100644
--- a/services/speech_to_text/v1.js
+++ b/services/speech_to_text/v1.js
@@ -230,7 +230,7 @@ module.exports = function (RED) {
       var p = new Promise(function resolver(resolve, reject){
         var model = config.lang + '_' + config.band,
           params = {},
-          speech_to_text = null;
+          speech_to_text = null,
           serviceSettings = {
             username: username,
             password: password,
diff --git a/services/text_to_speech/v1.js b/services/text_to_speech/v1.js
index 707b4f25..a83377e3 100644
--- a/services/text_to_speech/v1.js
+++ b/services/text_to_speech/v1.js
@@ -17,7 +17,7 @@
 module.exports = function(RED) {
   const SERVICE_IDENTIFIER = 'text-to-speech';
   var pkg = require('../../package.json'),
-    TextToSpeechV1 = require('watson-developer-cloud/text-to-speech/v1');
+    TextToSpeechV1 = require('watson-developer-cloud/text-to-speech/v1'),
     serviceutils = require('../../utilities/service-utils'),
     payloadutils = require('../../utilities/payload-utils'),
     endpoint = '',
@@ -125,7 +125,7 @@ module.exports = function(RED) {
 
     function performTTS(msg, params) {
       var p = new Promise(function resolver(resolve, reject) {
-        var text_to_speech  = null;
+        var text_to_speech = null,
           serviceSettings = {
             username: username,
             password: password,
@@ -134,9 +134,9 @@ module.exports = function(RED) {
             }
           };
 
-          if (endpoint) {
-            serviceSettings.url = endpoint;
-          }
+        if (endpoint) {
+          serviceSettings.url = endpoint;
+        }
 
         text_to_speech = new TextToSpeechV1(serviceSettings);
         text_to_speech.synthesize(params, function (err, body, response) {
@@ -154,7 +154,7 @@ module.exports = function(RED) {
       msg.speech = body;
       if (config['payload-response']) {
         msg.payload = body;
-      } 
+      }
       return Promise.resolve();
     }
 

From 6b35974fc8bcebcc1710830b7ea90b67a124a8a0 Mon Sep 17 00:00:00 2001
From: chughts <soheel_chughtai@uk.ibm.com>
Date: Wed, 7 Jun 2017 20:40:28 +0100
Subject: [PATCH 20/20] Code Tidy

---
 services/language_translator/v2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/language_translator/v2.js b/services/language_translator/v2.js
index ea46129a..dbdbe63c 100644
--- a/services/language_translator/v2.js
+++ b/services/language_translator/v2.js
@@ -350,7 +350,7 @@ module.exports = function (RED) {
       var p = determineCustomModelId(msg)
         .then(function(model_id){
           return doTranslate(language_translator, msg, model_id);
-        })
+        });
       return p;
     }
 
@@ -359,7 +359,7 @@ module.exports = function (RED) {
       var p = determineModelId(msg)
         .then(function(model_id){
           return doTranslate(language_translator, msg, model_id);
-        })
+        });
       return p;
     }