Implement annotation-store rules directly in StoreImageAnnotation

biigle · Dec 20, 2024 · 296d0f9 · 296d0f9
1 parent ae7d882
commit 296d0f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 54 deletions.
diff --git a/app/Http/Requests/StoreImageAnnotation.php b/app/Http/Requests/StoreImageAnnotation.php
@@ -4,8 +4,9 @@
 
 use Biigle\Image;
 use Biigle\Shape;
+use Illuminate\Foundation\Http\FormRequest;
 
-class StoreImageAnnotation extends StoreImageAnnotationLabelFeatureVector
+class StoreImageAnnotation extends FormRequest
 {
     /**
      * The image on which the annotation should be created.
@@ -33,10 +34,13 @@ public function authorize()
      */
     public function rules()
     {
-        return array_merge(parent::rules(), [
+        return [
+            'label_id'    => 'required_without:feature_vector|integer|exists:labels,id',
+            'feature_vector' => 'required_without:label_id|array|size:384',
+            'confidence'  => 'required|numeric|between:0,1',
             'shape_id' => 'required|integer|exists:shapes,id',
             'points'   => 'required|array',
-        ]);
+        ];
     }
 
     /**

diff --git a/app/Http/Requests/StoreImageAnnotationLabelFeatureVector.php b/app/Http/Requests/StoreImageAnnotationLabelFeatureVector.php