update demos

CHANGELOG.md

@@ -9,7 +9,10 @@
   
 ## Changelog
   
-### **HEAD -> master** 2021/12/14 mandic00@live.com
+### **1.6.2** 2022/01/01 mandic00@live.com
+
+
+### **origin/master** 2021/12/27 mandic00@live.com
 
 
 ### **1.6.1** 2021/12/09 mandic00@live.com

demo/node-canvas.js

@@ -1,15 +1,13 @@
-// @ts-nocheck
-
 const fs = require('fs');
-const process = require('process');
 const path = require('path');
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
+const process = require('process');
 const log = require('@vladmandic/pilogger');
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require, no-unused-vars, @typescript-eslint/no-unused-vars
-const tf = require('@tensorflow/tfjs-node');
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
 const canvas = require('canvas');
-const faceapi = require('../dist/face-api.node.js'); // this is equivalent to '@vladmandic/faceapi'
+
+// eslint-disable-next-line import/no-extraneous-dependencies, no-unused-vars, @typescript-eslint/no-unused-vars
+const tf = require('@tensorflow/tfjs-node'); // in nodejs environments tfjs-node is required to be loaded before face-api
+// const faceapi = require('@vladmandic/face-api'); // use this when face-api is installed as module (majority of use cases)
+const faceapi = require('../dist/face-api.node.js'); // use this when using face-api in dev mode
 
 const modelPathRoot = '../model';
 const imgPathRoot = './demo'; // modify to include your sample images
@@ -80,7 +78,7 @@ async function main() {
       for (const face of result) print(face);
     }
     const t1 = process.hrtime.bigint();
-    log.info('Processed', numImages, 'images in', Math.trunc(parseInt(t1 - t0) / 1000 / 1000), 'ms');
+    log.info('Processed', numImages, 'images in', Math.trunc(Number((t1 - t0).toString()) / 1000 / 1000), 'ms');
   } else {
     const param = process.argv[2];
     if (fs.existsSync(param) || param.startsWith('http:') || param.startsWith('https:')) {

demo/node-image.js

@@ -1,11 +1,12 @@
 const fs = require('fs');
 // eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
-const tf = require('@tensorflow/tfjs-node');
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
 const image = require('@canvas/image'); // @canvas/image can decode jpeg, png, webp
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
 const log = require('@vladmandic/pilogger');
-const faceapi = require('../dist/face-api.node.js'); // this is equivalent to '@vladmandic/faceapi'
+
+// eslint-disable-next-line import/no-extraneous-dependencies, no-unused-vars, @typescript-eslint/no-unused-vars
+const tf = require('@tensorflow/tfjs-node'); // in nodejs environments tfjs-node is required to be loaded before face-api
+// const faceapi = require('@vladmandic/face-api'); // use this when face-api is installed as module (majority of use cases)
+const faceapi = require('../dist/face-api.node.js'); // use this when using face-api in dev mode
 
 const modelPath = 'model/';
 const imageFile = 'demo/sample1.jpg';

demo/node-match.js

@@ -1,8 +1,11 @@
 const fs = require('fs');
 const path = require('path');
-const tf = require('@tensorflow/tfjs-node');
 const log = require('@vladmandic/pilogger');
-const faceapi = require('../dist/face-api.node.js');
+
+// eslint-disable-next-line import/no-extraneous-dependencies, no-unused-vars, @typescript-eslint/no-unused-vars
+const tf = require('@tensorflow/tfjs-node'); // in nodejs environments tfjs-node is required to be loaded before face-api
+// const faceapi = require('@vladmandic/face-api'); // use this when face-api is installed as module (majority of use cases)
+const faceapi = require('../dist/face-api.node.js'); // use this when using face-api in dev mode
 
 let optionsSSDMobileNet;
 const minConfidence = 0.1;
@@ -13,6 +16,7 @@ const labeledFaceDescriptors = [];
 async function initFaceAPI() {
   await faceapi.nets.ssdMobilenetv1.loadFromDisk(modelPath);
   await faceapi.nets.faceLandmark68Net.loadFromDisk(modelPath);
+  await faceapi.nets.faceExpressionNet.loadFromDisk(modelPath);
   await faceapi.nets.faceRecognitionNet.loadFromDisk(modelPath);
   optionsSSDMobileNet = new faceapi.SsdMobilenetv1Options({ minConfidence, maxResults: 1 });
 }
@@ -22,6 +26,7 @@ async function getDescriptors(imageFile) {
   const tensor = tf.node.decodeImage(buffer, 3);
   const faces = await faceapi.detectAllFaces(tensor, optionsSSDMobileNet)
     .withFaceLandmarks()
+    .withFaceExpressions()
     .withFaceDescriptors();
   tf.dispose(tensor);
   return faces.map((face) => face.descriptor);

demo/node-multiprocess-worker.js

@@ -2,13 +2,13 @@
 
 const fs = require('fs');
 const path = require('path');
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
 const log = require('@vladmandic/pilogger');
 
 // workers actual import tfjs and faceapi modules
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
-const tf = require('@tensorflow/tfjs-node');
-const faceapi = require('../dist/face-api.node.js'); // this is equivalent to '@vladmandic/faceapi'
+// eslint-disable-next-line import/no-extraneous-dependencies, no-unused-vars, @typescript-eslint/no-unused-vars
+const tf = require('@tensorflow/tfjs-node'); // in nodejs environments tfjs-node is required to be loaded before face-api
+// const faceapi = require('@vladmandic/face-api'); // use this when face-api is installed as module (majority of use cases)
+const faceapi = require('../dist/face-api.node.js'); // use this when using face-api in dev mode
 
 // options used by faceapi
 const modelPathRoot = '../model';

demo/node-multiprocess.js

@@ -1,11 +1,8 @@
-// @ts-nocheck
-
 const fs = require('fs');
 const path = require('path');
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
 const log = require('@vladmandic/pilogger'); // this is my simple logger with few extra features
 const child_process = require('child_process');
-// note that main process import faceapi or tfjs at all
+// note that main process does not need to import faceapi or tfjs at all as processing is done in a worker process
 
 const imgPathRoot = './demo'; // modify to include your sample images
 const numWorkers = 4; // how many workers will be started
@@ -33,14 +30,14 @@ function waitCompletion() {
   if (activeWorkers > 0) setImmediate(() => waitCompletion());
   else {
     t[1] = process.hrtime.bigint();
-    log.info('Processed:', numImages, 'images in', 'total:', Math.trunc(parseInt(t[1] - t[0]) / 1000000), 'ms', 'working:', Math.trunc(parseInt(t[1] - t[2]) / 1000000), 'ms', 'average:', Math.trunc(parseInt(t[1] - t[2]) / numImages / 1000000), 'ms');
+    log.info('Processed:', numImages, 'images in', 'total:', Math.trunc(Number(t[1] - t[0]) / 1000000), 'ms', 'working:', Math.trunc(Number(t[1] - t[2]) / 1000000), 'ms', 'average:', Math.trunc(Number(t[1] - t[2]) / numImages / 1000000), 'ms');
   }
 }
 
 function measureLatency() {
   t[3] = process.hrtime.bigint();
-  const latencyInitialization = Math.trunc(parseInt(t[2] - t[0]) / 1000 / 1000);
-  const latencyRoundTrip = Math.trunc(parseInt(t[3] - t[2]) / 1000 / 1000);
+  const latencyInitialization = Math.trunc(Number(t[2] - t[0]) / 1000 / 1000);
+  const latencyRoundTrip = Math.trunc(Number(t[3] - t[2]) / 1000 / 1000);
   log.info('Latency: worker initializtion: ', latencyInitialization, 'message round trip:', latencyRoundTrip);
 }
 

demo/node-simple.js

@@ -0,0 +1,26 @@
+const fs = require('fs');
+
+// const faceapi = require('@vladmandic/face-api'); // use this when face-api is installed as module (majority of use cases)
+const faceapi = require('../dist/face-api.node.js'); // use this when using face-api in dev mode
+
+async function main() {
+  await faceapi.nets.ssdMobilenetv1.loadFromDisk('model'); // load models from a specific patch
+  await faceapi.nets.faceLandmark68Net.loadFromDisk('model');
+  await faceapi.nets.ageGenderNet.loadFromDisk('model');
+  await faceapi.nets.faceRecognitionNet.loadFromDisk('model');
+  await faceapi.nets.faceExpressionNet.loadFromDisk('model');
+  const options = new faceapi.SsdMobilenetv1Options({ minConfidence: 0.1, maxResults: 10 }); // set model options
+  const buffer = fs.readFileSync('demo/sample1.jpg'); // load jpg image as binary
+  const decodeT = faceapi.tf.node.decodeImage(buffer, 3); // decode binary buffer to rgb tensor
+  const expandT = faceapi.tf.expandDims(decodeT, 0); // add batch dimension to tensor
+  const result = await faceapi.detectAllFaces(expandT, options) // run detection
+    .withFaceLandmarks()
+    .withFaceExpressions()
+    .withFaceDescriptors()
+    .withAgeAndGender();
+  faceapi.tf.dispose([decodeT, expandT]); // dispose tensors to avoid memory leaks
+  // eslint-disable-next-line no-console
+  console.log({ result }); // print results
+}
+
+main();

demo/node.js

@@ -1,13 +1,12 @@
-// @ts-nocheck
-
 const fs = require('fs');
 const process = require('process');
 const path = require('path');
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
 const log = require('@vladmandic/pilogger');
-// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
-const tf = require('@tensorflow/tfjs-node');
-const faceapi = require('../dist/face-api.node.js'); // this is equivalent to '@vladmandic/faceapi'
+
+// eslint-disable-next-line import/no-extraneous-dependencies, no-unused-vars, @typescript-eslint/no-unused-vars
+const tf = require('@tensorflow/tfjs-node'); // in nodejs environments tfjs-node is required to be loaded before face-api
+// const faceapi = require('@vladmandic/face-api'); // use this when face-api is installed as module (majority of use cases)
+const faceapi = require('../dist/face-api.node.js'); // use this when using face-api in dev mode
 
 const modelPathRoot = '../model';
 const imgPathRoot = './demo'; // modify to include your sample images
@@ -118,7 +117,7 @@ async function main() {
       tensor.dispose();
     }
     const t1 = process.hrtime.bigint();
-    log.info('Processed', dir.length, 'images in', Math.trunc(parseInt(t1 - t0) / 1000 / 1000), 'ms');
+    log.info('Processed', dir.length, 'images in', Math.trunc(Number((t1 - t0)) / 1000 / 1000), 'ms');
   } else {
     const param = process.argv[2];
     if (fs.existsSync(param) || param.startsWith('http:') || param.startsWith('https:')) {

dist/face-api.esm-nobundle.js

@@ -2135,7 +2135,7 @@ function drawFaceLandmarks(canvasArg, faceLandmarks) {
 }
 
 // package.json
-var version10 = "1.6.1";
+var version10 = "1.6.2";
 
 // src/xception/extractParams.ts
 function extractorsFactory2(extractWeights, paramMappings) {

dist/face-api.esm.js

@@ -65931,7 +65931,7 @@ function drawFaceLandmarks(canvasArg, faceLandmarks) {
 }
 
 // package.json
-var version5 = "1.6.1";
+var version5 = "1.6.2";
 
 // src/xception/extractParams.ts
 function extractorsFactory2(extractWeights, paramMappings) {

dist/face-api.node-gpu.js

@@ -2290,7 +2290,7 @@ function drawFaceLandmarks(canvasArg, faceLandmarks) {
 }
 
 // package.json
-var version = "1.6.1";
+var version = "1.6.2";
 
 // src/ageGenderNet/AgeGenderNet.ts
 var tf20 = __toModule(require_tfjs_esm());

dist/face-api.node.js

@@ -2290,7 +2290,7 @@ function drawFaceLandmarks(canvasArg, faceLandmarks) {
 }
 
 // package.json
-var version = "1.6.1";
+var version = "1.6.2";
 
 // src/ageGenderNet/AgeGenderNet.ts
 var tf20 = __toModule(require_tfjs_esm());