Merge branch 'development' into v0.2.2

Author: joeyklee

.eslintrc.json

@@ -1,5 +1,5 @@
 {
-    "extends": "airbnb-base",
+    "extends": ["airbnb-base", "prettier"],
     "globals": {
         "fetch": false,
         "document": true

.gitignore

@@ -3,7 +3,6 @@ examples/es6/node_modules
 experiments/node_modules
 node_modules
 **/npm-debug.log
-.vscode
 *.DS_STORE
 experiments
 manual-test

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "prettier.trailingComma": "all",
+  "prettier.printWidth": 100,
+  "prettier.arrowParens": "avoid"
+}

package-lock.json

@@ -43,6 +43,7 @@
     "cz-conventional-changelog": "2.1.0",
     "eslint": "4.18.2",
     "eslint-config-airbnb-base": "12.1.0",
+    "eslint-config-prettier": "^4.1.0",
     "eslint-loader": "2.0.0",
     "eslint-plugin-import": "2.9.0",
     "extract-text-webpack-plugin": "4.0.0-beta.0",
@@ -87,7 +88,7 @@
     ]
   },
   "dependencies": {
-    "@magenta/sketch": "^0.1.2",
+    "@magenta/sketch": "0.1.2",
     "@tensorflow-models/mobilenet": "0.2.2",
     "@tensorflow-models/posenet": "0.2.2",
     "@tensorflow-models/knn-classifier": "0.2.2",

package.json

@@ -9,7 +9,7 @@ const RNN_MODEL_URL = 'https://raw.githubusercontent.com/ml5js/ml5-data-and-mode
 
 const RNN_MODEL_DEFAULTS = {
   cellsAmount: 2,
-  vocabSize: 223
+  vocabSize: 64
 };
 
 const RNN_DEFAULTS = {
@@ -21,15 +21,15 @@ const RNN_DEFAULTS = {
 
 const RNN_OPTIONS = {
   seed: 'the meaning of pizza is: ',
-  length: 500,
+  length: 100,
   temperature: 0.7
 }
 
 describe('charRnn', () => {
   let rnn;
 
   beforeAll(async () => {
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000; //set extra long interval due to issues with CharRNN generation time
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000; //set extra long interval due to issues with CharRNN generation time
     rnn  = await charRNN(RNN_MODEL_URL, undefined);
   });
 
@@ -52,9 +52,9 @@ describe('charRnn', () => {
       expect(result.sample.length).toBe(20);
     });
 
-    it('generates content that follows the set options', async() => {
-      const result = await rnn.generate(RNN_OPTIONS);
-      expect(result.sample.length).toBe(500);
-    });
+  //   it('generates content that follows the set options', async() => {
+  //     const result = await rnn.generate(RNN_OPTIONS);
+  //     expect(result.sample.length).toBe(100);
+  //   });
   });
 });

src/CharRNN/index_test.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 ml5
+// Copyright (c) 2019 ml5
 //
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
@@ -58,7 +58,7 @@ class ImageClassifier {
     await tf.nextFrame();
 
     if (this.video && this.video.readyState === 0) {
-      await new Promise((resolve) => {
+      await new Promise(resolve => {
         this.video.onloadeddata = () => resolve();
       });
     }
@@ -81,17 +81,28 @@ class ImageClassifier {
       numberOfClasses = inputNumOrCallback;
     } else if (inputNumOrCallback instanceof HTMLImageElement) {
       imgToPredict = inputNumOrCallback;
-    } else if (typeof inputNumOrCallback === 'object' && inputNumOrCallback.elt instanceof HTMLImageElement) {
+    } else if (
+      typeof inputNumOrCallback === 'object' &&
+      inputNumOrCallback.elt instanceof HTMLImageElement
+    ) {
       imgToPredict = inputNumOrCallback.elt; // Handle p5.js image
     } else if (inputNumOrCallback instanceof HTMLCanvasElement) {
       imgToPredict = inputNumOrCallback;
-    } else if (typeof inputNumOrCallback === 'object' && inputNumOrCallback.elt instanceof HTMLCanvasElement) {
+    } else if (
+      typeof inputNumOrCallback === 'object' &&
+      inputNumOrCallback.elt instanceof HTMLCanvasElement
+    ) {
       imgToPredict = inputNumOrCallback.elt; // Handle p5.js image
-    } else if (typeof inputNumOrCallback === 'object' && inputNumOrCallback.canvas instanceof HTMLCanvasElement) {
+    } else if (
+      typeof inputNumOrCallback === 'object' &&
+      inputNumOrCallback.canvas instanceof HTMLCanvasElement
+    ) {
       imgToPredict = inputNumOrCallback.canvas; // Handle p5.js image
     } else if (!(this.video instanceof HTMLVideoElement)) {
       // Handle unsupported input
-      throw new Error('No input image provided. If you want to classify a video, pass the video element in the constructor. ');
+      throw new Error(
+        'No input image provided. If you want to classify a video, pass the video element in the constructor. ',
+      );
     }
 
     if (typeof numOrCallback === 'number') {
@@ -126,7 +137,10 @@ const imageClassifier = (modelName, videoOrOptionsOrCallback, optionsOrCallback,
 
   if (videoOrOptionsOrCallback instanceof HTMLVideoElement) {
     video = videoOrOptionsOrCallback;
-  } else if (typeof videoOrOptionsOrCallback === 'object' && videoOrOptionsOrCallback.elt instanceof HTMLVideoElement) {
+  } else if (
+    typeof videoOrOptionsOrCallback === 'object' &&
+    videoOrOptionsOrCallback.elt instanceof HTMLVideoElement
+  ) {
     video = videoOrOptionsOrCallback.elt; // Handle a p5.js video element
   } else if (typeof videoOrOptionsOrCallback === 'object') {
     options = videoOrOptionsOrCallback;

src/ImageClassifier/index.js

@@ -85,7 +85,7 @@ class SketchRNN {
       callback = cb;
     }
 
-    const strokes = seedStrokes.map((s) => {
+    const strokes = seedStrokes.map(s => {
       const up = s.pen === 'up' ? 1 : 0;
       const down = s.pen === 'down' ? 1 : 0;
       const end = s.pen === 'end' ? 1 : 0;
@@ -102,6 +102,6 @@ class SketchRNN {
   }
 }
 
-const SketchRNNGenerator = (model, callback, large = true) => new SketchRNN(model, callback, large);
+const sketchRNN = (model, callback, large = true) => new SketchRNN(model, callback, large);
 
-export default SketchRNNGenerator;
+export default sketchRNN;

src/SketchRNN/index.js

@@ -15,7 +15,7 @@ import * as imageUtils from './utils/imageUtilities';
 import styleTransfer from './StyleTransfer/';
 import charRNN from './CharRNN/';
 import pix2pix from './Pix2pix/';
-import SketchRNN from './SketchRNN';
+import sketchRNN from './SketchRNN';
 import preloadRegister from './utils/p5PreloadHelper';
 import { version } from '../package.json';
 
@@ -26,7 +26,7 @@ const withPreload = {
   pitchDetection,
   pix2pix,
   poseNet,
-  SketchRNN,
+  sketchRNN,
   styleTransfer,
   word2vec,
   YOLO,