Migrate to ibm-watson

Author: chughts

README.md

@@ -54,7 +54,7 @@ During the migration there will be a dependancy on both modules.
 - Update language lists for STT, TTS, Language Translator and Document Translator Nodes
 
 ### Watson Nodes for Node-RED
-A collection of nodes to interact with the IBM Watson services in [IBM Cloud](http://bluemix.net).
+A collection of nodes to interact with the IBM Watson services in [IBM Cloud](http://cloud.ibm.com).
 
 # Nodes
 

package.json

@@ -24,7 +24,7 @@
   "license": "Apache-2.0",
   "keywords": [
     "node-red",
-    "bluemix",
+    "ibm-cloud",
     "watson"
   ],
   "contributors": [

services/discovery/discovery-utils.js

@@ -104,15 +104,16 @@ DiscoveryUtils.prototype = {
   buildParamsForPassages: function (me, msg, config, params) {
     let passagesFound = false;
 
-    // Allow the passages parameters to be passed in two ways
-    // 1. As the API is expecting
+    // Allow the passages parameters to be passed in three ways
+    // 1. As the API was expecting (watson-developer-cloud)
     ['passages.fields', 'passages.count', 'passages.characters'
     ].forEach(function(f) {
       params = me.buildParamsFor(msg, config, params, f);
       passagesFound = true;
     });
 
     // 2. As anyone misreading the documentation might do it.
+    // (again watson-developer-cloud)
     if (msg.discoveryparams && msg.discoveryparams.passages) {
       passagesFound = true;
       ['fields', 'count', 'characters'
@@ -123,7 +124,25 @@ DiscoveryUtils.prototype = {
       });
     }
 
+    // 3. As the ibm-watson SDK expects
+    ['passagesFields', 'passagesCount', 'passagesCharacters'
+    ].forEach(function(f) {
+      params = me.buildParamsFor(msg, config, params, f);
+      passagesFound = true;
+    });
+
     if (passagesFound) {
+      // Perform autocorrect for watson-developer-cloud to ibm-watson
+      // differences
+      ['passages.fields', 'passages.count', 'passages.characters'
+      ].forEach(function(f) {
+        if (params[f]) {
+          let parts = f.split(".");
+          let secondPart = parts[1]
+          let reformedField = parts[0] + secondPart[0].toUpperCase() + secondPart.slice(1);
+          params[reformedField] = params[f];
+        }
+      });
       params.passages = true;
     }
 

services/discovery/v1.js

@@ -251,27 +251,33 @@ module.exports = function (RED) {
 
   function executeQuery(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.query(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
+      discovery.query(params)
+        .then((response) => {
           msg.search_results = response;
+          if (response && response.result) {
+            msg.search_results = response.result;
+          }
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
     return p;
   }
 
   function executeQueryNotices(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.queryNotices(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.search_results = response;
-          resolve();
+      discovery.queryNotices(params)
+      .then((response) => {
+        msg.search_results = response;
+        if (response && response.result) {
+          msg.search_results = response.result;
         }
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;