Code tidy

Author: chughts

ChangeHistory.md

@@ -1,3 +1,88 @@
+## 0.6.x
+
+### New in version 0.6.14
+- Visual Recognition instances created post May 22 2018, have a new authentication mechanism
+
+### New in version 0.6.13
+- Added opt-out option for collection parsing of strings in Natural Language Classifier Node.
+
+### New in version 0.6.12
+- Fix to collection check in Natural Language Classification Node allowing for . in domain
+names.
+
+### New in version 0.6.11
+- Fix to defaulting name for NLU Node.
+- Allow pre-check of audio format to be disabled in Speech to Text node.
+- Migrate from deprecated getModels and getCustomizations methods in Speech to Text nodes.
+- Implement update classifier in Visual Recognition Util node.
+- In Visual Recognition Util node append 'positive_' to zip name if neither 'positive' not 'negative' not already there.
+- Removed duplicated code in Visual Recognition Util node.
+
+### New in version 0.6.10
+- Needed to stringify json before addDocument in Discovery node.
+- Using Node.js v 6 features, so will not run on Node.js v 4 anymore
+
+### New in version 0.6.9
+- Implemented classify collection on Natural Language Classifier node. The collection can be
+in the form of multiple sentences, an array of strings, or an array of objects.
+
+### New in version 0.6.8
+- Move all Discovery calls to latest API version - 2017-11-07
+- Updated calls to deprecated discovery methods addJsonDocument and getCollections
+- Correct implemetation of passages related options
+- Allow highlight option to be specified in Discovery overrides - msg.discoveryparams
+- Rename Conversation Nodes to Assistant
+- Use Assistant endpoint
+- Move all Assistant calls to latest API version - 2018-02-16
+- Move all Visual Recognition calls to lates API version - 2018-03-19
+- Add French as a Visual Recognition classification response language
+
+### New in version 0.6.7
+- Enable Opt-out option for Conversation Node.
+- Implement time out option for response from Conversation Node.
+- Bump to v 3.2.1 of watson-developer-cloud dependency.
+- Fix to how API version is specified in Natural Language Understanding Node.
+- Add Korean to list of languages in Natural Language Classifier Node.
+
+### New in version 0.6.6
+- Added Mute option for STT Node warning status when running in Streaming mode
+- Discard option for STT Node Streaming listening events.
+- Added Auto-Connect mode for STT Node - Will keep connection to service alive,
+else connection is restored on demand.
+- Fix to Discovery Query Builder Node to return schema options.
+
+### New in version 0.6.5
+- Endpoint can now be specified in Natural Language Classifier Node
+
+### New in version 0.6.4
+- Speech to Text node now reports all errors, including disconnects when running in stream mode.
+
+### New in version 0.6.3
+- Allow input / output from Node-RED web-sockets for Speech to Text node. To
+enable select streaming mode. No token is needed as the Node handles this. Look
+out for sample flows and templates showing how to use this feature.
+- Three new languages for Language Translator, Polish, Russian and Turkish in Neural Translation mode.
+- Removed the code for the deprecated Language Translation Nodes.  
+
+### New in version 0.6.2
+- Visual Recognition fix for accept-language
+
+### New in version 0.6.1
+- Allow STT Language to be dyamically configurable using msg.srclang
+
+### New in version 0.6.0
+- Bump to watson-developer-cloud 3.0.4
+- Document link updates
+- IE fix
+- Option to set Conversation credentials though msg.params
+- Speech To Text fullresult now includes speaker_labels. Breaking change to any code that used fullresult due an extra level of indirection.
+- Allow Korean as an option for Personality Insights
+- Text Recognition option removed from Visual Recognition Node
+- Move Retrieve and Rank nodes to deprecated list
+- Removed Document Conversion, Alchemy, Concept Insights, Dialog, Tradeoff Analytics and Similarity Search Nodes
+- Nodes deprecated in 0.5.x will be removed in 0.6.x releases
+
+
 ## 0.5.x
 
 ### New in version 0.5.23

README.md

@@ -7,96 +7,15 @@ 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.6.15
+### New in version 0.7.0
 - Assistant, Discovery, Speech to Text, Text to Speech, Tone Analyzer nodes updated
 to allow for use of iam key for authentication.
 - Migrated STT node off deprecated methods.
 - Fix to Tone Analyzer Node to preserve credentials on config reopen.
 - Fix to Tone Analyzer to allow json objects and arrays as payload.
 - Fix to STT where auto-connect was not being preserved when reopening configuration.
 - Bump to 2018-03-05 version date for Discovery service.
-
-### New in version 0.6.14
-- Visual Recognition instances created post May 22 2018, have a new authentication mechanism
-
-### New in version 0.6.13
-- Added opt-out option for collection parsing of strings in Natural Language Classifier Node.
-
-### New in version 0.6.12
-- Fix to collection check in Natural Language Classification Node allowing for . in domain
-names.
-
-### New in version 0.6.11
-- Fix to defaulting name for NLU Node.
-- Allow pre-check of audio format to be disabled in Speech to Text node.
-- Migrate from deprecated getModels and getCustomizations methods in Speech to Text nodes.
-- Implement update classifier in Visual Recognition Util node.
-- In Visual Recognition Util node append 'positive_' to zip name if neither 'positive' not 'negative' not already there.
-- Removed duplicated code in Visual Recognition Util node.
-
-### New in version 0.6.10
-- Needed to stringify json before addDocument in Discovery node.
-- Using Node.js v 6 features, so will not run on Node.js v 4 anymore
-
-### New in version 0.6.9
-- Implemented classify collection on Natural Language Classifier node. The collection can be
-in the form of multiple sentences, an array of strings, or an array of objects.
-
-### New in version 0.6.8
-- Move all Discovery calls to latest API version - 2017-11-07
-- Updated calls to deprecated discovery methods addJsonDocument and getCollections
-- Correct implemetation of passages related options
-- Allow highlight option to be specified in Discovery overrides - msg.discoveryparams
-- Rename Conversation Nodes to Assistant
-- Use Assistant endpoint
-- Move all Assistant calls to latest API version - 2018-02-16
-- Move all Visual Recognition calls to lates API version - 2018-03-19
-- Add French as a Visual Recognition classification response language
-
-### New in version 0.6.7
-- Enable Opt-out option for Conversation Node.
-- Implement time out option for response from Conversation Node.
-- Bump to v 3.2.1 of watson-developer-cloud dependency.
-- Fix to how API version is specified in Natural Language Understanding Node.
-- Add Korean to list of languages in Natural Language Classifier Node.
-
-### New in version 0.6.6
-- Added Mute option for STT Node warning status when running in Streaming mode
-- Discard option for STT Node Streaming listening events.
-- Added Auto-Connect mode for STT Node - Will keep connection to service alive,
-else connection is restored on demand.
-- Fix to Discovery Query Builder Node to return schema options.
-
-### New in version 0.6.5
-- Endpoint can now be specified in Natural Language Classifier Node
-
-### New in version 0.6.4
-- Speech to Text node now reports all errors, including disconnects when running in stream mode.
-
-### New in version 0.6.3
-- Allow input / output from Node-RED web-sockets for Speech to Text node. To
-enable select streaming mode. No token is needed as the Node handles this. Look
-out for sample flows and templates showing how to use this feature.
-- Three new languages for Language Translator, Polish, Russian and Turkish in Neural Translation mode.
-- Removed the code for the deprecated Language Translation Nodes.  
-
-### New in version 0.6.2
-- Visual Recognition fix for accept-language
-
-### New in version 0.6.1
-- Allow STT Language to be dyamically configurable using msg.srclang
-
-### New in version 0.6.0
-- Bump to watson-developer-cloud 3.0.4
-- Document link updates
-- IE fix
-- Option to set Conversation credentials though msg.params
-- Speech To Text fullresult now includes speaker_labels. Breaking change to any code that used fullresult due an extra level of indirection.
-- Allow Korean as an option for Personality Insights
-- Text Recognition option removed from Visual Recognition Node
-- Move Retrieve and Rank nodes to deprecated list
-- Removed Document Conversion, Alchemy, Concept Insights, Dialog, Tradeoff Analytics and Similarity Search Nodes
-- Nodes deprecated in 0.5.x will be removed in 0.6.x releases
+- Migraged Discovery Query Builder off deprecated getEnvrionments method
 
 
 ### Watson Nodes for Node-RED

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.6.15",
+  "version": "0.7.0",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",

services/discovery/discovery-utils.js

@@ -21,22 +21,18 @@ DiscoveryUtils.prototype = {
 
   buildService: function(username, password, apikey, endpoint) {
     let serviceSettings = {
-        version_date: '2018-03-05',
-        headers: {
-          'User-Agent': pkg.name + '-' + pkg.version
-        }
-      };
-
-      if (apikey) {
-        serviceSettings.iam_apikey = apikey;
-      } else {
-        serviceSettings.username = username;
-        serviceSettings.password = password;
+      version_date: '2018-03-05',
+      headers: {
+        'User-Agent': pkg.name + '-' + pkg.version
       }
+    };
 
-      if (endpoint) {
-        serviceSettings.url = endpoint;
-      }
+    if (apikey) {
+      serviceSettings.iam_apikey = apikey;
+    } else {
+      serviceSettings.username = username;
+      serviceSettings.password = password;
+    }
 
     if (endpoint) {
       serviceSettings.url = endpoint;

services/speech_to_text/stt-utils.js

@@ -1,4 +1,20 @@
-const pkg = require('../../package.json'),
+/**
+ * Copyright 2018 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+ const pkg = require('../../package.json'),
   STTV1 = require('watson-developer-cloud/speech-to-text/v1');
 
 class STTUtils {

services/speech_to_text/v1-corpus-builder.js

@@ -16,8 +16,7 @@
 
 module.exports = function (RED) {
   const SERVICE_IDENTIFIER = 'speech-to-text';
-  var cfenv = require('cfenv'),
-    url = require('url'),
+  var url = require('url'),
     temp = require('temp'),
     fs = require('fs'),
     fileType = require('file-type'),

services/speech_to_text/v1.html

@@ -614,6 +614,7 @@
                 'payload-response' :{value: false},
                 'streaming-mode' :{value: false},
                 'streaming-mute' :{value: true},
+                'auto-connect' :{value: false},
                 'discard-listening' :{value: false},
                 'disable-precheck' :{value: false},
                 'default-endpoint' :{value: true},