Migrate nodes to ibm-watson dependancy

Author: chughts

README.md

@@ -11,6 +11,8 @@ Node-RED Watson Nodes for IBM Cloud
 - Node-RED & IBM-Watson & Use of promises on API invokation & IAM URL construct migration & Removal of default endpoint of
     - Speech to Text node
     - Speech to Text Corpus Builder node
+    - Natural Language Understandig node
+- New NLU Model Manager node.
 
 ### New in version 0.8.0
 - In the 0.8.x releases the nodes are migrated to a node-red 1.0.x input

package.json

@@ -47,6 +47,7 @@
       "watson-language-translator-util-v3": "services/language_translator_util/v3.js",
       "watson-natural-language-classifier-v1": "services/natural_language_classifier/v1.js",
       "watson-natural-language-understanding-v1": "services/natural_language_understanding/v1.js",
+      "watson-natural-language-understanding-model-manager-v1": "services/natural_language_understanding/v1-model-manager.js",
       "watson-personality-insights-v3": "services/personality_insights/v3.js",
       "watson-speech-to-text-v1": "services/speech_to_text/v1.js",
       "watson-speech-to-text-corpus-builder-v1": "services/speech_to_text/v1-corpus-builder.js",

services/natural_language_understanding/v1.html

@@ -45,11 +45,6 @@
     </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://gateway.watsonplatform.net/natural-language-understanding/api">
     </div>
@@ -340,10 +335,6 @@
                                     + ', #node-input-semantic-keywords'
                                     + ', #node-input-maxsemantics'));
 
-
-    nluV1.CreateIListener($('#node-input-default-endpoint'),
-                                $('#node-input-service-endpoint'), true);
-
     nluV1.CreateIListener($('#node-input-syntax'),
                                 $('#node-input-syntax-sentences'
                                     + ', #node-input-syntax-tokens-lemma'
@@ -404,8 +395,7 @@
               'syntax-sentences': {value: false},
               'syntax-tokens-lemma': {value: false},
               'syntax-tokens-pos': {value: false},
-              'default-endpoint' :{value: true},
-              'service-endpoint' :{value: 'https://gateway.watsonplatform.net/natural-language-understanding/api'}
+              'service-endpoint' :{value: ''}
             },
             credentials: {
               username: {type:"text"},

services/natural_language_understanding/v1.js

@@ -15,8 +15,9 @@
  **/
 
 module.exports = function (RED) {
-  const SERVICE_IDENTIFIER = 'natural-language-understanding';
-  const NaturalLanguageUnderstandingV1 = require('watson-developer-cloud/natural-language-understanding/v1');
+  const SERVICE_IDENTIFIER = 'natural-language-understanding',
+    NaturalLanguageUnderstandingV1 = require('ibm-watson/natural-language-understanding/v1'),
+    { IamAuthenticator } = require('ibm-watson/auth');
 
   const NLU_FEATURES = {
     'categories': 'categories',
@@ -44,11 +45,6 @@ module.exports = function (RED) {
     endpoint = '',
     sEndpoint = 'https://gateway.watsonplatform.net/natural-language-understanding/api';
 
-  function reportError(node, msg, message) {
-    var messageTxt = message.error ? message.error : message;
-    node.status({fill:'red', shape:'dot', text: messageTxt});
-    node.error(message, msg);
-  }
 
   function initialCheck(u, p, k) {
     if (!k && (!u || !p)) {
@@ -84,7 +80,7 @@ module.exports = function (RED) {
     var limitCharacters = parseInt(config.limittextcharacters);
 
     if (! isNaN(limitCharacters) && 0 < limitCharacters) {
-      options.limit_text_characters = limitCharacters;
+      options.limitTextCharacters = limitCharacters;
     }
 
     return Promise.resolve();
@@ -216,35 +212,37 @@ module.exports = function (RED) {
   }
 
   function invokeService(options) {
-    var nlu = null,
+    let nlu = null,
+      authSettings  = {};
       serviceSettings = {
-        version: '2018-11-16',
+        version: '2019-07-12',
         headers: {
           'User-Agent': pkg.name + '-' + pkg.version
         }
       };
 
     if (apikey) {
-      serviceSettings.iam_apikey = apikey;
+      authSettings.apikey = apikey;
     } else {
-      serviceSettings.username = username;
-      serviceSettings.password = password;
+      authSettings.username = username;
+      authSettings.password = password;
     }
+    serviceSettings.authenticator = new IamAuthenticator(authSettings);
 
     if (endpoint) {
       serviceSettings.url = endpoint;
     }
 
     nlu = new NaturalLanguageUnderstandingV1(serviceSettings);
 
-    var p = new Promise(function resolver(resolve, reject){
-      nlu.analyze(options, function(err, data) {
-        if (err) {
+    var p = new Promise(function resolver(resolve, reject) {
+      nlu.analyze(options)
+        .then((response) => {
+          resolve(response);
+        })
+        .catch((err) => {
           reject(err);
-        } else {
-          resolve(data);
-        }
-      });
+        });
     });
     return p;
   }
@@ -267,7 +265,7 @@ module.exports = function (RED) {
     RED.nodes.createNode(this, config);
     var node = this;
 
-    this.on('input', function (msg) {
+    this.on('input', function(msg, send, done) {
       var message = '',
         options = {};
 
@@ -278,7 +276,7 @@ module.exports = function (RED) {
       apikey = sApikey || this.credentials.apikey;
 
       endpoint = sEndpoint;
-      if ((!config['default-endpoint']) && config['service-endpoint']) {
+      if (config['service-endpoint']) {
         endpoint = config['service-endpoint'];
       }
 
@@ -304,11 +302,16 @@ module.exports = function (RED) {
         })
         .then(function(data){
           msg.features = data;
-          node.send(msg);
+          if (data && data.result) {
+            msg.features = data.result;
+          }
+          send(msg);
           node.status({});
+          done();
         })
         .catch(function(err){
-          reportError(node,msg,err);
+          let errMsg = payloadutils.reportError(node, msg, err);
+          done(errMsg);
         });
 
     });

services/speech_to_text/v1-corpus-builder.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 IBM Corp.
+ * Copyright 2017, 2020 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ module.exports = function (RED) {
       stt.createLanguageModel(params)
         .then((response) => {
           responseutils.parseResponseFor(msg, response, 'customization_id');
-          resolve();
+          resolve(response);
         })
         .catch((err) => {
           reject(err);

services/visual_recognition/v4-collection-utils.html

@@ -129,7 +129,7 @@
       <li>Collections
         <ul>
           <li><b>Create a collection</b></li>
-          <li><b>List listCollections</b></li>
+          <li><b>List collections</b></li>
           <li><b>Get collection details</b></li>
           <li><b>Update collection</b></li>
           <li><b>Delete collection</b></li>

services/visual_recognition/v4-collection-utils.js

@@ -460,7 +460,7 @@ module.exports = function(RED) {
       });
   }
 
-  // This is the Watson Visual Recognition V3 Node
+  // This is the Watson Visual Recognition V4 Node
   function WatsonVisualRecognitionV4Node(config) {
     let node = this;
 

utilities/payload-utils.js

@@ -124,24 +124,29 @@ PayloadUtils.prototype = {
     });
   },
 
+  runThroughErrOptions: function(err) {
+    let messageTxt = err;
+    if (err.error) {
+      messageTxt = err.error;
+    } else if (err.description) {
+      messageTxt = err.description;
+    } else if (err.message) {
+      messageTxt = err.message;
+    }
+    return messageTxt;
+  },
 
   reportError: function (node, msg, err) {
-    var messageTxt = err;
+    let messageTxt = err;
 
     if (err.body && 'string' === typeof err.body) {
       messageTxt = err.body;
       try {
         let errBody = JSON.parse(err.body);
-        if (('object' === typeof errBody) && errBody.error) {
-          messageTxt = errBody.error;
-        }
+        messageTxt = PayloadUtils.prototype.runThroughErrOptions(errBody);
       } catch(e) {}
-    } else if (err.error) {
-      messageTxt = err.error;
-    } else if (err.description) {
-      messageTxt = err.description;
-    } else if (err.message) {
-      messageTxt = err.message;
+    } else {
+      messageTxt = PayloadUtils.prototype.runThroughErrOptions(err);
     }
 
     msg.watsonerror = messageTxt;