Remove AnnotationSerializer

Author: XanderVertegaal

backend/annotation/serializers.py

@@ -142,45 +142,6 @@ def get_removable(self, annotation: LabelAnnotation) -> bool:
 
         return False
 
-
-class AnnotationSerializer(serializers.Serializer):
-    kbAnnotations = serializers.SerializerMethodField()
-    labelAnnotations = serializers.SerializerMethodField()
-
-    class Meta:
-        fields = ["kbAnnotations", "labelAnnotations"]
-
-    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(
-            problem=problem, session=last_session, removed_at__isnull=True
-        )
-        return KnowledgeBaseAnnotationSerializer(kb_annotations, many=True).data
-
-    def get_labelAnnotations(self, obj):
-        problem, last_session = self._get_problem_and_last_session()
-        if not problem or not last_session:
-            return []
-        label_annotations = LabelAnnotation.objects.filter(
-            problem=problem, session=last_session, removed_at__isnull=True
-        )
-        return LabelAnnotationSerializer(
-            label_annotations, many=True, context=self.context
-        ).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 problem, last_session
-
-
 class SelectedLabelSerializer(serializers.Serializer):
     """Serializer for a selected label in the save labels input."""
 

backend/problem/serializers.py

@@ -1,12 +1,10 @@
 from rest_framework import serializers
 
-from annotation.serializers import (
-    AnnotationSerializer,
-    KnowledgeBaseAnnotationSerializer,
-)
+from annotation.serializers import KnowledgeBaseAnnotationSerializer, LabelAnnotationSerializer
 from annotation.models import (
     AnnotationSession,
     KnowledgeBaseAnnotation,
+    LabelAnnotation,
 )
 from problem.services import FracasData, SNLIData, SickData
 from problem.models import Problem, Sentence
@@ -23,7 +21,8 @@ class ProblemSerializer(serializers.ModelSerializer):
     hypothesis = serializers.SerializerMethodField()
     entailmentLabel = serializers.CharField(source="entailment_label")
     extraData = serializers.SerializerMethodField()
-    annotations = serializers.SerializerMethodField()
+    kbAnnotations = serializers.SerializerMethodField()
+    labelAnnotations = serializers.SerializerMethodField()
 
     class Meta:
         model = Problem
@@ -35,18 +34,19 @@ class Meta:
             "entailmentLabel",
             "extraData",
             "base",
-            "annotations",
+            "kbAnnotations",
+            "labelAnnotations",
         ]
 
-    def get_premises(self, problem):
+    def get_premises(self, problem: Problem):
         """Get list of premise texts."""
         return [premise.text for premise in problem.premises.all()]
 
-    def get_hypothesis(self, problem):
+    def get_hypothesis(self, problem: Problem):
         """Get hypothesis text."""
         return problem.hypothesis.text
 
-    def get_extraData(self, problem):
+    def get_extraData(self, problem: Problem):
         """Get dataset-specific extra data."""
         match problem.dataset:
             case Problem.Dataset.SICK:
@@ -58,17 +58,20 @@ def get_extraData(self, problem):
             case _:
                 return {}
 
-    def get_annotations(self, problem: Problem):
-        request = self.context.get("request", None)
-        if not request or not request.user:
-            return None
-        return AnnotationSerializer(
-            {},
-            context={
-                "problem": problem,
-                "user": request.user,
-            },
-        ).data
+    def get_kbAnnotations(self, problem: Problem):
+        """Get knowledge base annotations for the problem."""
+        kb_annotations = KnowledgeBaseAnnotation.objects.filter(
+            problem=problem, removed_at__isnull=True
+        )
+        kb_data =  KnowledgeBaseAnnotationSerializer(kb_annotations, many=True).data
+        return kb_data
+
+    def get_labelAnnotations(self, problem: Problem):
+        """Get label annotations for the problem."""
+        label_annotations = LabelAnnotation.objects.filter(
+            problem=problem, removed_at__isnull=True
+        )
+        return LabelAnnotationSerializer(label_annotations, many=True).data
 
 
 class ProblemInputSerializer(serializers.Serializer):

frontend/src/app/annotate/annotation-input/annotation-input.component.ts

@@ -162,7 +162,7 @@ export class AnnotationInputComponent implements OnInit {
     }
 
     private buildForm(problem: Problem): ParseInputForm {
-        const kbItems = this.buildKbForms(problem.annotations?.kbAnnotations ?? []);
+        const kbItems = this.buildKbForms(problem.kbAnnotations ?? []);
 
         return new FormGroup({
             id: new FormControl<number | null>(problem.id, {

frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts

@@ -79,7 +79,7 @@ export class ProblemDetailsComponent {
             baseProblemId: problem.base?.toString() ?? null,
             dataset: problem.dataset,
             entailmentLabel: problem.entailmentLabel,
-            labelAnnotations: problem.annotations?.labelAnnotations ?? [],
+            labelAnnotations: problem.labelAnnotations ?? [],
         };
 
         switch (problem.dataset) {

frontend/src/app/services/problem.service.ts

@@ -132,15 +132,13 @@ export class ProblemService {
                 premises: existingProblem?.premises ?? [],
                 entailmentLabel: EntailmentLabel.UNKNOWN,
                 extraData: null,
-                annotations: {
-                    kbAnnotations: existingProblem?.annotations?.kbAnnotations.map(annotation => ({
-                        ...annotation, id: null,
-                    })) ?? [],
-                    labelAnnotations: existingProblem?.annotations?.labelAnnotations.map(annotation => ({
-                        ...annotation,
-                        id: null,
-                    })) ?? [],
-                }
+                kbAnnotations: existingProblem?.kbAnnotations.map(annotation => ({
+                    ...annotation, id: null,
+                })) ?? [],
+                labelAnnotations: existingProblem?.labelAnnotations.map(annotation => ({
+                    ...annotation,
+                    id: null,
+                })) ?? [],
             }
         };
     }

frontend/src/app/types.ts

@@ -58,18 +58,14 @@ export interface LabelAnnotation extends BaseAnnotation {
     attachedByCurrentUser: boolean;
 }
 
-interface Annotation {
-    kbAnnotations: KnowledgeBaseAnnotation[];
-    labelAnnotations: LabelAnnotation[];
-}
-
 interface ProblemBase {
     id: number | null;
     base: number | null;
     premises: string[];
     hypothesis: string | null;
     entailmentLabel: EntailmentLabel;
-    annotations: Annotation | null;
+    kbAnnotations: KnowledgeBaseAnnotation[];
+    labelAnnotations: LabelAnnotation[];
 }
 
 interface SickProblem extends ProblemBase {