Merge pull request #205 from chughts/translator

Translator Nodes

Author: chughts

README.md

@@ -7,6 +7,11 @@ Node-RED Watson Nodes for IBM Bluemix
 
 <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.4.21
+- Added Translation and Language Identify nodes for Language Translator Service (Blue Tiles)
+- Deprecated Translation and Language Indentification nodes for Language Translation (Green Tiles)
+
 ### New in version 0.4.20
 - Translation Node supports German
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.4.20",
+  "version": "0.4.21",
   "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": "^2.1.0",
+    "watson-developer-cloud": "^2.4.6",
     "kuromoji": "^0.0.5",
     "is-docx": "^0.0.3"
   },
@@ -37,7 +37,9 @@
       "watson-document-conversion-v1": "services/document_conversion/v1.js",
       "watson-concept-insights-v2": "services/concept_insights/v2.js",
       "watson-dialog-v1": "services/dialog/v1.js",
-      "alchemy_language-v1": "services/alchemy_language/v1.js",
+      "watson-language-translator-v2": "services/language_translator/v2.js",
+      "watson-language-translator-identify-v2": "services/language_translator_identify/v2.js",
+      "watson-language-translator-util-v2": "services/language_translator_util/v2.js",
       "watson-language-identification-v1": "/services/language_identification/v1.js",
       "watson-language-translate-v1": "services/language_translation/v2.js",
       "watson-language-translate-util-v1": "services/language_translation_util/v2.js",
@@ -54,7 +56,8 @@
       "watson-visual-recognition-v1": "services/visual_recognition/v1.js",
       "watson-visual-recognition-v3": "services/visual_recognition/v3.js",
       "watson-similarity-search-v3": "services/similarity_search/v3.js",
-      "alchemy-vision-v1": "services/alchemy_vision/v1.js"
+      "alchemy-vision-v1": "services/alchemy_vision/v1.js",
+      "alchemy_language-v1": "services/alchemy_language/v1.js"
     }
   }
 }

services/language_identification/v1.html

@@ -35,6 +35,10 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-language-identification">
+    <p><b>NB:</b> The Watson Language Translation service has been deprecated in favor of the new Watson Translator service. Once the service
+      has been switched off this node will no longer work. The node will be removed from the palette in a
+      future release. </p>
+    <br/>
     <p>The Language Identification service analyzes UTF-8 encoded text, detects the language used in that text, and displays the associated 5-letter ISO language code. </p>
     <p>The text to detect should be passed in on <code>msg.payload</code>.</p>
     <p>The ISO language code will be returned on <code>msg.lang</code>.</p>
@@ -45,7 +49,7 @@
 <script type="text/javascript">
     (function() {
         RED.nodes.registerType('watson-language-identification', {
-            category: 'IBM Watson',
+            category: 'Watson Deprecated',
             defaults: {
                 name: {value: ""}
             },

services/language_translation/v2.html

@@ -127,7 +127,11 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-translate">
-    <p>Packaged in with release 0.4.19 of node-red-node-watson</p>
+    <p><b>NB:</b> The Watson Language Translation service has been deprecated in favor of the new Watson Translator service. Once the service
+      has been switched off this node will no longer work. The node will be removed from the palette in a
+      future release. </p>
+    <br/>
+    <p>Packaged in with release 0.4.21 of node-red-node-watson</p>
     <p>The Language Translation service enables you to translate text from one language to another and to add your own translation models.</p>
     <p></p>
     <p><b>Translation Mode</b>.</p>
@@ -653,7 +657,7 @@
   // Define and run the function to register this node.
   (function() {
         RED.nodes.registerType('watson-translate', {
-            category: 'IBM Watson',
+            category: 'Watson Deprecated',
             defaults: {
                 name: {value: ''},
                 action: {value: 'translate'},

services/language_translation/v2.js

@@ -50,21 +50,12 @@ module.exports = function (RED) {
 
   // API used by widget to fetch available models
   RED.httpAdmin.get('/watson-translate/models', function (req, res) {
-    var lt = null;
-
-    if(!username && !password) {
-      lt = watson.language_translator({
-        username: req.query.un,
-        password: req.query.pwd,
-        version: 'v2'
-      });
-    } else {
-      lt = watson.language_translator({
-        username: username,
-        password: password,
+    var lt = watson.language_translator({
+        username: sUsername ? sUsername : req.query.un,
+        password: sPassword ? sPassword : req.query.pwd,
         version: 'v2'
       });
-    }
+      
     lt.getModels({}, function (err, models) {
       if (err) {
         res.json(err);

services/language_translation_util/v2.html

@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="watson-translate-util">
+<script type="text/x-red" data-template-name="watson-translator-util">
     <div id="credentials-check" class="form-row">
         <div class="form-tips">
             <i class="fa fa-question-circle"></i><b> Please wait: </b> Checking for bound service credentials...
@@ -35,7 +35,12 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-translate-util">
-    <p>The Language Translation Utility service enables you to discover parameters used by the language translation node.</p>
+    <p><b>NB:</b> The Watson Language Translator service has been deprecated in favor of the new Watson Translator service. Once the service
+      has been switched off this node will no longer work. The node will be removed from the palette in a
+      future release. </p>
+    <br/>
+    <p>The Language Translation Utility service enables you to set using dasboard utility functions
+    the language translation to be used by the Language Translation Node.</p>
     <p></p>
     <p><b>Translation Mode Utility</b>.</p>
     <p>The regular Watson Translation cerdentials should be set through the UI.</p>
@@ -55,7 +60,7 @@
 <script type="text/javascript">
     (function() {
         RED.nodes.registerType('watson-translate-util', {
-            category: 'IBM Watson',
+            category: 'Watson Deprecated',
             defaults: {
                 name: {value: ""}
             },

services/language_translation_util/v2.js

@@ -219,4 +219,4 @@ module.exports = function (RED) {
       password: {type:'password'}
     }
   });
-};
+};