Merge pull request #158 from biigle/patch-1

Fix filtering in process novelty/object detected image jobs
biigle · Feb 14, 2024 · 6020a3f · 6020a3f
2 parents c77e573 + 384f753
commit 6020a3f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 2 deletions.
diff --git a/src/Jobs/ProcessNoveltyDetectedImage.php b/src/Jobs/ProcessNoveltyDetectedImage.php
@@ -33,7 +33,8 @@ public function __construct(
     protected function getAnnotationQuery(VolumeFile $file): Builder
     {
         return TrainingProposal::where('image_id', $file->id)
-            ->where('job_id', $this->maiaJob->id);
+            ->where('job_id', $this->maiaJob->id)
+            ->when(!empty($this->only), fn ($q) => $q->whereIn('id', $this->only));
     }
 
     /**

diff --git a/src/Jobs/ProcessObjectDetectedImage.php b/src/Jobs/ProcessObjectDetectedImage.php
@@ -33,7 +33,8 @@ public function __construct(
     protected function getAnnotationQuery(VolumeFile $file): Builder
     {
         return AnnotationCandidate::where('image_id', $file->id)
-            ->where('job_id', $this->maiaJob->id);
+            ->where('job_id', $this->maiaJob->id)
+            ->when(!empty($this->only), fn ($q) => $q->whereIn('id', $this->only));
     }
 
     /**

diff --git a/tests/Jobs/ProcessNoveltyDetectedImageTest.php b/tests/Jobs/ProcessNoveltyDetectedImageTest.php
@@ -62,6 +62,29 @@ public function testGenerateFeatureVector()
         $this->assertEquals(range(0, 383), $vectors[0]->vector->toArray());
     }
 
+    public function testOnly()
+    {
+        $disk = Storage::fake('test');
+        $image = $this->getImageMock();
+        $proposal = TrainingProposal::factory()->create([
+            'points' => [200, 200, 10],
+        ]);
+        $proposal2 = TrainingProposal::factory()->create([
+            'points' => [200, 200, 10],
+            'image_id' => $proposal->image_id,
+            'job_id' => $proposal->job_id,
+        ]);
+        $job = new ProcessNoveltyDetectedImageStub($proposal->image, $proposal->job,
+            targetDisk: 'test', only: [$proposal->id]
+        );
+        $job->mock = $image;
+
+        $image->shouldReceive('crop')->once()->andReturn($image);
+        $image->shouldReceive('writeToBuffer')->andReturn('abc123');
+
+        $job->handleFile($proposal->image, 'abc');
+    }
+
     protected function getImageMock($times = 1)
     {
         $image = Mockery::mock();

diff --git a/tests/Jobs/ProcessObjectDetectedImageTest.php b/tests/Jobs/ProcessObjectDetectedImageTest.php
@@ -62,6 +62,29 @@ public function testGenerateFeatureVector()
         $this->assertEquals(range(0, 383), $vectors[0]->vector->toArray());
     }
 
+    public function testOnly()
+    {
+        $disk = Storage::fake('test');
+        $image = $this->getImageMock();
+        $candidate = AnnotationCandidate::factory()->create([
+            'points' => [200, 200, 10],
+        ]);
+        $candidate2 = AnnotationCandidate::factory()->create([
+            'points' => [200, 200, 10],
+            'image_id' => $candidate->image_id,
+            'job_id' => $candidate->job_id,
+        ]);
+        $job = new ProcessObjectDetectedImageStub($candidate->image, $candidate->job,
+            targetDisk: 'test', only: [$candidate->id]
+        );
+        $job->mock = $image;
+
+        $image->shouldReceive('crop')->once()->andReturn($image);
+        $image->shouldReceive('writeToBuffer')->andReturn('abc123');
+
+        $job->handleFile($candidate->image, 'abc');
+    }
+
     protected function getImageMock($times = 1)
     {
         $image = Mockery::mock();