Gs/generalized quality

cvat/apps/consensus/intersect_merge.py

@@ -16,11 +16,8 @@
 from datumaro.util.annotation_util import mean_bbox
 from datumaro.util.attrs_util import ensure_cls
 
-from cvat.apps.quality_control.quality_reports import (
-    ComparisonParameters,
-    DistanceComparator,
-    segment_iou,
-)
+from cvat.apps.quality_control.annotation_matching import DistanceComparator, segment_iou
+from cvat.apps.quality_control.comparison_report import ComparisonParameters
 
 
 @attrs.define(kw_only=True, slots=False)

cvat/apps/consensus/merging_manager.py

@@ -24,7 +24,8 @@
     clear_annotations_in_jobs,
 )
 from cvat.apps.profiler import silk_profile
-from cvat.apps.quality_control.quality_reports import ComparisonParameters, JobDataProvider
+from cvat.apps.quality_control.comparison_report import ComparisonParameters
+from cvat.apps.quality_control.quality_reports import JobDataProvider
 from cvat.apps.redis_handler.background import AbstractRequestManager
 
 

cvat/apps/consensus/migrations/0003_consensussettings_quorum.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.26 on 2026-04-09 09:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("consensus", "0002_remove_consensussettings_quorum"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="consensussettings",
+            name="quorum",
+            field=models.FloatField(default=0.5),
+        ),
+    ]

cvat/apps/consensus/models.py

@@ -4,15 +4,19 @@
 
 from __future__ import annotations
 
+from attrs import fields_dict
 from django.db import models
 
-import cvat.apps.quality_control.quality_reports as qc
 from cvat.apps.engine.models import Task
+from cvat.apps.quality_control.comparison_report import ComparisonParameters
+
+DEFAULT_CONSENSUS_IOU_THRESHOLD = fields_dict(ComparisonParameters)["iou_threshold"].default
 
 
 class ConsensusSettings(models.Model):
     task = models.ForeignKey(Task, on_delete=models.CASCADE, related_name="consensus_settings")
-    iou_threshold = models.FloatField(default=qc.DatasetComparator.DEFAULT_SETTINGS.iou_threshold)
+    quorum = models.FloatField(default=0.5)
+    iou_threshold = models.FloatField(default=DEFAULT_CONSENSUS_IOU_THRESHOLD)
 
     @property
     def organization_id(self):

cvat/apps/engine/filters.py

@@ -514,9 +514,8 @@ class NonModelJsonLogicFilter(JsonLogicFilter, _NestedAttributeHandler):
     def _apply_filter(self, rules, lookup_fields, obj):
         op, args = next(iter(rules.items()))
         if op in ["or", "and"]:
-            return reduce(
-                {"or": any, "and": all}[op],
-                [self._apply_filter(arg, lookup_fields, obj) for arg in args],
+            return {"or": any, "and": all}[op](
+                self._apply_filter(arg, lookup_fields, obj) for arg in args
             )
         elif op == "!":
             return not self._apply_filter(args, lookup_fields, obj)