Merge latest changes from dev

germanattanasio · germanattanasio · commit 04d1775b4b5c · 2015-11-24T10:51:43.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -9,5 +9,5 @@ script:
 after_success:
 - npm run coveralls
 before_install:
-- openssl aes-256-cbc -K $encrypted_cb4d3d070e32_key -iv $encrypted_cb4d3d070e32_iv
+- openssl aes-256-cbc -K $encrypted_d4f181ef7c79_key -iv $encrypted_d4f181ef7c79_iv
   -in auth.js.enc -out test/resources/auth.js -d
diff --git a/auth.js.enc b/auth.js.enc
diff --git a/examples/alchemy_data_news.v1.js b/examples/alchemy_data_news.v1.js
@@ -6,14 +6,19 @@ var alchemy_data_news = watson.alchemy_data_news({
   api_key: '<api_key>'
 });
 
+// News about company acquisitions in the past 24 hours:
+// More information: http://docs.alchemyapi.com/docs/introduction
 var params = {
   start: 'now-1d',
-  end: 'now'
+  end: 'now',
+  count: 100,
+  'q.enriched.url.enrichedTitle.relations.relation': '|action.verb.text=acquire,object.entities.entity.type=Company|',
+  return: 'enriched.url.title'
 };
 
 alchemy_data_news.getNews(params, function (err, news) {
   if (err)
     console.log('error:', err);
   else
     console.log(JSON.stringify(news, null, 2));
-});
+});
diff --git a/examples/alchemy_vision.v1.js b/examples/alchemy_vision.v1.js
@@ -10,6 +10,7 @@ var alchemy_vision = watson.alchemy_vision({
 // Image keywords
 var params = {
   image: fs.createReadStream('resources/car.png')
+  forceShowAll: 1 // Includes lower confidence tags
 };
 
 alchemy_vision.getImageKeywords(params, function (err, keywords) {
@@ -32,6 +33,7 @@ alchemy_vision.getImageKeywords(params, function (err, keywords) {
 
 // Face recognize
 var params = {
+  knowledgeGraph: 1 // Include knowledge graph information in the the results.
   url: 'https://upload.wikimedia.org/wikipedia/commons/0/00/Scarlett_Johansson_-_Captain_America_2_press_conference_%28retouched%29_2.jpg'
 };
 
diff --git a/examples/document_conversion.v1-experimental.js b/examples/document_conversion.v1-experimental.js
@@ -12,12 +12,18 @@ var document_conversion = watson.document_conversion({
 // convert a single document
 document_conversion.convert({
   // (JSON) ANSWER_UNITS, NORMALIZED_HTML, or NORMALIZED_TEXT
-  file: fs.createReadStream(__dirname + '/resources/document_conversion/sample-docx.docx'),
-  conversion_target: document_conversion.conversion_target.ANSWER_UNITS
+  file: fs.createReadStream(__dirname + '/resources/example.html'),
+  conversion_target: document_conversion.conversion_target.ANSWER_UNITS,
+  config: { 
+    // split the html file by "h2", "h3" and "h4" tags
+    html_to_answer_units: {
+      selectors: [ 'h2','h3', 'h4']
+    }
+  }
 }, function (err, response) {
   if (err) {
     console.error(err);
   } else {
     console.log(JSON.stringify(response, null, 2));
   }
-});
+});
diff --git a/examples/document_conversion_integration.v1-experimental.js b/examples/document_conversion_integration.v1-experimental.js
@@ -21,7 +21,7 @@ Document Conversion Service and upload it to the Retrieve and Rank Service to ma
 */
 
 var watson = require('watson-developer-cloud');
-var async  = require('async');
+var async = require('async');
 var fs = require('fs');
 
 /*
@@ -57,17 +57,25 @@ var solrClient = retrieve.createSolrClient({
 
 async.waterfall([
 
-  function convert(done){
+  function convert(done) {
     // convert a single document
     document_conversion.convert({
       // (JSON) ANSWER_UNITS, NORMALIZED_HTML, or NORMALIZED_TEXT
       file: fs.createReadStream(__dirname + inputDocument),
-      conversion_target: document_conversion.conversion_target.ANSWER_UNITS
-    }, function (err, response) {
+      conversion_target: document_conversion.conversion_target.ANSWER_UNITS,
+      config: {
+        html_to_html: {
+          specify_content_to_extract: {
+            enabled: true,
+            xpaths: ['//h3']
+          }
+        }
+      }
+    }, function(err, response) {
       if (err) {
         console.error(err);
       } else {
-         done(null, response);
+        done(null, response);
       }
     });
   },
@@ -76,13 +84,13 @@ async.waterfall([
     console.log('Indexing a document...');
     var doc = mapAnswerUnits2SolrDocs(response);
     solrClient.add(doc, function(err) {
-      if(err) {
+      if (err) {
         console.log('Error indexing document: ' + err);
         done();
       } else {
         console.log('Indexed a document.');
         solrClient.commit(function(err) {
-          if(err) {
+          if (err) {
             console.log('Error committing change: ' + err);
           } else {
             console.log('Successfully committed changes.');
@@ -99,10 +107,12 @@ async.waterfall([
     // This query searches for the term 'psychological' in the content_text field.
     // For a wildcard query use:
     // query.q({ '*' : '*' });
-    query.q({ 'content_text' : 'psychological' });
+    query.q({
+      'content_text': 'psychological'
+    });
 
     solrClient.search(query, function(err, searchResponse) {
-      if(err) {
+      if (err) {
         console.log('Error searching for documents: ' + err);
       } else {
         console.log('Found ' + searchResponse.response.numFound + ' document(s).');
@@ -116,7 +126,7 @@ async.waterfall([
 function mapAnswerUnits2SolrDocs(data) {
   var answerUnits = data.answer_units;
   var solrDocList = [];
-  answerUnits.forEach(function(value){
+  answerUnits.forEach(function(value) {
     var solrDoc = convertAnswerUnit2SolrDoc(value);
     solrDocList.push(solrDoc);
   });
@@ -126,9 +136,15 @@ function mapAnswerUnits2SolrDocs(data) {
 function convertAnswerUnit2SolrDoc(au) {
   var solrDoc;
   var auContents = au.content;
-  auContents.forEach(function(auContent){
-    if(auContent.media_type === 'text/plain') {
-      solrDoc = { id : au.id, title: au.title, type: au.type, media_type: auContent.media_type, content_text: auContent.text };
+  auContents.forEach(function(auContent) {
+    if (auContent.media_type === 'text/plain') {
+      solrDoc = {
+        id: au.id,
+        title: au.title,
+        type: au.type,
+        media_type: auContent.media_type,
+        content_text: auContent.text
+      };
     }
   });
   return solrDoc;
diff --git a/services/alchemy_data_news/v1.js b/services/alchemy_data_news/v1.js
@@ -39,7 +39,7 @@ function errorFormatter(cb) {
 function AlchemyDataNews(options) {
   // Default URL
   var serviceDefaults = {
-    url: 'https://access.alchemyapi.com/calls'
+    url: 'https://gateway-a.watsonplatform.net/calls'
   };
   // Replace default options with user provided
   this._options = extend(serviceDefaults, options);
@@ -65,4 +65,4 @@ AlchemyDataNews.prototype.getNews = function(params, callback ) {
     return requestFactory(parameters, errorFormatter(callback));
   };
 
-module.exports = AlchemyDataNews;
+module.exports = AlchemyDataNews;
diff --git a/services/alchemy_language/v1.js b/services/alchemy_language/v1.js
@@ -17,6 +17,7 @@
 'use strict';
 
 var extend         = require('extend');
+var util           = require('util');
 var requestFactory = require('../../lib/requestwrapper');
 var endpoints      = require('../../lib/alchemy_endpoints.json');
 var helper         = require('../../lib/helper');
@@ -93,8 +94,12 @@ AlchemyLanguage.prototype.concepts = createRequest('concepts');
  * Calculates the sentiment for text, a URL or HTML.
  */
 AlchemyLanguage.prototype.sentiment = function(params, callback) {
-  var service = (params && params.target) ? 'sentiment_targeted' : 'sentiment';
-  return createRequest(service).call(this, params, callback);
+  var _params = extend({}, params);
+  var service = (params.target || params.targets) ? 'sentiment_targeted' : 'sentiment';
+  if (util.isArray(_params.targets))
+    _params.targets = _params.targets.join('|');
+
+  return createRequest(service).call(this, _params, callback);
 };
 /**
  * Extracts the cleaned text (removes ads, navigation, etc.) for a URL or HTML.
diff --git a/services/concept_insights/v2.js b/services/concept_insights/v2.js
@@ -205,9 +205,13 @@ ConceptInsightsGraphs.prototype.getRelationScores = function(params, callback) {
  * Retrieves the available corpora
  */
 ConceptInsightsCorpora.prototype.listCorpora = function(params, callback) {
+  var path = '/v2/corpora';
+  if (params && params.account_id)
+    path += '/' + params.account_id;
+
   var parameters = {
     options: {
-      url: '/v2/corpora',
+      url: path,
       method: 'GET',
       json: true
     },
diff --git a/services/dialog/v1.js b/services/dialog/v1.js
@@ -65,8 +65,7 @@ Dialog.prototype.updateProfile = function(params, callback) {
       url: '/v1/dialogs/{dialog_id}/profile',
       method: 'PUT',
       json: true,
-      body: pick(params, ['name_values']),
-      qs: pick(params, ['client_id']),
+      body: pick(params, ['name_values','client_id']),
       path: params
     },
     requiredParams: ['dialog_id', 'name_values'],
diff --git a/test/resources/alchemy-text.txt b/test/resources/alchemy-text.txt
@@ -0,0 +1,13 @@
+One year ago, several hours before cities across the United States started their annual fireworks displays,
+a different type of fireworks were set off at the European Center for Nuclear Research (CERN) in Switzerland. At 9:00 a.m.,
+physicists announced to the world that they had found something they had been sear
+There now is your insular city of the Manhattoes, belted round by wharves as Indian isles by coral
+reefs-commerce surrounds it with her surf. Right and left, the streets take you waterward. Its extreme
+downtown is the battery, where that noble mole is washed by waves, and cooled by breezes, which a few
+hours previous were out of sight of land. Look at the crowds of water-gazers there.
+ching for for nearly 50 years: the elusive Higgs boson. Today, on the anniversary
+of its discovery, are we any closer to figuring out what that particle's true identity is?
+ The Higgs boson is popularly referred to as "the God particle," perhaps because of its
+ role in giving other particles their mass. However, it's not the boson itself that gives mass.
+  Back in 1964, Peter Higgs proposed a theory that described a universal field
+  (similar to an electric or a magnetic field) that particles interacted with.
diff --git a/test/test.dialog.v1.js b/test/test.dialog.v1.js
@@ -84,10 +84,9 @@ describe('dialog', function() {
     });
 
     it('should generate a valid payload', function() {
-      var clientQuery = qs.stringify(pick(payload,['client_id']));
 
       var req = dialog.updateProfile(params, noop);
-      assert.equal(req.uri.href, service.url + paths.profile + '?' + clientQuery);
+      assert.equal(req.uri.href, service.url + paths.profile);
       assert.equal(req.method, 'PUT');
     });
   });
diff --git a/test/test.integration-all-services.js b/test/test.integration-all-services.js
