Added taxon on photoprediction response

Author: epou

api/serializers.py

@@ -1429,6 +1429,7 @@ class Meta:
     photo = SimplePhotoSerializer(read_only=True)
     bbox = BoundingBoxSerializer(source='*')
     scores = PredictionScoreSerializer(source='*')
+    taxon = SimpleTaxonSerializer(allow_null=True, read_only=True)
 
     class Meta:
         model = PhotoPrediction
@@ -1437,6 +1438,7 @@ class Meta:
             'bbox',
             'insect_confidence',
             'predicted_class',
+            'taxon',
             'threshold_deviation',
             'is_decisive',
             'scores',

api/tests/integration/identification_tasks/predictions/create.tavern.yml

@@ -91,6 +91,7 @@ stages:
           y_max: 0.5
         insect_confidence: 0.9
         predicted_class: 'ae_albopictus'
+        taxon: !anything
         is_decisive: false
         threshold_deviation: 0.9
         scores:

api/tests/integration/identification_tasks/predictions/schema.yml

@@ -15,6 +15,7 @@ variables:
       y_max: !anyfloat
     insect_confidence: !anyfloat
     predicted_class: !anystr
+    taxon: !anything
     is_decisive: !anybool
     threshold_deviation: !anyfloat
     scores:

api/tests/integration/photos/predictions/schema.yml

@@ -15,6 +15,7 @@ variables:
       y_max: !anyfloat
     insect_confidence: !anyfloat
     predicted_class: !anystr
+    taxon: !anything
     is_decisive: !anybool
     threshold_deviation: !anyfloat
     scores:

api/tests/test_views.py

@@ -217,6 +217,19 @@ def test_is_decisive_False_does_not_set_identification_task(self, api_client, id
         assert (identification_task.result_source == IdentificationTask.ResultSource.AI) == is_decisive
         assert identification_task.report.published == is_decisive
 
+    def test_taxon_is_null(self, api_client, user, identification_task):
+        photo = identification_task.photo
+        photo_prediction = create_photo_prediction(photo=photo)
+        PhotoPrediction.objects.filter(pk=photo_prediction.pk).update(taxon=None)
+
+        grant_permission_to_user(type='view', model_class=PhotoPrediction, user=user)
+
+        response = api_client.get(
+            self.build_url(identification_task=identification_task, photo_uuid=photo.uuid),
+            format='json'
+        )
+        assert response.status_code == status.HTTP_200_OK
+        assert response.data['taxon'] is None
 
 @pytest.mark.django_db
 class TestTokenAPI:

api/views.py

@@ -433,7 +433,7 @@ class PhotoViewSet(
         permission_classes=GenericNoMobileViewSet.permission_classes,
         parser_classes=GenericViewSet.parser_classes,
         serializer_class=PhotoPredictionSerializer,
-        queryset=PhotoPrediction.objects.all(),
+        queryset=PhotoPrediction.objects.all().select_related("taxon"),
         lookup_field='photo__uuid',
         filter_backends=[]
     )
@@ -567,7 +567,7 @@ def assign_next(self, request):
         ]
     )
     class PhotoPredictionViewSet(IdentificationTaskNestedAttribute, NestedViewSetMixin, CreateModelMixin, RetrieveModelMixin, ListModelMixin, UpdateModelMixin, DestroyModelMixin, GenericNoMobileViewSet):
-        queryset = PhotoPrediction.objects.all()
+        queryset = PhotoPrediction.objects.all().select_related("taxon")
         permission_classes = (PhotoPredictionPermissions, )
 
         parent_lookup_kwargs = {