Merge pull request #206 from chughts/bugfixes

Fixed Old Translation Nodes

Author: chughts

package.json

@@ -37,6 +37,7 @@
       "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",
@@ -56,8 +57,7 @@
       "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_language-v1": "services/alchemy_language/v1.js"
+      "alchemy-vision-v1": "services/alchemy_vision/v1.js"
     }
   }
 }

services/language_identification/v1.js

@@ -15,18 +15,18 @@
  **/
 
 module.exports = function (RED) {
-  var cfenv = require('cfenv');
-
-  var services = cfenv.getAppEnv().services,
-    service;
-
-  var username, password;
-
-  var service = cfenv.getAppEnv().getServiceCreds(/language translation/i)
+  var cfenv = require('cfenv'),
+    LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
+    service = cfenv.getAppEnv().getServiceCreds(/language translation/i)
+    username = null,
+    password = null,
+    sUsername = null,
+    sPassword = null,
+    endpointUrl = 'https://gateway.watsonplatform.net/language-translation/api';
 
   if (service) {
-    username = service.username;
-    password = service.password;
+    sUsername = service.username;
+    sPassword = service.password;
   }
 
   RED.httpAdmin.get('/watson-language-identification/vcap', function (req, res) {
@@ -44,21 +44,20 @@ module.exports = function (RED) {
         return;
       }
 
-      username = username || this.credentials.username;
-      password = password || this.credentials.password;
+      username = sUsername || this.credentials.username;
+      password = sPassword || this.credentials.password;
 
       if (!username || !password) {
         var message = 'Missing Language Identification service credentials';
         node.error(message, msg);
         return;
       }
 
-      var watson = require('watson-developer-cloud');
-
-      var language_translation = watson.language_translator({
+      var language_translation = new LanguageTranslatorV2({
         username: username,
         password: password,
-        version: 'v2'
+        version: 'v2',
+        url: endpointUrl
       });
 
       node.status({fill:"blue", shape:"dot", text:"requesting"});

services/language_translation/v2.html

@@ -25,6 +25,8 @@
             <i class="fa fa-question-circle"></i><b> Could not bind to service. </b> This node can not be further configured without a valid service. Try entering valid credentials?
         </div>
     </div>
+    <div id="id-error-getting-models" class="form-row">
+    </div>
 
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
@@ -111,7 +113,7 @@
         <input type="text" id="node-input-trainid" placeholder="Model ID">
     </div>
 
-  <div class="form-row">
+    <div class="form-row">
        <label for="node-input-lgparams2"><i class="fa fa-cog"></i> Parameters Scope</label>
        <input type="checkbox" id="node-input-lgparams2" style="display: inline-block; width: auto; vertical-align: top;">
        <label for="node-input-lgparams2" style="width: 70%;"> Use Local Parameters</label>
@@ -229,6 +231,7 @@
   // Function to be used at the start, as don't want to expose any fields, unless the model is
   // available. The model it self can only be fetched if the credentials are available.
   function hideAll() {
+    $('#id-error-getting-models').hide();
     if (!models) {
         $('#credentials-not-found').show();
         $('#node-input-action').parent().hide();
@@ -271,9 +274,13 @@
 
     $.getJSON('watson-translate/models/', {un: u, pwd: p}).done(function (data) {
       if (data.models) {
+        $('#id-error-getting-models').hide();
         models = data.models;
         have_credentials = true;
         checkVisibility();
+      } else if (data.error){
+        $('#id-error-getting-models').show();
+        $('#id-error-getting-models').text(data.error);
       }
     }).fail(function (err) {
       console.log(err);

services/language_translation/v2.js

@@ -22,7 +22,7 @@ module.exports = function (RED) {
   // Otherwise, once set username would never get reset, resulting in a frustrated
   // user who, when he errenously enters bad credentials, can't figure out why
   // the edited ones are not being taken.
-  var watson = require('watson-developer-cloud'),
+  var LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
     cfenv = require('cfenv'),
     fs = require('fs'),
     temp = require('temp'),
@@ -31,6 +31,8 @@ module.exports = function (RED) {
     sUsername = null,
     sPassword = null,
     service = cfenv.getAppEnv().getServiceCreds(/language translation/i);
+    endpointUrl = 'https://gateway.watsonplatform.net/language-translation/api';
+
 
   temp.track();
 
@@ -50,12 +52,13 @@ module.exports = function (RED) {
 
   // API used by widget to fetch available models
   RED.httpAdmin.get('/watson-translate/models', function (req, res) {
-    var lt = watson.language_translator({
-        username: sUsername ? sUsername : req.query.un,
-        password: sPassword ? sPassword : req.query.pwd,
-        version: 'v2'
-      });
-      
+    var lt = new LanguageTranslatorV2({
+      username: sUsername ? sUsername : req.query.un,
+      password: sPassword ? sPassword : req.query.pwd,
+      version: 'v2',
+      url: endpointUrl
+    });
+
     lt.getModels({}, function (err, models) {
       if (err) {
         res.json(err);
@@ -98,10 +101,11 @@ module.exports = function (RED) {
         globalContext = this.context().global,
         tmpmodel_id = globalContext.get('g_model_id'),
         result = '',
-        language_translation = watson.language_translator({
+        language_translation = new LanguageTranslatorV2({
           username: username,
           password: password,
-          version: 'v2'
+          version: 'v2',
+          url: endpointUrl
         });
 
       if (!username || !password) {

services/language_translation_util/v2.js

@@ -15,8 +15,9 @@
  **/
 
 module.exports = function (RED) {
-  var watson = require('watson-developer-cloud');
+  var LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2');
   var cfenv = require('cfenv');
+  var endpointUrl = 'https://gateway.watsonplatform.net/language-translation/api';
 
   // Require the Cloud Foundry Module to pull credentials from bound service
   // If they are found then they are stored in sUsername and sPassword, as the
@@ -80,10 +81,11 @@ module.exports = function (RED) {
         return;
       }
 
-      var lt = watson.language_translator({
+      var lt = new LanguageTranslatorV2({
         username: username,
         password: password,
-        version: 'v2'
+        version: 'v2',
+        url: endpointUrl
       });
 
       // set global variable in order to make them accessible for the tranlsation node
@@ -219,4 +221,4 @@ module.exports = function (RED) {
       password: {type:'password'}
     }
   });
-};
+};

services/language_translator_identify/v2.js

@@ -58,7 +58,6 @@ module.exports = function (RED) {
         password: password,
         version: 'v2',
         url: endpointUrl
-
       });
 
       node.status({fill:'blue', shape:'dot', text:'requesting'});