From 93502cacd85d49959452d36bab470e20492c892a Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Tue, 15 Sep 2026 15:24:47 +0200 Subject: [PATCH 1/2] fix: Remove google-img-scrap fix: Remove google-img-scrap Signed-off-by: Marcel Klehr [skip ci] --- tests/faces-tests.js | 20 +++----------------- tests/landmarks-tests.js | 14 -------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/tests/faces-tests.js b/tests/faces-tests.js index de2f54a7f..c13b69872 100644 --- a/tests/faces-tests.js +++ b/tests/faces-tests.js @@ -1,5 +1,4 @@ const Flickr = require('flickr-sdk') -const { GOOGLE_IMG_SCRAP , GOOGLE_QUERY } = require('google-img-scrap'); const download = require('download') const flatten = require('lodash/flatten') const execa = require('execa') @@ -10,6 +9,7 @@ const LABELS = require('./res/famous_people.json') const PHOTOS_PER_LABEL = 10 const PHOTOS_OLDER_THAN = 1627464319 // 2021-07-28; for determinism const FACE_DISTANCE_THRESHOLD = 0.42 +const flickr = new Flickr(process.env.FLICKR_API_KEY) ;(async function() { const labels = LABELS.slice(0,20) @@ -17,7 +17,7 @@ const FACE_DISTANCE_THRESHOLD = 0.42 await Parallel.each(labels, async label => { try { - let urls = await findPhotosGoogle('"' + label + '"', PHOTOS_PER_LABEL) + let urls = await findPhotos(label, PHOTOS_PER_LABEL) await Promise.all( flatten(urls).map(url => download(url, 'temp_images/' + label)) ) @@ -28,7 +28,7 @@ const FACE_DISTANCE_THRESHOLD = 0.42 }, 1) try { - let urls = await findPhotosGoogle(negativeLabel, PHOTOS_PER_LABEL * 3) + let urls = await findPhotos(negativeLabel, PHOTOS_PER_LABEL * 3) await Promise.all( flatten(urls).map(url => download(url, 'temp_images/' + negativeLabel)) ) @@ -136,20 +136,6 @@ function findPhotos(label, amount = PHOTOS_PER_LABEL) { }) } -async function findPhotosGoogle(label, amount= PHOTOS_PER_LABEL) { - console.log('GOOGLE search: '+label) - const results = await GOOGLE_IMG_SCRAP({ - search: label, - query: { - EXTENSION: GOOGLE_QUERY.EXTENSION.JPG, - SIZE: GOOGLE_QUERY.SIZE.LARGE, - }, - limit: amount, - }); - - return results.result.map(i => i.url) -} - function addVectors(a, b) { return a.map((el, i) => el + b[i]) } diff --git a/tests/landmarks-tests.js b/tests/landmarks-tests.js index 496d0d127..995bb23a9 100644 --- a/tests/landmarks-tests.js +++ b/tests/landmarks-tests.js @@ -1,5 +1,4 @@ const Flickr = require('flickr-sdk') -const { GOOGLE_IMG_SCRAP , GOOGLE_QUERY } = require('google-img-scrap'); const download = require('download') const uniq = require('lodash/uniq') const flatten = require('lodash/flatten') @@ -100,16 +99,3 @@ function findPhotos(label, amount = PHOTOS_PER_LABEL) { throw err }) } - -async function findPhotosGoogle(label, amount= PHOTOS_PER_LABEL) { - console.log('GOOGLE search: '+label) - const results = await GOOGLE_IMG_SCRAP({ - search: label, - query: { - EXTENSION: GOOGLE_QUERY.EXTENSION.JPG - }, - limit: amount, - }); - - return results.result.map(i => i.url) -} From e7cde463bfe1073195fc8623f89eff48f52b4f58 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Wed, 23 Sep 2026 15:40:16 +0200 Subject: [PATCH 2/2] fix: Remove google-img-scrap from package.json Signed-off-by: Marcel Klehr --- package-lock.json | 32 -------------------------------- package.json | 1 - 2 files changed, 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 98369eb7a..5203f0466 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,6 @@ "async-parallel": "^1.2.3", "fast-glob": "^3.2.11", "flickr-sdk": "^6.0.0", - "google-img-scrap": "^1.0.6", "vue": "^2.7.14" }, "engines": { @@ -8509,12 +8508,6 @@ "node": ">= 6" } }, - "node_modules/fast-html-dom-parser": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/fast-html-dom-parser/-/fast-html-dom-parser-1.0.5.tgz", - "integrity": "sha512-YPZOt1uVV+frwxefFNKcK4DH816Ph5vswHEaXmlddc6R8f5gyieUSpv6sDBK+Rh/oZXQoIw10QEVAnyn5ajnqg==", - "dev": true - }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -9416,31 +9409,6 @@ "dev": true, "peer": true }, - "node_modules/google-img-scrap": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/google-img-scrap/-/google-img-scrap-1.1.1.tgz", - "integrity": "sha512-1p9tpMjzDTKGNt56Nm8pprldXkNslC6mbKbmeZ7lmuIYwyiJDfYwRJpQBOndY1P7FsAPqNptutOs344C1DJWbw==", - "dev": true, - "dependencies": { - "axios": "^1.2.3", - "fast-html-dom-parser": "^1.0.5", - "form-data": "^4.0.0" - } - }, - "node_modules/google-img-scrap/node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/google-protobuf": { "version": "3.21.2", "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz", diff --git a/package.json b/package.json index c38882303..95fb68663 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,6 @@ "async-parallel": "^1.2.3", "fast-glob": "^3.2.11", "flickr-sdk": "^6.0.0", - "google-img-scrap": "^1.0.6", "vue": "^2.7.14" }, "engines": {