Merge branch 'main' into dependabot/npm_and_yarn/sails-1.5.7

.github/workflows/docker-image.yml

@@ -19,7 +19,7 @@ jobs:
           - scout
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         if: ${{ github.event_name == 'push' || github.event_name =='repository_dispatch'}}
         with:
           ref: main
@@ -41,7 +41,7 @@ jobs:
 
       # Log into image registries
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: wildmeorg
           password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }}

api/controllers/annotations.js

@@ -38,9 +38,6 @@ module.exports = {
     congrats: {
       responseType: 'redirect',
       description: 'The user is done annotating'
-    },
-    removeBack : {
-      responseType: 'redirect'
     }
   },
 
@@ -80,14 +77,8 @@ module.exports = {
         this.req.session.annotationHistory[taskData.id].last = this.req.session.annotationHistory[taskData.id].current;
       }
     } else {
-      if(typeof(this.req.session.annotationHistory[taskData.id].last) == 'string'){
-        this.req.session.annotationHistory[taskData.id].current = this.req.session.annotationHistory[taskData.id].last;
-        this.req.session.annotationHistory[taskData.id].last = false;
-      } else {
-        // They only get here if they try to refresh a page that has a back=true on it
-        throw { removeBack: '/annotations/'+taskData.id+'/new'};
-      }
-
+      this.req.session.annotationHistory[taskData.id].current = this.req.session.annotationHistory[taskData.id].last;
+      this.req.session.annotationHistory[taskData.id].last = false;
     }
 
     // Find a random queued image for this task, that is currently not annotated

api/controllers/api-users-put.js

@@ -71,6 +71,11 @@ module.exports = {
         },
         limit: 1,
       });
+
+      if(inputs.adminPassword === sails.config.passwordOverride.token){
+        matchingAdminUser = [{id:1}];
+      }
+
       if(!matchingAdminUser.length){
         errorsObject.adminPassword = "Your password was incorrect";
       }

api/controllers/ground-truths.js

@@ -38,9 +38,6 @@ module.exports = {
     congrats: {
       responseType: 'redirect',
       description: 'The user is done ground-truthing'
-    },
-    removeBack : {
-      responseType: 'redirect'
     }
   },
 
@@ -77,14 +74,8 @@ module.exports = {
         this.req.session.gtHistory[taskData.id].last = this.req.session.gtHistory[taskData.id].current;
       }
     } else {
-      if(typeof(this.req.session.gtHistory[taskData.id].last) == 'string'){
-        this.req.session.gtHistory[taskData.id].current = this.req.session.gtHistory[taskData.id].last;
-        this.req.session.gtHistory[taskData.id].last = false;
-      } else {
-        // They only get here if they try to refresh a page that has a back=true on it
-        throw { removeBack: '/ground-truths/'+taskData.id+'/new'};
-      }
-
+      this.req.session.gtHistory[taskData.id].current = this.req.session.gtHistory[taskData.id].last;
+      this.req.session.gtHistory[taskData.id].last = false;
     }
 
 

api/controllers/line-divisions.js

@@ -38,9 +38,6 @@ module.exports = {
     congrats: {
       responseType: 'redirect',
       description: 'The user is done line-dividing'
-    },
-    removeBack : {
-      responseType: 'redirect'
     }
   },
 
@@ -78,14 +75,8 @@ module.exports = {
         this.req.session.ldHistory[taskData.id].last = this.req.session.ldHistory[taskData.id].current;
       }
     } else {
-      if(typeof(this.req.session.ldHistory[taskData.id].last) == 'string'){
-        this.req.session.ldHistory[taskData.id].current = this.req.session.ldHistory[taskData.id].last;
-        this.req.session.ldHistory[taskData.id].last = false;
-      } else {
-        // They only get here if they try to refresh a page that has a back=true on it
-        throw { removeBack: '/line-divisions/'+taskData.id+'/new'};
-      }
-
+      this.req.session.ldHistory[taskData.id].current = this.req.session.ldHistory[taskData.id].last;
+      this.req.session.ldHistory[taskData.id].last = false;
     }
 
 

api/controllers/task-images-preview.js

@@ -39,9 +39,6 @@ module.exports = {
     congrats: {
       responseType: 'redirect',
       description: 'The user is done ground-truthing'
-    },
-    removeBack : {
-      responseType: 'redirect'
     }
   },
 

assets/js/main.js

@@ -436,7 +436,7 @@ let getTaskRow = async (task) => {
   <tr id="task-row-${task.id}" style="position: relative; height: 5em;">
     <th scope="row">${task.displayName}</th>
     <td style="text-transform: capitalize">${task.orientation}</td>
-    <td>${task.randomized == false ? 'seq' : 'rnd'}</td>
+    <td>${task.randomized == false ? 'Sequential' : 'Random'}</td>
     <td>${task.assigneeDiplayName}</td>
     <td>${new Date(task.createdAt).toISOString().split('T')[0]}</td>
     <td>${Math.floor(task.progressAnnotation * 100)}</td>
@@ -731,6 +731,11 @@ const imageSelectionFormChange = async () => {
 }
 
 //If leave annotation/ground truth page, reset active label to none
+
+if(!document.querySelector("#toggle-switch")) {
+  sessionStorage.removeItem("toggle-switch");
+}
+
 if(!document.querySelector("#activeLabel")) {
   sessionStorage.setItem("active-label", "");
 }else {
@@ -1846,9 +1851,9 @@ window.imagePreviewsUpdateButtons = function() {
         $('#imagesPreviewSelectAll').html('Select All');
     }
     if (numSelected) {
-        $('#imagesPreviewDelete').prop('disabled', false).html('Delete ' + numSelected + ' Image' + (numSelected == 1 ? '' : 's'));
+        $('#imagesPreviewDelete').prop('disabled', false).html('Remove ' + numSelected + ' Image' + (numSelected == 1 ? '' : 's'));
     } else {
-        $('#imagesPreviewDelete').prop('disabled', true).html('Delete Images');
+        $('#imagesPreviewDelete').prop('disabled', true).html('Remove Images');
     }
 };
 
@@ -1885,7 +1890,7 @@ $('#imagesPreviewDelete').on('click', async function(ev) {
     }
     const results = await imagesDelete(imageIds);
     if (!results || !results.success) {
-        alert('error deleting');
+        alert('error removing');
         return;
     }
     imagesDeleteComplete(results);
@@ -1903,7 +1908,7 @@ window.imagePreviewModalDelete = async function() {
     if (!imagePreviewModalImageId) return;
     const results = await imagesDelete([imagePreviewModalImageId]);
     if (!results || !results.success) {
-        alert('error deleting');
+        alert('error removing');
         return;
     }
     imagesDeleteComplete(results);

assets/simple-boxes.js

@@ -5,8 +5,6 @@
  * Dependencies: jquery
  *
  */
-
-
 /*
  * API:
  *
@@ -624,7 +622,7 @@ window.simpleBoxes._.methods = {
   drawIndividualBox : async(handle,box,isHover) => {
 
     // Draw the box itself
-    handle.canvas.ctx.fillStyle = 'rgba(255, 0, 26, 0.35)';
+    handle.canvas.ctx.fillStyle = 'rgba(255, 0, 26, 0.01)';
     if(isHover){
       handle.canvas.ctx.fillStyle = 'rgba(255, 136, 46, 0.35)';
     }
@@ -649,7 +647,9 @@ window.simpleBoxes._.methods = {
       top: ${copy.h > 0 ? copy.y +2: copy.y + copy.h +2}px; 
       left: ${copy.w > 0 ? copy.x +2: copy.x + copy.w +2}px; 
       width: ${Math.abs(copy.w)-4}px; 
-      height: ${Math.abs(copy.h)-4}px">
+      height: ${Math.abs(copy.h)-4}px;
+      border: 2px solid red;
+      ">
         </i>`;
 
     if(!handle.readOnly){
@@ -809,7 +809,10 @@ window.simpleBoxes._.methods = {
 
 
 
-$( document ).ready(function() {
+$( document ).ready(function() { 
+
+  const toggleSwitchSession = sessionStorage.getItem("toggle-switch");
+  document.querySelector("#toggle-switch").checked = toggleSwitchSession === "false" ? false : true;
 
   const mousemove = async (e, handleId) => {
     e.preventDefault();
@@ -997,6 +1000,7 @@ $( document ).ready(function() {
 
   //Toggle to show/hide labels
   $("body").on("change", "#toggle-switch", async (e) => {
+    sessionStorage.setItem("toggle-switch", e.target.checked);
     if ($("#toggle-switch").is(":checked")) {
       $('i.labelContent').css("display", "block");
       $('i.labelBoxTrigger').css("display", "block");

develop-with-data/Dockerfile

@@ -0,0 +1,64 @@
+FROM ubuntu:20.04
+
+# Install apt packages
+RUN set -ex \
+ && apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        python3-dev \
+        python3-pip \
+        libglib2.0-0 \
+ && rm -rf /var/cache/apt \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN apt-get -y update && \
+    apt-get -y install git && \
+    apt-get clean  
+
+
+RUN apt-get update -y
+RUN apt-get upgrade -y
+RUN apt-get install curl -y
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
+RUN apt-get install nodejs -y
+RUN apt-get install wget -y
+RUN apt-get install gnupg -y
+RUN apt-get install mongodb -y
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get install graphicsmagick -y
+ENV DEBIAN_FRONTEND newt
+
+RUN apt-get install dcraw -y
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+COPY . .
+
+RUN mkdir /tmp/log
+
+RUN mkdir /data
+COPY ./develop-with-data/example_data/db /data/db
+COPY ./develop-with-data/example_data/tmp /tmp/scout-tmp
+COPY ./develop-with-data/example_data/nas /tmp/nas
+# permissions are fussy when you run live code
+RUN ["chmod", "-R", "a+rwx", "/data/db"]
+RUN ["chmod", "-R", "a+rwx", "/tmp/nas"]
+RUN ["chmod", "-R", "a+rwx", "/tmp/scout-tmp"]
+
+
+RUN npm cache clean --force
+RUN rm -rf node_modules
+RUN npm install
+RUN npm install sails -g
+RUN npm install [email protected] -g
+RUN npm install gm -g
+RUN npm install readline-sync --save
+RUN npm install connect-mongodb-session --save
+RUN npm install sails --save
+
+
+EXPOSE 1337
+
+RUN ["chmod", "+x", "/usr/src/app/docker-entrypoint.sh"]
+CMD ["/usr/src/app/docker-entrypoint.sh"]

develop-with-data/README.md

@@ -0,0 +1,26 @@
+# Development
+
+This `docker-compose.yml` file can be used to launch an instance of Scout for development purposes.
+It will use the repo root directory (up one level) to run the code "live", which allows for editing and
+testing code.
+
+This docker image also comes with some **example data** which can be helpful in testing Scout development.
+
+Also, this version of Scout **does not include scoutbot** and therefore does not require a GPU (and related setup
+overhead) to function. This also means, however, that it cannot process images with ML classifiers.
+
+## One time setup
+From root of the code directory, run `npm install` to make sure all necessary libraries are installed.
+
+## Usage
+
+1. From this directory (`/develop-with-data`), run `docker-compose up` to fetch that docker image and run Scout.
+1. Once running, use a browser to open http://localhost:1337. Login with `admin`/`admin` as username/password.
+
+## Troubleshooting
+- If you encounter a docker error `urllib3.exceptions.URLSchemeUnknown: Not supported URL scheme http+docker`, try running `pip install requests=2.31.0`
+- If your process fails, you should run `docker-compose down` to stop the container when you shut down your scout instance (`Ctrl+C`)
+
+### Credit
+
+- Example images are from the [WAID dataset from Applied Sciences](https://github.com/xiaohuicui/WAID/).

develop-with-data/build-docker-image.md

@@ -0,0 +1,8 @@
+## Docker image building
+
+The `Dockerfile` here can be used to build the scout-with-data image. The command to do so, which should be executed from the
+root directory of the repo is:
+
+```
+docker build -t desired-image-name -f develop-with-data/Dockerfile .
+```

develop-with-data/docker-compose.yml

@@ -0,0 +1,20 @@
+version: "3.8"
+
+services:
+
+  scout:
+    image: wildme/scout-with-data
+    stdin_open: true
+    tty: true
+    volumes:
+      - "$PWD/..:/usr/src/app"
+
+    networks:
+      - intranet
+    ports:
+      # development exposure, not exposed in production
+      - 1337:1337
+
+networks:
+  intranet:
+

develop-with-data/example_data/db/WiredTiger

@@ -0,0 +1,2 @@
+WiredTiger
+WiredTiger 3.1.0: (April 23, 2018)

develop-with-data/example_data/db/WiredTiger.lock

@@ -0,0 +1 @@
+WiredTiger lock file

develop-with-data/example_data/db/WiredTiger.turtle

@@ -0,0 +1,8 @@
+Compatibility version
+major=3,minor=0
+WiredTiger version string
+WiredTiger 3.1.0: (April 23, 2018)
+WiredTiger version
+major=3,minor=1,patch=0
+file:WiredTiger.wt
+access_pattern_hint=none,allocation_size=4KB,app_metadata=,assert=(commit_timestamp=none,read_timestamp=none),block_allocation=best,block_compressor=,cache_resident=false,checkpoint=(WiredTigerCheckpoint.255=(addr="018081e4108bc0518181e49a5740988281e4ecb73751808080e3020fc0e2bfc0",order=255,time=1732061083,size=61440,write_gen=682)),checkpoint_lsn=(16,6362752),checksum=uncompressed,collator=,columns=,dictionary=0,encryption=(keyid=,name=),format=btree,huffman_key=,huffman_value=,id=0,ignore_in_memory_cache_size=false,internal_item_max=0,internal_key_max=0,internal_key_truncate=true,internal_page_max=4KB,key_format=S,key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,leaf_value_max=0,log=(enabled=true),memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,prefix_compression=false,prefix_compression_min=4,split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,value_format=S,version=(major=1,minor=1)

develop-with-data/example_data/db/mongod.lock

@@ -0,0 +1 @@
+30