Cleanup

Author: XanderVertegaal

backend/problem/management/commands/import_snli.py

@@ -19,7 +19,7 @@ def add_arguments(self, parser):
         )
 
     def handle(self, *args, **options):
-        snli_paths = [("development", "problem/data/snli_1.0_dev.txt")]
+        snli_paths = [("dev", "problem/data/snli_1.0_dev.txt")]
         if options["full"]:
             snli_paths.extend(
                 [

backend/problem/types.py

@@ -50,7 +50,7 @@ def serialize(self) -> dict:
 
 @dataclass(frozen=True)
 class SNLIProblem:
-    pair_id: str
+    pair_id: int
     subset: Literal["train", "dev", "test"]
     sentence_one: str
     sentence_two: str

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

@@ -75,37 +75,38 @@ export class AnnotationInputComponent {
         if (!response.problem) {
             return Judgement.UNKNOWN;
         }
-        if (response.type === "sick") {
-            switch (response.problem.entailmentLabel) {
-                case "ENTAILMENT":
-                    return Judgement.ENTAILMENT;
-                case "CONTRADICTION":
-                    return Judgement.CONTRADICTION;
-                case "NEUTRAL":
-                    return Judgement.NEUTRAL;
-            }
-        } else if (response.type === "fracas") {
-            switch (response.problem.fracasAnswer) {
-                case "yes":
-                    return Judgement.ENTAILMENT;
-                case "no":
-                    return Judgement.CONTRADICTION;
-                case "unknown":
-                    return Judgement.NEUTRAL;
-                case "undefined":
-                    return Judgement.UNKNOWN;
-            }
-        }
-        // SNLI
-        switch (response.problem.goldLabel) {
-            case "entailment":
-                return Judgement.ENTAILMENT;
-            case "contradiction":
-                return Judgement.CONTRADICTION;
-            case "neutral":
-                return Judgement.NEUTRAL;
-            case "none":
-                return Judgement.UNKNOWN;
+        switch (response.type) {
+            case Dataset.SICK:
+                switch (response.problem.entailmentLabel) {
+                    case "ENTAILMENT":
+                        return Judgement.ENTAILMENT;
+                    case "CONTRADICTION":
+                        return Judgement.CONTRADICTION;
+                    case "NEUTRAL":
+                        return Judgement.NEUTRAL;
+                }
+            case Dataset.FRACAS:
+                switch (response.problem.fracasAnswer) {
+                    case "yes":
+                        return Judgement.ENTAILMENT;
+                    case "no":
+                        return Judgement.CONTRADICTION;
+                    case "unknown":
+                        return Judgement.NEUTRAL;
+                    case "undefined":
+                        return Judgement.UNKNOWN;
+                }
+            case Dataset.SNLI:
+                switch (response.problem.goldLabel) {
+                    case "entailment":
+                        return Judgement.ENTAILMENT;
+                    case "contradiction":
+                        return Judgement.CONTRADICTION;
+                    case "neutral":
+                        return Judgement.NEUTRAL;
+                    case "none":
+                        return Judgement.UNKNOWN;
+                }
         }
     }
 

frontend/src/app/types.ts

@@ -23,16 +23,16 @@ type SNLILabel = "neutral" | "contradiction" | "entailment" | "none";
 
 export interface SNLIProblem {
     pairId: number;
-    subset: 'development' | 'test' | 'train';
+    subset: 'dev' | 'test' | 'train';
     sentenceOne: string;
     sentenceTwo: string;
     goldLabel: SNLILabel;
     labels: SNLILabel[];
 }
 
 interface ProblemResponseBase {
-    id: string;
-    index: string | null;
+    id: number;
+    index: number | null;
     error: string | null;
     next: string | null;
     previous: string | null;