Skip to content
Snippets Groups Projects
Commit 0ab24751 authored by ml bonhomme's avatar ml bonhomme :bee: Committed by Erwan Rouchet
Browse files

Remove EntityRole and EntityLink models

parent c60099a0
No related branches found
No related tags found
1 merge request!2289Remove EntityRole and EntityLink models
This commit is part of merge request !2289. Comments created here will be created in the context of that merge request.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 876 additions and 1703 deletions
arkindex/documents/admin.py
+ 0
− 17
View file @ 0ab24751
......@@ -11,8 +11,6 @@ from arkindex.documents.models import (
Element,
ElementType,
Entity,
EntityLink,
EntityRole,
EntityType,
MetaData,
MLClass,
......@@ -135,29 +133,15 @@ class EntityMetaForm(forms.ModelForm):
metas = HStoreFormField()
class EntityLinkInLine(admin.TabularInline):
model = EntityLink
fk_name = "parent"
raw_id_fields = ("child", )
class EntityAdmin(admin.ModelAdmin):
list_display = ("id", "name", "type")
list_filter = ["corpus", "type"]
readonly_fields = ("id", )
raw_id_fields = ("worker_version", "worker_run", )
search_fields = ("name", )
inlines = (EntityLinkInLine, )
form = EntityMetaForm
class EntityRoleAdmin(admin.ModelAdmin):
list_display = ("id", "corpus", "parent_name", "child_name")
list_filter = ("corpus", )
readonly_fields = ("id", )
ordering = ("corpus", "parent_name", "child_name")
class EntityTypeAdmin(admin.ModelAdmin):
list_display = ("id", "corpus", "name", "color")
list_filter = ("corpus", )
......@@ -180,7 +164,6 @@ admin.site.register(Transcription, TranscriptionAdmin)
admin.site.register(MLClass, MLClassAdmin)
admin.site.register(MetaData, MetaDataAdmin)
admin.site.register(Entity, EntityAdmin)
admin.site.register(EntityRole, EntityRoleAdmin)
admin.site.register(EntityType, EntityTypeAdmin)
admin.site.register(AllowedMetaData, AllowedMetaDataAdmin)
admin.site.register(CorpusExport, CorpusExportAdmin)
arkindex/documents/api/entities.py
+ 3
− 118
View file @ 0ab24751
......@@ -3,32 +3,18 @@ from textwrap import dedent
from uuid import UUID
from django.core.exceptions import ValidationError as DjangoValidationError
from django.db.models import Q
from django.shortcuts import get_object_or_404
from drf_spectacular.utils import OpenApiExample, OpenApiParameter, OpenApiResponse, extend_schema, extend_schema_view
from drf_spectacular.utils import OpenApiParameter, OpenApiResponse, extend_schema, extend_schema_view
from rest_framework import permissions, serializers, status
from rest_framework.exceptions import NotFound, PermissionDenied, ValidationError
from rest_framework.generics import CreateAPIView, ListAPIView, ListCreateAPIView, RetrieveUpdateDestroyAPIView
from rest_framework.generics import CreateAPIView, ListAPIView, RetrieveUpdateDestroyAPIView
from rest_framework.response import Response
from arkindex.documents.models import (
Corpus,
Element,
Entity,
EntityLink,
EntityRole,
EntityType,
Transcription,
TranscriptionEntity,
)
from arkindex.documents.models import Corpus, Element, Entity, EntityType, Transcription, TranscriptionEntity
from arkindex.documents.serializers.elements import ElementTinySerializer
from arkindex.documents.serializers.entities import (
BaseEntitySerializer,
CreateEntityRoleErrorResponseSerializer,
EntityCreateSerializer,
EntityLinkCreateSerializer,
EntityLinkSerializer,
EntityRoleSerializer,
EntitySerializer,
EntityTypeCreateSerializer,
EntityTypeSerializer,
......@@ -44,53 +30,6 @@ from arkindex.project.permissions import IsVerified, IsVerifiedOrReadOnly
from arkindex.users.models import Role
@extend_schema(tags=["entities"])
@extend_schema_view(
get=extend_schema(operation_id="ListCorpusRoles", description="List all roles of a corpus"),
post=extend_schema(
description="Create a new entity role",
responses={
200: EntityRoleSerializer,
400: CreateEntityRoleErrorResponseSerializer
},
examples=[OpenApiExample(
status_codes=["400"],
response_only=True,
name="role-exists",
value={"id": "55cd009d-cd4b-4ec2-a475-b060f98f9138", "corpus": ["Role already exists in this corpus"]},
description="Role already exists."
)]
)
)
class CorpusRoles(CorpusACLMixin, ListCreateAPIView):
"""
List all roles in a corpus
"""
permission_classes = (IsVerifiedOrReadOnly, )
serializer_class = EntityRoleSerializer
queryset = EntityRole.objects.none()
def get_queryset(self):
return EntityRole.objects \
.filter(corpus=self.get_corpus(self.kwargs["pk"])) \
.order_by("parent_name", "child_name")
def perform_create(self, serializer):
data = self.request.data
if EntityRole.objects.filter(
parent_name=data["parent_name"],
child_name=data["child_name"],
parent_type=data["parent_type_id"],
child_type=data["child_type_id"],
corpus_id=self.request.parser_context["kwargs"]["pk"]
).exists():
raise serializers.ValidationError({
"corpus": ["Role already exists in this corpus"],
"id": self.request.parser_context["kwargs"]["pk"]
})
super().perform_create(serializer)
@extend_schema(tags=["entities"])
@extend_schema_view(
get=extend_schema(operation_id="ListCorpusEntityTypes", description="List all entity types in a corpus"),
......@@ -173,8 +112,6 @@ class EntityTypeUpdate(ACLMixin, RetrieveUpdateDestroyAPIView):
def perform_destroy(self, instance):
if instance.entities.exists():
raise ValidationError({"detail": ["Some entities are using this entity type."]})
if EntityRole.objects.filter(Q(parent_type_id=instance.id) | Q(child_type_id=instance.id)).exists():
raise ValidationError({"detail": ["Some entity roles are using this entity type."]})
super().perform_destroy(instance)
......@@ -196,14 +133,6 @@ class EntityDetails(ACLMixin, RetrieveUpdateDestroyAPIView):
.select_related("corpus", "type") \
.filter(corpus__in=Corpus.objects.readable(self.request.user)) \
.prefetch_related(
"parents__role__parent_type",
"parents__role__child_type",
"children__role__parent_type",
"children__role__child_type",
"parents__child__type",
"parents__parent__type",
"children__parent__type",
"children__child__type",
"corpus",
)
......@@ -307,15 +236,6 @@ class EntityCreate(CreateAPIView):
return Response(entity.data, status=status_code, headers=headers)
@extend_schema_view(post=extend_schema(operation_id="CreateEntityLink", tags=["entities"]))
class EntityLinkCreate(CreateAPIView):
"""
Create a new link between two entities with a role
"""
permission_classes = (IsVerified, )
serializer_class = EntityLinkCreateSerializer
@extend_schema_view(post=extend_schema(
operation_id="CreateTranscriptionEntity",
tags=["entities"],
......@@ -519,41 +439,6 @@ class CorpusEntities(CorpusACLMixin, ListAPIView):
return queryset
@extend_schema_view(get=extend_schema(operation_id="ListElementLinks", tags=["entities"]))
class ElementLinks(CorpusACLMixin, ListAPIView):
"""
List all links where parent and child are linked to the element.\n\n
Requires a **guest** access to the element corpus
"""
serializer_class = EntityLinkSerializer
def get_queryset(self):
try:
element = Element.objects.select_related("corpus").only("id", "corpus").get(id=self.kwargs["pk"])
except Element.DoesNotExist:
raise NotFound
if not self.has_read_access(element.corpus):
raise PermissionDenied(detail="You do not have access to this element.")
# Load entities linked by transcriptions
entities_tr = Entity.objects.filter(transcriptions__element_id=element.id).prefetch_related("transcriptions")
# Load entities linked by metadatas
entities_meta = Entity.objects.filter(metadatas__element_id=element.id).prefetch_related("metadatas")
# Now load all links belonging to those entities
# It's several times faster to combine the queries in the final one
# than combining them at the lower level (entities is slower than entities_tr + entities_meta)
# We need to support cross references between transcriptions & metadata entities
return EntityLink.objects.filter(
Q(parent__in=entities_tr, child__in=entities_tr)
| Q(parent__in=entities_tr, child__in=entities_meta)
| Q(parent__in=entities_meta, child__in=entities_tr)
| Q(parent__in=entities_meta, child__in=entities_meta)
).select_related("role", "child__type", "parent__type").order_by("parent__name")
@extend_schema_view(
post=extend_schema(
operation_id="CreateTranscriptionEntities",
......
arkindex/documents/export/__init__.py
+ 0
− 2
View file @ 0ab24751
......@@ -38,8 +38,6 @@ EXPORT_QUERIES = [
"entity_type",
"entity",
"transcription_entity",
"entity_role",
"entity_link",
"metadata",
"dataset",
"dataset_element",
......
arkindex/documents/export/entity_link.sql deleted 100644 → 0
+ 0
− 4
View file @ c60099a0
SELECT link.id, link.parent_id, link.child_id, link.role_id
FROM documents_entitylink link
INNER JOIN documents_entityrole role ON (link.role_id = role.id)
WHERE role.corpus_id = '{corpus_id}'::uuid
arkindex/documents/export/entity_role.sql deleted 100644 → 0
+ 0
− 3
View file @ c60099a0
SELECT id, parent_name, child_name, parent_type_id, child_type_id
FROM documents_entityrole
WHERE corpus_id = '{corpus_id}'::uuid
arkindex/documents/export/indexes.sql
+ 0
− 7
View file @ 0ab24751
......@@ -26,13 +26,6 @@ CREATE INDEX transcription_entity_entity_id ON transcription_entity (entity_id);
CREATE INDEX transcription_entity_worker_version_id ON transcription_entity (worker_version_id);
CREATE INDEX transcription_entity_worker_run_id ON transcription_entity (worker_run_id);
CREATE INDEX entity_link_parent_id ON entity_link (parent_id);
CREATE INDEX entity_link_child_id ON entity_link (child_id);
CREATE INDEX entity_link_role_id ON entity_link (role_id);
CREATE INDEX entity_role_parent_type_id ON entity_role (parent_type_id);
CREATE INDEX entity_role_child_type_id ON entity_role (child_type_id);
CREATE INDEX metadata_element_id ON metadata (element_id);
CREATE INDEX metadata_entity_id ON metadata (entity_id);
CREATE INDEX metadata_worker_version_id ON metadata (worker_version_id);
......
arkindex/documents/export/structure.sql
+ 1
− 24
View file @ 0ab24751
PRAGMA foreign_keys = ON;
CREATE TABLE export_version AS SELECT 8 AS version;
CREATE TABLE export_version AS SELECT 9 AS version;
CREATE TABLE image_server (
id INTEGER NOT NULL,
......@@ -168,29 +168,6 @@ CREATE TABLE transcription_entity (
CHECK (worker_run_id IS NULL OR worker_version_id IS NOT NULL)
);
CREATE TABLE entity_role (
id VARCHAR(37) NOT NULL,
parent_name VARCHAR(250) NOT NULL,
child_name VARCHAR(250) NOT NULL,
parent_type_id VARCHAR(37) NOT NULL,
child_type_id VARCHAR(37) NOT NULL,
PRIMARY KEY (id),
FOREIGN KEY (parent_type_id) REFERENCES entity_type (id) ON DELETE CASCADE,
FOREIGN KEY (child_type_id) REFERENCES entity_type (id) ON DELETE CASCADE,
UNIQUE (parent_name, child_name, parent_type_id, child_type_id)
);
CREATE TABLE entity_link (
id VARCHAR(37) NOT NULL,
parent_id VARCHAR(37) NOT NULL,
child_id VARCHAR(37) NOT NULL,
role_id VARCHAR(37) NOT NULL,
PRIMARY KEY (id),
FOREIGN KEY (parent_id) REFERENCES entity (id),
FOREIGN KEY (child_id) REFERENCES entity (id),
FOREIGN KEY (role_id) REFERENCES entity_role (id)
);
CREATE TABLE metadata (
id VARCHAR(37) NOT NULL,
element_id VARCHAR(37) NOT NULL,
......
arkindex/documents/fixtures/data.json
+ 820
− 890
View file @ 0ab24751
This diff is collapsed.
arkindex/documents/management/commands/load_export.py
+ 2
− 28
View file @ 0ab24751
......@@ -18,8 +18,6 @@ from arkindex.documents.models import (
ElementPath,
ElementType,
Entity,
EntityLink,
EntityRole,
EntityType,
MetaData,
MLClass,
......@@ -40,7 +38,7 @@ from arkindex.process.models import (
from arkindex.training.models import Dataset, DatasetElement, DatasetSet, Model
from arkindex.users.models import Role, User
EXPORT_VERSION = 8
EXPORT_VERSION = 9
TABLE_NAMES = {
"export_version",
......@@ -52,8 +50,6 @@ TABLE_NAMES = {
"element_path",
"entity",
"entity_type",
"entity_role",
"entity_link",
"transcription",
"transcription_entity",
"metadata",
......@@ -132,8 +128,6 @@ SQL_TOP_LEVEL_PATH_QUERY = """
SQL_ENTITY_QUERY = "SELECT * FROM entity"
SQL_ENTITY_TYPE_QUERY = "SELECT * FROM entity_type"
SQL_ENTITY_ROLE_QUERY = "SELECT * FROM entity_role"
SQL_ENTITY_LINK_QUERY = "SELECT * FROM entity_link"
SQL_TRANSCRIPTION_QUERY = "SELECT * FROM transcription"
SQL_TRANSCRIPTION_ENTITY_QUERY = "SELECT * FROM transcription_entity"
......@@ -249,24 +243,6 @@ class Command(BaseCommand):
corpus=self.corpus
)]
def convert_entity_roles(self, row):
return [EntityRole(
id=row["id"],
parent_name=row["parent_name"],
child_name=row["child_name"],
parent_type_id=row["parent_type_id"],
child_type_id=row["child_type_id"],
corpus=self.corpus
)]
def convert_entity_links(self, row):
return [EntityLink(
id=row["id"],
parent_id=row["parent_id"],
child_id=row["child_id"],
role_id=row["role_id"],
)]
def convert_transcriptions(self, row):
return [Transcription(
id=row["id"],
......@@ -597,11 +573,9 @@ class Command(BaseCommand):
self.bulk_create_objects(ElementPath, self.convert_element_paths, SQL_ELEMENT_PATH_QUERY, ignore_conflicts=False)
self.bulk_create_objects(ElementPath, self.convert_top_level_paths, SQL_TOP_LEVEL_PATH_QUERY, ignore_conflicts=False)
# Create entities, entity types, roles and links
# Create entities and entity types
self.bulk_create_objects(EntityType, self.convert_entity_types, SQL_ENTITY_TYPE_QUERY)
self.bulk_create_objects(Entity, self.convert_entities, SQL_ENTITY_QUERY)
self.bulk_create_objects(EntityRole, self.convert_entity_roles, SQL_ENTITY_ROLE_QUERY)
self.bulk_create_objects(EntityLink, self.convert_entity_links, SQL_ENTITY_LINK_QUERY)
# Create transcriptions and transcription entities
self.bulk_create_objects(Transcription, self.convert_transcriptions, SQL_TRANSCRIPTION_QUERY)
......
arkindex/documents/management/commands/merge_entities.py
+ 0
− 18
View file @ 0ab24751
......@@ -135,24 +135,6 @@ class Command(BaseCommand):
""")
self.stdout.write(f"Updated {cursor.rowcount} TranscriptionEntities.")
self.stdout.write("Updating child entity IDs on entity links…")
cursor.execute("""
UPDATE documents_entitylink
SET child_id = keep_id
FROM duplicated_entities
WHERE child_id = remove_id;
""")
self.stdout.write(f"Updated {cursor.rowcount} entity links.")
self.stdout.write("Updating parent entity IDs on entity links…")
cursor.execute("""
UPDATE documents_entitylink
SET parent_id = keep_id
FROM duplicated_entities
WHERE parent_id = remove_id;
""")
self.stdout.write(f"Updated {cursor.rowcount} entity links.")
self.stdout.write("Removing duplicate entities…")
cursor.execute("""
DELETE FROM documents_entity
......
arkindex/documents/migrations/0010_delete_entityrole_entitylink.py 0 → 100644
+ 35
− 0
View file @ 0ab24751
# Generated by Django 4.1.7 on 2024-04-15 12:36
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("documents", "0009_corpusexport_source"),
]
operations = [
migrations.AlterUniqueTogether(
name="entityrole",
unique_together=None,
),
migrations.RemoveField(
model_name="entityrole",
name="child_type",
),
migrations.RemoveField(
model_name="entityrole",
name="corpus",
),
migrations.RemoveField(
model_name="entityrole",
name="parent_type",
),
migrations.DeleteModel(
name="EntityLink",
),
migrations.DeleteModel(
name="EntityRole",
),
]
arkindex/documents/models.py
+ 0
− 57
View file @ 0ab24751
......@@ -769,63 +769,6 @@ class Entity(models.Model):
return self.name
class EntityRole(models.Model):
"""
Role's type between a parent and a child
"""
parent_name = models.CharField(max_length=250)
child_name = models.CharField(max_length=250)
parent_type = models.ForeignKey(EntityType, related_name="parent_role", on_delete=models.DO_NOTHING)
child_type = models.ForeignKey(EntityType, related_name="child_role", on_delete=models.DO_NOTHING)
corpus = models.ForeignKey(Corpus, related_name="roles", on_delete=models.CASCADE)
class Meta:
unique_together = (
("parent_name", "child_name", "parent_type", "child_type", "corpus"),
)
def __str__(self):
return "{} -> {}".format(self.parent_name, self.child_name)
class EntityLink(models.Model):
"""
Link between two entities with a role
"""
id = models.UUIDField(default=uuid.uuid4, primary_key=True, editable=False)
parent = models.ForeignKey(Entity, related_name="parents", on_delete=models.CASCADE)
child = models.ForeignKey(Entity, related_name="children", on_delete=models.CASCADE)
role = models.ForeignKey(EntityRole, related_name="links", on_delete=models.CASCADE)
def clean(self):
if self.role is None:
return
if self.parent is None:
return
if self.parent.type_id != self.role.parent_type_id:
raise ValidationError("Parent's type {} is different from the expected type {}".format(
self.parent.type_id,
self.role.parent_type_id))
if self.parent.corpus_id != self.role.corpus_id:
raise ValidationError("Parent's corpus {} is different from the expected corpus {}".format(
self.parent.corpus_id,
self.role.corpus_id))
if self.child is None:
return
if self.child.type_id != self.role.child_type_id:
raise ValidationError("Child's type {} is different from the expected type {}".format(
self.child.type_id,
self.role.child_type_id))
if self.child.corpus_id != self.role.corpus_id:
raise ValidationError("Child's corpus {} is different from the expected corpus {}".format(
self.child.corpus_id,
self.role.corpus_id))
def save(self, *args, **kwargs):
self.full_clean()
super().save(*args, **kwargs)
class TextOrientation(Enum):
HorizontalLeftToRight = "horizontal-lr"
HorizontalRightToLeft = "horizontal-rl"
......
arkindex/documents/serializers/entities.py
+ 1
− 126
View file @ 0ab24751
......@@ -6,7 +6,7 @@ from drf_spectacular.utils import extend_schema_serializer
from rest_framework import serializers
from rest_framework.exceptions import ValidationError
from arkindex.documents.models import Corpus, Entity, EntityLink, EntityRole, EntityType, TranscriptionEntity
from arkindex.documents.models import Corpus, Entity, EntityType, TranscriptionEntity
from arkindex.documents.serializers.light import CorpusLightSerializer, EntityTypeLightSerializer
from arkindex.documents.serializers.ml import WorkerRunSummarySerializer
from arkindex.project.serializer_fields import ForbiddenField, WorkerRunIDField
......@@ -86,79 +86,6 @@ class BaseEntitySerializer(serializers.ModelSerializer):
)
class EntityRoleSerializer(serializers.ModelSerializer):
"""
Serialize a role between two types of entity
"""
parent_type_id = serializers.PrimaryKeyRelatedField(
queryset=EntityType.objects.all(),
style={"base_template": "input.html"},
source="parent_type",
)
child_type_id = serializers.PrimaryKeyRelatedField(
queryset=EntityType.objects.all(),
style={"base_template": "input.html"},
source="child_type",
)
class Meta:
model = EntityRole
fields = (
"id",
"parent_name",
"child_name",
"parent_type_id",
"child_type_id"
)
def validate(self, data):
errors = defaultdict(list)
assert "corpus" not in data
assert self.context.get("request") is not None
corpus_id = self.context["request"].parser_context["kwargs"]["pk"]
corpus = Corpus.objects.writable(self.context["request"].user).filter(id=corpus_id).first()
if corpus is None:
raise serializers.ValidationError({
"corpus": ["You do not have write access to this corpus"],
"id": corpus_id,
})
parent_type = data.get("parent_type")
child_type = data.get("child_type")
if parent_type.corpus_id != corpus.id:
errors["parent_type_id"].append(f"Type {parent_type.id} does not exist in corpus {corpus}.")
if child_type.corpus_id != corpus.id:
errors["child_type_id"].append(f"Type {child_type.id} does not exist in corpus {corpus}.")
if errors:
raise ValidationError(errors)
data["corpus"] = corpus
return data
class CreateEntityRoleErrorResponseSerializer(serializers.Serializer):
id = serializers.UUIDField(required=False, help_text="The corpus ID.")
corpus = serializers.ListField(child=serializers.CharField(), required=False, help_text="Errors that occurred during corpus ID field validation.")
class EntityLinkSerializer(serializers.ModelSerializer):
"""
Serialize an entity link with its child, parent and role
"""
parent = BaseEntitySerializer()
child = BaseEntitySerializer()
role = EntityRoleSerializer()
class Meta:
model = EntityLink
fields = (
"id",
"parent",
"child",
"role"
)
@extend_schema_serializer(
deprecate_fields=("worker_version_id")
)
......@@ -167,8 +94,6 @@ class EntitySerializer(BaseEntitySerializer):
Serialize an entity with its metadata
"""
corpus = CorpusLightSerializer(read_only=True)
children = EntityLinkSerializer(many=True, read_only=True)
parents = EntityLinkSerializer(many=True, read_only=True)
# When updating an entity, the type can be set either by using its EntityType UUID, or its name
# (in which case the serializer checks that an EntityType with this name exists in the corpus)
type_id = serializers.PrimaryKeyRelatedField(
......@@ -183,14 +108,10 @@ class EntitySerializer(BaseEntitySerializer):
model = Entity
fields = BaseEntitySerializer.Meta.fields + (
"corpus",
"children",
"parents",
"type_id"
)
read_only_fields = BaseEntitySerializer.Meta.read_only_fields = (
"corpus",
"children",
"parents",
)
def validate(self, data):
......@@ -221,8 +142,6 @@ class EntityCreateSerializer(BaseEntitySerializer):
style={"base_template": "input.html"},
)
metas = serializers.HStoreField(child=serializers.CharField(), required=False)
children = EntityLinkSerializer(many=True, read_only=True)
parents = EntityLinkSerializer(many=True, read_only=True)
worker_version = serializers.UUIDField(
allow_null=True,
required=False,
......@@ -262,15 +181,11 @@ class EntityCreateSerializer(BaseEntitySerializer):
"metas",
"validated",
"corpus",
"parents",
"children",
"worker_version",
"worker_run_id"
)
read_only_fields = (
"id",
"children",
"parents",
)
def __init__(self, *args, **kwargs):
......@@ -300,46 +215,6 @@ class EntityCreateSerializer(BaseEntitySerializer):
return data
class EntityLinkCreateSerializer(EntityLinkSerializer):
"""
Serialize an entity with a possible parents and children
"""
parent = serializers.PrimaryKeyRelatedField(
queryset=Entity.objects.none(),
style={"base_template": "input.html"},
)
child = serializers.PrimaryKeyRelatedField(
queryset=Entity.objects.none(),
style={"base_template": "input.html"},
)
role = serializers.PrimaryKeyRelatedField(
queryset=EntityRole.objects.none(),
style={"base_template": "input.html"},
)
class Meta:
model = EntityLink
fields = EntityLinkSerializer.Meta.fields
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if not self.context.get("request"):
# Do not raise Error in order to create OpenAPI schema
return
corpora = Corpus.objects.writable(self.context["request"].user)
entities = Entity.objects.all().filter(corpus__in=corpora)
roles = EntityRole.objects.all().filter(corpus__in=corpora)
self.fields["parent"].queryset = entities
self.fields["child"].queryset = entities
self.fields["role"].queryset = roles
def validate(self, data):
data = super().validate(data)
link = EntityLink(**data)
link.full_clean()
return data
class TranscriptionEntityCreateSerializer(serializers.ModelSerializer):
"""
Serialise the link between an entity and a transcription
......
arkindex/documents/tasks.py
+ 0
− 3
View file @ 0ab24751
......@@ -16,7 +16,6 @@ from arkindex.documents.models import (
Corpus,
Element,
ElementPath,
EntityLink,
MetaData,
Selection,
Transcription,
......@@ -58,8 +57,6 @@ def corpus_delete(corpus_id: str) -> None:
WorkerActivity.objects.filter(process__corpus_id=corpus_id),
corpus.files.all(),
MetaData.objects.filter(element__corpus_id=corpus_id),
EntityLink.objects.filter(role__corpus_id=corpus_id),
corpus.roles.all(),
TranscriptionEntity.objects.filter(entity__corpus_id=corpus_id),
TranscriptionEntity.objects.filter(transcription__element__corpus_id=corpus_id),
corpus.entities.all(),
......
arkindex/documents/tests/commands/test_load_export.py
+ 0
− 28
View file @ 0ab24751
......@@ -48,8 +48,6 @@ class TestLoadExport(FixtureTestCase):
"documents.elementpath": [],
"documents.entity": [],
"documents.entitytype": [],
"documents.entityrole": [],
"documents.entitylink": [],
"documents.transcription": [],
"documents.transcriptionentity": [],
"documents.metadata": ["index"],
......@@ -162,13 +160,6 @@ class TestLoadExport(FixtureTestCase):
validated=True,
moderator=self.superuser,
)
role = self.corpus.roles.create(
parent_name="parent",
child_name="child",
parent_type=location_type,
child_type=person_type,
)
role.links.create(parent=entity1, child=entity2)
transcription.transcription_entities.create(
entity=entity1,
......@@ -251,7 +242,6 @@ class TestLoadExport(FixtureTestCase):
self.assertEqual(corpus.ml_classes.all().count(), 0)
self.assertEqual(corpus.elements.all().count(), 0)
self.assertEqual(corpus.entities.all().count(), 0)
self.assertEqual(corpus.roles.all().count(), 0)
@patch("arkindex.documents.export.os.unlink")
@patch("arkindex.project.aws.s3.Object")
......@@ -273,10 +263,6 @@ class TestLoadExport(FixtureTestCase):
dataset_set = Dataset.objects.first().sets.first()
DatasetElement.objects.create(set=dataset_set, element=element)
person_type = EntityType.objects.get(
name="person",
corpus=self.corpus
)
location_type = EntityType.objects.get(
name="location",
corpus=self.corpus
......@@ -286,19 +272,6 @@ class TestLoadExport(FixtureTestCase):
name="Arrokuda",
type=location_type,
)
entity2 = self.corpus.entities.create(
name="Stonjourner",
type=person_type,
validated=True,
moderator=self.superuser,
)
role = self.corpus.roles.create(
parent_name="parent",
child_name="child",
parent_type=location_type,
child_type=person_type,
)
role.links.create(parent=entity1, child=entity2)
transcription.transcription_entities.create(
entity=entity1,
......@@ -329,7 +302,6 @@ class TestLoadExport(FixtureTestCase):
self.assertEqual(corpus.ml_classes.all().count(), 1)
self.assertEqual(corpus.elements.all().count(), 0)
self.assertEqual(corpus.entities.all().count(), 0)
self.assertEqual(corpus.roles.all().count(), 0)
def test_create_worker(self):
repo_uuid = Repository.objects.get(url="http://my_repo.fake/workers/worker").id
......
arkindex/documents/tests/commands/test_merge_entities.py
+ 0
− 36
View file @ 0ab24751
......@@ -72,20 +72,6 @@ class TestMergeEntities(FixtureTestCase):
element.metadatas.create(type=MetaType.Text, name="something", value="dupe", entity=entity1)
element.metadatas.create(type=MetaType.Text, name="something", value="dupe", entity=entity2)
role = self.corpus.roles.create(
parent_type=self.person_type,
child_type=self.person_type,
parent_name="parent",
child_name="child",
)
# entity1 and entity2 are duplicates, so the deduplication would cause those links to be duplicates,
# but there are no constraints at all on EntityLinks, so there will not be any deletions.
role.links.create(parent=entity1, child=unique_entity)
role.links.create(parent=entity2, child=unique_entity)
# Nothing will stop an entity from being linked to itself either.
role.links.create(parent=entity1, child=entity2)
transcription = element.transcriptions.get()
worker_version = WorkerVersion.objects.first()
worker_run = WorkerRun.objects.first()
......@@ -158,10 +144,6 @@ class TestMergeEntities(FixtureTestCase):
Deleted 1 TranscriptionEntities.
Updating entity IDs on TranscriptionEntities…
Updated 1 TranscriptionEntities.
Updating child entity IDs on entity links…
Updated 1 entity links.
Updating parent entity IDs on entity links…
Updated 1 entity links.
Removing duplicate entities…
Removed 1 duplicate entities from corpus Unit Tests.
""").strip()
......@@ -195,24 +177,6 @@ class TestMergeEntities(FixtureTestCase):
]
)
self.assertListEqual(
list(role.links.order_by("parent_id", "child_id").values("parent_id", "child_id")),
[
{
"parent_id": entity1.id,
"child_id": entity1.id,
},
{
"parent_id": entity1.id,
"child_id": unique_entity.id,
},
{
"parent_id": entity1.id,
"child_id": unique_entity.id,
},
]
)
self.assertListEqual(
list(transcription.transcription_entities.order_by("id").values("entity_id", "offset", "length", "worker_version_id", "worker_run_id")),
[
......
arkindex/documents/tests/tasks/test_corpus_delete.py
+ 0
− 16
View file @ 0ab24751
......@@ -89,22 +89,6 @@ class TestDeleteCorpus(FixtureTestCase):
person_type = EntityType.objects.get(name="person", corpus=cls.corpus)
entity1 = cls.corpus.entities.create(name="Magnemite", type=person_type)
entity2 = cls.corpus.entities.create(
name="Magneton",
type=person_type,
worker_version=cls.worker_version,
worker_run=worker_run,
)
role = cls.corpus.roles.create(
parent_name="origin",
child_name="evolution",
parent_type=person_type,
child_type=person_type,
)
# Note: .parents means the EntityLinks where this entity is the parent,
# so they actually are the entity's children, and .children maps to the links to the entity's parents!
entity1.parents.create(child=entity2, role=role)
Transcription.objects.filter(element__corpus=cls.corpus).first().transcription_entities.create(
entity=entity1,
......
arkindex/documents/tests/tasks/test_export.py
+ 1
− 38
View file @ 0ab24751
......@@ -14,7 +14,6 @@ from arkindex.documents.models import (
Classification,
CorpusExportState,
ElementPath,
EntityLink,
EntityType,
MetaData,
MetaType,
......@@ -32,8 +31,6 @@ TABLE_NAMES = {
"element",
"element_path",
"entity",
"entity_link",
"entity_role",
"entity_type",
"image",
"image_server",
......@@ -108,13 +105,6 @@ class TestExport(FixtureTestCase):
validated=True,
moderator=self.superuser,
)
role = self.corpus.roles.create(
parent_name="parent",
child_name="child",
parent_type=location_type,
child_type=person_type,
)
role.links.create(parent=entity1, child=entity2)
transcription.transcription_entities.create(
entity=entity1,
......@@ -169,7 +159,7 @@ class TestExport(FixtureTestCase):
)
self.assertCountEqual(
db.execute("SELECT version FROM export_version").fetchall(), [(8, )]
db.execute("SELECT version FROM export_version").fetchall(), [(9, )]
)
self.assertCountEqual(
......@@ -423,33 +413,6 @@ class TestExport(FixtureTestCase):
]
)
self.assertCountEqual(
db.execute("SELECT id, parent_name, child_name, parent_type_id, child_type_id FROM entity_role").fetchall(),
[
(
str(role.id),
role.parent_name,
role.child_name,
str(role.parent_type.id),
str(role.child_type.id),
)
for role in self.corpus.roles.all()
]
)
self.assertCountEqual(
db.execute("SELECT id, parent_id, child_id, role_id FROM entity_link").fetchall(),
[
(
str(link.id),
str(link.parent_id),
str(link.child_id),
str(link.role_id)
)
for link in EntityLink.objects.filter(role__corpus=self.corpus)
]
)
self.assertCountEqual(
db.execute("""
SELECT
......
arkindex/documents/tests/test_entities.py
+ 1
− 41
View file @ 0ab24751
from django.core.exceptions import ValidationError
from arkindex.documents.models import Corpus, Entity, EntityLink, EntityRole, EntityType, MetaData, MetaType
from arkindex.documents.models import Corpus, Entity, EntityType, MetaData, MetaType
from arkindex.process.models import WorkerVersion
from arkindex.project.tests import FixtureTestCase
......@@ -33,46 +33,6 @@ class TestSaveEntities(FixtureTestCase):
name="child",
worker_version=worker_version,
)
cls.role = EntityRole.objects.create(
parent_name="organization",
child_name="person",
parent_type=cls.org_type,
child_type=cls.person_type,
corpus=cls.corpus1,
)
cls.link = EntityLink(parent=cls.parent, child=cls.child, role=cls.role)
def test_parent_type_different(self):
self.parent.corpus = self.corpus1
self.child.corpus = self.corpus1
self.parent.type = self.person_type
self.child.type = self.person_type
with self.assertRaises(ValidationError):
self.link.save()
def test_parent_corpus_different(self):
self.parent.corpus = self.corpus2
self.child.corpus = self.corpus1
self.parent.type = self.org_type
self.child.type = self.person_type
with self.assertRaises(ValidationError):
self.link.save()
def test_child_type_different(self):
self.parent.corpus = self.corpus1
self.child.corpus = self.corpus1
self.parent.type = self.org_type
self.child.type = self.org_type
with self.assertRaises(ValidationError):
self.link.save()
def test_child_corpus_different(self):
self.parent.corpus = self.corpus1
self.child.corpus = self.corpus2
self.parent.type = self.org_type
self.child.type = self.person_type
with self.assertRaises(ValidationError):
self.link.save()
def test_save_entity_in_metadata(self):
self.parent.corpus = self.corpus2
......
arkindex/documents/tests/test_entities_api.py
+ 12
− 247
View file @ 0ab24751
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment