mutliple security fixes, disabled classification, improved label presentation

.gitignore

@@ -26,3 +26,5 @@ tmp/
 .Rproj.user
 delete.bat
 .Rhistory
+model/build/Mask*
+model/build/taco*

.in

@@ -1,5 +1,5 @@
 source $HOME/.config/nvm/nvm.sh
-nvm use 16.14.0
+nvm use 16
 export B=$(dirname $0)
 export O=$B/frontend.orig
 export S=$B/frontend/src

backend/yarn.lock

@@ -1092,7 +1092,7 @@ dayjs@^1.11.0:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.0.tgz#009bf7ef2e2ea2d5db2e6583d2d39a4b5061e805"
   integrity sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==
 
-debug@4, debug@^4.1.1, debug@^4.3.3:
+debug@4, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2665,16 +2665,16 @@ mkdirp@^1.0.3:
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 moment-timezone@^0.5.31:
-  version "0.5.34"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c"
-  integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==
+  version "0.5.40"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89"
+  integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg==
   dependencies:
     moment ">= 2.9.0"
 
 "moment@>= 2.9.0":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+  version "2.29.4"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 ms@2.1.2:
   version "2.1.2"
@@ -3569,13 +3569,13 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 simple-git@^3.4.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.5.0.tgz#3c3538f4d7a1b3c8f3904412b12740bdcad9c8b1"
-  integrity sha512-fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA==
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.16.0.tgz#421773e24680f5716999cc4a1d60127b4b6a9dec"
+  integrity sha512-zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw==
   dependencies:
     "@kwsites/file-exists" "^1.1.1"
     "@kwsites/promise-deferred" "^1.1.1"
-    debug "^4.3.3"
+    debug "^4.3.4"
 
 slash@^3.0.0:
   version "3.0.0"

bin/github_actions.py

@@ -321,7 +321,7 @@ def amplify_deploy(self):
             raise SystemExit(f"Unknown branch: {self.branch}")
         response = amplifycli.start_deployment(
             appId=appid,
-            branchName=self.stage,
+            branchName=self.branch.replace("aws/", ""),
             sourceUrl=f"s3://{self.public_bucket}/deploy.zip",
         )
 
@@ -351,7 +351,7 @@ def frontend_stack(self):
             ),
             Cmd(
                 "frontend_stack",
-                working_dir=self.BASE.joinpath("frontend"),
+                working_dir=FRONTEND,
                 cmd="yarn vite build",
                 callback=self.amplify_deploy,
             ),

docs/localdev.md

@@ -18,6 +18,9 @@ Pushing / merging PR's to any branches with a prefix of `aws/` will trigger depl
 For full functionality you will want to get a Google Maps API key and name it VITE_GOOGLE_MAPS_API_KEY, but it is not required
 =======
 
+Pushing / merging PR's to any branches with a prefix of `aws/` will
+trigger deployment actions, when developing locally, create a new branch
+and submit a pull request to `aws/trashai-staging`
 
 ---
 # Set up 

frontend/.gitignore

@@ -21,3 +21,4 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+.log

frontend/notes.txt

@@ -0,0 +1,18 @@
+https://github.com/tensorflow/models/blob/master/research/object_detection/g3doc/tf1_detection_zoo.md
+https://indiantechwarrior.com/tutorial-on-tensorflow-image-segmentation/
+https://tfhub.dev/tensorflow/collections/lite/task-library/image-segmenter/1
+https://www.tensorflow.org/lite/inference_with_metadata/task_library/image_segmenter
+https://www.tensorflow.org/lite/examples/segmentation/overview
+https://github.com/tensorflow/datasets
+https://github.com/tensorflow/tfjs-models
+https://datasetsearch.research.google.com/
+https://research.google/tools/datasets/
+https://www.tensorflow.org/resources/models-datasets
+https://github.com/aegorfk/TensorFlow.js-for-any-model/blob/master/src/custom-model/index.js
+https://cloud.google.com/vision/automl/docs/tensorflow-js-tutorial#node.js
+
+
+https://keras.io/examples/keras_recipes/creating_tfrecords/
+https://www.kaggle.com/code/ryanholbrook/tfrecords-basics/notebook
+https://medium.com/ai%C2%B3-theory-practice-business/image-dataset-with-tfrecord-files-7188b565bfc
+https://towardsdatascience.com/create-tfrecords-dataset-and-use-it-to-train-an-ml-model-da26fe9f0c2c

frontend/package.json

@@ -22,12 +22,14 @@
         "crypto-js": "^4.1.1",
         "dexie": "^3.2.2",
         "file-saver": "^2.0.5",
+        "fuse.js": "^6.6.2",
         "jszip": "^3.10.0",
         "loglevel": "^1.8.0",
-        "p-queue": "^7.2.0",
-        "pinia": "^2.0.16",
+        "p-queue": "^7.3.0",
+        "pinia": "^2.0.17",
         "pinia-plugin-persistedstate": "^1.6.3",
         "roboto-fontface": "^0.10.0",
+        "rxjs": "^7.5.7",
         "ts-exif-parser": "^0.2.2",
         "vite-plugin-pages": "^0.25.0",
         "vite-plugin-vuetify": "^1.0.0-alpha.13",

frontend/src/App.vue

@@ -7,6 +7,7 @@
         @dragover.prevent
     >
         <Snack ref="snack" />
+        <HighlightImage />
         <v-layout>
             <v-app-bar
                 color="primary"
@@ -163,8 +164,11 @@
 import Snack from '@/components/snack.vue'
 import { defineComponent, ref } from 'vue'
 import IconCode4Sac from '@/components/icon/code4sac.vue'
+import HighlightImage from '@/components/model/highlight_image.vue'
 import { useTheme } from 'vuetify'
-import * as m from '@/lib'
+import { useAppStore, useImageStore, useCache } from '@/lib/store'
+import { log } from '@/lib/logging'
+import { TensorFlow } from '@/lib'
 
 interface Data {
     drawer: boolean
@@ -174,41 +178,45 @@ export default defineComponent({
     name: 'App',
     components: {
         IconCode4Sac,
+        HighlightImage,
         Snack,
     },
     setup() {
-        const imgstore = m.useImageStore()
-        const appstore = m.useAppStore()
+        const imgstore = useImageStore()
+        const appstore = useAppStore()
+        const cache = useCache()
         const theme = useTheme()
         const snackbar = ref<typeof Snack>()
         return {
+            cache,
             snackbar,
             imgstore,
             appstore,
             theme,
         }
     },
-    created() {
-        m.TensorFlow.getInstance()
-    },
-    mounted() {
+    async mounted() {
         // handle back button stuff
         window.onpopstate = () => {
             // @ts-ignore
             this.preloader = false
         }
         this.theme.global.name.value = this.appstore.theme
         this.imgstore.doinit()
-        m.log.debug('veutify', this.$vuetify)
-        m.log.debug('mounted', this)
-        m.log.debug(navigator.storage.estimate())
+        log.debug('veutify', this.$vuetify)
+        log.debug('mounted', this)
+        log.debug(navigator.storage.estimate())
+
         // this.$root!.$snack = this.snackbar!.value
     },
     data(): Data {
         return {
             drawer: false,
         }
     },
+    async created() {
+        await TensorFlow.getInstance().load()
+    },
     computed: {
         is_mobile(): boolean {
             return this.$vuetify.display.mobile

frontend/src/components/classify_instructions.vue

@@ -0,0 +1,31 @@
+<template>
+    <div class="d-flex">
+        <div class="mx-5 section-border">
+            <v-icon class="mr-3"> mdi-image-edit </v-icon>
+            <span> <b>Edit</b> </span>
+            <b> Double click </b>
+            on a classification label
+        </div>
+        <div class="mx-5 section-border">
+            <v-icon class="mr-3"> mdi-new-box </v-icon>
+            <span> <b>New</b> </span>
+            Hold the <b>middle mouse button</b> to draw a new classification
+        </div>
+        <slot />
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+    name: 'Instructions',
+})
+</script>
+<style>
+.section-border {
+    border: 2px solid black;
+    padding: 10px;
+    margin: 5px;
+}
+</style>

frontend/src/components/copybutton.vue

@@ -9,7 +9,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import useClipboard from 'vue-clipboard3'
-import * as m from '@/lib'
+import { log } from '@/lib/logging'
 export default defineComponent({
     name: 'CopyButton',
     props: {
@@ -34,7 +34,7 @@ export default defineComponent({
                 icon: 'mdi-check',
                 timer: 3000,
             })
-            m.log.debug('copied', this.text)
+            log.debug('copied', this.text)
         },
     },
 })