Merge pull request #236 from FIRST-Tech-Challenge/pr_labeling_issues

Fixed issues related to labeling frames and tracking

Author: lizlooney

server/app_engine.py

@@ -977,7 +977,7 @@ def prepare_to_start_tracking():
 @handle_exceptions
 @login_required
 def retrieve_tracked_bboxes():
-    time_limit = datetime.now(timezone.utc) + timedelta(seconds=25)
+    time_limit = datetime.now(timezone.utc) + timedelta(seconds=15)
     data = validate_keys(flask.request.form.to_dict(flat=True),
         ['video_uuid', 'tracker_uuid', 'retrieve_frame_number'])
     video_uuid = storage.validate_uuid(data.get('video_uuid'))
@@ -998,7 +998,7 @@ def retrieve_tracked_bboxes():
 @handle_exceptions
 @login_required
 def continue_tracking():
-    time_limit = datetime.now(timezone.utc) + timedelta(seconds=25)
+    time_limit = datetime.now(timezone.utc) + timedelta(seconds=15)
     team_uuid = team_info.retrieve_team_uuid(flask.session, flask.request)
     data = validate_keys(flask.request.form.to_dict(flat=True),
         ['video_uuid', 'tracker_uuid', 'frame_number', 'bboxes_text'], optional_keys=['retrieve_frame_number'])

server/src/js/labelVideo.js

@@ -113,6 +113,8 @@ fmltc.LabelVideo = function(util, videoEntity, videoFrameEntity0) {
 
   this.retryingGoToFrame = false;
 
+  this.savingBboxes = false;
+
   this.playing = false;
   this.playingDirection = 1;
   this.playingIntervalMs = 0;
@@ -130,6 +132,7 @@ fmltc.LabelVideo = function(util, videoEntity, videoFrameEntity0) {
 
   this.trackingAlreadyInProgress = false;
   this.trackingInProgress = false;
+  this.trackingNumberOfBboxes = 0;
   this.trackingPaused = false;
   this.trackingWaitingForBboxes = false;
   this.trackingInitFrameNumber = 0;
@@ -734,6 +737,12 @@ fmltc.LabelVideo.prototype.saveBboxes = function() {
     return bboxesText;
   }
 
+  if (this.savingBboxes) {
+    setTimeout(this.saveBboxes.bind(this), 1000);
+    return;
+  }
+  this.savingBboxes = true;
+
   this.labelingAreaSavingMessageDiv.style.color = '#0d6efd';
   this.labelingAreaSavingMessageDiv.textContent = ''; // 'Saving...';
 
@@ -771,6 +780,7 @@ fmltc.LabelVideo.prototype.xhr_storeVideoFrameBboxesText_onreadystatechange = fu
       console.log('Failure! /storeVideoFrameBboxesText?' + params +
           ' xhr.status is ' + xhr.status + '. xhr.statusText is ' + xhr.statusText);
     }
+    this.savingBboxes = false;
   }
 };
 
@@ -1259,6 +1269,7 @@ fmltc.LabelVideo.prototype.trackingStartButton_onclick = function() {
   this.updateUI(false);
 
   const bboxesText = this.saveBboxes();
+  this.trackingNumberOfBboxes = this.convertTextToBboxes(bboxesText).length;
   const trackingScale = Math.max(this.trackingScaleInput.min, Math.min(this.trackingScaleInput.value, this.trackingScaleInput.max));
 
   const xhr = new XMLHttpRequest();
@@ -1393,7 +1404,10 @@ fmltc.LabelVideo.prototype.xhr_retrieveTrackedBboxes_onreadystatechange = functi
         }
         this.goToFrame(frameNumber);
 
-        if (this.trackingPaused) {
+        if (this.bboxes[frameNumber].length != this.trackingNumberOfBboxes) {
+          this.trackingPaused = true;
+          this.trackingMessageDiv.textContent = 'Could not track all objects. Paused.';
+        } else if (this.trackingPaused) {
           this.trackingMessageDiv.textContent = 'Paused.';
         } else {
           this.trackingMessageDiv.textContent =
@@ -1439,6 +1453,7 @@ fmltc.LabelVideo.prototype.sendContinueTracking = function(failureCount) {
   this.trackingWaitingForBboxes = true;
   this.updateUI(false);
 
+  this.trackingNumberOfBboxes = this.bboxes[this.currentFrameNumber].length;
   this.videoFrameEntity[this.currentFrameNumber].bboxes_text =
       this.convertBboxesToText(this.bboxes[this.currentFrameNumber]);
 

server/storage.py

@@ -360,23 +360,23 @@ def retrieve_video_entity_for_labeling(team_uuid, video_uuid):
             tracker_entity = maybe_retrieve_tracker_entity(video_uuid, tracker_uuid)
             if tracker_entity is None:
                 tracking_in_progress = False
-                logging.critical('Tracker is not in progress. Tracker entity is missing.')
+                logging.warning('Tracker is not in progress. Tracker entity is missing.')
             else:
                 # If it's been more than two minutes, assume the tracker has died.
                 timedelta_since_last_update = datetime.now(timezone.utc) - tracker_entity['update_time']
                 if timedelta_since_last_update > timedelta(minutes=2):
-                    logging.critical('Tracker is not in progress. Elapsed time since last tracker update: %f seconds' %
+                    logging.warning('Tracker is not in progress. Elapsed time since last tracker update: %f seconds' %
                         timedelta_since_last_update.total_seconds())
                     tracking_in_progress = False
             tracker_client_entity = maybe_retrieve_tracker_client_entity(video_uuid, tracker_uuid)
             if tracker_client_entity is None:
                 tracking_in_progress = False
-                logging.critical('Tracker is not in progress. Tracker client entity is missing.')
+                logging.warning('Tracker is not in progress. Tracker client entity is missing.')
             else:
                 # If it's been more than two minutes, assume the tracker client is not connected.
                 timedelta_since_last_update = datetime.now(timezone.utc) - tracker_client_entity['update_time']
                 if timedelta_since_last_update > timedelta(minutes=2):
-                    logging.critical('Tracker is not in progress. Elapsed time since last tracker client update: %f seconds' %
+                    logging.warning('Tracker is not in progress. Elapsed time since last tracker client update: %f seconds' %
                         timedelta_since_last_update.total_seconds())
                     tracking_in_progress = False
             if not tracking_in_progress:
@@ -732,7 +732,7 @@ def retrieve_tracked_bboxes(video_uuid, tracker_uuid, retrieve_frame_number, tim
     tracker_entity = maybe_retrieve_tracker_entity(video_uuid, tracker_uuid)
     while True:
         if tracker_entity is None:
-            logging.critical('Tracker appears to have failed. Tracker entity is missing.')
+            logging.warning('Tracker appears to have failed. Tracker entity is missing.')
             return True, 0, ''
         if tracker_entity['frame_number'] == retrieve_frame_number:
             break
@@ -741,7 +741,7 @@ def retrieve_tracked_bboxes(video_uuid, tracker_uuid, retrieve_frame_number, tim
         # If it's been more than two minutes, assume the tracker has died.
         timedelta_since_last_update = datetime.now(timezone.utc) - tracker_entity['update_time']
         if timedelta_since_last_update > timedelta(minutes=2):
-            logging.critical('Tracker appears to have failed. Elapsed time since last tracker update: %f seconds' %
+            logging.warning('Tracker appears to have failed. Elapsed time since last tracker update: %f seconds' %
                 timedelta_since_last_update.total_seconds())
             tracker_stopping(tracker_entity['team_uuid'], tracker_entity['video_uuid'], tracker_uuid)
             tracker_failed = True