Merge pull request #65 from WildMeOrg/pipeline-v3

Pipeline v3

Author: TanyaStere42

Dockerfile

@@ -22,6 +22,7 @@ RUN pip3 install onnxruntime-gpu
 RUN scoutbot fetch --config phase1
 RUN scoutbot fetch --config mvp
 RUN scoutbot fetch --config v3
+RUN scoutbot fetch --config v3-cls
 
 # END SCOUTBOT SETUP
 

api/controllers/api-tasks-post.js

@@ -93,7 +93,8 @@ module.exports = {
     let mlAssignees = {
       'ml-v1' : 'ML Config: V1 Classifier',
       'ml-v2' :  'ML Config: V2 Classifier',
-      'ml-v3' :  'ML Config: V3 Classifier',
+      'ml-v3' :  'ML Config: V3 Detector',
+      'ml-v3-cls' :  'ML Config: V3 Classifier',
       'ml-dummy' :  'ML Config: Random Nonsense'
     }
     // Check to see if that name exists

app.js

@@ -988,9 +988,7 @@ const invokeMl = async (fullPath,configName) => {
   //let jsonFileName = 'package';
   let pathToJson = pathToDir+'json/'+jsonFileName+'.json';
   let command;
-
   command = 'scoutbot pipeline --config="'+configName+'" "'+fullPath+'" --output="'+pathToJson+'"';
-
 
   try {
     const { stdout, stderr } = await exec(command);
@@ -1016,7 +1014,7 @@ const invokeMl = async (fullPath,configName) => {
    let foundTasks = await Tasks.find({
      where : {
        taskType : 'ml',
-       assignee : ['ml-v1','ml-v2', 'ml-v3'],
+       assignee : ['ml-v1','ml-v2', 'ml-v3', 'ml-v3-cls'],
        progressAnnotation : {
          '<' : 1
        }
@@ -1059,6 +1057,8 @@ const invokeMl = async (fullPath,configName) => {
         configInvocationName = 'mvp';
     } else if (taskData.assignee == 'ml-v3') {
         configInvocationName = 'v3';
+    } else if (taskData.assignee == 'ml-v3-cls') {
+        configInvocationName = 'v3-cls';
     }
 
    let annotationsArr = await invokeMl(imageData.fullPath,configInvocationName);

assets/js/main.js

@@ -43,7 +43,9 @@ window.tagsList = [
   'waterbuck',
   'white_bones',
   'wildebeest',
-  'zebra'
+  'zebra',
+  'baboon',
+  'object'
 ];
 
 const minimumImageHeight = 650;

views/pages/tasks-new.ejs

@@ -38,8 +38,8 @@
             <option disabled>--- MACHINE LEARNING ---</option>
             <option value="ml-v1">ML Config: V1 Classifier</option>
             <option value="ml-v2">ML Config: V2 Classifier</option>
-            <option value="ml-v3">ML Config: V3 Classifier</option>
-
+            <option value="ml-v3">ML Config: V3 Detector</option>
+            <option value="ml-v3-cls">ML Config: V3 Classifier</option>
 
           </select>
           <label for="assignee">Assignee</label>

views/pages/tasks.ejs

@@ -91,7 +91,8 @@
       <option disabled>--- MACHINE LEARNING ---</option>
       <option value="ml-v1">ML Config: V1 Classifier</option>
       <option value="ml-v2">ML Config: V2 Classifier</option>
-      <option value="ml-v3">ML Config: V3 Classifier</option>
+      <option value="ml-v3">ML Config: V3 Detector</option>
+      <option value="ml-v3-cls">ML Config: V3 Classifier</option>
       <option value="ml-dummy">ML Config: Random Nonsense</option>