Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update functions/imagemagick sample #580

Merged
merged 5 commits into from
Apr 4, 2018
Merged

Update functions/imagemagick sample #580

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b27b39d
Update index.js
Mar 14, 2018
49301a5
Update package.json
Mar 14, 2018
d2464f3
Lint
Apr 3, 2018
20fa32a
Update index.test.js
Apr 3, 2018
506fe70
Merge branch 'master' into functions-imagemagick
Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions functions/imagemagick/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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.`);
}
Expand Down
2 changes: 1 addition & 1 deletion functions/imagemagick/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"dependencies": {
"@google-cloud/storage": "1.4.0",
"@google-cloud/vision": "0.12.0"
"@google-cloud/vision": "0.15.0"
},
"devDependencies": {
"@google-cloud/nodejs-repo-tools": "2.1.0",
Expand Down