Merge pull request #113 from CentreForDigitalHumanities/feature/conflict-label

Feature/conflict label

Author: XanderVertegaal

backend/annotation/migrations/0004_alter_problemannotation_entailment_label.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.30 on 2026-06-08 09:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("annotation", "0003_labelannotation_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="problemannotation",
+            name="entailment_label",
+            field=models.CharField(
+                choices=[
+                    ("neutral", "Neutral"),
+                    ("entailment", "Entailment"),
+                    ("contradiction", "Contradiction"),
+                    ("conflict", "Conflict"),
+                    ("unknown", "Unknown"),
+                ],
+                default="unknown",
+                max_length=255,
+            ),
+        ),
+    ]

backend/problem/management/commands/import_fracas.py

@@ -14,7 +14,7 @@ class Command(BaseCommand):
     ENTAILMENT_LABELS = {
         "yes": Problem.EntailmentLabel.ENTAILMENT,
         "no": Problem.EntailmentLabel.CONTRADICTION,
-        "unknown": Problem.EntailmentLabel.NEUTRAL,
+        "unknown": Problem.EntailmentLabel.CONFLICT,
         "undefined": Problem.EntailmentLabel.UNKNOWN,
     }
 

backend/problem/migrations/0009_alter_problem_entailment_label.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.30 on 2026-06-08 09:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("problem", "0008_delete_knowledgebase"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="problem",
+            name="entailment_label",
+            field=models.CharField(
+                choices=[
+                    ("neutral", "Neutral"),
+                    ("entailment", "Entailment"),
+                    ("contradiction", "Contradiction"),
+                    ("conflict", "Conflict"),
+                    ("unknown", "Unknown"),
+                ],
+                default="unknown",
+                max_length=255,
+            ),
+        ),
+    ]

backend/problem/models.py

@@ -19,6 +19,7 @@ class EntailmentLabel(models.TextChoices):
         NEUTRAL = "neutral", "Neutral"
         ENTAILMENT = "entailment", "Entailment"
         CONTRADICTION = "contradiction", "Contradiction"
+        CONFLICT = "conflict", "Conflict"
         UNKNOWN = "unknown", "Unknown"
 
     dataset = models.CharField(

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

@@ -28,6 +28,8 @@ export class EntailmentLabelBadgeComponent {
                 return "badge text-bg-secondary";
             case EntailmentLabel.UNKNOWN:
                 return "badge text-bg-warning";
+            case EntailmentLabel.CONFLICT:
+                return "badge text-bg-dark";
         }
     });
 }

frontend/src/app/shared/displayTextMappings.ts

@@ -5,6 +5,7 @@ export const entailmentLabels: Record<EntailmentLabel, string> = {
     [EntailmentLabel.CONTRADICTION]: $localize`Contradiction`,
     [EntailmentLabel.NEUTRAL]: $localize`Neutral`,
     [EntailmentLabel.UNKNOWN]: $localize`Unknown`,
+    [EntailmentLabel.CONFLICT]: $localize`Conflict`,
 };
 
 export const datasetLabels: Record<Dataset, string> = {

frontend/src/app/types.ts

@@ -123,6 +123,7 @@ export enum EntailmentLabel {
     ENTAILMENT = "entailment",
     CONTRADICTION = "contradiction",
     NEUTRAL = "neutral",
+    CONFLICT = "conflict",
     UNKNOWN = "unknown",
 }