From a0c6902a16dded452f7ba22ed36c3ecf812bc831 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 21 Oct 2016 12:39:08 -0400 Subject: [PATCH] vision: update gapic layer --- packages/vision/package.json | 2 +- packages/vision/src/v1/image_annotator_api.js | 26 +++++++------------ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/packages/vision/package.json b/packages/vision/package.json index e53db4d2d09..de6a3957351 100644 --- a/packages/vision/package.json +++ b/packages/vision/package.json @@ -54,7 +54,7 @@ "arrify": "^1.0.0", "async": "^2.0.1", "extend": "^3.0.0", - "google-gax": "^0.7.0", + "google-gax": "^0.8.1", "google-proto-files": "^0.8.0", "is": "^3.0.1", "propprop": "^0.3.0", diff --git a/packages/vision/src/v1/image_annotator_api.js b/packages/vision/src/v1/image_annotator_api.js index de2c47c0b09..a43f11b3c5d 100644 --- a/packages/vision/src/v1/image_annotator_api.js +++ b/packages/vision/src/v1/image_annotator_api.js @@ -108,7 +108,9 @@ function ImageAnnotatorApi(gaxGrpc, grpcClients, opts) { /** * Run image detection and annotation for a batch of images. * - * @param {Object[]} requests + * @param {Object} request + * The request object that will be sent. + * @param {Object[]} request.requests * Individual image annotation requests for this batch. * * This object should have the same structure as [AnnotateImageRequest]{@link AnnotateImageRequest} @@ -119,25 +121,20 @@ function ImageAnnotatorApi(gaxGrpc, grpcClients, opts) { * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [BatchAnnotateImagesResponse]{@link BatchAnnotateImagesResponse} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = visionV1.imageAnnotatorApi(); * var requests = []; - * api.batchAnnotateImages(requests, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * api.batchAnnotateImages({requests: requests}).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -ImageAnnotatorApi.prototype.batchAnnotateImages = function batchAnnotateImages( - requests, - options, - callback) { +ImageAnnotatorApi.prototype.batchAnnotateImages = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -145,10 +142,7 @@ ImageAnnotatorApi.prototype.batchAnnotateImages = function batchAnnotateImages( if (options === undefined) { options = {}; } - var req = { - requests: requests - }; - return this._batchAnnotateImages(req, options, callback); + return this._batchAnnotateImages(request, options, callback); }; function ImageAnnotatorApiBuilder(gaxGrpc) {