Add multi-signal authority model

Author: webstackdev

core/tests/test_permissions.py

@@ -263,88 +263,95 @@ def test_reader_is_denied_contributor_and_admin_endpoints(self):
                 self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
     def test_member_can_use_contributor_endpoints_but_not_admin_only_ones(self):
-        _typed_client(self.client).force_authenticate(self.member_user)
+        with patch("entities.extraction.queue_entity_identity_enrichment"):
+            _typed_client(self.client).force_authenticate(self.member_user)
 
-        review_queue_response = self.client.get(
-            reverse(
-                "v1:project-review-queue-list",
-                kwargs={"project_id": _require_pk(self.project)},
+            review_queue_response = self.client.get(
+                reverse(
+                    "v1:project-review-queue-list",
+                    kwargs={"project_id": _require_pk(self.project)},
+                )
             )
-        )
-        self.assertEqual(review_queue_response.status_code, status.HTTP_200_OK)
+            self.assertEqual(review_queue_response.status_code, status.HTTP_200_OK)
 
-        source_config_response = self.client.post(
-            reverse(
-                "v1:project-source-config-list",
-                kwargs={"project_id": _require_pk(self.project)},
-            ),
-            {
-                "plugin_name": SourcePluginName.RSS,
-                "config": {"feed_url": "https://example.com/feed.xml"},
-                "is_active": True,
-            },
-            format="json",
-        )
-        self.assertEqual(source_config_response.status_code, status.HTTP_201_CREATED)
+            source_config_response = self.client.post(
+                reverse(
+                    "v1:project-source-config-list",
+                    kwargs={"project_id": _require_pk(self.project)},
+                ),
+                {
+                    "plugin_name": SourcePluginName.RSS,
+                    "config": {"feed_url": "https://example.com/feed.xml"},
+                    "is_active": True,
+                },
+                format="json",
+            )
+            self.assertEqual(
+                source_config_response.status_code, status.HTTP_201_CREATED
+            )
 
-        topic_summary_response = self.client.get(
-            reverse(
-                "v1:project-topic-centroid-snapshot-summary",
-                kwargs={"project_id": _require_pk(self.project)},
+            topic_summary_response = self.client.get(
+                reverse(
+                    "v1:project-topic-centroid-snapshot-summary",
+                    kwargs={"project_id": _require_pk(self.project)},
+                )
             )
-        )
-        self.assertEqual(topic_summary_response.status_code, status.HTTP_200_OK)
+            self.assertEqual(topic_summary_response.status_code, status.HTTP_200_OK)
 
-        accept_candidate_response = self.client.post(
-            reverse(
-                "v1:project-entity-candidate-accept",
-                kwargs={
-                    "project_id": _require_pk(self.project),
-                    "pk": _require_pk(self.entity_candidate),
-                },
-            ),
-            format="json",
-        )
-        self.assertEqual(accept_candidate_response.status_code, status.HTTP_200_OK)
+            accept_candidate_response = self.client.post(
+                reverse(
+                    "v1:project-entity-candidate-accept",
+                    kwargs={
+                        "project_id": _require_pk(self.project),
+                        "pk": _require_pk(self.entity_candidate),
+                    },
+                ),
+                format="json",
+            )
+            self.assertEqual(accept_candidate_response.status_code, status.HTTP_200_OK)
 
-        delete_own_feedback_response = self.client.delete(
-            reverse(
-                "v1:project-feedback-detail",
-                kwargs={
-                    "project_id": _require_pk(self.project),
-                    "pk": _require_pk(self.member_feedback),
-                },
+            delete_own_feedback_response = self.client.delete(
+                reverse(
+                    "v1:project-feedback-detail",
+                    kwargs={
+                        "project_id": _require_pk(self.project),
+                        "pk": _require_pk(self.member_feedback),
+                    },
+                )
+            )
+            self.assertEqual(
+                delete_own_feedback_response.status_code, status.HTTP_204_NO_CONTENT
             )
-        )
-        self.assertEqual(
-            delete_own_feedback_response.status_code, status.HTTP_204_NO_CONTENT
-        )
 
-        update_project_response = self.client.patch(
-            reverse("v1:project-detail", kwargs={"id": _require_pk(self.project)}),
-            {"name": "Member Update"},
-            format="json",
-        )
-        self.assertEqual(update_project_response.status_code, status.HTTP_403_FORBIDDEN)
+            update_project_response = self.client.patch(
+                reverse("v1:project-detail", kwargs={"id": _require_pk(self.project)}),
+                {"name": "Member Update"},
+                format="json",
+            )
+            self.assertEqual(
+                update_project_response.status_code, status.HTTP_403_FORBIDDEN
+            )
 
-        list_credentials_response = self.client.get(
-            reverse(
-                "v1:project-bluesky-credentials-list",
-                kwargs={"project_id": _require_pk(self.project)},
+            list_credentials_response = self.client.get(
+                reverse(
+                    "v1:project-bluesky-credentials-list",
+                    kwargs={"project_id": _require_pk(self.project)},
+                )
+            )
+            self.assertEqual(
+                list_credentials_response.status_code, status.HTTP_403_FORBIDDEN
             )
-        )
-        self.assertEqual(
-            list_credentials_response.status_code, status.HTTP_403_FORBIDDEN
-        )
 
-        rotate_token_response = self.client.post(
-            reverse(
-                "v1:project-rotate-intake-token",
-                kwargs={"id": _require_pk(self.project)},
-            ),
-            format="json",
-        )
-        self.assertEqual(rotate_token_response.status_code, status.HTTP_403_FORBIDDEN)
+            rotate_token_response = self.client.post(
+                reverse(
+                    "v1:project-rotate-intake-token",
+                    kwargs={"id": _require_pk(self.project)},
+                ),
+                format="json",
+            )
+            self.assertEqual(
+                rotate_token_response.status_code, status.HTTP_403_FORBIDDEN
+            )
 
     def test_member_cannot_delete_other_users_feedback(self):
         _typed_client(self.client).force_authenticate(self.member_user)

entities/admin.py

@@ -174,7 +174,9 @@ class EntityCandidateAdmin(admin.ModelAdmin):
         "project",
         "suggested_type",
         "occurrence_count",
+        "cluster_key",
         "status",
+        "auto_promotion_blocked_reason",
         "merged_into",
         "first_seen_in",
         "created_at",
@@ -196,7 +198,7 @@ def accept_selected_candidates(self, request, queryset):
         for candidate in queryset.select_related("project"):
             if candidate.status == EntityCandidateStatus.ACCEPTED:
                 continue
-            accept_entity_candidate(candidate)
+            accept_entity_candidate(candidate, schedule_enrichment=True)
             accepted_count += 1
         self.message_user(
             request,
@@ -238,7 +240,11 @@ def merge_into_existing_entities(
             if matching_entities.count() != 1:
                 unresolved_names.append(candidate.name)
                 continue
-            merge_entity_candidate(candidate, matching_entities.get())
+            merge_entity_candidate(
+                candidate,
+                matching_entities.get(),
+                schedule_enrichment=True,
+            )
             merged_count += 1
 
         if merged_count:

entities/api.py

@@ -13,17 +13,17 @@
     build_crud_action_overrides,
     document_project_owned_viewset,
 )
-from entities.extraction import (
-    accept_entity_candidate,
-    merge_entity_candidate,
-    reject_entity_candidate,
-)
 from core.permissions import (
     IsProjectAdmin,
     IsProjectContributor,
     IsProjectMember,
     IsProjectMemberWritable,
 )
+from entities.extraction import (
+    accept_entity_candidate,
+    merge_entity_candidate,
+    reject_entity_candidate,
+)
 from entities.models import Entity, EntityCandidate, EntityMention
 from entities.serializers import (
     EntityAuthoritySnapshotSerializer,
@@ -55,6 +55,7 @@ class EntityViewSet(ProjectOwnedQuerysetMixin, viewsets.ModelViewSet):
     queryset = (
         Entity.objects.select_related("project")
         .annotate(mention_count=Count("mentions", distinct=True))
+        .prefetch_related("identity_claims")
         .prefetch_related(
             Prefetch(
                 "mentions",
@@ -180,7 +181,7 @@ def accept(self, request, *args, **kwargs):
         """Accept an entity candidate and return its updated representation."""
 
         candidate = self.get_object()
-        accept_entity_candidate(candidate)
+        accept_entity_candidate(candidate, schedule_enrichment=True)
         candidate.refresh_from_db()
         serializer = self.get_serializer(candidate)
         return Response(serializer.data)
@@ -226,7 +227,11 @@ def merge(self, request, *args, **kwargs):
             context=self.get_serializer_context(),
         )
         serializer.is_valid(raise_exception=True)
-        merge_entity_candidate(candidate, serializer.validated_data["merged_into"])
+        merge_entity_candidate(
+            candidate,
+            serializer.validated_data["merged_into"],
+            schedule_enrichment=True,
+        )
         candidate.refresh_from_db()
         response_serializer = self.get_serializer(candidate)
         return Response(response_serializer.data)