updated my fork from original

Author: arlemi

README.md

@@ -3,10 +3,17 @@ 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 next version
+### 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.
+
+### New in version 0.4.2
 - The transcription returned for the Speech to Text node now returns full (untruncated) transcription. The
 alternatives are returned in msg.fullresult. The dialog now loads available models dynamically. This will
 allow new speech models to be identified without requiring a further code change. 
+- The Retrieve and Rank node nows stores credentials in a configuration node, allowing the credentials to be 
+shared acrosss a flow with multiple Retrieve and Rank nodes.
+- New Tone Analyzer V3 node to support the V3 GA API. 
 
 ### New in version 0.4.1
 - AlchemyAPI Image Analysis and Language nodes migrated from old Alchemy SDK to current 

codacy/codacy-conf.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "alchemy-api": "^1.3.0",
@@ -11,7 +11,7 @@
     "temp": "^0.8.3",
     "qs": "6.x",
 	  "image-type": "^2.0.2",
-    "watson-developer-cloud": "^1.2.4"
+    "watson-developer-cloud": "^1.9.2"
   },
   "repository": {
     "type": "git",
@@ -42,7 +42,8 @@
       "watson-tradeoff-analytics-v1": "services/tradeoff_analytics/v1.js",
       "watson-tone-analyzer-v3-beta": "services/tone_analyzer/v3-beta.js",
       "watson-tone-analyzer-v3": "services/tone_analyzer/v3.js",
-      "watson-visual-recognition-v1": "services/visual_recognition/v1.js"
+      "watson-visual-recognition-v1": "services/visual_recognition/v1.js",
+      "watson-visual-recognition-v3": "services/visual_recognition/v3.js"
     }
   }
-}
+}

package.json

@@ -41,7 +41,7 @@ module.exports = function (RED) {
     this.username = config.username;
     this.password = config.password;
   }
- 
+
   function createRankerNode(config) {
     RED.nodes.createNode(this, config);
     var node = this;
@@ -56,20 +56,20 @@ module.exports = function (RED) {
         var params = {
           training_data: msg.payload
         };
-      
+
         if (config.rankername) {
-          params.training_metadata = "{\"name\": \""+config.rankername+"\"}";
+          params.training_metadata = '{\"name\": \"'+config.rankername+'\"}';
         }
-        node.status({fill:"blue",shape:"ring",text:"Uploading training data"});
+        node.status({fill:'blue',shape:'ring',text:'Uploading training data'});
         retrieve_and_rank.createRanker(params, function(err, res) {
             handleWatsonCallback(null,node,msg,err,res,function() {
-              node.status({fill:"blue",shape:"ring",text:"Training data uploaded. Ranker is training"});
+              node.status({fill:'blue',shape:'ring',text:'Training data uploaded. Ranker is training'});
               //Now check the status of the ranker
               var ranker_id = res.ranker_id;
               checkRankerStatus(retrieve_and_rank,msg,node,ranker_id);
             });;
         });
-      });      
+      });
     });
   }
 
@@ -97,7 +97,7 @@ module.exports = function (RED) {
               var message = 'No ranker id specified';
               node.error(message, msg)
               return;
-            }           
+            }
             break;
           case 'delete':
             if (params.ranker_id) {
@@ -111,7 +111,7 @@ module.exports = function (RED) {
             }
             break;
         }
-      });      
+      });
     });
   }
 
@@ -121,7 +121,7 @@ module.exports = function (RED) {
 
     this.on('input', function(msg) {
       setupRankRetrieveNode(msg,config,this,function(retrieve_and_rank) {
-        
+
         var params = {
           cluster_id: config.clusterid,
           collection_name: config.collectionname
@@ -144,7 +144,7 @@ module.exports = function (RED) {
           handleWatsonCallback(null,node,msg,err,searchResponse);
         });
 
-      });      
+      });
     });
   }
 
@@ -155,8 +155,12 @@ module.exports = function (RED) {
     this.on('input', function(msg) {
       setupRankRetrieveNode(msg, config, this, function (retrieve_and_rank) {
 
+        //Cluster name can be passed into msg.payload, but the cluster name
+        //specified in the config takes priority
+        var clustername;
+        (config.clustername !== '') ? clustername = config.clustername : clustername = msg.payload;
         var params = {
-          cluster_name: config.clustername,
+          cluster_name: clustername,
           cluster_size: config.clustersize !== 'free' ? config.clustersize : null,
         }
 
@@ -166,7 +170,7 @@ module.exports = function (RED) {
 
           if (err) {
             node.status({});
-            var message = "";
+            var message = '';
             (err.error) ? message = err.error : message = err.message;
             return node.error(message, msg);
           }
@@ -208,7 +212,7 @@ module.exports = function (RED) {
               var message = 'No cluster id specified';
               node.error(message, msg)
               return;
-            }           
+            }
             break;
           case 'delete':
             if (params.cluster_id) {
@@ -222,7 +226,7 @@ module.exports = function (RED) {
             }
             break;
         }
-      });      
+      });
     });
   }
 
@@ -269,7 +273,7 @@ module.exports = function (RED) {
             uploadConfig(file, temp.cleanup);
           });
         });
-      });      
+      });
     });
   }
 
@@ -297,7 +301,7 @@ module.exports = function (RED) {
               //Note. temporary workaround until bug is fixed in Node SDK
               //Stream zip file from watson api to temp directory,
               //read from temp directory and pass on in msg.payload as buffer
-              var url = "https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/"+params.cluster_id+"/config/"+params.config_name;
+              var url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/'+params.cluster_id+'/config/'+params.config_name;
               var sendToPayload = function(zipFile, cb) {
                 msg.payload = zipFile;
                 node.send(msg);
@@ -321,12 +325,12 @@ module.exports = function (RED) {
                 stream_url(info.path, url, function (content) {
                   sendToPayload(content, temp.cleanup);
                 });
-              });    
+              });
             } else {
               var message = 'Missing cluster id or config name';
               node.error(message, msg)
               return;
-            }           
+            }
             break;
           case 'delete':
             if (params.cluster_id && params.config_name) {
@@ -340,7 +344,7 @@ module.exports = function (RED) {
             }
             break;
         }
-      });      
+      });
     });
   }
 
@@ -420,56 +424,56 @@ module.exports = function (RED) {
             }
             break;
         }
-      });      
+      });
     });
   }
 
-  RED.nodes.registerType("watson-retrieve-rank-credentials", serviceCredentialsConfigurationNode);
+  RED.nodes.registerType('watson-retrieve-rank-credentials', serviceCredentialsConfigurationNode);
   RED.nodes.registerType('watson-retrieve-rank-create-cluster', createClusterNode);
 
   RED.nodes.registerType('watson-retrieve-rank-cluster-settings', clusterSettingsNode, {
     credentials: {
-      username: {type:"text"},
-      password: {type:"password"}
+      username: {type:'text'},
+      password: {type:'password'}
     }
   });
   RED.nodes.registerType('watson-retrieve-rank-upload-solr-configuration', uploadSolrConfigurationNode, {
     credentials: {
-      username: {type:"text"},
-      password: {type:"password"}
+      username: {type:'text'},
+      password: {type:'password'}
     }
   });
   RED.nodes.registerType('watson-retrieve-rank-solr-configuration-settings', solrConfigurationSettingsNode, {
     credentials: {
-      username: {type:"text"},
-      password: {type:"password"}
+      username: {type:'text'},
+      password: {type:'password'}
     }
   });
   RED.nodes.registerType('watson-retrieve-rank-solr-collection', solrCollectionNode, {
     credentials: {
-      username: {type:"text"},
-      password: {type:"password"}
+      username: {type:'text'},
+      password: {type:'password'}
     }
   });
   RED.nodes.registerType('watson-retrieve-rank-create-ranker', createRankerNode, {
     credentials: {
-      username: {type:"text"},
-      password: {type:"password"}
+      username: {type:'text'},
+      password: {type:'password'}
     }
   });
   RED.nodes.registerType('watson-retrieve-rank-ranker-settings', rankerSettingsNode, {
     credentials: {
-      username: {type:"text"},
-      password: {type:"password"}
+      username: {type:'text'},
+      password: {type:'password'}
     }
   });
   RED.nodes.registerType('watson-retrieve-rank-search-and-rank', searchAndRankNode, {
     credentials: {
-      username: {type:"text"},
-      password: {type:"password"}
+      username: {type:'text'},
+      password: {type:'password'}
     }
   });
-  
+
   function setupRankRetrieveNode(msg,config,node,callback) {
     //Check for payload
     if (!msg.payload) {
@@ -480,7 +484,6 @@ module.exports = function (RED) {
 
     //Check credentials
     this.credentials = RED.nodes.getNode(config.servicecreds);
-    console.log(config);
     username = username || this.credentials.username;
     password = password || this.credentials.password;
 
@@ -501,7 +504,7 @@ module.exports = function (RED) {
 
   function handleWatsonCallback(mode,node,msg,err,res,cb) {
     if (err) {
-      var message = "";
+      var message = '';
       if (err.description) {
         message = err.description;
       } else if (err.message) {
@@ -512,7 +515,7 @@ module.exports = function (RED) {
       node.status({});
       return node.error(message, msg);
     } else {
-      (mode == 'delete' && Object.keys(res).length == 0) ? msg.payload = "Ranker deleted" : msg.payload = res;
+      (mode == 'delete' && Object.keys(res).length == 0) ? msg.payload = 'Ranker deleted' : msg.payload = res;
       if (mode != 'index') {
         node.send(msg);
       }
@@ -522,7 +525,7 @@ module.exports = function (RED) {
 
   function checkRankerStatus(retrieve_and_rank,msg,node,ranker_id) {
     var interval = 10000;
-    //Loop and check the status of the ranker 
+    //Loop and check the status of the ranker
     var statusInterval = setInterval(function(){
       var params = {
         ranker_id: ranker_id
@@ -531,13 +534,13 @@ module.exports = function (RED) {
           if (err) {
             node.status({});
             console.log(err);
-            var message = "Ranker training state error: "+err.error;
+            var message = 'Ranker training state error: '+err.error;
             clearInterval(statusInterval);
             return node.error(message, msg);
           } else {
             switch (res.status) {
               case 'Available':
-                node.status({fill:"green",shape:"ring",text:"Ranker available"});
+                node.status({fill:'green',shape:'ring',text:'Ranker available'});
                 return clearInterval(statusInterval);
                 break;
 
@@ -546,7 +549,7 @@ module.exports = function (RED) {
 
               default:
                 node.status({});
-                var message = "Ranker training status: "+res.status+", description: "+res.status_description;
+                var message = 'Ranker training status: '+res.status+', description: '+res.status_description;
                 clearInterval(statusInterval);
                 return node.error(message, msg);
             }
@@ -566,14 +569,14 @@ module.exports = function (RED) {
         retrieve_and_rank.pollCluster(params, function(err, res) {
             if (err) {
               node.status({});
-              var message = "Cluster creation state error: "+err.error;
+              var message = 'Cluster creation state error: '+err.error;
               clearInterval(statusInterval);
               return node.error(message, msg);
             } else {
 
               switch (res.solr_cluster_status) {
                 case 'READY':
-                  node.status({fill:"green",shape:"ring",text:"Cluster available"});
+                  node.status({fill:'green',shape:'ring',text:'Cluster available'});
                   return clearInterval(statusInterval);
                   break;
 
@@ -582,7 +585,7 @@ module.exports = function (RED) {
 
                 default:
                   node.status({});
-                  var message = "Cluster status: "+res.status+", description: "+res.status_description;
+                  var message = 'Cluster status: '+res.status+', description: '+res.status_description;
                   clearInterval(statusInterval);
                   return node.error(message, msg);
               }

services/retrieve_and_rank/v1.html

@@ -52,6 +52,8 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-tone-analyzer">
+    <p><b>NB:</b> This node uses the old beta API and it is only being retained for backward compatibility for anyone that has old credentials. It will no longer work with new credentials.</p>
+    <br/>
     <p>The Tone Analyzer service uses linguistic analysis to detect emotional tones, social propensities, and writing styles in written communication.</p>
     <p>The text to analyze should be passed in on <b>msg.payload</b>.</p>
     <p>The service response will be returned on <b>msg.response</b>.</p>

services/retrieve_and_rank/v1.js

@@ -59,10 +59,14 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-tone-analyzer-v3">
-    <p>The Tone Analyzer service uses linguistic analysis to detect emotional tones, social propensities, and writing styles in written communication.</p>
+    <p>The Tone Analyzer service uses linguistic analysis to detect emotional tones, social propensities, 
+       and writing styles in written communication.</p>
     <p>The text to analyze should be passed in on <b>msg.payload</b>.</p>
     <p>The service response will be returned on <b>msg.response</b>.</p>
-    <p>Usng the node editor dialog users can filter the results by tone (emotion, writing or social) and whether to include sentence-level analysis.</p>
+    <p>The tone and sentances can be programmaticaly set in <code>msg.tones</code>
+    and <code>msg.sentences</code></p>
+    <p>Usng the node editor dialog users can filter the results by tone (emotion, language or social) and 
+      whether to include sentence-level analysis.</p>
     <p>For more information about the Tone Analyzer service, read the <a href="https://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/tone-analyzer.html">documentation</a>.</p>
 </script>