Add AnnotationSerializer

Author: XanderVertegaal

backend/annotation/serializers.py

@@ -1,5 +1,9 @@
 from rest_framework import serializers
-from annotation.models import ProblemAnnotation, KnowledgeBaseAnnotation
+from annotation.models import (
+    AnnotationSession,
+    ProblemAnnotation,
+    KnowledgeBaseAnnotation,
+)
 
 
 class KnowledgeBaseAnnotationSerializer(serializers.ModelSerializer):
@@ -33,23 +37,48 @@ def update(
 
 
 class ProblemAnnotationSerializer(serializers.ModelSerializer):
-    kb_items = KnowledgeBaseAnnotationSerializer(
-        many=True, source="session.kb_annotations"
-    )
 
     class Meta:
         model = ProblemAnnotation
         fields = [
             "id",
-            "entailment_label",
             "created_at",
+            "entailment_label",
+        ]
+
+
+class AnnotationSerializer(serializers.Serializer):
+    kbAnnotations = serializers.SerializerMethodField()
+    problemAnnotations = serializers.SerializerMethodField()
+
+    class Meta:
+        fields = [
+            "kbAnnotations",
+            "problemAnnotations",
         ]
 
-    def get_kb_items(self, problem_annotation: ProblemAnnotation):
-        """Get the KnowledgeBaseAnnotation items related to this ProblemAnnotation."""
+    def get_kbAnnotations(self, obj):
+        problem, last_session = self._get_problem_and_last_session()
+        if not problem or not last_session:
+            return []
         kb_annotations = KnowledgeBaseAnnotation.objects.filter(
-            session=problem_annotation.session
+            session=last_session, problem=problem
+        )
+        return KnowledgeBaseAnnotationSerializer(kb_annotations, many=True).data
+
+    def get_problemAnnotations(self, obj):
+        problem, last_session = self._get_problem_and_last_session()
+        problem_annotations = ProblemAnnotation.objects.filter(
+            session=last_session, problem=problem
+        )
+        return ProblemAnnotationSerializer(problem_annotations, many=True).data
+
+    def _get_problem_and_last_session(self):
+        problem = self.context.get("problem", None)
+        user = self.context.get("user", None)
+        if not problem or not user or user.is_authenticated is False:
+            return None, None
+        last_session = (
+            AnnotationSession.objects.filter(user=user).order_by("-created_at").first()
         )
-        return KnowledgeBaseAnnotationSerializer(
-            kb_annotations, many=True
-        ).data
+        return problem, last_session

backend/problem/models.py

@@ -1,7 +1,6 @@
 from django.db import models
 from django.db.models import QuerySet
 
-from problem.services import FracasData, SNLIData, SickData
 from langpro_annotator.logger import logger
 
 

backend/problem/serializers.py

@@ -1,12 +1,11 @@
 from rest_framework import serializers
 from annotation.models import (
     AnnotationSession,
-    ProblemAnnotation,
     KnowledgeBaseAnnotation,
 )
 from annotation.serializers import (
+    AnnotationSerializer,
     KnowledgeBaseAnnotationSerializer,
-    ProblemAnnotationSerializer,
 )
 from problem.services import FracasData, SNLIData, SickData
 from problem.models import Problem, Sentence
@@ -33,7 +32,7 @@ class Meta:
             "hypothesis",
             "entailmentLabel",
             "extraData",
-            "kbItems",
+            "annotation",
             "base",
         ]
 
@@ -58,9 +57,12 @@ def get_extraData(self, problem):
                 return {}
 
     def get_annotation(self, problem: Problem):
-        """Get the last annotation for the problem."""
-        annotation = problem.annotations.last()
-        return ProblemAnnotationSerializer(annotation).data if annotation else None
+        request = self.context.get("request")
+        if not request or not request.user:
+            return None
+        return AnnotationSerializer(
+            {}, context={"problem": problem, "user": request.user}
+        ).data
 
     def create(self, validated_data: dict) -> Problem:
         """

backend/problem/views/problem.py

@@ -125,7 +125,7 @@ def _handle_update_create_problem(
         input_serializer.is_valid(raise_exception=True)
         validated_input: dict = input_serializer.validated_data  # type: ignore
 
-        problem_serializer = ProblemSerializer()
+        problem_serializer = ProblemSerializer(context={"request": request})
 
         if problem_id is None:
             problem = problem_serializer.create(validated_input)  # type: ignore
@@ -140,4 +140,3 @@ def _handle_update_create_problem(
             status = HTTP_200_OK
 
         return Response({"id": problem.pk}, status=status)
-