Merge pull request #118 from chughts/sttbugfix

Fix to STT model fetch

Author: chughts

README.md

@@ -3,6 +3,9 @@ Node-RED Watson Nodes for IBM Bluemix
 
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/e157cf8407f2442396789dc78075340a)](https://www.codacy.com/app/rezgui-y/node-red-node-watson)
 
+### New in version 0.4.4
+- Bugfixes to Speech to Text
+
 ### New in version 0.4.3
 - New Visual Recognition V3 node to support the V3 GA API. This incorporates the features that were previously
 available as part of AlchemyAPI Vision.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "alchemy-api": "^1.3.0",

services/language_translation/v2.html

@@ -188,7 +188,7 @@
     var first = true;
 
     langs.forEach(function(language){
-      txt += (LANGUAGES[language] ? LANGUAGES[language] : lang); 
+      txt += (LANGUAGES[language] ? LANGUAGES[language] : language); 
       if (first) {
         txt += ' - ';
         first = false;
@@ -307,7 +307,7 @@
         return a.domain;
       });     
     }
-    if (domains) {
+    if (domains && domains.length) {
       $('select#node-input-domain').empty();
       var unique_domains = domains.filter(checkUnique);
 

services/speech_to_text/v1.html

@@ -57,7 +57,6 @@
         <input type="hidden" id="node-input-bandhidden"/>
     </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>
@@ -90,12 +89,15 @@
 </script>
 
 <script type="text/javascript">
-  var models = null;
-  var languages = null;
-  var bands = null;
 
-  var language_selected = '';
-  var band_selected = '';
+  // Need to simulate a namespace, as some of the variables had started to leak across nodes
+  function STT () {
+    var models = null;
+  }  
+
+  // This is the namespace for stt. Currently only contains models, but more vars and functions may need to be 
+  // moved in if there is a clash with other nodes.
+  var stt = new STT();
 
   var LANGUAGES = { 'en-US' : 'US English', 
                     'pt-BR': 'Portuguese Braziilian', 
@@ -106,6 +108,12 @@
                     'ja-JP': 'Japanese'
                   };
 
+  var languages = null;
+  var bands = null;
+
+  var language_selected = '';
+  var band_selected = '';
+
 
   // sorting functions
   function onlyUnique(value, index, self) {
@@ -115,7 +123,7 @@
   // Function to be used at the start, as don't want to expose any fields, unless the models are 
   // available. The models can only be fetched if the credentials are available. 
   function hideEverything() {
-    if (!models) {
+    if (!stt.models) {
       $('#credentials-not-found').show();
       $('label#node-label-message').parent().hide();    
       $('input#node-input-continuous').parent().hide();   
@@ -127,7 +135,7 @@
   // Check if there is a model then can show the fields. 
   // available. The models can only be fetched if the credentials are available. 
   function visibilityCheck() {
-    if (models) {
+    if (stt.models) {
       $('label#node-label-message').parent().hide();            
       $('input#node-input-continuous').parent().show(); 
       $('select#node-input-lang').parent().show();  
@@ -142,22 +150,22 @@
 
 
   // Simple check that is only invoked if the service is not bound into bluemix. In this case the
-  // user has to provide credentials. Once there are credentials, then the models are retrieved. 
+  // user has to provide credentials. Once there are credentials, then the stt.models are retrieved. 
   function checkCredentials() {
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
 
     if (u && u.length && p) {      
-      if (!models) {
+      if (!stt.models) {
         getModels();
       } 
     }  
   }
 
   // Populate the quality select field
   function populateBands() {
-    if (!bands && models) {
-      bands = models.map(function(m) {
+    if (!bands && stt.models) {
+      bands = stt.models.map(function(m) {
         return m.name.split('_')[1];
       });
       var unique_bands = bands.filter(onlyUnique); 
@@ -215,12 +223,12 @@
     var u = $('#node-input-username').val();
     var p = $('#node-input-password').val();
 
-    $.getJSON('/watson-speech-to-text/models/', {un: u, pwd: p}).done(function (data) {
+    $.getJSON('watson-speech-to-text/models/', {un: u, pwd: p}).done(function (data) {
       if (data.error) {
         $('label#node-label-message').parent().show();
         $('label#node-label-message').text(data.error); 
       } else if (data.models) {
-        models = data.models;
+        stt.models = data.models;
         //have_credentials = true; 
         postModelCheck();       
       }
@@ -233,8 +241,8 @@
 
   // Called to complete the languages selection table
   function processLanguages() {
-    if (!languages && models) {
-      languages = models.map(function(m) {
+    if (!languages && stt.models) {
+      languages = stt.models.map(function(m) {
         return m.language;
       });
     }
@@ -261,7 +269,7 @@
 
   // Called to work through the models, completing the dyanmic selection fields.
   function processModels() {
-    if (models) {
+    if (stt.models) {
       processLanguages();
       populateBands();
     }
@@ -293,7 +301,7 @@
       .done(function (service) {
         restoreFromHidden();
         $('.credentials').toggle(!service);
-        if (!models) {getModels(service);}
+        if (!stt.models) {getModels(service);}
         else {postModelCheck();}
       })
       .fail(function () {
@@ -340,4 +348,5 @@
             oneditsave: oneditsave
         });
     })();
+
 </script>

services/speech_to_text/v1.js

@@ -23,7 +23,7 @@ module.exports = function (RED) {
   var fileType = require('file-type');
   var watson = require('watson-developer-cloud');
 
-  var service = cfenv.getAppEnv().getServiceCreds(/speech to text/i)
+  var service = cfenv.getAppEnv().getServiceCreds(/speech to text/i);
 
   // Require the Cloud Foundry Module to pull credentials from bound service 
   // If they are found then the username and password will be stored in 
@@ -77,7 +77,7 @@ module.exports = function (RED) {
 
   // Utility function to perform a URL validation check
   function urlCheck(str) {
-    var parsed = url.parse(str)
+    var parsed = url.parse(str);
 
     return (!!parsed.hostname && !!parsed.protocol && str.indexOf(' ') < 0);
   }
@@ -102,7 +102,7 @@ module.exports = function (RED) {
         if (err) {
           throw err;
         }
-        cb(fileType(buf).ext)
+        cb(fileType(buf).ext);
       });
     });
 
@@ -139,12 +139,12 @@ module.exports = function (RED) {
               // console.log(a.alternatives);
               a.alternatives.forEach(function(t){
                 msg.transcription += t.transcript;
-              })
+              });
             });   
           }
           node.send(msg); 
         }        
-      }  
+      };  
 
 
       // Utility function that performs the speech to text service call. 
@@ -177,7 +177,7 @@ module.exports = function (RED) {
 
         // Everything is now in place to invoke the service 
         speech_to_text.recognize(params, function (err, res) {
-          node.status({})
+          node.status({});
           cbdone(err,res);
           if (cbcleanup) {
             cbcleanup();
@@ -205,21 +205,21 @@ module.exports = function (RED) {
       if (!username || !password) {
         var message_err_credentials = 'Missing Speech To Text service credentials';
 
-        node.error(message_err_credentials, msg)
+        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)
+        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)
+        node.error(message_err_band, msg);
         return;
       }  
 
@@ -228,7 +228,7 @@ module.exports = function (RED) {
       if (!config.continuous) {
         var message_err_continuous = 'Missing continuous details, unable to process speech.';
 
-        node.error(message_err_continuous, msg)
+        node.error(message_err_continuous, msg);
         return;
       }  
 
@@ -237,7 +237,7 @@ module.exports = function (RED) {
       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)
+        node.error(message, msg);
         return;
       }
 
@@ -262,7 +262,7 @@ module.exports = function (RED) {
           var message_err_format 
               = 'Audio format (' + f + ') not supported, must be encoded as WAV, FLAC or OGG.';
 
-          node.error(message_err_format, msg)
+          node.error(message_err_format, msg);
           return;  
         }
       }