Also transform images into predict

Kevin Scott · Kevin Scott · commit 19638ae22056 · 2018-07-16T12:48:39.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ml-classifier",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "A machine learning engine for quickly training image classification models in your browser",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
diff --git a/src/index.ts b/src/index.ts
@@ -125,11 +125,12 @@ class MLClassifier {
     return history;
   }
 
-  public predict = async (data: tf.Tensor3D) => {
+  public predict = async (orig: tf.Tensor3D | HTMLImageElement | string) => {
     await this.loaded();
     if (!this.model) {
       throw new Error('You must call train prior to calling predict');
     }
+    const data = await translateImages([orig])[0];
     const img = await this.cropAndActivateImage(data);
     // TODO: Do these images need to be activated?
     const predictedClass = tf.tidy(() => {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ml-classifier",`
`3`		`- "version": "0.3.7",`
	`3`	`+ "version": "0.3.8",`
`4`	`4`	`"description": "A machine learning engine for quickly training image classification models in your browser",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"typings": "dist/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,12 @@ class MLClassifier {`
`125`	`125`	`return history;`
`126`	`126`	`}`
`127`	`127`
`128`		`- public predict = async (data: tf.Tensor3D) => {`
	`128`	`+ public predict = async (orig: tf.Tensor3D \| HTMLImageElement \| string) => {`
`129`	`129`	`await this.loaded();`
`130`	`130`	`if (!this.model) {`
`131`	`131`	`throw new Error('You must call train prior to calling predict');`
`132`	`132`	`}`
	`133`	`+ const data = await translateImages([orig])[0];`
`133`	`134`	`const img = await this.cropAndActivateImage(data);`
`134`	`135`	`// TODO: Do these images need to be activated?`
`135`	`136`	`const predictedClass = tf.tidy(() => {`