perf(tensor): add sharp async image decoding

a11ywatch · Aug 5, 2023 · b3aed82 · b3aed82
1 parent f9d61e3
commit b3aed82
Show file tree

Hide file tree

Showing 41 changed files with 351 additions and 22 deletions.
diff --git a/.yarn/cache/b4a-npm-1.6.4-080bcba845-81b086f9af.zip b/.yarn/cache/b4a-npm-1.6.4-080bcba845-81b086f9af.zip
diff --git a/.yarn/cache/base64-js-npm-1.5.1-b2f7275641-669632eb37.zip b/.yarn/cache/base64-js-npm-1.5.1-b2f7275641-669632eb37.zip
diff --git a/.yarn/cache/base64-to-tensor-npm-1.2.15-6b2625c4ea-55e72c0e82.zip b/.yarn/cache/base64-to-tensor-npm-1.2.15-6b2625c4ea-55e72c0e82.zip
diff --git a/.yarn/cache/bl-npm-4.1.0-7f94cdcf3f-9e8521fa7e.zip b/.yarn/cache/bl-npm-4.1.0-7f94cdcf3f-9e8521fa7e.zip
diff --git a/.yarn/cache/buffer-npm-5.7.1-513ef8259e-e2cf8429e1.zip b/.yarn/cache/buffer-npm-5.7.1-513ef8259e-e2cf8429e1.zip
diff --git a/.yarn/cache/chownr-npm-1.1.4-5bd400ab08-115648f8eb.zip b/.yarn/cache/chownr-npm-1.1.4-5bd400ab08-115648f8eb.zip
diff --git a/.yarn/cache/color-npm-4.2.3-4a23227581-0579629c02.zip b/.yarn/cache/color-npm-4.2.3-4a23227581-0579629c02.zip
diff --git a/.yarn/cache/color-string-npm-1.9.1-dc020e56be-c13fe7cff7.zip b/.yarn/cache/color-string-npm-1.9.1-dc020e56be-c13fe7cff7.zip
diff --git a/.yarn/cache/decompress-response-npm-6.0.0-359de2878c-d377cf47e0.zip b/.yarn/cache/decompress-response-npm-6.0.0-359de2878c-d377cf47e0.zip
diff --git a/.yarn/cache/deep-extend-npm-0.6.0-e182924219-7be7e5a8d4.zip b/.yarn/cache/deep-extend-npm-0.6.0-e182924219-7be7e5a8d4.zip
diff --git a/.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip b/.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip
diff --git a/.yarn/cache/expand-template-npm-2.0.3-80de959306-588c198472.zip b/.yarn/cache/expand-template-npm-2.0.3-80de959306-588c198472.zip
diff --git a/.yarn/cache/fast-fifo-npm-1.3.0-bd15200000-edc589b818.zip b/.yarn/cache/fast-fifo-npm-1.3.0-bd15200000-edc589b818.zip
diff --git a/.yarn/cache/fs-constants-npm-1.0.0-59576b2177-18f5b71837.zip b/.yarn/cache/fs-constants-npm-1.0.0-59576b2177-18f5b71837.zip
diff --git a/.yarn/cache/github-from-package-npm-0.0.0-519f80c9a1-14e448192a.zip b/.yarn/cache/github-from-package-npm-0.0.0-519f80c9a1-14e448192a.zip
diff --git a/.yarn/cache/ieee754-npm-1.2.1-fb63b3caeb-5144c0c981.zip b/.yarn/cache/ieee754-npm-1.2.1-fb63b3caeb-5144c0c981.zip
diff --git a/.yarn/cache/ini-npm-1.3.8-fb5040b4c0-dfd98b0ca3.zip b/.yarn/cache/ini-npm-1.3.8-fb5040b4c0-dfd98b0ca3.zip
diff --git a/.yarn/cache/is-arrayish-npm-0.3.2-f856180f79-977e64f54d.zip b/.yarn/cache/is-arrayish-npm-0.3.2-f856180f79-977e64f54d.zip
diff --git a/.yarn/cache/jpeg-js-npm-0.4.4-4dd87659c3-bd7cb61aa8.zip b/.yarn/cache/jpeg-js-npm-0.4.4-4dd87659c3-bd7cb61aa8.zip
diff --git a/.yarn/cache/mimic-response-npm-3.1.0-a4a24b4e96-25739fee32.zip b/.yarn/cache/mimic-response-npm-3.1.0-a4a24b4e96-25739fee32.zip
diff --git a/.yarn/cache/mkdirp-classic-npm-0.5.3-3b5c991910-3f4e088208.zip b/.yarn/cache/mkdirp-classic-npm-0.5.3-3b5c991910-3f4e088208.zip
diff --git a/.yarn/cache/napi-build-utils-npm-1.0.2-892e4bba56-06c14271ee.zip b/.yarn/cache/napi-build-utils-npm-1.0.2-892e4bba56-06c14271ee.zip
diff --git a/.yarn/cache/node-abi-npm-3.45.0-586bc5cf50-18c4305d7d.zip b/.yarn/cache/node-abi-npm-3.45.0-586bc5cf50-18c4305d7d.zip
diff --git a/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-3a539510e6.zip b/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-3a539510e6.zip
diff --git a/.yarn/cache/prebuild-install-npm-7.1.1-cb9fc9d341-dbf96d0146.zip b/.yarn/cache/prebuild-install-npm-7.1.1-cb9fc9d341-dbf96d0146.zip
diff --git a/.yarn/cache/queue-tick-npm-1.0.1-10bd6eaf3d-57c3292814.zip b/.yarn/cache/queue-tick-npm-1.0.1-10bd6eaf3d-57c3292814.zip
diff --git a/.yarn/cache/rc-npm-1.2.8-d6768ac936-2e26e052f8.zip b/.yarn/cache/rc-npm-1.2.8-d6768ac936-2e26e052f8.zip
diff --git a/.yarn/cache/sharp-npm-0.32.4-5e8bfafca7-52e3cfe8fb.zip b/.yarn/cache/sharp-npm-0.32.4-5e8bfafca7-52e3cfe8fb.zip
diff --git a/.yarn/cache/simple-concat-npm-1.0.1-48df70de29-4d211042cc.zip b/.yarn/cache/simple-concat-npm-1.0.1-48df70de29-4d211042cc.zip
diff --git a/.yarn/cache/simple-get-npm-4.0.1-fa2a97645d-e4132fd27c.zip b/.yarn/cache/simple-get-npm-4.0.1-fa2a97645d-e4132fd27c.zip
diff --git a/.yarn/cache/simple-swizzle-npm-0.2.2-8dee37fad1-a7f3f2ab5c.zip b/.yarn/cache/simple-swizzle-npm-0.2.2-8dee37fad1-a7f3f2ab5c.zip
diff --git a/.yarn/cache/streamx-npm-2.15.0-ea55d22e88-6f1dcdc326.zip b/.yarn/cache/streamx-npm-2.15.0-ea55d22e88-6f1dcdc326.zip
diff --git a/.yarn/cache/tar-fs-npm-2.1.1-e374d3b7a2-f5b9a70059.zip b/.yarn/cache/tar-fs-npm-2.1.1-e374d3b7a2-f5b9a70059.zip
diff --git a/.yarn/cache/tar-fs-npm-3.0.4-fa3da2e321-dcf4054f9e.zip b/.yarn/cache/tar-fs-npm-3.0.4-fa3da2e321-dcf4054f9e.zip
diff --git a/.yarn/cache/tar-stream-npm-2.2.0-884c79b510-699831a8b9.zip b/.yarn/cache/tar-stream-npm-2.2.0-884c79b510-699831a8b9.zip
diff --git a/.yarn/cache/tar-stream-npm-3.1.6-ce3ac17e49-f3627f9185.zip b/.yarn/cache/tar-stream-npm-3.1.6-ce3ac17e49-f3627f9185.zip
diff --git a/.yarn/cache/tunnel-agent-npm-0.6.0-64345ab7eb-05f6510358.zip b/.yarn/cache/tunnel-agent-npm-0.6.0-64345ab7eb-05f6510358.zip
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@a11ywatch/mav",
-  "version": "0.7.24",
+  "version": "0.7.26",
   "description": "a gRPC image recognition service",
   "main": "./server.js",
   "scripts": {
@@ -25,8 +25,8 @@
     "@tensorflow/tfjs-backend-wasm": "^4.9.0",
     "@tensorflow/tfjs-converter": "^4.9.0",
     "@tensorflow/tfjs-core": "^4.9.0",
-    "base64-to-tensor": "^1.2.12",
-    "jpeg-js": "^0.4.4",
+    "base64-to-tensor": "^1.2.15",
+    "sharp": "^0.32.4",
     "tensornet": "^1.0.17"
   },
   "devDependencies": {

diff --git a/src/ai/detectImage.ts b/src/ai/detectImage.ts
@@ -1,4 +1,4 @@
-import { classify } from "tensornet";
+import { classifyAsync } from "tensornet";
 import { computerVision } from "./azure/azure-detect-image";
 import { chainNextClassifier } from "../utils/chain-next";
 import { confidentCaptions } from "../utils/confidence";
@@ -11,7 +11,7 @@ export const detectImageModel = async (
   let predictions = [];
 
   try {
-    const classification = config.img && (await classify(config.img));
+    const classification = config.img && (await classifyAsync(config.img));
     if (classification && classification?.length) {
       predictions = classification;
     }