Update functions/imagemagick sample

functions/imagemagick/index.js

@@ -20,7 +20,9 @@ const exec = require('child_process').exec;
 const fs = require('fs');
 const path = require('path');
 const storage = require('@google-cloud/storage')();
-const vision = require('@google-cloud/vision')();
+const vision = require('@google-cloud/vision').v1p1beta1;
+
+const client = new vision.ImageAnnotatorClient();
 // [END functions_imagemagick_setup]
 
 // [START functions_imagemagick_analyze]
@@ -38,18 +40,22 @@ exports.blurOffensiveImages = (event) => {
   }
 
   const file = storage.bucket(object.bucket).file(object.name);
+  const filePath = `gs://${object.bucket}/${object.name}`;
 
   console.log(`Analyzing ${file.name}.`);
 
-  return vision.detectSafeSearch(file)
+  return client.safeSearchDetection(filePath)
     .catch((err) => {
       console.error(`Failed to analyze ${file.name}.`, err);
       return Promise.reject(err);
     })
-    .then(([safeSearch]) => {
-      if (safeSearch.adult || safeSearch.violence) {
+    .then(([result]) => {
+      const detections = result.safeSearchAnnotation;
+
+      if (detections.adult === 'VERY_LIKELY' ||
+          detections.violence === 'VERY_LIKELY') {
         console.log(`The image ${file.name} has been detected as inappropriate.`);
-        return blurImage(file, safeSearch);
+        return blurImage(file);
       } else {
         console.log(`The image ${file.name} has been detected as OK.`);
       }

functions/imagemagick/test/index.test.js

@@ -19,10 +19,21 @@ const proxyquire = require(`proxyquire`).noCallThru();
 const sinon = require(`sinon`);
 const test = require(`ava`);
 const tools = require(`@google-cloud/nodejs-repo-tools`);
+const vision = require('@google-cloud/vision').v1p1beta1;
 
 const bucketName = `my-bucket`;
 const filename = `image.jpg`;
 
+var VisionStub = sinon.stub(vision, 'ImageAnnotatorClient');
+VisionStub.returns({
+  safeSearchDetection: sinon.stub().returns(Promise.resolve([{
+    safeSearchAnnotation: {
+      adult: 'VERY_LIKELY',
+      violence: 'VERY_LIKELY'
+    }
+  }]))
+});
+
 function getSample () {
   const file = {
     getMetadata: sinon.stub().returns(Promise.resolve([{}])),
@@ -39,11 +50,7 @@ function getSample () {
   const storageMock = {
     bucket: sinon.stub().returns(bucket)
   };
-  const visionMock = {
-    detectSafeSearch: sinon.stub().returns(Promise.resolve([{ violence: true }]))
-  };
   const StorageMock = sinon.stub().returns(storageMock);
-  const VisionMock = sinon.stub().returns(visionMock);
   const childProcessMock = {
     exec: sinon.stub().yields()
   };
@@ -53,7 +60,6 @@ function getSample () {
 
   return {
     program: proxyquire(`../`, {
-      '@google-cloud/vision': VisionMock,
       '@google-cloud/storage': StorageMock,
       'child_process': childProcessMock,
       'fs': fsMock
@@ -63,8 +69,7 @@ function getSample () {
       childProcess: childProcessMock,
       storage: storageMock,
       bucket,
-      file,
-      vision: visionMock
+      file
     }
   };
 }
@@ -96,8 +101,17 @@ test.serial(`blurOffensiveImages blurs images`, async (t) => {
 });
 
 test.serial(`blurOffensiveImages ignores safe images`, async (t) => {
+  VisionStub.restore();
+  VisionStub = sinon.stub(vision, 'ImageAnnotatorClient');
+  VisionStub.returns({
+    safeSearchDetection: sinon.stub().returns(Promise.resolve([{
+      safeSearchAnnotation: {
+        adult: 'VERY_UNLIKELY',
+        violence: 'VERY_UNLIKELY'
+      }
+    }]))
+  });
   const sample = getSample();
-  sample.mocks.vision.detectSafeSearch = sinon.stub().returns(Promise.resolve([{}]));
   await sample.program.blurOffensiveImages({ data: { bucket: bucketName, name: filename } });
   t.is(console.log.callCount, 2);
   t.deepEqual(console.log.getCall(0).args, [`Analyzing ${sample.mocks.file.name}.`]);