Move assets to vite public folder (#152)

Closes: #151

Models and samples are now properly structured in the vite public folder so they are properly automatically incorporated into the the builds and work with both builds and dev tests.

Reviewed-on: #152

src/models/abdomen-mini/descript.json

@@ -1,11 +0,0 @@
-{
-  "version": "0.0.0-n1",
-  "region": "Coco",
-  "size": 640,
-  "epochs": 1000,
-  "name": "coco128 test",
-  "yolo-version": "8.1.20 docker",
-  "date": "2024-03-12",
-  "export": "coco128.yaml"
-}
-

src/models/abdomen-mini/metadata.yaml

@@ -1,92 +0,0 @@
-description: Ultralytics best model trained on /usr/src/ultralytics/ultralytics/cfg/datasets/coco128.yaml
-author: Ultralytics
-license: AGPL-3.0 https://ultralytics.com/license
-date: '2024-03-12T16:25:00.089873'
-version: 8.1.20
-stride: 32
-task: detect
-batch: 1
-imgsz:
-- 640
-- 640
-names:
-  0: person
-  1: bicycle
-  2: car
-  3: motorcycle
-  4: airplane
-  5: bus
-  6: train
-  7: truck
-  8: boat
-  9: traffic light
-  10: fire hydrant
-  11: stop sign
-  12: parking meter
-  13: bench
-  14: bird
-  15: cat
-  16: dog
-  17: horse
-  18: sheep
-  19: cow
-  20: elephant
-  21: bear
-  22: zebra
-  23: giraffe
-  24: backpack
-  25: umbrella
-  26: handbag
-  27: tie
-  28: suitcase
-  29: frisbee
-  30: skis
-  31: snowboard
-  32: sports ball
-  33: kite
-  34: baseball bat
-  35: baseball glove
-  36: skateboard
-  37: surfboard
-  38: tennis racket
-  39: bottle
-  40: wine glass
-  41: cup
-  42: fork
-  43: knife
-  44: spoon
-  45: bowl
-  46: banana
-  47: apple
-  48: sandwich
-  49: orange
-  50: broccoli
-  51: carrot
-  52: hot dog
-  53: pizza
-  54: donut
-  55: cake
-  56: chair
-  57: couch
-  58: potted plant
-  59: bed
-  60: dining table
-  61: toilet
-  62: tv
-  63: laptop
-  64: mouse
-  65: remote
-  66: keyboard
-  67: cell phone
-  68: microwave
-  69: oven
-  70: toaster
-  71: sink
-  72: refrigerator
-  73: book
-  74: clock
-  75: vase
-  76: scissors
-  77: teddy bear
-  78: hair drier
-  79: toothbrush

src/models/abdomen/classes.json

@@ -1,82 +0,0 @@
-[
-  "person",
-  "bicycle",
-  "car",
-  "motorcycle",
-  "airplane",
-  "bus",
-  "train",
-  "truck",
-  "boat",
-  "traffic light",
-  "fire hydrant",
-  "stop sign",
-  "parking meter",
-  "bench",
-  "bird",
-  "cat",
-  "dog",
-  "horse",
-  "sheep",
-  "cow",
-  "elephant",
-  "bear",
-  "zebra",
-  "giraffe",
-  "backpack",
-  "umbrella",
-  "handbag",
-  "tie",
-  "suitcase",
-  "frisbee",
-  "skis",
-  "snowboard",
-  "sports ball",
-  "kite",
-  "baseball bat",
-  "baseball glove",
-  "skateboard",
-  "surfboard",
-  "tennis racket",
-  "bottle",
-  "wine glass",
-  "cup",
-  "fork",
-  "knife",
-  "spoon",
-  "bowl",
-  "banana",
-  "apple",
-  "sandwich",
-  "orange",
-  "broccoli",
-  "carrot",
-  "hot dog",
-  "pizza",
-  "donut",
-  "cake",
-  "chair",
-  "couch",
-  "potted plant",
-  "bed",
-  "dining table",
-  "toilet",
-  "tv",
-  "laptop",
-  "mouse",
-  "remote",
-  "keyboard",
-  "cell phone",
-  "microwave",
-  "oven",
-  "toaster",
-  "sink",
-  "refrigerator",
-  "book",
-  "clock",
-  "vase",
-  "scissors",
-  "teddy bear",
-  "hair drier",
-  "toothbrush"
-]

src/models/abdomen/descript.json

@@ -1,11 +0,0 @@
-{
-  "version": "0.0.0-n1",
-  "region": "Coco",
-  "size": 640,
-  "epochs": 1000,
-  "name": "coco128 test",
-  "yolo-version": "8.1.20 docker",
-  "date": "2024-03-12",
-  "export": "coco128.yaml"
-}
-

src/models/abdomen/metadata.yaml

@@ -1,92 +0,0 @@
-description: Ultralytics best model trained on /usr/src/ultralytics/ultralytics/cfg/datasets/coco128.yaml
-author: Ultralytics
-license: AGPL-3.0 https://ultralytics.com/license
-date: '2024-03-12T16:25:00.089873'
-version: 8.1.20
-stride: 32
-task: detect
-batch: 1
-imgsz:
-- 640
-- 640
-names:
-  0: person
-  1: bicycle
-  2: car
-  3: motorcycle
-  4: airplane
-  5: bus
-  6: train
-  7: truck
-  8: boat
-  9: traffic light
-  10: fire hydrant
-  11: stop sign
-  12: parking meter
-  13: bench
-  14: bird
-  15: cat
-  16: dog
-  17: horse
-  18: sheep
-  19: cow
-  20: elephant
-  21: bear
-  22: zebra
-  23: giraffe
-  24: backpack
-  25: umbrella
-  26: handbag
-  27: tie
-  28: suitcase
-  29: frisbee
-  30: skis
-  31: snowboard
-  32: sports ball
-  33: kite
-  34: baseball bat
-  35: baseball glove
-  36: skateboard
-  37: surfboard
-  38: tennis racket
-  39: bottle
-  40: wine glass
-  41: cup
-  42: fork
-  43: knife
-  44: spoon
-  45: bowl
-  46: banana
-  47: apple
-  48: sandwich
-  49: orange
-  50: broccoli
-  51: carrot
-  52: hot dog
-  53: pizza
-  54: donut
-  55: cake
-  56: chair
-  57: couch
-  58: potted plant
-  59: bed
-  60: dining table
-  61: toilet
-  62: tv
-  63: laptop
-  64: mouse
-  65: remote
-  66: keyboard
-  67: cell phone
-  68: microwave
-  69: oven
-  70: toaster
-  71: sink
-  72: refrigerator
-  73: book
-  74: clock
-  75: vase
-  76: scissors
-  77: teddy bear
-  78: hair drier
-  79: toothbrush

src/models/thorax-mini/descript.json

@@ -1,10 +0,0 @@
-{
-  "version": "0.1.0-n4",
-  "region": "Thorax",
-  "size": 640,
-  "epochs": 1000,
-  "name": "nano4",
-  "yolo-version": "8.1.20 docker",
-  "date": "2024-03-08",
-  "export": "0.1.0-th"
-}

src/models/thorax-mini/metadata.yaml

@@ -1,53 +0,0 @@
-description: Ultralytics best model trained on /data/ALVINN/Thorax/Thorax 0.1.0/thorax.yaml
-author: Ultralytics
-license: AGPL-3.0 https://ultralytics.com/license
-date: '2024-03-08T20:14:34.118186'
-version: 8.1.20
-stride: 32
-task: detect
-batch: 1
-imgsz:
-- 640
-- 640
-names:
-  0: Abdominal diaphragm
-  1: Aorta
-  2: Azygous vein
-  3: Brachiocephalic trunk
-  4: Caudal vena cava
-  5: Cranial vena cava
-  6: Esophagus
-  7: External abdominal oblique
-  8: Iliocostalis
-  9: Latissimus dorsi
-  10: Left atrium
-  11: Left auricle
-  12: Left lung
-  13: Left subclavian artery
-  14: Left ventricle
-  15: Longissimus
-  16: Pectoralis profundus
-  17: Pectoralis superficialis
-  18: Pericardium
-  19: Phrenic nerve
-  20: Primary bronchus
-  21: Pulmonary artery
-  22: Pulmonary trunk
-  23: Pulmonary vein
-  24: Rectus abdominis
-  25: Rectus thoracis
-  26: Recurrent laryngeal nerve
-  27: Rhomboideus
-  28: Right atrium
-  29: Right auricle
-  30: Right lung
-  31: Right ventricle
-  32: Scalenus
-  33: Serratus dorsalis caudalis
-  34: Serratus dorsalis cranialis
-  35: Serratus ventralis
-  36: Spinalis
-  37: Sympathetic chain
-  38: Trachea
-  39: Trapezius
-  40: Vagus nerve

src/models/thorax/classes.json

@@ -1,43 +0,0 @@
-[
-  "Abdominal diaphragm",
-  "Aorta",
-  "Azygous vein",
-  "Brachiocephalic trunk",
-  "Caudal vena cava",
-  "Cranial vena cava",
-  "Esophagus",
-  "External abdominal oblique",
-  "Iliocostalis",
-  "Latissimus dorsi",
-  "Left atrium",
-  "Left auricle",
-  "Left lung",
-  "Left subclavian artery",
-  "Left ventricle",
-  "Longissimus",
-  "Pectoralis profundus",
-  "Pectoralis superficialis",
-  "Pericardium",
-  "Phrenic nerve",
-  "Primary bronchus",
-  "Pulmonary artery",
-  "Pulmonary trunk",
-  "Pulmonary vein",
-  "Rectus abdominis",
-  "Rectus thoracis",
-  "Recurrent laryngeal nerve",
-  "Rhomboideus",
-  "Right atrium",
-  "Right auricle",
-  "Right lung",
-  "Right ventricle",
-  "Scalenus",
-  "Serratus dorsalis caudalis",
-  "Serratus dorsalis cranialis",
-  "Serratus ventralis",
-  "Spinalis",
-  "Sympathetic chain",
-  "Trachea",
-  "Trapezius",
-  "Vagus nerve"
-]

src/models/thorax/descript.json

@@ -1,10 +0,0 @@
-{
-  "version": "0.1.0-s1",
-  "region": "Thorax",
-  "size": 640,
-  "epochs": 1000,
-  "name": "small1",
-  "yolo-version": "8.1.20 docker",
-  "date": "2024-03-07",
-  "export": "0.1.0-th"
-}

src/models/thorax/metadata.yaml

@@ -1,53 +0,0 @@
-description: Ultralytics best model trained on /data/ALVINN/Thorax/Thorax 0.1.0/thorax.yaml
-author: Ultralytics
-license: AGPL-3.0 https://ultralytics.com/license
-date: '2024-03-07T16:03:03.296997'
-version: 8.1.20
-stride: 32
-task: detect
-batch: 1
-imgsz:
-- 640
-- 640
-names:
-  0: Abdominal diaphragm
-  1: Aorta
-  2: Azygous vein
-  3: Brachiocephalic trunk
-  4: Caudal vena cava
-  5: Cranial vena cava
-  6: Esophagus
-  7: External abdominal oblique
-  8: Iliocostalis
-  9: Latissimus dorsi
-  10: Left atrium
-  11: Left auricle
-  12: Left lung
-  13: Left subclavian artery
-  14: Left ventricle
-  15: Longissimus
-  16: Pectoralis profundus
-  17: Pectoralis superficialis
-  18: Pericardium
-  19: Phrenic nerve
-  20: Primary bronchus
-  21: Pulmonary artery
-  22: Pulmonary trunk
-  23: Pulmonary vein
-  24: Rectus abdominis
-  25: Rectus thoracis
-  26: Recurrent laryngeal nerve
-  27: Rhomboideus
-  28: Right atrium
-  29: Right auricle
-  30: Right lung
-  31: Right ventricle
-  32: Scalenus
-  33: Serratus dorsalis caudalis
-  34: Serratus dorsalis cranialis
-  35: Serratus ventralis
-  36: Spinalis
-  37: Sympathetic chain
-  38: Trachea
-  39: Trapezius
-  40: Vagus nerve

src/pages/detect.vue

@@ -120,7 +120,6 @@
   import submitMixin from './submit-mixin'
   import detectionMixin from './detection-mixin'
   import cameraMixin from './camera-mixin'
-import App from 'framework7-vue/components/app'
 
   export default {
     mixins: [submitMixin, detectionMixin, cameraMixin],
@@ -168,7 +167,7 @@ import App from 'framework7-vue/components/app'
     created () {
       let loadOtherSettings = localStorage.getItem('otherSettings')
       if (loadOtherSettings) this.otherSettings = JSON.parse(loadOtherSettings)
-      let modelRoot = this.isCordova ? 'https://localhost' : (import.meta.env.PROD ? '.' : '..')
+      let modelRoot = this.isCordova ? 'https://localhost' : '.'
       switch (this.f7route.params.region) {
         case 'thorax':
           this.activeRegion = 0
@@ -188,10 +187,12 @@ import App from 'framework7-vue/components/app'
       }
       this.modelLocation = `${modelRoot}/models/${this.detectorName}${this.otherSettings.mini ? '-mini' : ''}/model.json`
       this.miniLocation = `${modelRoot}/models/${this.detectorName}-mini/model.json`
-      import(`../models/${this.detectorName}/classes.json`).then((mod) => {
-        this.classesList = mod.default
-        this.detectorLabels = this.classesList.map( l => { return {'name': l, 'detect': true} } )
-      })
+      fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/${this.detectorName}/classes.json`)
+        .then((mod) => { return mod.json() })
+        .then((classes) => {
+          this.classesList = classes
+          this.detectorLabels = this.classesList.map( l => { return {'name': l, 'detect': true} } )
+        })
       var loadServerSettings = localStorage.getItem('serverSettings')
       if (loadServerSettings) this.serverSettings = JSON.parse(loadServerSettings)
     },
@@ -385,7 +386,7 @@ import App from 'framework7-vue/components/app'
             resolve(reader.result)
           })
           if (this.imageLoadMode == 'sample') {
-            fetch(`${this.isCordova ? 'https://localhost' : '..'}/samples/${this.detectorName}-${searchImage}.jpeg`).then( resp => {
+            fetch(`${this.isCordova ? 'https://localhost' : '.'}/samples/${this.detectorName}-${searchImage}.jpeg`).then( resp => {
               return resp.blob()
             }).then(respBlob => {
               reader.readAsDataURL(respBlob)

src/pages/specs.vue

@@ -45,6 +45,7 @@
         limbsDetails: { "version": "N/A" },
         headneckDetails: { "version": "N/A" },
         alvinnVersion: store().getVersion,
+        isCordova: !!window.cordova,
         otherSettings: {}
       }
     },
@@ -54,22 +55,18 @@
     created () {
       var loadOtherSettings = localStorage.getItem('otherSettings')
       if (loadOtherSettings) this.otherSettings = JSON.parse(loadOtherSettings)
-      import('../models/thorax/descript.json')
-        .then((mod) => {
-          this.thoraxDetails = mod.default
-        })
-      import('../models/thorax-mini/descript.json')
-        .then((mod) => {
-          this.miniThoraxDetails = mod.default
-        })
-      import('../models/abdomen/descript.json')
-        .then((mod) => {
-          this.abdomenDetails = mod.default
-        })
-      import('../models/abdomen-mini/descript.json')
-        .then((mod) => {
-          this.miniAbdomenDetails = mod.default
-        })
+        fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/thorax/descript.json`)
+          .then((mod) => { return mod.json() })
+          .then((desc) => { this.thoraxDetails = desc })
+        fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/thorax-mini/descript.json`)
+          .then((mod) => { return mod.json() })
+          .then((desc) => { this.miniThoraxDetails = desc })
+        fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/abdomen/descript.json`)
+          .then((mod) => { return mod.json() })
+          .then((desc) => { this.abdomenDetails = desc })
+        fetch(`${this.isCordova ? 'https://localhost' : '.'}/models/abdomen-mini/descript.json`)
+          .then((mod) => { return mod.json() })
+          .then((desc) => { this.miniAbdomenDetails = desc })
     },
     methods: {
     }