fix: better error handling when training fails to prevent stuck loadi…

…ng bar
jakowenko · Aug 17, 2021 · 07dfd25 · 07dfd25
1 parent 8f760de
commit 07dfd25
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/api/src/util/db.util.js b/api/src/util/db.util.js
@@ -53,6 +53,8 @@ module.exports.init = async () => {
     )`
     ).run();
 
+    db.prepare(`DELETE FROM train WHERE meta IS NULL`).run();
+
     await this.resync.files();
   } catch (error) {
     error.message = `db init error: ${error.message}`;

diff --git a/api/src/util/train.util.js b/api/src/util/train.util.js
@@ -30,7 +30,7 @@ module.exports.queue = async (files) => {
         name,
         key: `${STORAGE.PATH}/train/${name}/${filename}`,
         detector,
-      });
+      }).catch((error) => ({ error: error.message }));
       outputs.push({ ...result });
       records[i].meta = JSON.stringify(result);
       database.create.train(records[i]);
@@ -50,12 +50,22 @@ module.exports.process = async ({ name, key, detector }) => {
       detector,
     };
   } catch (error) {
+    if (!error.response) {
+      return {
+        message: error.message,
+        status: 500,
+        detector,
+      };
+    }
     const { status, data } = error.response;
     const message = typeof data === 'string' ? { data } : { ...data };
-
-    error.message = `${detector} training error: ${error.message}`;
-    console.error(error);
-
+    if (data.message) {
+      console.error(`${detector} training error: ${data.message}`);
+    } else if (data.error) {
+      console.error(`${detector} training error: ${data.error}`);
+    } else {
+      console.error(`${detector} training error: ${error.message}`);
+    }
     return {
       ...message,
       status,

diff --git a/frontend/src/components/Asset.vue b/frontend/src/components/Asset.vue
@@ -73,7 +73,7 @@
                 :value="slotProps.data.detector"
                 :severity="
                   slotProps.data.result
-                    ? slotProps.data.result.status.toString().charAt(0) === '2'
+                    ? slotProps?.data?.result?.status?.toString().charAt(0) === '2'
                       ? 'success'
                       : 'danger'
                     : ''

diff --git a/frontend/src/views/Train.vue b/frontend/src/views/Train.vue
@@ -130,8 +130,12 @@ export default {
         async files() {
           try {
             const ids = $this.matches.selected.map((obj) => obj.id);
-            const trained = $this.matches.selected.filter((obj) => obj.results.length);
-            const untrained = $this.matches.selected.filter((obj) => !obj.results.length);
+            const trained = $this.matches.selected.filter(
+              (obj) => obj.results.filter((res) => res.result.status === 200).length,
+            );
+            const untrained = $this.matches.selected.filter(
+              (obj) => !obj.results.length || obj.results.filter((res) => res.result.status !== 200).length,
+            );
             const names = [...new Set(trained.map((obj) => obj.name))];
             let message = '';
             if (trained.length) {