Merge branch 'master' into plain-torch

Author: mzur

src/Http/Controllers/Api/AnnotationCandidateController.php

@@ -43,7 +43,7 @@ public function index($id)
         $job = MaiaJob::findOrFail($id);
         $this->authorize('access', $job);
 
-        return $job->annotationCandidates()
+        $query = $job->annotationCandidates()
             ->join('images', 'images.id', '=', 'maia_annotation_candidates.image_id')
             ->select(
                 'maia_annotation_candidates.id',
@@ -53,12 +53,18 @@ public function index($id)
                 'images.uuid as uuid'
             )
             ->orderBy('score', 'desc')
-            ->with('label')
-            ->get()
-            ->each(function ($candidate) {
-                $candidate->makeHidden('label_id');
-            })
-            ->toArray();
+            ->orderBy('id', 'desc')
+            ->with('label');
+
+        $yieldItems = function () use ($query): \Generator {
+            foreach ($query->lazy() as $item) {
+                $item->makeHidden('label_id');
+                yield $item;
+            }
+        };
+
+        // Use a streamed response because there can be a lot of items.
+        return response()->streamJson($yieldItems());
     }
 
     /**

src/Http/Controllers/Api/TrainingProposalController.php

@@ -43,7 +43,7 @@ public function index($id)
         $job = MaiaJob::findOrFail($id);
         $this->authorize('access', $job);
 
-        return $job->trainingProposals()
+        $query = $job->trainingProposals()
             ->join('images', 'images.id', '=', 'maia_training_proposals.image_id')
             ->select(
                 'maia_training_proposals.id',
@@ -52,8 +52,16 @@ public function index($id)
                 'images.uuid as uuid'
             )
             ->orderBy('score', 'desc')
-            ->get()
-            ->toArray();
+            ->orderBy('id', 'desc');
+
+        $yieldItems = function () use ($query): \Generator {
+            foreach ($query->lazy() as $item) {
+                yield $item;
+            }
+        };
+
+        // Use a streamed response because there can be a lot of items.
+        return response()->streamJson($yieldItems());
     }
 
     /**

src/Http/Controllers/Views/MaiaJobController.php

@@ -136,6 +136,7 @@ public function show(Request $request, $id)
             ->url(':prefix/:id.'.config('largo.patch_format'));
 
         $tpLimit = config('maia.training_proposal_limit');
+        $acLimit = config('maia.annotation_candidate_limit');
 
         return view('maia::show', compact(
             'job',
@@ -144,7 +145,8 @@ public function show(Request $request, $id)
             'trees',
             'tpUrlTemplate',
             'acUrlTemplate',
-            'tpLimit'
+            'tpLimit',
+            'acLimit'
         ));
     }
 }

src/Jobs/DetectionJob.php

@@ -250,6 +250,29 @@ protected function createMaiaAnnotation($annotation)
         ];
     }
 
+    /**
+     * Apply the limit for the maximum number of annotations.
+     *
+     * @param array $annotations
+     * @param int $limit
+     *
+     * @return array
+     */
+    protected function maybeLimitAnnotations($annotations, $limit)
+    {
+        if (count($annotations) <= $limit) {
+            return $annotations;
+        }
+
+        usort($annotations, function ($a, $b) {
+            // The fourth array element is the score of the annotation. We want to sort
+            // the annotations by descending scores.
+            return round($b[4] - $a[4]);
+        });
+
+        return array_slice($annotations, 0, $limit);
+    }
+
     /**
      * Insert one chunk of the MAIA annotations that should be created into the database.
      *

src/Jobs/NoveltyDetection.php

@@ -102,29 +102,6 @@ protected function getTmpDirPath()
         return parent::getTmpDirPath()."-novelty-detection";
     }
 
-    /**
-     * Apply the limit for the maximum number of annotations.
-     *
-     * @param array $annotations
-     * @param int $limit
-     *
-     * @return array
-     */
-    protected function maybeLimitAnnotations($annotations, $limit)
-    {
-        if (count($annotations) <= $limit) {
-            return $annotations;
-        }
-
-        usort($annotations, function ($a, $b) {
-            // The fourth array element is the score of the annotation. We want to sort
-            // the annotations by descending scores.
-            return round($b[4] - $a[4]);
-        });
-
-        return array_slice($annotations, 0, $limit);
-    }
-
     /**
      * {@inheritdoc}
      */

src/Jobs/ObjectDetection.php

@@ -92,6 +92,8 @@ public function handle()
         $this->performInference($images, $output[0], $output[1]);
 
         $annotations = $this->parseAnnotations($images);
+        $limit = config('maia.annotation_candidate_limit');
+        $annotations = $this->maybeLimitAnnotations($annotations, $limit);
 
         // Make sure to roll back any DB modifications if an error occurs.
         DB::transaction(function () use ($annotations) {

src/config/maia.php

@@ -14,6 +14,13 @@
     */
     'training_proposal_limit' => 50000,
 
+    /*
+    | Maximum number of automatically generated annottation candidates that are created
+    | for a job. The limit applies to the list of annotation candidates sorted by
+    | confidence score in descending order. Set to INF to allow any number.
+    */
+    'annotation_candidate_limit' => 100000,
+
     /*
     | Storage disk where the annotation candidate patch images will be stored
     */

src/public/assets/main-CdD9oKBL.js src/public/assets/main-BsJxabry.jssrc/public/assets/main-CdD9oKBL.js renamed to src/public/assets/main-BsJxabry.js

@@ -1,6 +1,6 @@
 {
   "src/resources/assets/js/main.js": {
-    "file": "assets/main-CdD9oKBL.js",
+    "file": "assets/main-BsJxabry.js",
     "name": "main",
     "src": "src/resources/assets/js/main.js",
     "isEntry": true

src/public/manifest.json

@@ -1,6 +1,14 @@
 <template>
     <div class="sidebar-tab__content sidebar-tab__content--maia">
         <div class="maia-tab-content__top">
+            <p class="lead">
+                {{selectedCandidatesCount}} of {{candidatesCount}} selected
+            </p>
+            <div v-if="reachedLimit" class="panel panel-warning">
+                <div class="panel-body text-warning">
+                    This job reached the allowed maximum of {{candidatesLimit}} annotation candidates!
+                </div>
+            </div>
             <label-trees
                 :trees="labelTrees"
                 :show-favourites="true"
@@ -41,6 +49,23 @@ export default {
             type: Array,
             required: true,
         },
+        candidatesCount: {
+            type: Number,
+            required: true,
+        },
+        selectedCandidatesCount: {
+            type: Number,
+            required: true,
+        },
+        candidatesLimit: {
+            type: Number,
+            default: Infinity,
+        },
+    },
+    computed: {
+        reachedLimit() {
+            return this.candidatesCount >= this.candidatesLimit;
+        },
     },
     methods: {
         handleSelectedLabel(label) {