model URLs should not be turned into lower case (#650)

* only lowercase if not a URL

* same fix for sound classifier

Author: shiffman

src/ImageClassifier/index.js

@@ -76,46 +76,46 @@ class ImageClassifier {
    */
   async loadModel(modelUrl) {
     if (modelUrl) this.model = await this.loadModelFrom(modelUrl);
-    else this.model = await this.modelToUse.load({version: this.version, alpha: this.alpha});
+    else this.model = await this.modelToUse.load({ version: this.version, alpha: this.alpha });
 
     return this;
   }
 
   async loadModelFrom(path = null) {
     fetch(path)
-    .then(r => r.json())
-    .then((r) => {
-      if (r.ml5Specs) {
-        this.mapStringToIndex = r.ml5Specs.mapStringToIndex;
-      }
-    })
-    // When loading model generated by Teachable Machine 2.0, the r.ml5Specs is missing,
-    // which is causing imageClassifier failing to display lables.
-    // In this case, labels are stored in path/./metadata.json
-    // Therefore, I'm fetching the metadata and feeding the labels into this.mapStringToIndex
-    // by Yang Yang, [email protected], Oct 2, 2019
-    .then(()=>{
-      if (this.mapStringToIndex.length === 0) {
-        const split = path.split("/");
-        const prefix = split.slice(0, split.length - 1).join("/");
-        const metadataUrl = `${prefix}/metadata.json`;
-        fetch(metadataUrl)
-        .then((res) => {
-          if (!res.ok) {
-            console.log("Tried to fetch metadata.json, but it seems to be missing.");
-            throw Error(res.statusText);
-          }
-          return res;
-        })
-        .then(metadataJson => metadataJson.json())
-        .then((metadataJson)=> {
-          if (metadataJson.labels){
-            this.mapStringToIndex = metadataJson.labels;
-          }
-        })
-        .catch(() => console.log("Error when loading metadata.json"));
-      }
-    });
+      .then(r => r.json())
+      .then((r) => {
+        if (r.ml5Specs) {
+          this.mapStringToIndex = r.ml5Specs.mapStringToIndex;
+        }
+      })
+      // When loading model generated by Teachable Machine 2.0, the r.ml5Specs is missing,
+      // which is causing imageClassifier failing to display lables.
+      // In this case, labels are stored in path/./metadata.json
+      // Therefore, I'm fetching the metadata and feeding the labels into this.mapStringToIndex
+      // by Yang Yang, [email protected], Oct 2, 2019
+      .then(() => {
+        if (this.mapStringToIndex.length === 0) {
+          const split = path.split("/");
+          const prefix = split.slice(0, split.length - 1).join("/");
+          const metadataUrl = `${prefix}/metadata.json`;
+          fetch(metadataUrl)
+            .then((res) => {
+              if (!res.ok) {
+                console.log("Tried to fetch metadata.json, but it seems to be missing.");
+                throw Error(res.statusText);
+              }
+              return res;
+            })
+            .then(metadataJson => metadataJson.json())
+            .then((metadataJson) => {
+              if (metadataJson.labels) {
+                this.mapStringToIndex = metadataJson.labels;
+              }
+            })
+            .catch(() => console.log("Error when loading metadata.json"));
+        }
+      });
     // end of the Oct 2, 2019 fix
     this.model = await tf.loadLayersModel(path);
     return this.model;
@@ -206,7 +206,7 @@ class ImageClassifier {
         || inputNumOrCallback.elt instanceof HTMLCanvasElement
         || inputNumOrCallback.elt instanceof ImageData)
     ) {
-        imgToPredict = inputNumOrCallback.elt; // Handle p5.js image
+      imgToPredict = inputNumOrCallback.elt; // Handle p5.js image
     } else if (typeof inputNumOrCallback === 'object' && inputNumOrCallback.canvas instanceof HTMLCanvasElement) {
       imgToPredict = inputNumOrCallback.canvas; // Handle p5.js image
     } else if (!(this.video instanceof HTMLVideoElement)) {
@@ -242,15 +242,15 @@ class ImageClassifier {
 }
 
 const imageClassifier = (modelName, videoOrOptionsOrCallback, optionsOrCallback, cb) => {
-  let model;
   let video;
   let options = {};
   let callback = cb;
 
-  if (typeof modelName === 'string') {
-    model = modelName.toLowerCase();
-  } else {
+  let model = modelName;
+  if (typeof model !== 'string') {
     throw new Error('Please specify a model to use. E.g: "MobileNet"');
+  } else if (model.indexOf('http') === -1) {
+    model = modelName.toLowerCase();
   }
 
   if (videoOrOptionsOrCallback instanceof HTMLVideoElement) {

src/SoundClassifier/index.js

@@ -59,7 +59,7 @@ class SoundClassifier {
 
   /**
    * Classifies the audio from microphone and takes a callback to handle the results
-   * @param {function | number} numOrCallback - 
+   * @param {function | number} numOrCallback -
    *    takes any of the following params
    * @param {function} cb - a callback function that handles the results of the function.
    * @return {function} a promise or the results of a given callback, cb.
@@ -82,14 +82,14 @@ class SoundClassifier {
 }
 
 const soundClassifier = (modelName, optionsOrCallback, cb) => {
-  let model;
   let options = {};
   let callback = cb;
 
-  if (typeof modelName === 'string') {
-    model = modelName.toLowerCase();
-  } else {
+  let model = modelName;
+  if (typeof model !== 'string') {
     throw new Error('Please specify a model to use. E.g: "SpeechCommands18w"');
+  } else if (model.indexOf('http') === -1) {
+    model = modelName.toLowerCase();
   }
 
   if (typeof optionsOrCallback === 'object') {