alchemy vision - get links is now supported #72

Author: germanattanasio

lib/alchemy_endpoints.json

@@ -84,7 +84,7 @@
     "html" : "/html/HTMLGetCombinedData"
   },
 
-  "image": {
+  "image_link": {
     "url"  : "/url/URLGetImage",
     "html" : "/html/HTMLGetImage"
   },
@@ -94,7 +94,7 @@
     "image" : "/image/ImageGetRankedImageKeywords"
   },
 
-  "image_face_tag": {
+  "image_recognition": {
     "url"  : "/url/URLGetRankedImageFaceTags",
     "image" : "/image/ImageGetRankedImageFaceTags"
   }

lib/index.js

@@ -113,8 +113,8 @@ var watson = {};
   'user_modeling',
 
   // alchemy
-  'alchemy_language',
-  'alchemy_vision'
+  'alchemy_language'
+  //'alchemy_vision'
 
 ].forEach(function(api) {
   watson[api] = createServiceAPI(api);

services/alchemy_language/v1.js

@@ -22,15 +22,18 @@ var endpoints      = require('../../lib/alchemy_endpoints.json');
 var helper         = require('../../lib/helper');
 
 var errorFormatter = function(cb) {
-  return function(err, result) {
+  return function(err, result, response) {
     if (err) {
       cb(err, result);
     }
     else {
       if (result.status === 'OK')
         cb(err,result);
       else
-        cb({error: result.statusInfo, code:400 }, null);
+        cb({
+          error: result.statusInfo || response['headers']['x-alchemyapi-error-msg'],
+          code: 400
+        }, null);
     }
   };
 };

services/alchemy_vision/v1.js

@@ -54,24 +54,15 @@ function createRequest(method) {
       return;
     }
 
-    var imageOptions = {};
-
-    if (typeof(_params.image) !== 'string') {
-      params.imagePostMode = 'raw';
-      imageOptions.formData = { attachments: [_params.image] };
-    } else {
-      imageOptions.form = pick(params,['image']);
-    }
-
-    var parameters = extend({
+    var parameters = {
       options: {
         url: endpoints[method][format],
         method: 'POST',
         json: true,
-        qs: extend({outputMode: 'json'}, omit(params,['image'])) // change default output to json
+        qs: extend({outputMode: 'json'}, params) // change default output to json
       },
       defaultOptions: this._options
-    }, imageOptions);
+    };
 
     return requestFactory(parameters, errorFormatter(callback));
   };
@@ -89,14 +80,21 @@ function AlchemyVision(options) {
 /**
  * Extracts images from a URL.
  */
-AlchemyVision.prototype.imageLinks = createRequest('image');
+AlchemyVision.prototype.imageLinks = createRequest('image_link');
 
 /**
  * Tags image with keywords
  */
 AlchemyVision.prototype.imageTags = function(_params, callback) {
   var params = _params || {};
 
+  if (typeof(params.image) !== 'undefined' && typeof(params.image) !== 'string') {
+    callback(new Error('Invalid arguments: image needs to be a filename or base64 image'));
+    return;
+  }
+
+  if (typeof(params.image) !== 'string')
+    params.imagePostMode = 'raw';
 
   return createRequest('image_keywords').call(this, params, callback);
 };
@@ -110,7 +108,7 @@ AlchemyVision.prototype.imageFaces = function(_params, callback) {
   if (typeof(params.image) !== 'string')
     params.imagePostMode = 'raw';
 
-  return createRequest('image_face_tag').call(this, params, callback);
+  return createRequest('image_recognition').call(this, params, callback);
 };
 
 module.exports = AlchemyVision;