Merge pull request #451 from chughts/sttiamfix

STT IAM Fix

Author: chughts

README.md

@@ -7,6 +7,16 @@ Node-RED Watson Nodes for IBM Cloud
 
 <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.7.6
+- Bump SDK Dependency to 3.18.2
+- STT Node To use iam-utils in place of removed iam-token-manager
+- STT Node removed codec setting as service can now automatically detect the codec of the input audio and supports more than codec=opus for ogg formats.
+- TSS Node fix to add visibility check on tts.voices and not stt.models
+- Assistant V1 Workspace Manager Node updated to reflect that in update mode, updated fields
+need a new_ prefix in their keys as part of the input json.
+- NLC Node - migrate off deprecated methods
+- NLC Node - Allow create of a classier to be based on a csv template node.
+
 ### New in version 0.7.5
 - Bump SDK Dependency to 3.15.0
 - Added Portuguese (Brazilian) and Chinese (Simplified and Traditional) as output languages

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",
@@ -10,7 +10,8 @@
     "temp": "^0.9.0",
     "qs": "6.x",
     "image-type": "^2.0.2",
-    "watson-developer-cloud": "^3.15.0",
+    "watson-developer-cloud": "^3.18.2",
+    "ibm-cloud-sdk-core": "^0.0.1",
     "word-count": "^0.2.2",
     "is-docx": "^0.0.3",
     "stream-to-array": "^2.3.0",

services/assistant/v1-workspace-manager.html

@@ -340,7 +340,8 @@
       <p>In this mode, the specified dialog node is updated. The input json structure
         defining the content of the updates
         should be passed in
-        as <code>msg.payload</code>.
+        as <code>msg.payload</code>. Fields to be updated need a
+        <code>new_</code> prefix as part of their key. 
       </p>
     </li>
     <li>Delete Dialog Node

services/natural_language_classifier/v1.html

@@ -53,8 +53,8 @@
         <select type="text" id="node-input-mode" style="display: inline-block; width: 70%;" >
             <option value="classify">Classify</option>
             <option value="create">Train</option>
-			      <option value="remove">Remove</option>
-		        <option value="list">List</option>
+			      <option value="deleteClassifier">Remove</option>
+		        <option value="listClassifiers">List</option>
         </select>
     </div>
     <div class="form-row mode classify">

services/natural_language_classifier/v1.js

@@ -140,13 +140,13 @@ module.exports = function(RED) {
     node.checkForCreate = function(msg, config) {
       if ('create' !== config.mode) {
         return Promise.resolve(null);
-      } else {
-        var p = node.openTemp()
-          .then(function(info) {
-            return node.streamFile(msg, config, info);
-          });
-        return p;
+      } else if ('string' === typeof msg.payload) {
+        return Promise.resolve(null);
       }
+      return node.openTemp()
+        .then(function(info) {
+          return node.streamFile(msg, config, info);
+        });
     };
 
     node.buildParams = function(msg, config, info, payloadData) {
@@ -167,11 +167,16 @@ module.exports = function(RED) {
         }
         break;
       case 'create':
-        params.training_data = fs.createReadStream(info.path);
+        if ('string' === typeof msg.payload) {
+          params.training_data = msg.payload;
+        } else {
+          params.training_data = fs.createReadStream(info.path);
+        }
+
         params.language = config.language;
         break;
-      case 'remove':
-      case 'list':
+      case 'deleteClassifier':
+      case 'listClassifiers':
         params.classifier_id = msg.payload;
         if (msg.nlcparams && msg.nlcparams.classifier_id) {
           params.classifier_id = msg.nlcparams.classifier_id;

services/speech_to_text/v1.js

@@ -28,7 +28,7 @@ module.exports = function (RED) {
     iamutils = require('../../utilities/iam-utils'),
     sttutils = require('./stt-utils'),
     AuthV1 = require('watson-developer-cloud/authorization/v1'),
-    AuthIAMV1 = require('watson-developer-cloud/iam-token-manager/v1'),
+    AuthIAMV1 = require('ibm-cloud-sdk-core/iam-token-manager/v1'),
     muteMode = true, discardMode = false, autoConnect = true,
     username = '', password = '', sUsername = '', sPassword = '',
     apikey = '', sApikey = '',
@@ -365,9 +365,11 @@ module.exports = function (RED) {
           params = {};
 
         // If we get to here then the audio is in one of the supported formats.
-        if (audioData.format === 'ogg') {
-          audioData.format += ';codecs=opus';
-        }
+        // STT service can now automatically detect the codec of the input audio
+        // and supports more than codec=opus for ogg formats.
+        //if (audioData.format === 'ogg') {
+        //  audioData.format += ';codecs=opus';
+        //}
 
         params = {
           audio: audioData.audio,

services/text_to_speech/v1.html

@@ -447,7 +447,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.
   tts.hideEverything = function () {
-    if (!stt.models) {
+    if (!tts.voices) {
       $('label#node-label-message').parent().hide();
       $('select#node-input-lang').parent().hide();
       $('select#node-input-voice').parent().hide();