Add mocha reporter back, try to make classes thenable

Author: tmcw

karma.conf.js

@@ -34,7 +34,7 @@ module.exports = (config) => {
         os_version: 'High Sierra'
       },
     },
-    reporters: ['progress'],
+    reporters: ['mocha'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

src/FeatureExtractor/Mobilenet.js

@@ -41,6 +41,7 @@ class Mobilenet {
     this.mapStringToIndex = [];
     this.usageType = null;
     this.ready = callCallback(this.loadModel(), callback);
+    this.then = this.ready.then;
   }
 
   async loadModel() {

src/FeatureExtractor/index.js

@@ -28,8 +28,7 @@ const featureExtractor = (model, optionsOrCallback, cb) => {
   }
 
   if (modelName === 'mobilenet') {
-    const instance = new Mobilenet(options, callback);
-    return callback ? instance : instance.ready;
+    return new Mobilenet(options, callback);
   }
   throw new Error(`${modelName} is not a valid model.`);
 };

src/LSTM/index.js

@@ -31,6 +31,7 @@ class LSTM {
       temperature: 0.5,
     };
     this.ready = callCallback(this.loadCheckpoints(model), callback);
+    this.then = this.ready.then.bind(this.ready);
   }
 
   async loadCheckpoints(path) {
@@ -152,8 +153,7 @@ class LSTM {
 }
 
 const LSTMGenerator = (modelPath = './', callback) => {
-  const instance = new LSTM(modelPath);
-  return callback ? instance : instance.ready;
+  return new LSTM(modelPath, callback);
 };
 
 export default LSTMGenerator;

src/PoseNet/index.js

@@ -35,6 +35,7 @@ class PoseNet extends EventEmitter {
     this.minConfidence = options.minConfidence || DEFAULTS.minConfidence;
     this.multiplier = options.multiplier || DEFAULTS.multiplier;
     this.ready = callCallback(this.load(), callback);
+    this.then = this.ready.then;
   }
 
   async load() {
@@ -115,8 +116,7 @@ const poseNet = (videoOrOptionsOrCallback, optionsOrCallback, cb) => {
     detectionType = optionsOrCallback;
   }
 
-  const instance = new PoseNet(video, options, detectionType, callback);
-  return callback ? instance : instance.ready;
+  return new PoseNet(video, options, detectionType, callback);
 };
 
 export default poseNet;

src/StyleTransfer/index.js

@@ -26,6 +26,7 @@ class StyleTransfer extends Video {
     this.epsilonScalar = tf.scalar(1e-3);
     this.video = null;
     this.ready = callCallback(this.load(model), callback);
+    this.then = this.ready.then;
   }
 
   async load(model) {
@@ -139,8 +140,7 @@ const styleTransfer = (model, videoOrCallback, cb) => {
     callback = videoOrCallback;
   }
 
-  const instance = new StyleTransfer(model, video, callback);
-  return callback ? instance : instance.ready;
+  return new StyleTransfer(model, video, callback);
 };
 
 export default styleTransfer;

src/Word2vec/index.js

@@ -26,33 +26,39 @@ class Word2Vec {
     };
 
     this.ready = callCallback(loadModel(model), callback);
+    this.then = this.ready.then.bind(this.ready);
   }
 
-  add(inputs, max = 1) {
+  async add(inputs, max = 1) {
+    await this.ready;
     const sum = Word2Vec.addOrSubtract(this.model, inputs, 'ADD');
     return Word2Vec.nearest(this.model, sum, inputs.length, inputs.length + max);
   }
 
-  subtract(inputs, max = 1) {
+  async subtract(inputs, max = 1) {
+    await this.ready;
     const subtraction = Word2Vec.addOrSubtract(this.model, inputs, 'SUBTRACT');
     return Word2Vec.nearest(this.model, subtraction, inputs.length, inputs.length + max);
   }
 
-  average(inputs, max = 1) {
+  async average(inputs, max = 1) {
+    await this.ready;
     const sum = Word2Vec.addOrSubtract(this.model, inputs, 'ADD');
     const avg = tf.div(sum, tf.tensor(inputs.length));
     return Word2Vec.nearest(this.model, avg, inputs.length, inputs.length + max);
   }
 
-  nearest(input, max = 10) {
+  async nearest(input, max = 10) {
+    await this.ready;
     const vector = this.model[input];
     if (!vector) {
       return null;
     }
     return Word2Vec.nearest(this.model, vector, 1, max + 1);
   }
 
-  getRandomWord() {
+  async getRandomWord() {
+    await this.ready;
     const words = Object.keys(this.model);
     return words[Math.floor(Math.random() * words.length)];
   }
@@ -100,8 +106,7 @@ class Word2Vec {
 }
 
 const word2vec = (model, cb) => {
-  const instance = new Word2Vec(model, cb);
-  return cb ? instance : instance.ready;
+  return new Word2Vec(model, cb);
 };
 
 export default word2vec;

src/Word2vec/index_test.js

@@ -15,8 +15,9 @@ describe('initialize word2vec', () => {
     }));
   });
 
-  it('computes nearest words', () => {
-    expect(word2vec.nearest('love', 5).map(v => v.vector))
+  it('computes nearest words', async () => {
+    const nearest = await word2vec.nearest('love', 5);
+    expect(nearest.map(v => v.vector))
       .toEqual(['loved', 'loves', 'hate', 'wonderful', 'beautiful']);
   });
 });

src/YOLO/index.js

@@ -44,6 +44,7 @@ class YOLOBase extends Video {
     this.modelReady = false;
     this.isPredicting = false;
     this.ready = callCallback(this.loadModel(), callback);
+    this.then = this.ready.then;
   }
 
   async loadModel() {
@@ -155,8 +156,7 @@ const YOLO = (videoOrOptionsOrCallback, optionsOrCallback, cb) => {
     callback = optionsOrCallback;
   }
 
-  const instance = new YOLOBase(video, options, callback);
-  return cb ? instance : instance.ready;
+  return new YOLOBase(video, options, callback);
 };
 
 export default YOLO;

src/utils/callcallback.js

@@ -4,9 +4,11 @@
 // https://opensource.org/licenses/MIT
 
 export default function callCallback(promise, callback) {
-  return callback ? promise.then((result) => {
-    callback(undefined, result);
-  }, (error) => {
-    callback(error);
-  }) : promise;
+  if (callback) {
+    promise.then((result) => {
+      callback(undefined, result);
+      return result;
+    });
+  }
+  return promise;
 }