From 63aa2860de468c70ba07a04b19c98e982e48810c Mon Sep 17 00:00:00 2001
From: Eva Bardou <ebardou@teklia.com>
Date: Thu, 9 Apr 2020 14:04:23 +0000
Subject: [PATCH] Remove model Event and enum EventType
---
README.md | 1 -
arkindex/dataimport/api.py | 22 +-
arkindex/dataimport/iiif.py | 12 +-
.../dataimport/migrations/0001_initial.py | 7 +-
.../migrations/0004_remove_event.py | 20 +
arkindex/dataimport/models.py | 23 +-
arkindex/dataimport/serializers/git.py | 22 +-
arkindex/dataimport/tests/test_iiif.py | 25 -
arkindex/documents/admin.py | 7 +-
arkindex/documents/consumers.py | 3 +-
arkindex/documents/fixtures/data.json | 949 +++++++++---------
arkindex/documents/serializers/elements.py | 3 -
.../tests/consumers/test_corpus_consumer.py | 11 +-
arkindex/project/api_v1.py | 3 +-
14 files changed, 501 insertions(+), 607 deletions(-)
create mode 100644 arkindex/dataimport/migrations/0004_remove_event.py
diff --git a/README.md b/README.md
index a031a6d27a..a82045aaf9 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,6 @@ SHELL_PLUS_POST_IMPORTS = [
('arkindex_common.enums', '*'),
('arkindex.dataimport.models', (
'DataImportMode',
- 'EventType',
)),
('arkindex.project.aws', (
'S3FileStatus',
diff --git a/arkindex/dataimport/api.py b/arkindex/dataimport/api.py
index edc06672e7..6709534531 100644
--- a/arkindex/dataimport/api.py
+++ b/arkindex/dataimport/api.py
@@ -17,11 +17,11 @@ from arkindex.project.permissions import IsVerified, IsAdminUser
from arkindex.project.openapi import AutoSchema
from arkindex.documents.models import Corpus, Right, Element
from arkindex.dataimport.models import \
- DataImport, DataFile, Repository, Event, EventType
+ DataImport, DataFile, Repository
from arkindex.dataimport.serializers.ml_tool import MLToolSerializer, MLToolTaskSerializer
from arkindex.dataimport.serializers.files import DataFileSerializer, DataFileCreateSerializer
from arkindex.dataimport.serializers.git import \
- RepositorySerializer, RepositoryStartImportSerializer, ExternalRepositorySerializer, EventSerializer
+ RepositorySerializer, RepositoryStartImportSerializer, ExternalRepositorySerializer
from arkindex.dataimport.serializers.imports import (
DataImportLightSerializer, DataImportSerializer,
DataImportFromFilesSerializer, ElementsWorkflowSerializer
@@ -203,7 +203,6 @@ class DataImportFromFiles(CreateAPIView):
name=folder_name,
type=corpus.types.get(slug=folder_type_slug),
)
- folder.events.create(type=EventType.Addition)
payload = {
'folder_type': folder_type_slug,
@@ -565,23 +564,6 @@ class RepositoryStartImport(RetrieveAPIView):
return Response(self.get_serializer(di).data)
-class ElementHistory(ListAPIView):
- """
- List an element's update history
- """
- serializer_class = EventSerializer
- openapi_overrides = {
- 'security': [],
- 'tags': ['elements'],
- }
-
- def get_queryset(self):
- return Event.objects.filter(
- element_id=self.kwargs['pk'],
- element__corpus__in=Corpus.objects.readable(self.request.user),
- )
-
-
class MLToolList(ListAPIView):
"""
List available machine learning tools
diff --git a/arkindex/dataimport/iiif.py b/arkindex/dataimport/iiif.py
index d226e8cc28..c97ef2a147 100644
--- a/arkindex/dataimport/iiif.py
+++ b/arkindex/dataimport/iiif.py
@@ -12,7 +12,7 @@ from django.db import transaction
from arkindex_common.enums import MetaType
from arkindex.documents.models import Corpus, Element, ElementType, MetaData
from arkindex.images.models import ImageServer, Zone
-from arkindex.dataimport.models import Revision, EventType
+from arkindex.dataimport.models import Revision
from arkindex.project.polygon import Polygon
from arkindex.project.tools import random_string, get_or_instance
@@ -364,10 +364,6 @@ class ManifestParser(IIIFParser):
self.folder_changed = True
page.zone.save()
page.save()
- page.events.create(
- revision=self.revision,
- type=EventType.Addition,
- )
# Create path or update ordering
page.add_parent(self.folder, order=i)
page.metadatas.create(
@@ -387,12 +383,6 @@ class ManifestParser(IIIFParser):
logger.info('Removing {} deleted pages...'.format(len(deleted_pages)))
deleted_pages.delete()
- if self.is_new or self.folder_changed:
- self.folder.events.get_or_create(
- revision=self.revision,
- defaults={'type': EventType.Addition if self.is_new else EventType.Edit},
- )
-
def run(self):
try:
self.parse()
diff --git a/arkindex/dataimport/migrations/0001_initial.py b/arkindex/dataimport/migrations/0001_initial.py
index 56f88c425e..e89683990c 100644
--- a/arkindex/dataimport/migrations/0001_initial.py
+++ b/arkindex/dataimport/migrations/0001_initial.py
@@ -7,8 +7,13 @@ import arkindex_common.enums
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import enumfields.fields
+from enumfields import Enum
import uuid
+class EventType(Enum):
+ Addition = 'A'
+ Edit = 'M'
+ Deletion = 'D'
class Migration(migrations.Migration):
@@ -52,7 +57,7 @@ class Migration(migrations.Migration):
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('created', models.DateTimeField(auto_now_add=True)),
('updated', models.DateTimeField(auto_now=True)),
- ('type', enumfields.fields.EnumField(enum=arkindex.dataimport.models.EventType, max_length=10)),
+ ('type', enumfields.fields.EnumField(enum=EventType, max_length=10)),
],
options={
'ordering': ['element_id', '-created'],
diff --git a/arkindex/dataimport/migrations/0004_remove_event.py b/arkindex/dataimport/migrations/0004_remove_event.py
new file mode 100644
index 0000000000..7e064158aa
--- /dev/null
+++ b/arkindex/dataimport/migrations/0004_remove_event.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2.11 on 2020-04-09 12:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dataimport', '0003_initial'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='revision',
+ name='elements',
+ ),
+ migrations.DeleteModel(
+ name='Event',
+ ),
+ ]
diff --git a/arkindex/dataimport/models.py b/arkindex/dataimport/models.py
index a7ce06da1b..cab092b0f9 100644
--- a/arkindex/dataimport/models.py
+++ b/arkindex/dataimport/models.py
@@ -3,7 +3,7 @@ from django.contrib.postgres.fields import JSONField
from django.conf import settings
from django.utils.functional import cached_property
from rest_framework.exceptions import ValidationError
-from enumfields import EnumField, Enum
+from enumfields import EnumField
from arkindex_common.enums import DataImportMode, DataImportPDFEngine
from arkindex.project.aws import S3FileModelMixin
from arkindex.project.models import IndexableModel
@@ -287,7 +287,6 @@ class Revision(IndexableModel):
ref = models.CharField(max_length=50)
message = models.TextField()
author = models.CharField(max_length=50)
- elements = models.ManyToManyField('documents.Element', through='dataimport.Event', related_name='revisions')
class Meta:
unique_together = (('repo', 'hash'), )
@@ -311,23 +310,3 @@ class Revision(IndexableModel):
def __str__(self):
return '{} "{}" by {}'.format(self.hash[:8], self.message.splitlines()[0], self.author)
-
-
-class EventType(Enum):
- Addition = 'A'
- Edit = 'M'
- Deletion = 'D'
-
-
-class Event(models.Model):
- id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
- created = models.DateTimeField(auto_now_add=True)
- updated = models.DateTimeField(auto_now=True)
- element = models.ForeignKey('documents.Element', on_delete=models.CASCADE, related_name='events')
- revision = models.ForeignKey(
- 'dataimport.Revision', on_delete=models.CASCADE, related_name='events', blank=True, null=True)
- type = EnumField(EventType, max_length=10)
-
- class Meta:
- unique_together = (('element', 'revision'), )
- ordering = ['element_id', '-created']
diff --git a/arkindex/dataimport/serializers/git.py b/arkindex/dataimport/serializers/git.py
index c3638d2ab6..cf0d6ed5a6 100644
--- a/arkindex/dataimport/serializers/git.py
+++ b/arkindex/dataimport/serializers/git.py
@@ -1,7 +1,6 @@
from rest_framework import serializers
-from arkindex.project.serializer_fields import EnumField
from arkindex.documents.models import Corpus
-from arkindex.dataimport.models import DataImport, Repository, Revision, Event, EventType
+from arkindex.dataimport.models import DataImport, Repository, Revision
import gitlab.v4.objects
@@ -99,22 +98,3 @@ class ExternalRepositorySerializer(serializers.Serializer):
'corpus': Corpus.objects.writable(self.context['request'].user)
.get(id=data['corpus'])
}
-
-
-class EventSerializer(serializers.ModelSerializer):
- """
- Serialize a diff event for an element on a revision
- """
-
- type = EnumField(EventType)
- revision = RevisionSerializer()
- date = serializers.DateTimeField(source='created')
-
- class Meta:
- model = Event
- fields = (
- 'id',
- 'type',
- 'date',
- 'revision',
- )
diff --git a/arkindex/dataimport/tests/test_iiif.py b/arkindex/dataimport/tests/test_iiif.py
index f4a1b95bc1..276dcf9642 100644
--- a/arkindex/dataimport/tests/test_iiif.py
+++ b/arkindex/dataimport/tests/test_iiif.py
@@ -4,7 +4,6 @@ from arkindex_common.enums import MetaType, DataImportMode
from arkindex.project.tests import FixtureTestCase
from arkindex.documents.models import Element
from arkindex.images.models import ImageServer
-from arkindex.dataimport.models import EventType
from arkindex.dataimport.git import GitFlow
from arkindex.dataimport.iiif import IIIFParser, ManifestParser, CollectionParser
from arkindex.project.aws import S3FileStatus
@@ -91,13 +90,6 @@ class TestManifestParser(FixtureTestCase):
self.assertEqual(p.zone.image.width, 2000)
self.assertEqual(p.zone.image.height, 1000)
- # Events
- for elt in (vol, first_page, second_page):
- self.assertEqual(elt.events.count(), 1)
- event = elt.events.get()
- self.assertEqual(event.type, EventType.Addition)
- self.assertEqual(event.revision, first_rev)
-
def _assert_second_import(self, first_rev, second_rev):
"""
Check importing changed.json after base.json
@@ -141,23 +133,6 @@ class TestManifestParser(FixtureTestCase):
self.assertEqual(p.zone.image.width, 2000)
self.assertEqual(p.zone.image.height, 1000)
- # Events
- self.assertCountEqual(
- vol.events.values_list('type', 'revision'),
- [
- (EventType.Addition, first_rev.id),
- (EventType.Edit, second_rev.id),
- ],
- )
- self.assertCountEqual(
- first_page.events.values_list('type', 'revision'),
- [(EventType.Addition, second_rev.id)],
- )
- self.assertCountEqual(
- second_page.events.values_list('type', 'revision'),
- [(EventType.Addition, second_rev.id)],
- )
-
def test_import_once(self):
"""
Import a manifest file from scratch
diff --git a/arkindex/documents/admin.py b/arkindex/documents/admin.py
index 8e661dd52f..5ac27bf520 100644
--- a/arkindex/documents/admin.py
+++ b/arkindex/documents/admin.py
@@ -4,7 +4,6 @@ from django_admin_hstore_widget.forms import HStoreFormField
from arkindex.documents.models import \
Corpus, Element, ElementType, Transcription, MetaData, AllowedMetaData, MLClass, \
Classification, DataSource, Entity, EntityRole, EntityLink
-from arkindex.dataimport.models import Event
from enumfields.admin import EnumFieldListFilter
@@ -29,10 +28,6 @@ class DataSourceAdmin(admin.ModelAdmin):
readonly_fields = ('id', )
-class EventInline(admin.TabularInline):
- model = Event
-
-
class ClassificationInline(admin.TabularInline):
model = Classification
readonly_fields = ('confidence', 'high_confidence', )
@@ -61,7 +56,7 @@ class ElementAdmin(admin.ModelAdmin):
fields = ('id', 'type', 'name', 'corpus')
readonly_fields = ('id', )
search_fields = ('name', )
- inlines = (MetaDataInline, EventInline, ClassificationInline)
+ inlines = (MetaDataInline, ClassificationInline)
class TranscriptionAdmin(admin.ModelAdmin):
diff --git a/arkindex/documents/consumers.py b/arkindex/documents/consumers.py
index c88e0913c1..fbbc38e55e 100644
--- a/arkindex/documents/consumers.py
+++ b/arkindex/documents/consumers.py
@@ -5,7 +5,7 @@ from django.db.models.deletion import Collector
from django.db.models.signals import pre_delete
from arkindex.project.tools import disconnect_signal
from arkindex.project.triggers import reindex_start
-from arkindex.dataimport.models import Event, Revision
+from arkindex.dataimport.models import Revision
from arkindex.documents.indexer import Indexer
from arkindex.documents.models import (
Corpus, Element, ElementPath, MetaData, Transcription, TranscriptionEntity, Entity,
@@ -163,7 +163,6 @@ class CorpusConsumer(SyncConsumer):
# Delete all related objects, bypassing RESTRICTs deletion rules
# and Django's way of loading everything into memory before deleting.
querysets = [
- Event.objects.filter(element__in=corpus.elements.all()),
corpus.imports.all(),
Revision.objects.filter(repo__corpus_id=corpus_id),
corpus.repos.all(),
diff --git a/arkindex/documents/fixtures/data.json b/arkindex/documents/fixtures/data.json
index aba7d2a88f..1297095415 100644
--- a/arkindex/documents/fixtures/data.json
+++ b/arkindex/documents/fixtures/data.json
@@ -1,22 +1,22 @@
[
{
"model": "dataimport.repository",
- "pk": "11991cc5-d101-4bd2-b68c-d9dad132e56d",
+ "pk": "66419a09-4255-44a4-b60c-cf989e383667",
"fields": {
"url": "http://gitlab/repo",
"hook_token": "hook-token",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "credentials": "1a13bc0b-3a75-452d-a954-ed7175e42ea1",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "credentials": "770845a4-888d-49eb-82c0-fa393e00a5d6",
"provider_name": "GitLabProvider"
}
},
{
"model": "dataimport.revision",
- "pk": "9b6ecc67-176e-4e49-8b24-917589ae723f",
+ "pk": "4943abd5-5479-48d8-a9dc-260e5f493ab6",
"fields": {
- "created": "2020-03-16T14:39:06.927Z",
- "updated": "2020-03-16T14:39:06.927Z",
- "repo": "11991cc5-d101-4bd2-b68c-d9dad132e56d",
+ "created": "2020-04-09T12:53:46.273Z",
+ "updated": "2020-04-09T12:53:46.273Z",
+ "repo": "66419a09-4255-44a4-b60c-cf989e383667",
"hash": "42",
"ref": "refs/heads/master",
"message": "a",
@@ -25,7 +25,7 @@
},
{
"model": "documents.corpus",
- "pk": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
+ "pk": "65f36be6-802e-4682-a430-06a4eb198432",
"fields": {
"name": "Unit Tests",
"description": "",
@@ -34,432 +34,451 @@
},
{
"model": "documents.elementtype",
- "pk": "23feb4f8-72f9-4eef-9a4a-7570ff29e8f2",
+ "pk": "0bf3908b-7a82-4f47-aa67-1636eccf1af0",
"fields": {
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "slug": "surface",
- "display_name": "Surface",
- "folder": false,
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "slug": "volume",
+ "display_name": "Volume",
+ "folder": true,
"default_view": false
}
},
{
"model": "documents.elementtype",
- "pk": "4e0cc5c3-4b9d-48fb-a558-7e3fe038275d",
+ "pk": "50a4c54f-27ac-4b97-bd65-659de98d38c3",
"fields": {
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "slug": "act",
- "display_name": "Act",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "slug": "page",
+ "display_name": "Page",
"folder": false,
"default_view": false
}
},
{
"model": "documents.elementtype",
- "pk": "97d1869d-ec38-43fe-8b24-bd299c76f084",
+ "pk": "524047f6-a6fe-4751-b4c5-3c955c798f53",
"fields": {
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "slug": "volume",
- "display_name": "Volume",
- "folder": true,
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "slug": "act",
+ "display_name": "Act",
+ "folder": false,
"default_view": false
}
},
{
"model": "documents.elementtype",
- "pk": "d8948c1c-80e6-4d81-b1cb-0e12791f3fd6",
+ "pk": "c0f1219c-98b3-4ca4-8ff7-636a6fc30e72",
"fields": {
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "slug": "page",
- "display_name": "Page",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "slug": "surface",
+ "display_name": "Surface",
"folder": false,
"default_view": false
}
},
{
"model": "documents.elementpath",
- "pk": "073525d4-5bad-468c-b4b9-4bc5d3535442",
+ "pk": "03f034ea-866b-4128-a5af-8d569613f4e8",
"fields": {
- "element": "bb957a52-54b6-461d-9cc0-c6f938608508",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\", \"fd7e56a5-cb29-4cba-a4c9-01b775fa6917\"]",
- "ordering": 0
+ "element": "50d6d842-6aca-4160-8c6a-76c6165c34d5",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "111d73bd-be60-4c63-9f8e-d12e6d8a2672",
+ "pk": "0a7aa532-bcf5-4a01-af87-bd24409fe40b",
"fields": {
- "element": "e8dd99f4-9f96-4e8e-9a87-557ae969cefe",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\", \"b6efe5dc-7609-44d1-9c32-8aa8ee8193ba\"]",
- "ordering": 0
+ "element": "b5a89b33-3bf3-43e6-a71f-e58df6760933",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\"]",
+ "ordering": 3
}
},
{
"model": "documents.elementpath",
- "pk": "149eebf3-6dbd-4cdb-8aad-c279562080f6",
+ "pk": "0c2181f5-95f0-41e9-81fd-074f0f239faf",
"fields": {
- "element": "6cb4cc4a-2f28-4a7d-9fb2-bac1e80aa0b1",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\"]",
- "ordering": 0
+ "element": "f660613c-e830-4cff-bcbd-6abcdf749446",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "549fe81f-cafe-4a11-a29a-ecb9998d88b0",
+ "pk": "32303508-0baa-428a-960b-9545a09605e3",
"fields": {
- "element": "b9b5fca5-ce9f-48c9-81b8-10a302115d42",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\"]",
- "ordering": 1
+ "element": "9fcfdf1c-8aab-4d91-9edc-da4798948b5c",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\", \"ab4ba872-d31d-4670-bc96-7254e5c20d47\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "622aa082-e4b4-4025-a734-a4406b46d8f8",
+ "pk": "5bbe7288-4e6f-4965-8339-db6122f67ce1",
"fields": {
- "element": "662e3de8-e9b4-42d8-b37f-316a65aee474",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\"]",
- "ordering": 2
+ "element": "27e07919-24c6-409d-b25e-1c8abc127525",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\", \"f25e970c-15da-43e1-a07a-c5c3bd890d1a\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "9b1def19-d685-450c-b484-51840b43fe84",
+ "pk": "707c6464-420e-4d6c-8e26-6715435ab248",
"fields": {
- "element": "fd7e56a5-cb29-4cba-a4c9-01b775fa6917",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\"]",
- "ordering": 4
+ "element": "9b03583b-ae83-4500-9d8d-d8b4b1689458",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "a3b28d86-d026-42b2-8f6b-b7dd149a4a59",
+ "pk": "81a48e55-7f32-4e53-9098-c8c41ed472a4",
"fields": {
- "element": "e7d5dcb9-7a9b-4db5-ac2b-490c1843364b",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\", \"b9b5fca5-ce9f-48c9-81b8-10a302115d42\"]",
- "ordering": 0
+ "element": "f25e970c-15da-43e1-a07a-c5c3bd890d1a",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\"]",
+ "ordering": 4
}
},
{
"model": "documents.elementpath",
- "pk": "bfbd918a-1ec2-4d60-817c-97b1bf5bbf5d",
+ "pk": "8211bd47-52cd-48c1-b389-c9b74139a2af",
"fields": {
- "element": "a7cc930a-3873-49a7-b17d-d9967b978bbe",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\", \"72596168-5970-456b-b453-9ce0a9061b20\"]",
+ "element": "fb965eb7-62ab-4726-b0c9-44504bce9162",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\", \"f660613c-e830-4cff-bcbd-6abcdf749446\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "c3526a5e-0e25-4b4e-b838-b8b8dc61232b",
+ "pk": "8474fc3b-4b6e-4c36-a2b4-d03cf0efbd38",
"fields": {
- "element": "496f3298-18ce-4e3d-a0f1-677a9994e9b3",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\"]",
- "ordering": 1
+ "element": "65df7a77-e1c0-45ff-a465-168d473147de",
+ "path": "[\"e1ec1de1-1e2d-4e0e-9a05-0c56f6bcdf5e\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "c8114094-688b-408a-8f31-f7feac1f5125",
+ "pk": "86eab58a-10c3-40e5-9abe-9a21dff73a29",
"fields": {
- "element": "2395463f-7409-474c-a48b-0432f3024d7c",
- "path": "[\"ac6ee86f-18fd-4519-a7fd-5900694c4afa\"]",
- "ordering": 0
+ "element": "2762b234-6925-4346-9eac-8e81dee9e2e4",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "d3b1520e-6570-4cb7-98b4-8ef22e77cbad",
+ "pk": "91087b6e-f168-4e7e-9fb4-583d48c89551",
"fields": {
- "element": "b6efe5dc-7609-44d1-9c32-8aa8ee8193ba",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\"]",
- "ordering": 3
+ "element": "ab4ba872-d31d-4670-bc96-7254e5c20d47",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "d46dfff0-8b1e-42e4-aebd-1ed38ac86ecc",
+ "pk": "9b47eb01-ca89-46ce-b898-fbd631b137c4",
"fields": {
- "element": "4aa9822a-901d-4ef8-9753-f5e04a7c109a",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\"]",
- "ordering": 2
+ "element": "9301d2af-b0a2-4ba0-9588-982c251af592",
+ "path": "[\"e1ec1de1-1e2d-4e0e-9a05-0c56f6bcdf5e\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "d6df7040-b737-4d89-804c-0ee453e18845",
+ "pk": "acd3e820-dbeb-4928-ac2e-adea1f8d5df7",
"fields": {
- "element": "ca5d923e-8baf-4785-8d11-4a02bf8f4398",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\", \"4aa9822a-901d-4ef8-9753-f5e04a7c109a\"]",
+ "element": "8f10ff8b-2b69-4e71-9418-58a7f0008d16",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\", \"50d6d842-6aca-4160-8c6a-76c6165c34d5\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "d7e42d5f-42ac-4e51-b1a8-89189557f10c",
+ "pk": "d6f49b95-4ced-4e07-84c4-ca7800ea3cc4",
"fields": {
- "element": "f2c3ace2-9170-414c-a37e-57fa56006303",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\", \"b9b5fca5-ce9f-48c9-81b8-10a302115d42\"]",
- "ordering": 1
+ "element": "e467cc9f-e1a3-42f0-ba9b-a71a2bc34389",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "ec5c6eaa-0eb6-433d-af22-c700993d0077",
+ "pk": "e4774098-0def-469f-bddc-39762ab3ca9a",
"fields": {
- "element": "72596168-5970-456b-b453-9ce0a9061b20",
- "path": "[\"6bf4840f-2e63-4193-837d-a73921ffefd2\"]",
+ "element": "609e81c6-e1e2-4f4d-9029-90a795b3bee7",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\", \"b5a89b33-3bf3-43e6-a71f-e58df6760933\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "f3e38186-ab16-4680-a3fe-d52af10ce3ab",
+ "pk": "e77eaa30-fb15-47ea-9750-97e6e44c4f11",
"fields": {
- "element": "70e17c98-d637-440e-a473-d59b1c500e0d",
- "path": "[\"ac6ee86f-18fd-4519-a7fd-5900694c4afa\"]",
+ "element": "d224a2ee-48ca-4829-9f4d-3e69f89c343f",
+ "path": "[\"e1ec1de1-1e2d-4e0e-9a05-0c56f6bcdf5e\"]",
"ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "f9fbe17a-f4db-4c7f-a5b7-fd0af37f0b17",
+ "pk": "fc20f514-8301-4d3f-8371-bcc7b5304482",
"fields": {
- "element": "9f58188b-37d1-4d65-a203-d76729037f75",
- "path": "[\"ac6ee86f-18fd-4519-a7fd-5900694c4afa\"]",
- "ordering": 2
+ "element": "e6b655f7-8914-45eb-800c-58d606ceeaa1",
+ "path": "[\"b51ae748-098a-4053-9327-4b4150c7113c\", \"f660613c-e830-4cff-bcbd-6abcdf749446\"]",
+ "ordering": 1
}
},
{
"model": "documents.element",
- "pk": "2395463f-7409-474c-a48b-0432f3024d7c",
+ "pk": "2762b234-6925-4346-9eac-8e81dee9e2e4",
"fields": {
- "created": "2020-03-16T14:39:06.784Z",
- "updated": "2020-03-16T14:39:06.784Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "d8948c1c-80e6-4d81-b1cb-0e12791f3fd6",
- "name": "Volume 2, page 1r",
- "zone": "62a3681c-173a-4175-9052-79194cc7eea6"
+ "created": "2020-04-09T12:53:46.034Z",
+ "updated": "2020-04-09T12:53:46.034Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "50a4c54f-27ac-4b97-bd65-659de98d38c3",
+ "name": "Volume 1, page 2r",
+ "zone": "552dba0d-bd69-469d-a627-b0de581ed2b5",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "496f3298-18ce-4e3d-a0f1-677a9994e9b3",
+ "pk": "27e07919-24c6-409d-b25e-1c8abc127525",
"fields": {
- "created": "2020-03-16T14:39:06.753Z",
- "updated": "2020-03-16T14:39:06.753Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "d8948c1c-80e6-4d81-b1cb-0e12791f3fd6",
- "name": "Volume 1, page 1v",
- "zone": "436f056e-8e6e-4cd9-b83f-f7c104fdeb2b"
+ "created": "2020-04-09T12:53:46.224Z",
+ "updated": "2020-04-09T12:53:46.224Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "c0f1219c-98b3-4ca4-8ff7-636a6fc30e72",
+ "name": "Surface F",
+ "zone": "64b9a967-7c61-4b69-b083-1381cd680fe0",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "4aa9822a-901d-4ef8-9753-f5e04a7c109a",
+ "pk": "50d6d842-6aca-4160-8c6a-76c6165c34d5",
"fields": {
- "created": "2020-03-16T14:39:06.835Z",
- "updated": "2020-03-16T14:39:06.835Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "4e0cc5c3-4b9d-48fb-a558-7e3fe038275d",
+ "created": "2020-04-09T12:53:46.148Z",
+ "updated": "2020-04-09T12:53:46.148Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "524047f6-a6fe-4751-b4c5-3c955c798f53",
"name": "Act 3",
- "zone": null
+ "zone": null,
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "662e3de8-e9b4-42d8-b37f-316a65aee474",
+ "pk": "609e81c6-e1e2-4f4d-9029-90a795b3bee7",
"fields": {
- "created": "2020-03-16T14:39:06.753Z",
- "updated": "2020-03-16T14:39:06.753Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "d8948c1c-80e6-4d81-b1cb-0e12791f3fd6",
- "name": "Volume 1, page 2r",
- "zone": "47d6a530-af55-4da9-bdb1-ed9704ba88f3"
+ "created": "2020-04-09T12:53:46.221Z",
+ "updated": "2020-04-09T12:53:46.221Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "c0f1219c-98b3-4ca4-8ff7-636a6fc30e72",
+ "name": "Surface E",
+ "zone": "727ce74a-674b-4f92-92f2-8b8ad583c4be",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "6bf4840f-2e63-4193-837d-a73921ffefd2",
+ "pk": "65df7a77-e1c0-45ff-a465-168d473147de",
"fields": {
- "created": "2020-03-16T14:39:06.750Z",
- "updated": "2020-03-16T14:39:06.750Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "97d1869d-ec38-43fe-8b24-bd299c76f084",
- "name": "Volume 1",
- "zone": null
+ "created": "2020-04-09T12:53:46.078Z",
+ "updated": "2020-04-09T12:53:46.078Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "50a4c54f-27ac-4b97-bd65-659de98d38c3",
+ "name": "Volume 2, page 2r",
+ "zone": "10dcedf7-009a-4654-a330-a61bc38e90b9",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "6cb4cc4a-2f28-4a7d-9fb2-bac1e80aa0b1",
+ "pk": "8f10ff8b-2b69-4e71-9418-58a7f0008d16",
"fields": {
- "created": "2020-03-16T14:39:06.752Z",
- "updated": "2020-03-16T14:39:06.752Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "d8948c1c-80e6-4d81-b1cb-0e12791f3fd6",
- "name": "Volume 1, page 1r",
- "zone": "45c9c5c9-47f7-4d11-9b62-3595c8bbab27"
+ "created": "2020-04-09T12:53:46.218Z",
+ "updated": "2020-04-09T12:53:46.218Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "c0f1219c-98b3-4ca4-8ff7-636a6fc30e72",
+ "name": "Surface D",
+ "zone": "fa959e43-ca7c-47c9-a57f-491101ea24fb",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "70e17c98-d637-440e-a473-d59b1c500e0d",
+ "pk": "9301d2af-b0a2-4ba0-9588-982c251af592",
"fields": {
- "created": "2020-03-16T14:39:06.785Z",
- "updated": "2020-03-16T14:39:06.785Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "d8948c1c-80e6-4d81-b1cb-0e12791f3fd6",
- "name": "Volume 2, page 1v",
- "zone": "17d2068d-b036-43f6-91d3-04df36ad8d16"
+ "created": "2020-04-09T12:53:46.076Z",
+ "updated": "2020-04-09T12:53:46.076Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "50a4c54f-27ac-4b97-bd65-659de98d38c3",
+ "name": "Volume 2, page 1r",
+ "zone": "8ea59de5-7c1c-4e5f-b0f9-03949ce6524d",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "72596168-5970-456b-b453-9ce0a9061b20",
+ "pk": "9b03583b-ae83-4500-9d8d-d8b4b1689458",
"fields": {
- "created": "2020-03-16T14:39:06.834Z",
- "updated": "2020-03-16T14:39:06.834Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "4e0cc5c3-4b9d-48fb-a558-7e3fe038275d",
- "name": "Act 1",
- "zone": null
+ "created": "2020-04-09T12:53:46.033Z",
+ "updated": "2020-04-09T12:53:46.033Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "50a4c54f-27ac-4b97-bd65-659de98d38c3",
+ "name": "Volume 1, page 1v",
+ "zone": "5085be24-9d01-4d58-918e-4282d281d535",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "9f58188b-37d1-4d65-a203-d76729037f75",
+ "pk": "9fcfdf1c-8aab-4d91-9edc-da4798948b5c",
"fields": {
- "created": "2020-03-16T14:39:06.785Z",
- "updated": "2020-03-16T14:39:06.785Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "d8948c1c-80e6-4d81-b1cb-0e12791f3fd6",
- "name": "Volume 2, page 2r",
- "zone": "a9db0c55-db63-4049-a787-e0befa45882e"
+ "created": "2020-04-09T12:53:46.209Z",
+ "updated": "2020-04-09T12:53:46.209Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "c0f1219c-98b3-4ca4-8ff7-636a6fc30e72",
+ "name": "Surface A",
+ "zone": "0bb3185f-069b-49e6-8c05-9ef2115ad3dc",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "a7cc930a-3873-49a7-b17d-d9967b978bbe",
+ "pk": "ab4ba872-d31d-4670-bc96-7254e5c20d47",
"fields": {
- "created": "2020-03-16T14:39:06.882Z",
- "updated": "2020-03-16T14:39:06.882Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "23feb4f8-72f9-4eef-9a4a-7570ff29e8f2",
- "name": "Surface A",
- "zone": "71209a1e-449e-4020-83be-f5c1571f84ba"
+ "created": "2020-04-09T12:53:46.146Z",
+ "updated": "2020-04-09T12:53:46.146Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "524047f6-a6fe-4751-b4c5-3c955c798f53",
+ "name": "Act 1",
+ "zone": null,
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "ac6ee86f-18fd-4519-a7fd-5900694c4afa",
+ "pk": "b51ae748-098a-4053-9327-4b4150c7113c",
"fields": {
- "created": "2020-03-16T14:39:06.751Z",
- "updated": "2020-03-16T14:39:06.751Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "97d1869d-ec38-43fe-8b24-bd299c76f084",
- "name": "Volume 2",
- "zone": null
+ "created": "2020-04-09T12:53:46.027Z",
+ "updated": "2020-04-09T12:53:46.027Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "0bf3908b-7a82-4f47-aa67-1636eccf1af0",
+ "name": "Volume 1",
+ "zone": null,
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "b6efe5dc-7609-44d1-9c32-8aa8ee8193ba",
+ "pk": "b5a89b33-3bf3-43e6-a71f-e58df6760933",
"fields": {
- "created": "2020-03-16T14:39:06.835Z",
- "updated": "2020-03-16T14:39:06.835Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "4e0cc5c3-4b9d-48fb-a558-7e3fe038275d",
+ "created": "2020-04-09T12:53:46.149Z",
+ "updated": "2020-04-09T12:53:46.149Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "524047f6-a6fe-4751-b4c5-3c955c798f53",
"name": "Act 4",
- "zone": null
+ "zone": null,
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "b9b5fca5-ce9f-48c9-81b8-10a302115d42",
+ "pk": "d224a2ee-48ca-4829-9f4d-3e69f89c343f",
"fields": {
- "created": "2020-03-16T14:39:06.834Z",
- "updated": "2020-03-16T14:39:06.834Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "4e0cc5c3-4b9d-48fb-a558-7e3fe038275d",
- "name": "Act 2",
- "zone": null
+ "created": "2020-04-09T12:53:46.077Z",
+ "updated": "2020-04-09T12:53:46.077Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "50a4c54f-27ac-4b97-bd65-659de98d38c3",
+ "name": "Volume 2, page 1v",
+ "zone": "56304d4d-fb82-4948-bcbb-d8276050d5ec",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "bb957a52-54b6-461d-9cc0-c6f938608508",
+ "pk": "e1ec1de1-1e2d-4e0e-9a05-0c56f6bcdf5e",
"fields": {
- "created": "2020-03-16T14:39:06.893Z",
- "updated": "2020-03-16T14:39:06.893Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "23feb4f8-72f9-4eef-9a4a-7570ff29e8f2",
- "name": "Surface F",
- "zone": "2c049238-f43d-4b00-9e83-3ef699d896f7"
+ "created": "2020-04-09T12:53:46.028Z",
+ "updated": "2020-04-09T12:53:46.028Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "0bf3908b-7a82-4f47-aa67-1636eccf1af0",
+ "name": "Volume 2",
+ "zone": null,
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "ca5d923e-8baf-4785-8d11-4a02bf8f4398",
+ "pk": "e467cc9f-e1a3-42f0-ba9b-a71a2bc34389",
"fields": {
- "created": "2020-03-16T14:39:06.889Z",
- "updated": "2020-03-16T14:39:06.889Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "23feb4f8-72f9-4eef-9a4a-7570ff29e8f2",
- "name": "Surface D",
- "zone": "2ccc2b75-19c6-48f7-b36a-3ca73f903c1f"
+ "created": "2020-04-09T12:53:46.029Z",
+ "updated": "2020-04-09T12:53:46.029Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "50a4c54f-27ac-4b97-bd65-659de98d38c3",
+ "name": "Volume 1, page 1r",
+ "zone": "610db57f-08a5-4880-b9a7-8d0ec3034389",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "e7d5dcb9-7a9b-4db5-ac2b-490c1843364b",
+ "pk": "e6b655f7-8914-45eb-800c-58d606ceeaa1",
"fields": {
- "created": "2020-03-16T14:39:06.885Z",
- "updated": "2020-03-16T14:39:06.885Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "23feb4f8-72f9-4eef-9a4a-7570ff29e8f2",
- "name": "Surface B",
- "zone": "50e22cc9-27f8-4e32-b28f-052fde10686c"
+ "created": "2020-04-09T12:53:46.215Z",
+ "updated": "2020-04-09T12:53:46.215Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "c0f1219c-98b3-4ca4-8ff7-636a6fc30e72",
+ "name": "Surface C",
+ "zone": "5085be24-9d01-4d58-918e-4282d281d535",
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "e8dd99f4-9f96-4e8e-9a87-557ae969cefe",
+ "pk": "f25e970c-15da-43e1-a07a-c5c3bd890d1a",
"fields": {
- "created": "2020-03-16T14:39:06.891Z",
- "updated": "2020-03-16T14:39:06.891Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "23feb4f8-72f9-4eef-9a4a-7570ff29e8f2",
- "name": "Surface E",
- "zone": "b29c5928-17a0-4c46-9631-4f113ca257d6"
+ "created": "2020-04-09T12:53:46.149Z",
+ "updated": "2020-04-09T12:53:46.149Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "524047f6-a6fe-4751-b4c5-3c955c798f53",
+ "name": "Act 5",
+ "zone": null,
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "f2c3ace2-9170-414c-a37e-57fa56006303",
+ "pk": "f660613c-e830-4cff-bcbd-6abcdf749446",
"fields": {
- "created": "2020-03-16T14:39:06.886Z",
- "updated": "2020-03-16T14:39:06.886Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "23feb4f8-72f9-4eef-9a4a-7570ff29e8f2",
- "name": "Surface C",
- "zone": "436f056e-8e6e-4cd9-b83f-f7c104fdeb2b"
+ "created": "2020-04-09T12:53:46.147Z",
+ "updated": "2020-04-09T12:53:46.147Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "524047f6-a6fe-4751-b4c5-3c955c798f53",
+ "name": "Act 2",
+ "zone": null,
+ "source": null
}
},
{
"model": "documents.element",
- "pk": "fd7e56a5-cb29-4cba-a4c9-01b775fa6917",
+ "pk": "fb965eb7-62ab-4726-b0c9-44504bce9162",
"fields": {
- "created": "2020-03-16T14:39:06.836Z",
- "updated": "2020-03-16T14:39:06.836Z",
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
- "type": "4e0cc5c3-4b9d-48fb-a558-7e3fe038275d",
- "name": "Act 5",
- "zone": null
+ "created": "2020-04-09T12:53:46.213Z",
+ "updated": "2020-04-09T12:53:46.213Z",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
+ "type": "c0f1219c-98b3-4ca4-8ff7-636a6fc30e72",
+ "name": "Surface B",
+ "zone": "1ae63984-6fc3-40db-b0f2-1617bd39944b",
+ "source": null
}
},
{
"model": "documents.datasource",
- "pk": "13492127-1bb0-432a-bf57-dded0b967d6e",
+ "pk": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
"fields": {
"type": "recognizer",
"slug": "test",
@@ -470,147 +489,147 @@
},
{
"model": "documents.transcription",
- "pk": "11351508-02a4-4442-905d-eea89ad59058",
+ "pk": "37918aae-8f10-4902-b3a6-1c5d02113bd7",
"fields": {
- "element": "662e3de8-e9b4-42d8-b37f-316a65aee474",
+ "element": "2762b234-6925-4346-9eac-8e81dee9e2e4",
"type": "word",
- "zone": "316dcc85-6746-4211-b871-a42c7ebc7fc5",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
+ "zone": "a8ea1d9c-ece2-4ab1-9e27-81393aea3b90",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
"text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "4934364e-e57d-425e-a7d9-86b6380e77a7",
+ "pk": "458261b5-fc41-447a-839d-37773505c7c8",
"fields": {
- "element": "496f3298-18ce-4e3d-a0f1-677a9994e9b3",
+ "element": "2762b234-6925-4346-9eac-8e81dee9e2e4",
"type": "word",
- "zone": "e95ae5d7-6b52-463b-a9a2-2ceebcd36ab1",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
- "text": "DATUM",
+ "zone": "2019f994-94c9-4fad-a918-bc6a858e718d",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
+ "text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "528b1316-49f6-43a1-adec-5bb9a0e5e943",
+ "pk": "57ef483f-538d-49cf-9b5c-5fa55c25cc09",
"fields": {
- "element": "6cb4cc4a-2f28-4a7d-9fb2-bac1e80aa0b1",
+ "element": "e467cc9f-e1a3-42f0-ba9b-a71a2bc34389",
"type": "word",
- "zone": "b3479601-d469-40a5-aca1-58a87deaa1d3",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
- "text": "DATUM",
+ "zone": "a8292178-661e-4c31-9347-eebaa967ce9c",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
+ "text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "6c4ae0c0-6643-41ea-aa60-c2f8549fbcb4",
+ "pk": "592dbdae-8e6f-4d2f-b82b-c1856f688a69",
"fields": {
- "element": "662e3de8-e9b4-42d8-b37f-316a65aee474",
+ "element": "9b03583b-ae83-4500-9d8d-d8b4b1689458",
"type": "word",
- "zone": "0006ffa7-208a-4ee5-bf4f-0adefbb2810b",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
- "text": "DATUM",
+ "zone": "3bd421b2-65c0-487d-8ebb-4d87d66593b1",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
+ "text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "706c3a3d-278a-47c6-856b-76b32f47e3ff",
+ "pk": "5c1f45c7-9015-48cb-bb65-65bf5f913c9f",
"fields": {
- "element": "496f3298-18ce-4e3d-a0f1-677a9994e9b3",
+ "element": "e467cc9f-e1a3-42f0-ba9b-a71a2bc34389",
"type": "word",
- "zone": "3f422021-36c1-430b-9634-7bc0066286fd",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
- "text": "ROY",
+ "zone": "37b93276-ef53-4a75-9ccb-3d56101e652d",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
+ "text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "96050782-95c2-4469-bee1-f9192b9093fc",
+ "pk": "6186f3a2-85d4-49eb-8c61-168b2b9732db",
"fields": {
- "element": "496f3298-18ce-4e3d-a0f1-677a9994e9b3",
+ "element": "9b03583b-ae83-4500-9d8d-d8b4b1689458",
"type": "word",
- "zone": "4f7ee5cd-2408-494e-b96c-d1397787c544",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
- "text": "PARIS",
+ "zone": "4283c035-dfb8-48cc-b074-359d6d1e17d6",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
+ "text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "c851cacf-f3a3-4b8e-9acb-9aae481f106d",
+ "pk": "c2aeb9ae-f815-432f-afdb-03ab7aacedba",
"fields": {
- "element": "6cb4cc4a-2f28-4a7d-9fb2-bac1e80aa0b1",
+ "element": "2762b234-6925-4346-9eac-8e81dee9e2e4",
"type": "word",
- "zone": "8781ccf4-e9ab-4c73-a14e-3e7febe56137",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
- "text": "PARIS",
+ "zone": "e643f364-9ab3-4c7e-8198-5e3948ec4b54",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "e2c45bfc-9e99-4e77-8f04-d57ba7902652",
+ "pk": "d35935a1-86a8-411d-99d2-d5059fe79fdb",
"fields": {
- "element": "662e3de8-e9b4-42d8-b37f-316a65aee474",
+ "element": "e467cc9f-e1a3-42f0-ba9b-a71a2bc34389",
"type": "word",
- "zone": "e53af5b9-ac68-4374-8096-5f5230a570d6",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
- "text": "PARIS",
+ "zone": "e5c613f9-017d-4d01-939f-43c3ca5f75b8",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "f6f0eb37-5105-485b-8144-836e5db42335",
+ "pk": "d93a76f7-8e1e-481b-b002-74cbccd7fa52",
"fields": {
- "element": "6cb4cc4a-2f28-4a7d-9fb2-bac1e80aa0b1",
+ "element": "9b03583b-ae83-4500-9d8d-d8b4b1689458",
"type": "word",
- "zone": "b54819df-ef83-4a6b-997b-caadf343ede3",
- "source": "13492127-1bb0-432a-bf57-dded0b967d6e",
- "text": "ROY",
+ "zone": "e7955614-d253-4c0a-b1c5-afadc43dab6d",
+ "source": "d0cb82cd-918a-4a57-ab6f-204fc51a1ba9",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.allowedmetadata",
- "pk": "03b5a59c-4ce0-4872-a43d-bbc9d74ee018",
+ "pk": "73183f1b-6a3b-47b9-9221-66bb299c4bb3",
"fields": {
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
"type": "date",
"name": "date"
}
},
{
"model": "documents.allowedmetadata",
- "pk": "e8bdfb2d-7339-44bd-9a5f-d92c2e3af000",
+ "pk": "7332ce1c-425e-4677-8b6e-356bbe51ba87",
"fields": {
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
"type": "text",
"name": "folio"
}
},
{
"model": "documents.allowedmetadata",
- "pk": "f491b51e-9f5c-4d2a-9bd7-a4b0bba6dc5f",
+ "pk": "ec501b3a-30a7-4f6c-9af4-1f44ac27fd98",
"fields": {
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
"type": "location",
"name": "location"
}
},
{
"model": "documents.metadata",
- "pk": "0921bc3d-e254-4895-8350-22bfe4900bb6",
+ "pk": "01f1660a-e257-4337-891e-b3782b34c379",
"fields": {
- "element": "72596168-5970-456b-b453-9ce0a9061b20",
- "name": "number",
+ "element": "2762b234-6925-4346-9eac-8e81dee9e2e4",
+ "name": "folio",
"type": "text",
- "value": "1",
+ "value": "2r",
"revision": null,
"index": 0,
"entity": null
@@ -618,9 +637,9 @@
},
{
"model": "documents.metadata",
- "pk": "16496f73-13e9-4a58-ba5a-ea9d8a510338",
+ "pk": "2eb7c0e0-a1fd-4ca3-8d0c-534a3497d9b3",
"fields": {
- "element": "70e17c98-d637-440e-a473-d59b1c500e0d",
+ "element": "d224a2ee-48ca-4829-9f4d-3e69f89c343f",
"name": "folio",
"type": "text",
"value": "1v",
@@ -631,12 +650,12 @@
},
{
"model": "documents.metadata",
- "pk": "2e95daf0-2c27-4a6c-bb62-eeabdba2a386",
+ "pk": "5dd74d34-f84d-44d9-9439-205b0321107f",
"fields": {
- "element": "496f3298-18ce-4e3d-a0f1-677a9994e9b3",
+ "element": "65df7a77-e1c0-45ff-a465-168d473147de",
"name": "folio",
"type": "text",
- "value": "1v",
+ "value": "2r",
"revision": null,
"index": 0,
"entity": null
@@ -644,12 +663,12 @@
},
{
"model": "documents.metadata",
- "pk": "64fc333b-7f2c-4ec1-9a0a-d42b0fa08633",
+ "pk": "688c83e2-9e3e-4498-a6a9-f8abd3a5f973",
"fields": {
- "element": "2395463f-7409-474c-a48b-0432f3024d7c",
- "name": "folio",
+ "element": "ab4ba872-d31d-4670-bc96-7254e5c20d47",
+ "name": "number",
"type": "text",
- "value": "1r",
+ "value": "1",
"revision": null,
"index": 0,
"entity": null
@@ -657,12 +676,12 @@
},
{
"model": "documents.metadata",
- "pk": "7d02aa14-41ff-482a-8257-70932a681159",
+ "pk": "94c0bac2-7eb7-4056-a7fa-150fae29a006",
"fields": {
- "element": "fd7e56a5-cb29-4cba-a4c9-01b775fa6917",
+ "element": "b5a89b33-3bf3-43e6-a71f-e58df6760933",
"name": "number",
"type": "text",
- "value": "5",
+ "value": "4",
"revision": null,
"index": 0,
"entity": null
@@ -670,12 +689,12 @@
},
{
"model": "documents.metadata",
- "pk": "99c4edcb-991e-4594-95a6-98e499180b4f",
+ "pk": "9fee5877-b2f7-409c-8a52-cb2f8d33dbfb",
"fields": {
- "element": "b6efe5dc-7609-44d1-9c32-8aa8ee8193ba",
- "name": "number",
+ "element": "9301d2af-b0a2-4ba0-9588-982c251af592",
+ "name": "folio",
"type": "text",
- "value": "4",
+ "value": "1r",
"revision": null,
"index": 0,
"entity": null
@@ -683,9 +702,9 @@
},
{
"model": "documents.metadata",
- "pk": "de66928d-c973-4e87-9c2a-1abf7d999289",
+ "pk": "a3c145d8-0a4f-4bef-bf2b-ae729017d79d",
"fields": {
- "element": "4aa9822a-901d-4ef8-9753-f5e04a7c109a",
+ "element": "50d6d842-6aca-4160-8c6a-76c6165c34d5",
"name": "number",
"type": "text",
"value": "3",
@@ -696,12 +715,12 @@
},
{
"model": "documents.metadata",
- "pk": "e063def3-fe25-434b-ad6a-5eca0a3883b0",
+ "pk": "ca6afe89-01d2-4931-abaf-0826c97d3c50",
"fields": {
- "element": "b9b5fca5-ce9f-48c9-81b8-10a302115d42",
+ "element": "f25e970c-15da-43e1-a07a-c5c3bd890d1a",
"name": "number",
"type": "text",
- "value": "2",
+ "value": "5",
"revision": null,
"index": 0,
"entity": null
@@ -709,12 +728,12 @@
},
{
"model": "documents.metadata",
- "pk": "e3d5951f-6685-433a-be5f-522bc5b34dab",
+ "pk": "fec220fe-78e0-4dd4-9db8-f597ef25de8f",
"fields": {
- "element": "9f58188b-37d1-4d65-a203-d76729037f75",
+ "element": "e467cc9f-e1a3-42f0-ba9b-a71a2bc34389",
"name": "folio",
"type": "text",
- "value": "2r",
+ "value": "1r",
"revision": null,
"index": 0,
"entity": null
@@ -722,12 +741,12 @@
},
{
"model": "documents.metadata",
- "pk": "f41278bd-f088-4f85-83fe-9c459cbcdc4c",
+ "pk": "fedcf922-0e64-43d8-ab92-a433c16f7a32",
"fields": {
- "element": "662e3de8-e9b4-42d8-b37f-316a65aee474",
+ "element": "9b03583b-ae83-4500-9d8d-d8b4b1689458",
"name": "folio",
"type": "text",
- "value": "2r",
+ "value": "1v",
"revision": null,
"index": 0,
"entity": null
@@ -735,12 +754,12 @@
},
{
"model": "documents.metadata",
- "pk": "f42bfc8a-562d-4cd0-aa78-e42ce5fe4a5a",
+ "pk": "fefcf6fc-2098-4987-8fc2-f433a092c978",
"fields": {
- "element": "6cb4cc4a-2f28-4a7d-9fb2-bac1e80aa0b1",
- "name": "folio",
+ "element": "f660613c-e830-4cff-bcbd-6abcdf749446",
+ "name": "number",
"type": "text",
- "value": "1r",
+ "value": "2",
"revision": null,
"index": 0,
"entity": null
@@ -756,21 +775,21 @@
"s3_region": null,
"max_width": null,
"max_height": null,
- "created": "2020-03-16T14:39:06.545Z",
- "updated": "2020-03-16T14:39:06.545Z",
+ "created": "2020-04-09T12:53:45.749Z",
+ "updated": "2020-04-09T12:53:45.749Z",
"validated": false,
"read_only": false
}
},
{
"model": "images.image",
- "pk": "0d99aee1-de58-4b21-804e-ba30ab4e349c",
+ "pk": "31020713-4cd9-43fe-b0e5-e4ff5a5f3bca",
"fields": {
"status": "unchecked",
- "created": "2020-03-16T14:39:06.546Z",
- "updated": "2020-03-16T14:39:06.546Z",
+ "created": "2020-04-09T12:53:45.753Z",
+ "updated": "2020-04-09T12:53:45.753Z",
"server": 1,
- "path": "img1",
+ "path": "img2",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -779,13 +798,13 @@
},
{
"model": "images.image",
- "pk": "22ced269-3a4d-4b0a-8060-1f17f6447080",
+ "pk": "4dd87e9b-8a14-46a4-bdb4-82ce07e40499",
"fields": {
"status": "unchecked",
- "created": "2020-03-16T14:39:06.550Z",
- "updated": "2020-03-16T14:39:06.550Z",
+ "created": "2020-04-09T12:53:45.751Z",
+ "updated": "2020-04-09T12:53:45.751Z",
"server": 1,
- "path": "img5",
+ "path": "img1",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -794,13 +813,13 @@
},
{
"model": "images.image",
- "pk": "4ee06684-5e5b-428f-a1e7-4f458951be92",
+ "pk": "66f8f9ba-b2c3-4f5b-ba5f-1f1e86e79a02",
"fields": {
"status": "unchecked",
- "created": "2020-03-16T14:39:06.547Z",
- "updated": "2020-03-16T14:39:06.547Z",
+ "created": "2020-04-09T12:53:45.754Z",
+ "updated": "2020-04-09T12:53:45.754Z",
"server": 1,
- "path": "img2",
+ "path": "img3",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -809,13 +828,13 @@
},
{
"model": "images.image",
- "pk": "6b41d75f-b573-4f00-bfe7-7a245addfbb6",
+ "pk": "83fcba76-3b8c-4e89-8b8a-59d7760d3739",
"fields": {
"status": "unchecked",
- "created": "2020-03-16T14:39:06.550Z",
- "updated": "2020-03-16T14:39:06.550Z",
+ "created": "2020-04-09T12:53:45.755Z",
+ "updated": "2020-04-09T12:53:45.755Z",
"server": 1,
- "path": "img6",
+ "path": "img4",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -824,13 +843,13 @@
},
{
"model": "images.image",
- "pk": "bc41ce26-802e-431a-9d79-c12b78fbb267",
+ "pk": "8d1a86c3-0a53-4640-a2c3-892706e6a628",
"fields": {
"status": "unchecked",
- "created": "2020-03-16T14:39:06.549Z",
- "updated": "2020-03-16T14:39:06.549Z",
+ "created": "2020-04-09T12:53:45.756Z",
+ "updated": "2020-04-09T12:53:45.756Z",
"server": 1,
- "path": "img4",
+ "path": "img5",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -839,13 +858,13 @@
},
{
"model": "images.image",
- "pk": "dca56be5-7daa-4b6a-909b-1e8f1ca732dd",
+ "pk": "f6e43660-a034-4388-8867-64df6812c59e",
"fields": {
"status": "unchecked",
- "created": "2020-03-16T14:39:06.548Z",
- "updated": "2020-03-16T14:39:06.548Z",
+ "created": "2020-04-09T12:53:45.757Z",
+ "updated": "2020-04-09T12:53:45.757Z",
"server": 1,
- "path": "img3",
+ "path": "img6",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -854,202 +873,202 @@
},
{
"model": "images.zone",
- "pk": "0006ffa7-208a-4ee5-bf4f-0adefbb2810b",
+ "pk": "0bb3185f-069b-49e6-8c05-9ef2115ad3dc",
"fields": {
- "created": "2020-03-16T14:39:06.832Z",
- "updated": "2020-03-16T14:39:06.832Z",
- "image": "dca56be5-7daa-4b6a-909b-1e8f1ca732dd",
- "polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
+ "created": "2020-04-09T12:53:46.208Z",
+ "updated": "2020-04-09T12:53:46.208Z",
+ "image": "4dd87e9b-8a14-46a4-bdb4-82ce07e40499",
+ "polygon": "Polygon([(0, 0), (0, 600), (600, 600), (600, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "17d2068d-b036-43f6-91d3-04df36ad8d16",
+ "pk": "10dcedf7-009a-4654-a330-a61bc38e90b9",
"fields": {
- "created": "2020-03-16T14:39:06.561Z",
- "updated": "2020-03-16T14:39:06.561Z",
- "image": "22ced269-3a4d-4b0a-8060-1f17f6447080",
+ "created": "2020-04-09T12:53:45.773Z",
+ "updated": "2020-04-09T12:53:45.773Z",
+ "image": "f6e43660-a034-4388-8867-64df6812c59e",
"polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "2c049238-f43d-4b00-9e83-3ef699d896f7",
+ "pk": "1ae63984-6fc3-40db-b0f2-1617bd39944b",
"fields": {
- "created": "2020-03-16T14:39:06.892Z",
- "updated": "2020-03-16T14:39:06.892Z",
- "image": "dca56be5-7daa-4b6a-909b-1e8f1ca732dd",
+ "created": "2020-04-09T12:53:46.211Z",
+ "updated": "2020-04-09T12:53:46.211Z",
+ "image": "4dd87e9b-8a14-46a4-bdb4-82ce07e40499",
"polygon": "Polygon([(600, 600), (600, 1000), (1000, 1000), (1000, 600), (600, 600)])"
}
},
{
"model": "images.zone",
- "pk": "2ccc2b75-19c6-48f7-b36a-3ca73f903c1f",
+ "pk": "2019f994-94c9-4fad-a918-bc6a858e718d",
"fields": {
- "created": "2020-03-16T14:39:06.887Z",
- "updated": "2020-03-16T14:39:06.888Z",
- "image": "dca56be5-7daa-4b6a-909b-1e8f1ca732dd",
- "polygon": "Polygon([(0, 0), (0, 300), (300, 300), (300, 0), (0, 0)])"
+ "created": "2020-04-09T12:53:46.137Z",
+ "updated": "2020-04-09T12:53:46.137Z",
+ "image": "66f8f9ba-b2c3-4f5b-ba5f-1f1e86e79a02",
+ "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
}
},
{
"model": "images.zone",
- "pk": "316dcc85-6746-4211-b871-a42c7ebc7fc5",
+ "pk": "37b93276-ef53-4a75-9ccb-3d56101e652d",
"fields": {
- "created": "2020-03-16T14:39:06.830Z",
- "updated": "2020-03-16T14:39:06.830Z",
- "image": "dca56be5-7daa-4b6a-909b-1e8f1ca732dd",
- "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
+ "created": "2020-04-09T12:53:46.117Z",
+ "updated": "2020-04-09T12:53:46.117Z",
+ "image": "4dd87e9b-8a14-46a4-bdb4-82ce07e40499",
+ "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
}
},
{
"model": "images.zone",
- "pk": "3f422021-36c1-430b-9634-7bc0066286fd",
+ "pk": "3bd421b2-65c0-487d-8ebb-4d87d66593b1",
"fields": {
- "created": "2020-03-16T14:39:06.823Z",
- "updated": "2020-03-16T14:39:06.823Z",
- "image": "4ee06684-5e5b-428f-a1e7-4f458951be92",
- "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
+ "created": "2020-04-09T12:53:46.128Z",
+ "updated": "2020-04-09T12:53:46.128Z",
+ "image": "31020713-4cd9-43fe-b0e5-e4ff5a5f3bca",
+ "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
}
},
{
"model": "images.zone",
- "pk": "436f056e-8e6e-4cd9-b83f-f7c104fdeb2b",
+ "pk": "4283c035-dfb8-48cc-b074-359d6d1e17d6",
"fields": {
- "created": "2020-03-16T14:39:06.555Z",
- "updated": "2020-03-16T14:39:06.555Z",
- "image": "4ee06684-5e5b-428f-a1e7-4f458951be92",
- "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
+ "created": "2020-04-09T12:53:46.131Z",
+ "updated": "2020-04-09T12:53:46.131Z",
+ "image": "31020713-4cd9-43fe-b0e5-e4ff5a5f3bca",
+ "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
}
},
{
"model": "images.zone",
- "pk": "45c9c5c9-47f7-4d11-9b62-3595c8bbab27",
+ "pk": "5085be24-9d01-4d58-918e-4282d281d535",
"fields": {
- "created": "2020-03-16T14:39:06.553Z",
- "updated": "2020-03-16T14:39:06.553Z",
- "image": "0d99aee1-de58-4b21-804e-ba30ab4e349c",
+ "created": "2020-04-09T12:53:45.763Z",
+ "updated": "2020-04-09T12:53:45.763Z",
+ "image": "31020713-4cd9-43fe-b0e5-e4ff5a5f3bca",
"polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "47d6a530-af55-4da9-bdb1-ed9704ba88f3",
+ "pk": "552dba0d-bd69-469d-a627-b0de581ed2b5",
"fields": {
- "created": "2020-03-16T14:39:06.558Z",
- "updated": "2020-03-16T14:39:06.558Z",
- "image": "dca56be5-7daa-4b6a-909b-1e8f1ca732dd",
+ "created": "2020-04-09T12:53:45.766Z",
+ "updated": "2020-04-09T12:53:45.766Z",
+ "image": "66f8f9ba-b2c3-4f5b-ba5f-1f1e86e79a02",
"polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "4f7ee5cd-2408-494e-b96c-d1397787c544",
+ "pk": "56304d4d-fb82-4948-bcbb-d8276050d5ec",
"fields": {
- "created": "2020-03-16T14:39:06.820Z",
- "updated": "2020-03-16T14:39:06.820Z",
- "image": "4ee06684-5e5b-428f-a1e7-4f458951be92",
- "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
+ "created": "2020-04-09T12:53:45.770Z",
+ "updated": "2020-04-09T12:53:45.770Z",
+ "image": "8d1a86c3-0a53-4640-a2c3-892706e6a628",
+ "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "50e22cc9-27f8-4e32-b28f-052fde10686c",
+ "pk": "610db57f-08a5-4880-b9a7-8d0ec3034389",
"fields": {
- "created": "2020-03-16T14:39:06.884Z",
- "updated": "2020-03-16T14:39:06.884Z",
- "image": "0d99aee1-de58-4b21-804e-ba30ab4e349c",
- "polygon": "Polygon([(600, 600), (600, 1000), (1000, 1000), (1000, 600), (600, 600)])"
+ "created": "2020-04-09T12:53:45.760Z",
+ "updated": "2020-04-09T12:53:45.760Z",
+ "image": "4dd87e9b-8a14-46a4-bdb4-82ce07e40499",
+ "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "62a3681c-173a-4175-9052-79194cc7eea6",
+ "pk": "64b9a967-7c61-4b69-b083-1381cd680fe0",
"fields": {
- "created": "2020-03-16T14:39:06.560Z",
- "updated": "2020-03-16T14:39:06.560Z",
- "image": "bc41ce26-802e-431a-9d79-c12b78fbb267",
- "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
+ "created": "2020-04-09T12:53:46.223Z",
+ "updated": "2020-04-09T12:53:46.223Z",
+ "image": "66f8f9ba-b2c3-4f5b-ba5f-1f1e86e79a02",
+ "polygon": "Polygon([(600, 600), (600, 1000), (1000, 1000), (1000, 600), (600, 600)])"
}
},
{
"model": "images.zone",
- "pk": "71209a1e-449e-4020-83be-f5c1571f84ba",
+ "pk": "727ce74a-674b-4f92-92f2-8b8ad583c4be",
"fields": {
- "created": "2020-03-16T14:39:06.881Z",
- "updated": "2020-03-16T14:39:06.881Z",
- "image": "0d99aee1-de58-4b21-804e-ba30ab4e349c",
- "polygon": "Polygon([(0, 0), (0, 600), (600, 600), (600, 0), (0, 0)])"
+ "created": "2020-04-09T12:53:46.220Z",
+ "updated": "2020-04-09T12:53:46.220Z",
+ "image": "66f8f9ba-b2c3-4f5b-ba5f-1f1e86e79a02",
+ "polygon": "Polygon([(300, 300), (300, 600), (600, 600), (600, 300), (300, 300)])"
}
},
{
"model": "images.zone",
- "pk": "8781ccf4-e9ab-4c73-a14e-3e7febe56137",
+ "pk": "8ea59de5-7c1c-4e5f-b0f9-03949ce6524d",
"fields": {
- "created": "2020-03-16T14:39:06.812Z",
- "updated": "2020-03-16T14:39:06.812Z",
- "image": "0d99aee1-de58-4b21-804e-ba30ab4e349c",
- "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
+ "created": "2020-04-09T12:53:45.768Z",
+ "updated": "2020-04-09T12:53:45.768Z",
+ "image": "83fcba76-3b8c-4e89-8b8a-59d7760d3739",
+ "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "a9db0c55-db63-4049-a787-e0befa45882e",
+ "pk": "a8292178-661e-4c31-9347-eebaa967ce9c",
"fields": {
- "created": "2020-03-16T14:39:06.563Z",
- "updated": "2020-03-16T14:39:06.563Z",
- "image": "6b41d75f-b573-4f00-bfe7-7a245addfbb6",
- "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
+ "created": "2020-04-09T12:53:46.121Z",
+ "updated": "2020-04-09T12:53:46.121Z",
+ "image": "4dd87e9b-8a14-46a4-bdb4-82ce07e40499",
+ "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
}
},
{
"model": "images.zone",
- "pk": "b29c5928-17a0-4c46-9631-4f113ca257d6",
+ "pk": "a8ea1d9c-ece2-4ab1-9e27-81393aea3b90",
"fields": {
- "created": "2020-03-16T14:39:06.890Z",
- "updated": "2020-03-16T14:39:06.890Z",
- "image": "dca56be5-7daa-4b6a-909b-1e8f1ca732dd",
- "polygon": "Polygon([(300, 300), (300, 600), (600, 600), (600, 300), (300, 300)])"
+ "created": "2020-04-09T12:53:46.141Z",
+ "updated": "2020-04-09T12:53:46.141Z",
+ "image": "66f8f9ba-b2c3-4f5b-ba5f-1f1e86e79a02",
+ "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
}
},
{
"model": "images.zone",
- "pk": "b3479601-d469-40a5-aca1-58a87deaa1d3",
+ "pk": "e5c613f9-017d-4d01-939f-43c3ca5f75b8",
"fields": {
- "created": "2020-03-16T14:39:06.818Z",
- "updated": "2020-03-16T14:39:06.818Z",
- "image": "0d99aee1-de58-4b21-804e-ba30ab4e349c",
+ "created": "2020-04-09T12:53:46.124Z",
+ "updated": "2020-04-09T12:53:46.124Z",
+ "image": "4dd87e9b-8a14-46a4-bdb4-82ce07e40499",
"polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
}
},
{
"model": "images.zone",
- "pk": "b54819df-ef83-4a6b-997b-caadf343ede3",
+ "pk": "e643f364-9ab3-4c7e-8198-5e3948ec4b54",
"fields": {
- "created": "2020-03-16T14:39:06.815Z",
- "updated": "2020-03-16T14:39:06.815Z",
- "image": "0d99aee1-de58-4b21-804e-ba30ab4e349c",
- "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
+ "created": "2020-04-09T12:53:46.144Z",
+ "updated": "2020-04-09T12:53:46.144Z",
+ "image": "66f8f9ba-b2c3-4f5b-ba5f-1f1e86e79a02",
+ "polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
}
},
{
"model": "images.zone",
- "pk": "e53af5b9-ac68-4374-8096-5f5230a570d6",
+ "pk": "e7955614-d253-4c0a-b1c5-afadc43dab6d",
"fields": {
- "created": "2020-03-16T14:39:06.828Z",
- "updated": "2020-03-16T14:39:06.828Z",
- "image": "dca56be5-7daa-4b6a-909b-1e8f1ca732dd",
- "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
+ "created": "2020-04-09T12:53:46.134Z",
+ "updated": "2020-04-09T12:53:46.134Z",
+ "image": "31020713-4cd9-43fe-b0e5-e4ff5a5f3bca",
+ "polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
}
},
{
"model": "images.zone",
- "pk": "e95ae5d7-6b52-463b-a9a2-2ceebcd36ab1",
+ "pk": "fa959e43-ca7c-47c9-a57f-491101ea24fb",
"fields": {
- "created": "2020-03-16T14:39:06.825Z",
- "updated": "2020-03-16T14:39:06.825Z",
- "image": "4ee06684-5e5b-428f-a1e7-4f458951be92",
- "polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
+ "created": "2020-04-09T12:53:46.217Z",
+ "updated": "2020-04-09T12:53:46.217Z",
+ "image": "66f8f9ba-b2c3-4f5b-ba5f-1f1e86e79a02",
+ "polygon": "Polygon([(0, 0), (0, 300), (300, 300), (300, 0), (0, 0)])"
}
},
{
@@ -2243,108 +2262,72 @@
{
"model": "auth.permission",
"pk": 133,
- "fields": {
- "name": "Can add event",
- "content_type": 34,
- "codename": "add_event"
- }
-},
-{
- "model": "auth.permission",
- "pk": 134,
- "fields": {
- "name": "Can change event",
- "content_type": 34,
- "codename": "change_event"
- }
-},
-{
- "model": "auth.permission",
- "pk": 135,
- "fields": {
- "name": "Can delete event",
- "content_type": 34,
- "codename": "delete_event"
- }
-},
-{
- "model": "auth.permission",
- "pk": 136,
- "fields": {
- "name": "Can view event",
- "content_type": 34,
- "codename": "view_event"
- }
-},
-{
- "model": "auth.permission",
- "pk": 137,
"fields": {
"name": "Can add repository",
- "content_type": 35,
+ "content_type": 34,
"codename": "add_repository"
}
},
{
"model": "auth.permission",
- "pk": 138,
+ "pk": 134,
"fields": {
"name": "Can change repository",
- "content_type": 35,
+ "content_type": 34,
"codename": "change_repository"
}
},
{
"model": "auth.permission",
- "pk": 139,
+ "pk": 135,
"fields": {
"name": "Can delete repository",
- "content_type": 35,
+ "content_type": 34,
"codename": "delete_repository"
}
},
{
"model": "auth.permission",
- "pk": 140,
+ "pk": 136,
"fields": {
"name": "Can view repository",
- "content_type": 35,
+ "content_type": 34,
"codename": "view_repository"
}
},
{
"model": "auth.permission",
- "pk": 141,
+ "pk": 137,
"fields": {
"name": "Can add revision",
- "content_type": 36,
+ "content_type": 35,
"codename": "add_revision"
}
},
{
"model": "auth.permission",
- "pk": 142,
+ "pk": 138,
"fields": {
"name": "Can change revision",
- "content_type": 36,
+ "content_type": 35,
"codename": "change_revision"
}
},
{
"model": "auth.permission",
- "pk": 143,
+ "pk": 139,
"fields": {
"name": "Can delete revision",
- "content_type": 36,
+ "content_type": 35,
"codename": "delete_revision"
}
},
{
"model": "auth.permission",
- "pk": 144,
+ "pk": 140,
"fields": {
"name": "Can view revision",
- "content_type": 36,
+ "content_type": 35,
"codename": "view_revision"
}
},
@@ -2360,7 +2343,7 @@
"model": "users.user",
"pk": 1,
"fields": {
- "password": "pbkdf2_sha256$150000$1zDTlX9jUDEq$7lBdtXRlwFvCsUxHX3aV5O/fniUa6IQgpu2yW9E3CSc=",
+ "password": "pbkdf2_sha256$150000$QzmrNTPVgJDJ$Xx5Axhr6ETWvQb61hEGkhnBmD/teapMqghTnOXyXD5Y=",
"last_login": null,
"email": "root@root.fr",
"is_active": true,
@@ -2373,7 +2356,7 @@
"model": "users.user",
"pk": 2,
"fields": {
- "password": "pbkdf2_sha256$150000$SdB5xKlDXxhX$m3TEkPVfImLUqvqUBcDygD4X60nalEJ55jwYrG1IMx8=",
+ "password": "pbkdf2_sha256$150000$frMXHk4OYK7H$u8wpaCTTwZYd3B69BUWn3kmZ842YB1uKfQtlRdBVQPU=",
"last_login": null,
"email": "user@user.fr",
"is_active": true,
@@ -2384,7 +2367,7 @@
},
{
"model": "users.oauthcredentials",
- "pk": "1a13bc0b-3a75-452d-a954-ed7175e42ea1",
+ "pk": "770845a4-888d-49eb-82c0-fa393e00a5d6",
"fields": {
"user": 2,
"provider_name": "gitlab",
@@ -2401,7 +2384,7 @@
"pk": 1,
"fields": {
"user": 2,
- "corpus": "cff3f52e-8f6e-45cf-ae0d-1698188fe146",
+ "corpus": "65f36be6-802e-4682-a430-06a4eb198432",
"can_write": true,
"can_admin": true
}
diff --git a/arkindex/documents/serializers/elements.py b/arkindex/documents/serializers/elements.py
index e6b525a48d..2ea877849c 100644
--- a/arkindex/documents/serializers/elements.py
+++ b/arkindex/documents/serializers/elements.py
@@ -10,7 +10,6 @@ from arkindex.documents.serializers.light import (
EntityLightSerializer, MetaDataLightSerializer,
)
from arkindex.documents.serializers.ml import ClassificationSerializer, DataSourceSerializer
-from arkindex.dataimport.models import EventType
from arkindex.project.serializer_fields import PolygonField, DataSourceSlugField
from arkindex.project.polygon import Polygon
from arkindex.project.aws import S3FileStatus
@@ -232,7 +231,6 @@ class ElementSerializer(ElementSlimSerializer):
def create(self, *args, **kwargs):
instance = super().create(*args, **kwargs)
- instance.events.create(type=EventType.Addition)
return instance
def update(self, instance, validated_data):
@@ -256,7 +254,6 @@ class ElementSerializer(ElementSlimSerializer):
instance.zone, _ = image.zones.get_or_create(polygon=polygon)
instance = super().update(instance, validated_data)
- instance.events.create(type=EventType.Edit)
return instance
def get_metadata(self, obj):
diff --git a/arkindex/documents/tests/consumers/test_corpus_consumer.py b/arkindex/documents/tests/consumers/test_corpus_consumer.py
index dc857609bc..3f3bb5cf3f 100644
--- a/arkindex/documents/tests/consumers/test_corpus_consumer.py
+++ b/arkindex/documents/tests/consumers/test_corpus_consumer.py
@@ -2,7 +2,6 @@ from django.db.models.signals import pre_delete
from arkindex_common.enums import TranscriptionType, MetaType, DataImportMode
from arkindex_common.ml_tool import MLToolType
from arkindex.project.tests import FixtureTestCase
-from arkindex.dataimport.models import EventType
from arkindex.documents.consumers import CorpusConsumer
from arkindex.documents.models import Corpus, Element, DataSource, MLClass
@@ -47,10 +46,6 @@ class TestDeleteCorpus(FixtureTestCase):
name='meta',
value='data',
)
- cls.vol.events.create(
- revision=cls.rev,
- type=EventType.Addition,
- )
cls.page = Element.objects.create(
corpus=cls.corpus2,
type=cls.corpus2.types.create(slug='page'),
@@ -86,7 +81,7 @@ class TestDeleteCorpus(FixtureTestCase):
def test_run(self):
receivers = pre_delete.receivers
- with self.assertNumQueries(56):
+ with self.assertNumQueries(53):
CorpusConsumer({}).corpus_delete({'id': str(self.corpus.id)})
# Ensure the command restores the signal receivers
@@ -116,10 +111,6 @@ class TestDeleteCorpus(FixtureTestCase):
self.assertEqual(md.name, 'meta')
self.assertEqual(md.value, 'data')
- event = self.vol.events.get()
- self.assertEqual(event.type, EventType.Addition)
- self.assertEqual(event.revision, self.rev)
-
cl = self.page.classifications.get()
self.assertEqual(cl.source.slug, 'classeur')
self.assertEqual(cl.ml_class.name, 'klass')
diff --git a/arkindex/project/api_v1.py b/arkindex/project/api_v1.py
index 6232f5f430..bc309fa1cd 100644
--- a/arkindex/project/api_v1.py
+++ b/arkindex/project/api_v1.py
@@ -23,7 +23,7 @@ from arkindex.dataimport.api import (
DataImportsList, DataImportDetails, DataImportRetry,
DataFileList, DataFileRetrieve, DataFileUpload, DataImportFromFiles,
RepositoryList, RepositoryRetrieve, RepositoryStartImport, DataFileCreate,
- GitRepositoryImportHook, AvailableRepositoriesList, ElementHistory, MLToolList,
+ GitRepositoryImportHook, AvailableRepositoriesList, MLToolList,
CorpusWorkflow
)
from arkindex.images.api import ImageCreate, IIIFImageCreate, ImageRetrieve, ImageElements
@@ -44,7 +44,6 @@ api = [
path('elements/create/', ElementsCreate.as_view(), name='elements-create'),
path('element/<uuid:pk>/', ElementRetrieve.as_view(), name='element-retrieve'),
path('element/<uuid:pk>/metadata/', ElementMetadata.as_view(), name='element-metadata'),
- path('element/<uuid:pk>/history/', ElementHistory.as_view(), name='element-history'),
path('element/<uuid:pk>/entities/', ElementEntities.as_view(), name='element-entities'),
path('element/<uuid:pk>/links/', ElementLinks.as_view(), name='element-links'),
path('element/<uuid:pk>/regions/', ElementRegions.as_view(), name='element-regions'),
--
GitLab