diff --git a/arkindex/documents/fixtures/data.json b/arkindex/documents/fixtures/data.json index a8f8c9cd9137262b6acfc5564119fdd95b4b7f04..4702afccc3d4485403b3cfff8be3e4152ff07a74 100644 --- a/arkindex/documents/fixtures/data.json +++ b/arkindex/documents/fixtures/data.json @@ -1,25 +1,24 @@ [ { "model": "process.process", - "pk": "6fb4ded9-ab97-4764-b0b0-4a7040556cde", + "pk": "9f2362e7-9e74-431a-8c5f-7a54a43fd5a8", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "name": "Process fixture", "creator": 2, - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", "mode": "workers", "activity_state": "disabled", "started": null, "finished": null, - "farm": "0464874a-12cd-4bb5-a06f-37a872a82e5a", + "farm": "dd6f9265-24cf-4773-9e61-a42853278337", "element": null, "folder_type": null, "element_type": null, "name_contains": null, "ml_class": null, "load_children": false, - "generate_thumbnails": false, "chunks": 1, "use_cache": false, "use_gpu": false, @@ -31,7 +30,7 @@ }, { "model": "process.process", - "pk": "89fbd695-bd87-4a1d-afef-8647a30d3ccc", + "pk": "ca34111d-1329-4b71-b322-688239e27b33", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -49,7 +48,6 @@ "name_contains": null, "ml_class": null, "load_children": false, - "generate_thumbnails": false, "chunks": 1, "use_cache": false, "use_gpu": false, @@ -61,7 +59,7 @@ }, { "model": "process.process", - "pk": "fb8b6046-9aa6-454d-8e0b-472f93605016", + "pk": "de1be14d-6a0c-4229-8d45-886c03cd8781", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -79,7 +77,6 @@ "name_contains": null, "ml_class": null, "load_children": false, - "generate_thumbnails": false, "chunks": 1, "use_cache": false, "use_gpu": false, @@ -91,123 +88,123 @@ }, { "model": "process.repository", - "pk": "a7c6b0d5-d68c-48f7-a07b-09e0522a4d5c", + "pk": "14f8f60b-d8ae-44a1-a45e-91ce272f4879", "fields": { "url": "http://my_repo.fake/workers/worker" } }, { "model": "process.repository", - "pk": "e3e6edfa-da1c-46a1-85be-24c0c5308fdd", + "pk": "570e432a-870a-491a-b877-6acf8f864e19", "fields": { "url": "http://gitlab/repo" } }, { "model": "process.revision", - "pk": "179c0b17-cfa7-4157-bba0-83c83d58ee62", + "pk": "11f73350-e6c8-452b-ac17-1dd07940f6b0", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "repo": "a7c6b0d5-d68c-48f7-a07b-09e0522a4d5c", - "hash": "1337", - "message": "My w0rk3r", - "author": "Test user" + "repo": "570e432a-870a-491a-b877-6acf8f864e19", + "hash": "42", + "message": "Salve", + "author": "Some user" } }, { "model": "process.revision", - "pk": "e67d4944-5167-4f45-bfac-2a4d92bbd177", + "pk": "76215c8a-9b35-4e69-97cd-2a363c471139", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "repo": "e3e6edfa-da1c-46a1-85be-24c0c5308fdd", - "hash": "42", - "message": "Salve", - "author": "Some user" + "repo": "14f8f60b-d8ae-44a1-a45e-91ce272f4879", + "hash": "1337", + "message": "My w0rk3r", + "author": "Test user" } }, { "model": "process.worker", - "pk": "7290f39e-fa17-4e7f-a051-a0e573c3ff6b", + "pk": "3d08cae6-8246-43a8-995c-46b12d319cca", "fields": { - "name": "Recognizer", - "slug": "reco", - "type": "ab7333fc-34e8-4fb6-a3bb-d733443cbe51", + "name": "Custom worker", + "slug": "custom", + "type": "96d9c3ce-557e-4156-8a34-02e2dd500f2e", "description": "", - "repository": "a7c6b0d5-d68c-48f7-a07b-09e0522a4d5c", + "repository": null, "public": false, "archived": null } }, { "model": "process.worker", - "pk": "7c61dba0-4fdc-494f-b587-abddc75b8dbb", + "pk": "487638f7-b88d-43a7-87c5-5523ec27374a", "fields": { "name": "Generic worker with a Model", "slug": "generic", - "type": "ab7333fc-34e8-4fb6-a3bb-d733443cbe51", + "type": "e9e38b3b-ca1a-439f-9e4f-30b14bc3ce75", "description": "", - "repository": "a7c6b0d5-d68c-48f7-a07b-09e0522a4d5c", + "repository": "14f8f60b-d8ae-44a1-a45e-91ce272f4879", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "8a27660c-f976-4550-834c-84d4ad033214", + "pk": "551f23ce-09d1-40f4-aec1-b8ed5fbc234f", "fields": { - "name": "Worker requiring a GPU", - "slug": "worker-gpu", - "type": "7af4b709-efd8-4882-b6be-6b408ebf9b2d", + "name": "File import", + "slug": "file_import", + "type": "7c005c72-ea87-4226-b299-f42cb217550e", "description": "", - "repository": "a7c6b0d5-d68c-48f7-a07b-09e0522a4d5c", + "repository": "14f8f60b-d8ae-44a1-a45e-91ce272f4879", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "af68bb34-5eaa-4edc-81fa-4400af06a715", + "pk": "958117cd-f5b7-49e7-80dd-872d26af6367", "fields": { - "name": "Custom worker", - "slug": "custom", - "type": "7fedc658-ecaa-4727-8844-71663ec6d0a9", + "name": "Worker requiring a GPU", + "slug": "worker-gpu", + "type": "8f637bcd-038f-46ac-b727-1235a7d59134", "description": "", - "repository": null, + "repository": "14f8f60b-d8ae-44a1-a45e-91ce272f4879", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "bc503daa-b53f-45ef-9d90-7f6a24d028a1", + "pk": "a2b24ca6-c4b0-4867-bae2-fcf9e7135032", "fields": { "name": "Document layout analyser", "slug": "dla", - "type": "26ca87e4-afb3-4e0f-bc1a-b0641c7dd427", + "type": "76f9adf0-2fb7-4ebe-9ae8-ed7535407bdd", "description": "", - "repository": "a7c6b0d5-d68c-48f7-a07b-09e0522a4d5c", + "repository": "14f8f60b-d8ae-44a1-a45e-91ce272f4879", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "d757e5ad-a03e-4e81-bf81-0b2a8719220e", + "pk": "b7b4f769-4ccb-4b1e-a701-280ba8013e0b", "fields": { - "name": "File import", - "slug": "file_import", - "type": "f2a53f25-1ffe-423e-b9c4-ee5a01a2b5a0", + "name": "Recognizer", + "slug": "reco", + "type": "e9e38b3b-ca1a-439f-9e4f-30b14bc3ce75", "description": "", - "repository": "a7c6b0d5-d68c-48f7-a07b-09e0522a4d5c", + "repository": "14f8f60b-d8ae-44a1-a45e-91ce272f4879", "public": false, "archived": null } }, { "model": "process.workertype", - "pk": "26ca87e4-afb3-4e0f-bc1a-b0641c7dd427", + "pk": "76f9adf0-2fb7-4ebe-9ae8-ed7535407bdd", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -217,56 +214,54 @@ }, { "model": "process.workertype", - "pk": "7af4b709-efd8-4882-b6be-6b408ebf9b2d", + "pk": "7c005c72-ea87-4226-b299-f42cb217550e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "worker", - "display_name": "Worker requiring a GPU" + "slug": "import", + "display_name": "Import" } }, { "model": "process.workertype", - "pk": "7fedc658-ecaa-4727-8844-71663ec6d0a9", + "pk": "8f637bcd-038f-46ac-b727-1235a7d59134", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "custom", - "display_name": "Custom" + "slug": "worker", + "display_name": "Worker requiring a GPU" } }, { "model": "process.workertype", - "pk": "ab7333fc-34e8-4fb6-a3bb-d733443cbe51", + "pk": "96d9c3ce-557e-4156-8a34-02e2dd500f2e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "recognizer", - "display_name": "Recognizer" + "slug": "custom", + "display_name": "Custom" } }, { "model": "process.workertype", - "pk": "f2a53f25-1ffe-423e-b9c4-ee5a01a2b5a0", + "pk": "e9e38b3b-ca1a-439f-9e4f-30b14bc3ce75", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "import", - "display_name": "Import" + "slug": "recognizer", + "display_name": "Recognizer" } }, { "model": "process.workerversion", - "pk": "148946e9-5ddd-42d2-ad29-bf78ca55f62c", + "pk": "0306d1e0-39e0-401f-840b-4ab885f2d627", "fields": { - "worker": "8a27660c-f976-4550-834c-84d4ad033214", - "revision": "179c0b17-cfa7-4157-bba0-83c83d58ee62", + "worker": "551f23ce-09d1-40f4-aec1-b8ed5fbc234f", + "revision": "76215c8a-9b35-4e69-97cd-2a363c471139", "version": null, - "configuration": { - "test": 42 - }, + "configuration": {}, "state": "available", - "gpu_usage": "required", + "gpu_usage": "disabled", "model_usage": "disabled", "docker_image": null, "docker_image_iid": "registry.somewhere.com/something:latest", @@ -276,9 +271,9 @@ }, { "model": "process.workerversion", - "pk": "194b33ea-4a45-4884-9a89-dd04c5a65fc3", + "pk": "51d03bd9-0ca8-40fd-a231-f03ad9d301c6", "fields": { - "worker": "af68bb34-5eaa-4edc-81fa-4400af06a715", + "worker": "3d08cae6-8246-43a8-995c-46b12d319cca", "revision": null, "version": 1, "configuration": { @@ -295,16 +290,16 @@ }, { "model": "process.workerversion", - "pk": "505988ea-21cb-4011-ad87-48bdab37237d", + "pk": "8359b5f9-c69f-4709-9736-090c51c70d07", "fields": { - "worker": "7290f39e-fa17-4e7f-a051-a0e573c3ff6b", - "revision": "179c0b17-cfa7-4157-bba0-83c83d58ee62", + "worker": "958117cd-f5b7-49e7-80dd-872d26af6367", + "revision": "76215c8a-9b35-4e69-97cd-2a363c471139", "version": null, "configuration": { "test": 42 }, "state": "available", - "gpu_usage": "disabled", + "gpu_usage": "required", "model_usage": "disabled", "docker_image": null, "docker_image_iid": "registry.somewhere.com/something:latest", @@ -314,17 +309,17 @@ }, { "model": "process.workerversion", - "pk": "6ee6d026-1ea4-4435-98a1-a811aed6304e", + "pk": "89cdf4f7-efe9-4387-91cc-fc7aa9bac2f7", "fields": { - "worker": "7c61dba0-4fdc-494f-b587-abddc75b8dbb", - "revision": "179c0b17-cfa7-4157-bba0-83c83d58ee62", + "worker": "a2b24ca6-c4b0-4867-bae2-fcf9e7135032", + "revision": "76215c8a-9b35-4e69-97cd-2a363c471139", "version": null, "configuration": { "test": 42 }, "state": "available", "gpu_usage": "disabled", - "model_usage": "required", + "model_usage": "disabled", "docker_image": null, "docker_image_iid": "registry.somewhere.com/something:latest", "created": "2020-02-02T01:23:45.678Z", @@ -333,17 +328,17 @@ }, { "model": "process.workerversion", - "pk": "9da1ac9d-0ff7-44fc-923f-3076a5bead35", + "pk": "d856b4de-d72b-46a5-a396-34cbf1a9b333", "fields": { - "worker": "bc503daa-b53f-45ef-9d90-7f6a24d028a1", - "revision": "179c0b17-cfa7-4157-bba0-83c83d58ee62", + "worker": "487638f7-b88d-43a7-87c5-5523ec27374a", + "revision": "76215c8a-9b35-4e69-97cd-2a363c471139", "version": null, "configuration": { "test": 42 }, "state": "available", "gpu_usage": "disabled", - "model_usage": "disabled", + "model_usage": "required", "docker_image": null, "docker_image_iid": "registry.somewhere.com/something:latest", "created": "2020-02-02T01:23:45.678Z", @@ -352,12 +347,14 @@ }, { "model": "process.workerversion", - "pk": "d822aa98-530d-46a9-b82b-d64eeb4668a6", + "pk": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "fields": { - "worker": "d757e5ad-a03e-4e81-bf81-0b2a8719220e", - "revision": "179c0b17-cfa7-4157-bba0-83c83d58ee62", + "worker": "b7b4f769-4ccb-4b1e-a701-280ba8013e0b", + "revision": "76215c8a-9b35-4e69-97cd-2a363c471139", "version": null, - "configuration": {}, + "configuration": { + "test": 42 + }, "state": "available", "gpu_usage": "disabled", "model_usage": "disabled", @@ -369,10 +366,10 @@ }, { "model": "process.workerrun", - "pk": "2dee3bf1-8c3a-4999-ae74-6801a141eea5", + "pk": "4a6c05a1-9f5f-41b1-8c55-9942d68f4fbe", "fields": { - "process": "fb8b6046-9aa6-454d-8e0b-472f93605016", - "version": "194b33ea-4a45-4884-9a89-dd04c5a65fc3", + "process": "ca34111d-1329-4b71-b322-688239e27b33", + "version": "51d03bd9-0ca8-40fd-a231-f03ad9d301c6", "model_version": null, "parents": "[]", "configuration": null, @@ -384,14 +381,14 @@ }, { "model": "process.workerrun", - "pk": "54d16192-ce9d-4fad-9e4b-b5692787a03a", + "pk": "561ff70e-282b-4ef0-9405-065658bee696", "fields": { - "process": "6fb4ded9-ab97-4764-b0b0-4a7040556cde", - "version": "9da1ac9d-0ff7-44fc-923f-3076a5bead35", + "process": "de1be14d-6a0c-4229-8d45-886c03cd8781", + "version": "51d03bd9-0ca8-40fd-a231-f03ad9d301c6", "model_version": null, "parents": "[]", "configuration": null, - "summary": "Worker Document layout analyser @ 9da1ac", + "summary": "Worker Custom worker @ version 1", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false @@ -399,14 +396,14 @@ }, { "model": "process.workerrun", - "pk": "c2f94771-d640-4c59-9920-a602c85fba61", + "pk": "75dc71dd-4eb2-45d3-bbb6-ad05bf7f252e", "fields": { - "process": "6fb4ded9-ab97-4764-b0b0-4a7040556cde", - "version": "505988ea-21cb-4011-ad87-48bdab37237d", + "process": "9f2362e7-9e74-431a-8c5f-7a54a43fd5a8", + "version": "89cdf4f7-efe9-4387-91cc-fc7aa9bac2f7", "model_version": null, - "parents": "[\"54d16192-ce9d-4fad-9e4b-b5692787a03a\"]", + "parents": "[]", "configuration": null, - "summary": "Worker Recognizer @ 505988", + "summary": "Worker Document layout analyser @ 89cdf4", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false @@ -414,14 +411,14 @@ }, { "model": "process.workerrun", - "pk": "f3246aec-23a7-4127-8368-5bec73b3e7cc", + "pk": "527f297e-25be-4cf0-a557-f2679d605c14", "fields": { - "process": "89fbd695-bd87-4a1d-afef-8647a30d3ccc", - "version": "194b33ea-4a45-4884-9a89-dd04c5a65fc3", + "process": "9f2362e7-9e74-431a-8c5f-7a54a43fd5a8", + "version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "model_version": null, - "parents": "[]", + "parents": "[\"75dc71dd-4eb2-45d3-bbb6-ad05bf7f252e\"]", "configuration": null, - "summary": "Worker Custom worker @ version 1", + "summary": "Worker Recognizer @ e14c27", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false @@ -429,7 +426,7 @@ }, { "model": "documents.corpus", - "pk": "35d72d0a-7d7a-4165-ad65-a863725a470f", + "pk": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -442,11 +439,11 @@ }, { "model": "documents.elementtype", - "pk": "264b7ce8-9232-49db-bda8-6c081c6817a0", + "pk": "335ef2dc-5f04-45d5-8847-bfddc373b272", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "slug": "page", - "display_name": "Page", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "slug": "act", + "display_name": "Act", "folder": false, "indexable": false, "color": "28b62c" @@ -454,9 +451,9 @@ }, { "model": "documents.elementtype", - "pk": "81ac6918-ad4b-4b0d-a9e2-b6c3b4e2421f", + "pk": "3d2df1f8-d332-463d-8d49-a65927742b18", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", "slug": "text_line", "display_name": "Line", "folder": false, @@ -466,23 +463,23 @@ }, { "model": "documents.elementtype", - "pk": "879b6e87-d531-4f61-a5fd-a943f6458e4f", + "pk": "4267d9ca-5619-4238-8743-7d0dbf40c89d", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "slug": "act", - "display_name": "Act", - "folder": false, + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "slug": "volume", + "display_name": "Volume", + "folder": true, "indexable": false, "color": "28b62c" } }, { "model": "documents.elementtype", - "pk": "917c264f-4b42-4335-a21f-9518056a7915", + "pk": "6c30e0df-fddc-497c-b775-2b9a13300fbc", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "slug": "word", - "display_name": "Word", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "slug": "surface", + "display_name": "Surface", "folder": false, "indexable": false, "color": "28b62c" @@ -490,23 +487,23 @@ }, { "model": "documents.elementtype", - "pk": "9c789715-ee58-4259-af53-6a83d5448223", + "pk": "cd2f76df-19ca-45a3-9e15-184058e0744d", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "slug": "volume", - "display_name": "Volume", - "folder": true, + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "slug": "page", + "display_name": "Page", + "folder": false, "indexable": false, "color": "28b62c" } }, { "model": "documents.elementtype", - "pk": "fa2c1395-9f8d-498e-84c4-db996ec47e03", + "pk": "f5a5752a-21a2-4185-ac55-83bfe769de5d", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "slug": "surface", - "display_name": "Surface", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "slug": "word", + "display_name": "Word", "folder": false, "indexable": false, "color": "28b62c" @@ -514,279 +511,279 @@ }, { "model": "documents.elementpath", - "pk": "035f294c-06c7-4acf-b3af-2fdff88efdaf", + "pk": "00078e58-059c-46da-951e-bbd506f6d198", "fields": { - "element": "f531f9a8-b826-4e87-bad3-edcd17cd435f", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"700c1fd5-1f67-4180-aea0-9d6533df44a4\"]", + "element": "f72770d3-d49c-4bf4-9e9f-99ff9934b94f", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"92a40b24-7f3d-49a0-9244-18857ef3472d\"]", "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "04d6c275-9b31-4af2-8dfe-0065e7527403", + "pk": "102e9d9e-80cd-4c9e-b8ac-0662887081ab", "fields": { - "element": "17517c85-cf36-4841-9577-391c8b343914", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"eedc30d8-ef94-40f6-843e-1900d15e47de\"]", - "ordering": 0 + "element": "2744c570-21f3-4ab7-8283-2b60ac1ef1d7", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"b0e720f7-2cfb-4ec1-aa3c-df623c3b24c7\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "0907474b-202a-4e14-8b4f-3614a17be95c", + "pk": "199d2b0a-c218-4b82-8443-24eb22a024ed", "fields": { - "element": "f20e8dd9-285b-4e9c-ba5c-4f63cdb2aaf8", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"700c1fd5-1f67-4180-aea0-9d6533df44a4\"]", + "element": "29ce75c4-1429-410e-bb71-deb1babf8fd9", + "path": "[\"2eb44fc9-837a-4d64-b9d2-5d4f6c16f0e5\"]", "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "0b627a4d-277c-4448-a21e-07a47f2ba855", + "pk": "29f262e4-c00f-422b-99da-9f120f349d4d", "fields": { - "element": "49b598b6-07a5-468f-aac0-e94a4ad06a6d", - "path": "[]", - "ordering": 0 + "element": "aef007bf-09f9-43f5-9110-42feef0ff720", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\"]", + "ordering": 5 } }, { "model": "documents.elementpath", - "pk": "12c39026-aa6b-4d71-b3e9-94fef1256ef7", + "pk": "33733e49-42d4-43f3-941c-5b8c298ac6c0", "fields": { - "element": "2dbf8cc9-cc10-4604-8eb5-de5f3718aa17", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\"]", + "element": "fc0f79c4-d219-416b-ba2d-942fc1f7e257", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"b0e720f7-2cfb-4ec1-aa3c-df623c3b24c7\"]", "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "13b02e99-d065-4b34-92fb-33a653d58c13", + "pk": "369b348e-c13d-44cc-8ba3-54054d5e6b36", "fields": { - "element": "1c02b4cc-858a-47bc-abaf-2549df1ef749", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"a433b9be-bf1d-4abd-840d-68401750c442\"]", + "element": "00cf69ea-f401-4223-bb11-3143fc45b734", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"92a40b24-7f3d-49a0-9244-18857ef3472d\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "2c99fbb0-fde9-4e4f-ae87-c1e74e34edf9", + "pk": "36bccd78-72c7-4f4b-81e9-8e46c3795d72", "fields": { - "element": "700c1fd5-1f67-4180-aea0-9d6533df44a4", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\"]", - "ordering": 0 + "element": "677bc0da-2881-499f-817d-805e1dba35bf", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\"]", + "ordering": 6 } }, { "model": "documents.elementpath", - "pk": "493be254-9117-474d-9a1a-16c7ed4c70d2", + "pk": "392c1ee0-1c8d-4d9f-8d92-9ed2a69d2703", "fields": { - "element": "a9a1a2ea-72bd-4649-9e12-e922884bd0e0", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"7d480460-0ab0-4471-a445-f72f2be75b9a\"]", - "ordering": 0 + "element": "81a94dae-4fdc-49e4-a96a-e6c2640f5ad7", + "path": "[\"2eb44fc9-837a-4d64-b9d2-5d4f6c16f0e5\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "64a5fefb-5132-48ee-bad9-03eadcb30b68", + "pk": "41f43bbe-cc86-4407-a6e5-f253c8199e39", "fields": { - "element": "173b6549-a747-446d-b073-567ec53f4a10", - "path": "[\"99777763-3b04-4a00-a6bc-ffdfe840243f\"]", + "element": "73c8186b-1456-4292-876b-0b8c48fa9501", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"ba868f93-f024-4501-9405-454536822065\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "7e5c2329-ccd5-45c3-9192-b5815a35de00", + "pk": "4479f9d2-6e11-4945-8400-3b70340e5324", "fields": { - "element": "fc21b00e-fe72-4be3-83f7-beb2b775f0a3", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"21e28831-aac0-4e11-b44a-4bcbd0f4ddf7\"]", - "ordering": 1 + "element": "7a541071-7dfb-4331-8476-0234ca1d6313", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"677bc0da-2881-499f-817d-805e1dba35bf\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "88c8f446-d600-4750-9ebc-c1514b67a645", + "pk": "4e7a2f71-db38-4186-993e-95b89ef1f17c", "fields": { - "element": "a433b9be-bf1d-4abd-840d-68401750c442", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\"]", - "ordering": 3 + "element": "f78a95f0-6980-4c2b-acf6-57965f9273de", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"ba868f93-f024-4501-9405-454536822065\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "9d405bca-c0c0-4ce2-ad98-b4ff2c292aaf", + "pk": "6031e1ee-b6e2-4cf6-a340-63dc76a6def3", "fields": { - "element": "2b49f87c-e879-48b1-a7c2-9f173f62baf5", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"700c1fd5-1f67-4180-aea0-9d6533df44a4\"]", - "ordering": 0 + "element": "021bfcd2-239a-4d9b-948a-e3db7deb0f30", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"dc12e918-17f0-4672-b767-4c9c7a229785\"]", + "ordering": 3 } }, { "model": "documents.elementpath", - "pk": "a394a82c-8ee9-4fce-a1c4-3b4475d85477", + "pk": "6340fbe9-e66d-4dfd-9418-4b0a79f4f337", "fields": { - "element": "17419d59-90af-4e7f-8052-5425e5444e80", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"2dbf8cc9-cc10-4604-8eb5-de5f3718aa17\"]", - "ordering": 1 + "element": "92a40b24-7f3d-49a0-9244-18857ef3472d", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\"]", + "ordering": 4 } }, { "model": "documents.elementpath", - "pk": "a6089453-c63c-49a8-8a9d-fc05eac6d7c8", + "pk": "6e8678b6-e9fb-467c-ae3f-ea5c4cdf13f0", "fields": { - "element": "7841e9f9-f71f-4582-8cca-844cb55210be", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"93c849a1-9e56-4fc8-a3a7-14200103482c\"]", + "element": "3c8195e1-a172-43dd-89e9-4db0ec39438c", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"dc12e918-17f0-4672-b767-4c9c7a229785\"]", "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "a788c955-06f6-404d-a48c-4526089a6589", + "pk": "79e2e1d0-2b4f-47c5-9084-d50734636674", "fields": { - "element": "7f3e6a59-1bf6-4236-afba-dcecbfb38088", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"700c1fd5-1f67-4180-aea0-9d6533df44a4\"]", + "element": "d06899de-4201-48ec-8d4f-2414b1e8ea9e", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\"]", "ordering": 3 } }, { "model": "documents.elementpath", - "pk": "b2cfb1dd-4d11-4b9e-b757-03ce49f20d10", + "pk": "92f1ac10-958c-451b-9d87-46348e750d73", "fields": { - "element": "580235a9-4050-45f2-b194-2c62ef69051e", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"93c849a1-9e56-4fc8-a3a7-14200103482c\"]", + "element": "a96b1536-3ab8-4394-a2e4-1a243e71ba71", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"b0e720f7-2cfb-4ec1-aa3c-df623c3b24c7\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "b30f2781-b3e3-4e13-b767-2dc354752772", + "pk": "9995019d-8f5d-4bdb-90a3-5a82cf1bc68d", "fields": { - "element": "93c849a1-9e56-4fc8-a3a7-14200103482c", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\"]", - "ordering": 2 + "element": "dc12e918-17f0-4672-b767-4c9c7a229785", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "b47d5414-1cbe-46f7-9a8c-7e11bcd5f5b8", + "pk": "a0d9a6c2-288a-4a84-bdea-dec7013e7260", "fields": { - "element": "7d480460-0ab0-4471-a445-f72f2be75b9a", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\"]", - "ordering": 6 + "element": "ba868f93-f024-4501-9405-454536822065", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "c1022f9a-8b8f-4c9c-abc6-0742b78be4cf", + "pk": "a35025d4-a2fd-4278-950e-506f7c0a7428", "fields": { - "element": "ea1947f6-dc20-447f-87f3-c46ef20cb3f1", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"d23ebc38-5318-46fc-bc1a-62466806723d\"]", + "element": "e47b0388-970d-40b1-afed-f0de9f0b31a0", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"dc12e918-17f0-4672-b767-4c9c7a229785\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "c724d4e4-e4df-48ab-9e19-851ac25674be", + "pk": "b5895b16-85bb-4ee0-83ae-0dbe8d70e74e", "fields": { - "element": "786a05b3-28db-45f9-9386-d86e4bd2370e", - "path": "[\"99777763-3b04-4a00-a6bc-ffdfe840243f\"]", - "ordering": 1 + "element": "c9f0ed74-71a7-4a6c-aa6e-4af9a10a7b07", + "path": "[\"2eb44fc9-837a-4d64-b9d2-5d4f6c16f0e5\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "c8d274f4-fef2-4cbf-b6e2-455024b6b288", + "pk": "bbad373e-eece-423c-8ce9-d96306ffa708", "fields": { - "element": "599a7d5a-63c5-4695-b6e3-8b164fbc9ebb", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"2dbf8cc9-cc10-4604-8eb5-de5f3718aa17\"]", + "element": "f2500bfd-5296-46bf-b039-7a52fa5501fe", + "path": "[]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "c9a3c855-9735-4e0d-916c-573bf789a142", + "pk": "c92d9ba6-45e0-4059-901f-e725fc607988", "fields": { - "element": "99777763-3b04-4a00-a6bc-ffdfe840243f", - "path": "[]", - "ordering": 0 + "element": "5f5a3194-9d00-4977-bd8e-69fd1c80f896", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\"]", + "ordering": 7 } }, { "model": "documents.elementpath", - "pk": "ca75fe24-7090-438d-a822-20a228987cc3", + "pk": "d3a1093c-940e-46e9-a699-9116420087ce", "fields": { - "element": "d23ebc38-5318-46fc-bc1a-62466806723d", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\"]", - "ordering": 5 + "element": "2eb44fc9-837a-4d64-b9d2-5d4f6c16f0e5", + "path": "[]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "cc426fcb-7bf6-42da-b4d1-ed6aa49296cf", + "pk": "dd5241cc-99b6-4ff6-925c-25101f29585e", "fields": { - "element": "236b450d-874b-40c9-9945-a7307a3be8d9", - "path": "[\"99777763-3b04-4a00-a6bc-ffdfe840243f\"]", - "ordering": 2 + "element": "386c28f6-9b6f-49b4-ba7b-b31d864a1231", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"d06899de-4201-48ec-8d4f-2414b1e8ea9e\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "d1a618e3-a489-479d-ba73-22f111f8e94b", + "pk": "de29171f-6de7-43ec-90aa-f6e13940d65f", "fields": { - "element": "c31953e0-1723-45ba-9fd2-4e06611b164a", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"21e28831-aac0-4e11-b44a-4bcbd0f4ddf7\"]", - "ordering": 0 + "element": "b0e720f7-2cfb-4ec1-aa3c-df623c3b24c7", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "d2e92f0f-0551-4e12-8fc5-d2d85f9b458c", + "pk": "e31fb634-0412-4d66-b6db-df24d4815c41", "fields": { - "element": "eedc30d8-ef94-40f6-843e-1900d15e47de", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\"]", - "ordering": 7 + "element": "2da972f0-55f7-4bc9-ae8a-f4952fec9ac7", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"5f5a3194-9d00-4977-bd8e-69fd1c80f896\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "dab68042-3da7-4bec-8a52-ae8fce056ca2", + "pk": "ec948cad-e91a-4211-9170-fdcbf4030bf4", "fields": { - "element": "642de90b-27a0-4eb3-8742-000faa53f765", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"93c849a1-9e56-4fc8-a3a7-14200103482c\"]", + "element": "cd73870c-7b2c-4308-b216-196cf6f4f086", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"dc12e918-17f0-4672-b767-4c9c7a229785\"]", "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "dc2c3dde-fab6-4db7-8fec-cffe85ed4564", + "pk": "ed870e4c-10a8-4d7a-8bd7-bd124b745872", "fields": { - "element": "43f1b64e-44a9-4648-a46c-0b605b420bd7", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\", \"2dbf8cc9-cc10-4604-8eb5-de5f3718aa17\"]", + "element": "e0c9fec4-a6a1-4eab-95da-26b7718bd021", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"ba868f93-f024-4501-9405-454536822065\"]", "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "f6f57c2b-3d4b-4e80-b320-d4d7acc38935", + "pk": "f893d7bf-9154-4130-9097-2e8f92e6a234", "fields": { - "element": "21e28831-aac0-4e11-b44a-4bcbd0f4ddf7", - "path": "[\"49b598b6-07a5-468f-aac0-e94a4ad06a6d\"]", - "ordering": 4 + "element": "714d988a-bb54-4d39-9d0a-cab528af5c9c", + "path": "[\"f2500bfd-5296-46bf-b039-7a52fa5501fe\", \"aef007bf-09f9-43f5-9110-42feef0ff720\"]", + "ordering": 0 } }, { "model": "documents.element", - "pk": "173b6549-a747-446d-b073-567ec53f4a10", + "pk": "00cf69ea-f401-4223-bb11-3143fc45b734", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "264b7ce8-9232-49db-bda8-6c081c6817a0", - "name": "Volume 2, page 1r", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "6c30e0df-fddc-497c-b775-2b9a13300fbc", + "name": "Surface B", "creator": null, "worker_version": null, "worker_run": null, - "image": "0fceb46b-af14-4568-984e-ac26ceb06fa4", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "e3e69ede-2d38-4ad9-adeb-7cf37da22a85", + "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -794,17 +791,17 @@ }, { "model": "documents.element", - "pk": "17419d59-90af-4e7f-8052-5425e5444e80", + "pk": "021bfcd2-239a-4d9b-948a-e3db7deb0f30", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", - "name": "ROY", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "3d2df1f8-d332-463d-8d49-a65927742b18", + "name": "Text line", "creator": null, "worker_version": null, "worker_run": null, - "image": "a4fef864-b712-41df-97cf-29b774450df8", + "image": "e3e69ede-2d38-4ad9-adeb-7cf37da22a85", "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, @@ -813,18 +810,18 @@ }, { "model": "documents.element", - "pk": "17517c85-cf36-4841-9577-391c8b343914", + "pk": "2744c570-21f3-4ab7-8283-2b60ac1ef1d7", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "fa2c1395-9f8d-498e-84c4-db996ec47e03", - "name": "Surface F", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "e48347c1-2047-4e9a-b567-52a9e7b71ac6", - "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", + "image": "32ce959e-a9a0-4f6b-be79-e185b7181055", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -832,18 +829,18 @@ }, { "model": "documents.element", - "pk": "1c02b4cc-858a-47bc-abaf-2549df1ef749", + "pk": "29ce75c4-1429-410e-bb71-deb1babf8fd9", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "fa2c1395-9f8d-498e-84c4-db996ec47e03", - "name": "Surface A", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "cd2f76df-19ca-45a3-9e15-184058e0744d", + "name": "Volume 2, page 2r", "creator": null, "worker_version": null, "worker_run": null, - "image": "bd3c8ee4-358a-4a50-90f6-1080b910d615", - "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)", + "image": "83e3f3a6-c940-4439-b9c8-72c60ad280fa", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -851,18 +848,18 @@ }, { "model": "documents.element", - "pk": "21e28831-aac0-4e11-b44a-4bcbd0f4ddf7", + "pk": "2da972f0-55f7-4bc9-ae8a-f4952fec9ac7", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "879b6e87-d531-4f61-a5fd-a943f6458e4f", - "name": "Act 2", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "6c30e0df-fddc-497c-b775-2b9a13300fbc", + "name": "Surface F", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "1cbb097f-9577-44ea-960e-54a2f81eca06", + "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -870,18 +867,18 @@ }, { "model": "documents.element", - "pk": "236b450d-874b-40c9-9945-a7307a3be8d9", + "pk": "2eb44fc9-837a-4d64-b9d2-5d4f6c16f0e5", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "264b7ce8-9232-49db-bda8-6c081c6817a0", - "name": "Volume 2, page 2r", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "4267d9ca-5619-4238-8743-7d0dbf40c89d", + "name": "Volume 2", "creator": null, "worker_version": null, "worker_run": null, - "image": "a43940c0-254f-4920-b725-7f063bcc0b50", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -889,18 +886,18 @@ }, { "model": "documents.element", - "pk": "2b49f87c-e879-48b1-a7c2-9f173f62baf5", + "pk": "386c28f6-9b6f-49b4-ba7b-b31d864a1231", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", - "name": "PARIS", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "6c30e0df-fddc-497c-b775-2b9a13300fbc", + "name": "Surface A", "creator": null, "worker_version": null, "worker_run": null, - "image": "bd3c8ee4-358a-4a50-90f6-1080b910d615", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": "e3e69ede-2d38-4ad9-adeb-7cf37da22a85", + "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -908,18 +905,18 @@ }, { "model": "documents.element", - "pk": "2dbf8cc9-cc10-4604-8eb5-de5f3718aa17", + "pk": "3c8195e1-a172-43dd-89e9-4db0ec39438c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "264b7ce8-9232-49db-bda8-6c081c6817a0", - "name": "Volume 1, page 1v", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "a4fef864-b712-41df-97cf-29b774450df8", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "e3e69ede-2d38-4ad9-adeb-7cf37da22a85", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -927,18 +924,18 @@ }, { "model": "documents.element", - "pk": "43f1b64e-44a9-4648-a46c-0b605b420bd7", + "pk": "5f5a3194-9d00-4977-bd8e-69fd1c80f896", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", - "name": "DATUM", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "335ef2dc-5f04-45d5-8847-bfddc373b272", + "name": "Act 5", "creator": null, "worker_version": null, "worker_run": null, - "image": "a4fef864-b712-41df-97cf-29b774450df8", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -946,13 +943,13 @@ }, { "model": "documents.element", - "pk": "49b598b6-07a5-468f-aac0-e94a4ad06a6d", + "pk": "677bc0da-2881-499f-817d-805e1dba35bf", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "9c789715-ee58-4259-af53-6a83d5448223", - "name": "Volume 1", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "335ef2dc-5f04-45d5-8847-bfddc373b272", + "name": "Act 4", "creator": null, "worker_version": null, "worker_run": null, @@ -965,18 +962,18 @@ }, { "model": "documents.element", - "pk": "580235a9-4050-45f2-b194-2c62ef69051e", + "pk": "714d988a-bb54-4d39-9d0a-cab528af5c9c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", - "name": "PARIS", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "6c30e0df-fddc-497c-b775-2b9a13300fbc", + "name": "Surface D", "creator": null, "worker_version": null, "worker_run": null, - "image": "e48347c1-2047-4e9a-b567-52a9e7b71ac6", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": "1cbb097f-9577-44ea-960e-54a2f81eca06", + "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -984,17 +981,17 @@ }, { "model": "documents.element", - "pk": "599a7d5a-63c5-4695-b6e3-8b164fbc9ebb", + "pk": "73c8186b-1456-4292-876b-0b8c48fa9501", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "a4fef864-b712-41df-97cf-29b774450df8", + "image": "1cbb097f-9577-44ea-960e-54a2f81eca06", "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, @@ -1003,18 +1000,18 @@ }, { "model": "documents.element", - "pk": "642de90b-27a0-4eb3-8742-000faa53f765", + "pk": "7a541071-7dfb-4331-8476-0234ca1d6313", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", - "name": "ROY", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "6c30e0df-fddc-497c-b775-2b9a13300fbc", + "name": "Surface E", "creator": null, "worker_version": null, "worker_run": null, - "image": "e48347c1-2047-4e9a-b567-52a9e7b71ac6", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "1cbb097f-9577-44ea-960e-54a2f81eca06", + "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1022,17 +1019,17 @@ }, { "model": "documents.element", - "pk": "700c1fd5-1f67-4180-aea0-9d6533df44a4", + "pk": "81a94dae-4fdc-49e4-a96a-e6c2640f5ad7", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "264b7ce8-9232-49db-bda8-6c081c6817a0", - "name": "Volume 1, page 1r", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "cd2f76df-19ca-45a3-9e15-184058e0744d", + "name": "Volume 2, page 1v", "creator": null, "worker_version": null, "worker_run": null, - "image": "bd3c8ee4-358a-4a50-90f6-1080b910d615", + "image": "4c59cb4d-7832-4362-82e3-2b62370ea778", "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, @@ -1041,18 +1038,18 @@ }, { "model": "documents.element", - "pk": "7841e9f9-f71f-4582-8cca-844cb55210be", + "pk": "92a40b24-7f3d-49a0-9244-18857ef3472d", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", - "name": "DATUM", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "335ef2dc-5f04-45d5-8847-bfddc373b272", + "name": "Act 2", "creator": null, "worker_version": null, "worker_run": null, - "image": "e48347c1-2047-4e9a-b567-52a9e7b71ac6", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1060,18 +1057,18 @@ }, { "model": "documents.element", - "pk": "786a05b3-28db-45f9-9386-d86e4bd2370e", + "pk": "a96b1536-3ab8-4394-a2e4-1a243e71ba71", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "264b7ce8-9232-49db-bda8-6c081c6817a0", - "name": "Volume 2, page 1v", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "7b3e5017-0c57-45da-aef8-fff14feba411", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "32ce959e-a9a0-4f6b-be79-e185b7181055", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1079,13 +1076,13 @@ }, { "model": "documents.element", - "pk": "7d480460-0ab0-4471-a445-f72f2be75b9a", + "pk": "aef007bf-09f9-43f5-9110-42feef0ff720", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "879b6e87-d531-4f61-a5fd-a943f6458e4f", - "name": "Act 4", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "335ef2dc-5f04-45d5-8847-bfddc373b272", + "name": "Act 3", "creator": null, "worker_version": null, "worker_run": null, @@ -1098,18 +1095,18 @@ }, { "model": "documents.element", - "pk": "7f3e6a59-1bf6-4236-afba-dcecbfb38088", + "pk": "b0e720f7-2cfb-4ec1-aa3c-df623c3b24c7", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "81ac6918-ad4b-4b0d-a9e2-b6c3b4e2421f", - "name": "Text line", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "cd2f76df-19ca-45a3-9e15-184058e0744d", + "name": "Volume 1, page 1v", "creator": null, "worker_version": null, "worker_run": null, - "image": "bd3c8ee4-358a-4a50-90f6-1080b910d615", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "32ce959e-a9a0-4f6b-be79-e185b7181055", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1117,17 +1114,17 @@ }, { "model": "documents.element", - "pk": "93c849a1-9e56-4fc8-a3a7-14200103482c", + "pk": "ba868f93-f024-4501-9405-454536822065", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "264b7ce8-9232-49db-bda8-6c081c6817a0", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "cd2f76df-19ca-45a3-9e15-184058e0744d", "name": "Volume 1, page 2r", "creator": null, "worker_version": null, "worker_run": null, - "image": "e48347c1-2047-4e9a-b567-52a9e7b71ac6", + "image": "1cbb097f-9577-44ea-960e-54a2f81eca06", "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, @@ -1136,18 +1133,18 @@ }, { "model": "documents.element", - "pk": "99777763-3b04-4a00-a6bc-ffdfe840243f", + "pk": "c9f0ed74-71a7-4a6c-aa6e-4af9a10a7b07", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "9c789715-ee58-4259-af53-6a83d5448223", - "name": "Volume 2", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "cd2f76df-19ca-45a3-9e15-184058e0744d", + "name": "Volume 2, page 1r", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "749a8cd8-e467-40dd-a04f-1078460d59c5", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1155,18 +1152,18 @@ }, { "model": "documents.element", - "pk": "a433b9be-bf1d-4abd-840d-68401750c442", + "pk": "cd73870c-7b2c-4308-b216-196cf6f4f086", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "879b6e87-d531-4f61-a5fd-a943f6458e4f", - "name": "Act 1", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "e3e69ede-2d38-4ad9-adeb-7cf37da22a85", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1174,18 +1171,18 @@ }, { "model": "documents.element", - "pk": "a9a1a2ea-72bd-4649-9e12-e922884bd0e0", + "pk": "d06899de-4201-48ec-8d4f-2414b1e8ea9e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "fa2c1395-9f8d-498e-84c4-db996ec47e03", - "name": "Surface E", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "335ef2dc-5f04-45d5-8847-bfddc373b272", + "name": "Act 1", "creator": null, "worker_version": null, "worker_run": null, - "image": "e48347c1-2047-4e9a-b567-52a9e7b71ac6", - "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1193,18 +1190,18 @@ }, { "model": "documents.element", - "pk": "c31953e0-1723-45ba-9fd2-4e06611b164a", + "pk": "dc12e918-17f0-4672-b767-4c9c7a229785", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "fa2c1395-9f8d-498e-84c4-db996ec47e03", - "name": "Surface B", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "cd2f76df-19ca-45a3-9e15-184058e0744d", + "name": "Volume 1, page 1r", "creator": null, "worker_version": null, "worker_run": null, - "image": "bd3c8ee4-358a-4a50-90f6-1080b910d615", - "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", + "image": "e3e69ede-2d38-4ad9-adeb-7cf37da22a85", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1212,18 +1209,18 @@ }, { "model": "documents.element", - "pk": "d23ebc38-5318-46fc-bc1a-62466806723d", + "pk": "e0c9fec4-a6a1-4eab-95da-26b7718bd021", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "879b6e87-d531-4f61-a5fd-a943f6458e4f", - "name": "Act 3", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "1cbb097f-9577-44ea-960e-54a2f81eca06", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1231,18 +1228,18 @@ }, { "model": "documents.element", - "pk": "ea1947f6-dc20-447f-87f3-c46ef20cb3f1", + "pk": "e47b0388-970d-40b1-afed-f0de9f0b31a0", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "fa2c1395-9f8d-498e-84c4-db996ec47e03", - "name": "Surface D", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "e48347c1-2047-4e9a-b567-52a9e7b71ac6", - "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)", + "image": "e3e69ede-2d38-4ad9-adeb-7cf37da22a85", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1250,13 +1247,13 @@ }, { "model": "documents.element", - "pk": "eedc30d8-ef94-40f6-843e-1900d15e47de", + "pk": "f2500bfd-5296-46bf-b039-7a52fa5501fe", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "879b6e87-d531-4f61-a5fd-a943f6458e4f", - "name": "Act 5", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "4267d9ca-5619-4238-8743-7d0dbf40c89d", + "name": "Volume 1", "creator": null, "worker_version": null, "worker_run": null, @@ -1269,18 +1266,18 @@ }, { "model": "documents.element", - "pk": "f20e8dd9-285b-4e9c-ba5c-4f63cdb2aaf8", + "pk": "f72770d3-d49c-4bf4-9e9f-99ff9934b94f", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", - "name": "DATUM", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "6c30e0df-fddc-497c-b775-2b9a13300fbc", + "name": "Surface C", "creator": null, "worker_version": null, "worker_run": null, - "image": "bd3c8ee4-358a-4a50-90f6-1080b910d615", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": "32ce959e-a9a0-4f6b-be79-e185b7181055", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1288,17 +1285,17 @@ }, { "model": "documents.element", - "pk": "f531f9a8-b826-4e87-bad3-edcd17cd435f", + "pk": "f78a95f0-6980-4c2b-acf6-57965f9273de", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "917c264f-4b42-4335-a21f-9518056a7915", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "bd3c8ee4-358a-4a50-90f6-1080b910d615", + "image": "1cbb097f-9577-44ea-960e-54a2f81eca06", "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, @@ -1307,18 +1304,18 @@ }, { "model": "documents.element", - "pk": "fc21b00e-fe72-4be3-83f7-beb2b775f0a3", + "pk": "fc0f79c4-d219-416b-ba2d-942fc1f7e257", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "fa2c1395-9f8d-498e-84c4-db996ec47e03", - "name": "Surface C", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "f5a5752a-21a2-4185-ac55-83bfe769de5d", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "a4fef864-b712-41df-97cf-29b774450df8", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "32ce959e-a9a0-4f6b-be79-e185b7181055", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1326,204 +1323,204 @@ }, { "model": "documents.entitytype", - "pk": "01c8c770-8bc0-4383-a87b-865439cad9c6", + "pk": "0cdeebff-edd0-4cd9-bab9-fdb8ef6ad755", "fields": { - "name": "location", + "name": "number", "color": "ff0000", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f" + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3" } }, { "model": "documents.entitytype", - "pk": "932468ff-0f6a-4c87-8e42-cbdfeb4de820", + "pk": "29f18118-dd12-46a9-a409-e16036ec7571", "fields": { - "name": "organization", + "name": "date", "color": "ff0000", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f" + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3" } }, { "model": "documents.entitytype", - "pk": "a9b5bd96-fe1e-41b0-86d5-1686b5364a95", + "pk": "2fb67db9-bcba-4c08-8022-304098543c13", "fields": { "name": "person", "color": "ff0000", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f" + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3" } }, { "model": "documents.entitytype", - "pk": "ba17ef5d-c875-4a13-b59c-7528417a6cb7", + "pk": "6df8d1e3-5af5-4511-993a-7d128b513ec4", "fields": { - "name": "number", + "name": "location", "color": "ff0000", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f" + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3" } }, { "model": "documents.entitytype", - "pk": "f9659fe1-0955-4b9e-acff-561a0cb7356a", + "pk": "89f521e3-35f2-4863-b382-d4bc1824a126", "fields": { - "name": "date", + "name": "organization", "color": "ff0000", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f" + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3" } }, { "model": "documents.transcription", - "pk": "2b15b4fd-d26b-4bce-8610-20348ad44887", + "pk": "0948ae28-223e-4ece-881e-0346461d5f70", "fields": { - "element": "2b49f87c-e879-48b1-a7c2-9f173f62baf5", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "2744c570-21f3-4ab7-8283-2b60ac1ef1d7", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "PARIS", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "3725b78b-efdf-432a-bc75-ae91bcb54297", + "pk": "1d0231a0-65a7-4d5f-ade5-c882df774a8a", "fields": { - "element": "700c1fd5-1f67-4180-aea0-9d6533df44a4", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "e47b0388-970d-40b1-afed-f0de9f0b31a0", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "Lorem ipsum dolor sit amet", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "4a7546e6-9e00-4dc9-82ff-5ae9b8bfbfc7", + "pk": "1e97abec-02e1-4b1b-b3f5-c9c4e5ba2350", "fields": { - "element": "f20e8dd9-285b-4e9c-ba5c-4f63cdb2aaf8", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "cd73870c-7b2c-4308-b216-196cf6f4f086", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "DATUM", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "5717edbf-0c6e-4f92-95f0-b4088a023dde", + "pk": "2d53623b-e3f9-4e17-a694-cc92bb81364e", "fields": { - "element": "599a7d5a-63c5-4695-b6e3-8b164fbc9ebb", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "fc0f79c4-d219-416b-ba2d-942fc1f7e257", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "PARIS", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "5ed1f7ca-e777-4e30-86b3-4789197729be", + "pk": "3e745322-d041-47f8-a6cf-60d6c93c6c5d", "fields": { - "element": "580235a9-4050-45f2-b194-2c62ef69051e", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "f78a95f0-6980-4c2b-acf6-57965f9273de", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "PARIS", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "6d0e6148-db3a-446a-bb16-539ea4255c30", + "pk": "66079256-1d7e-4b41-be22-4fe9fec0a743", "fields": { - "element": "7841e9f9-f71f-4582-8cca-844cb55210be", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "a96b1536-3ab8-4394-a2e4-1a243e71ba71", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "DATUM", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "7011525f-cae6-4582-b869-ebe16dd93764", + "pk": "b09aeb72-4610-4b12-8684-a0b3264652b4", "fields": { - "element": "43f1b64e-44a9-4648-a46c-0b605b420bd7", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "73c8186b-1456-4292-876b-0b8c48fa9501", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "DATUM", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "b2595600-d142-4515-a427-3b4b2dcb2d5f", + "pk": "c1d6d0c8-2820-4891-b872-81650df49e8c", "fields": { - "element": "f531f9a8-b826-4e87-bad3-edcd17cd435f", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "dc12e918-17f0-4672-b767-4c9c7a229785", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "ROY", + "text": "Lorem ipsum dolor sit amet", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "c399e488-675b-49ac-bd6b-a4be34756e87", + "pk": "ccf46e07-70c9-4050-be62-4d8adc1bd76f", "fields": { - "element": "642de90b-27a0-4eb3-8742-000faa53f765", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "e0c9fec4-a6a1-4eab-95da-26b7718bd021", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "ROY", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "c7d484cd-3080-41aa-b24d-e51fba98ee4e", + "pk": "d33e9dcc-4411-4a31-937e-0b5bbbccc2bc", "fields": { - "element": "17419d59-90af-4e7f-8052-5425e5444e80", - "worker_version": "505988ea-21cb-4011-ad87-48bdab37237d", + "element": "3c8195e1-a172-43dd-89e9-4db0ec39438c", + "worker_version": "e14c27a7-2525-42e8-8aea-2f9c8b38c708", "worker_run": null, - "text": "ROY", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.allowedmetadata", - "pk": "43948eee-60c9-42e1-affd-c72312b7f18e", + "pk": "248f6ac6-5ee3-4a5f-b6bd-44dfd38974e5", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "text", - "name": "folio" + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "location", + "name": "location" } }, { "model": "documents.allowedmetadata", - "pk": "58be7836-60ef-43b8-a6ea-e4472f2c0c31", + "pk": "c5d77da5-a270-4cc7-ae2c-00f3c2a76ca0", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "date", - "name": "date" + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "text", + "name": "folio" } }, { "model": "documents.allowedmetadata", - "pk": "60567a85-e544-47c4-b300-774308d0a6e8", + "pk": "ebf52c92-9329-422a-83dd-013f64fd69b8", "fields": { - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", - "type": "location", - "name": "location" + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "type": "date", + "name": "date" } }, { "model": "documents.metadata", - "pk": "11db8db6-e672-4fff-bfd6-064a30f1091f", + "pk": "19470d61-045c-49e0-838b-7553b6f96b73", "fields": { - "element": "786a05b3-28db-45f9-9386-d86e4bd2370e", - "name": "folio", + "element": "aef007bf-09f9-43f5-9110-42feef0ff720", + "name": "number", "type": "text", - "value": "1v", + "value": "3", "entity": null, "worker_version": null, "worker_run": null @@ -1531,12 +1528,12 @@ }, { "model": "documents.metadata", - "pk": "2127a4b5-44d7-4198-b285-45d11263a250", + "pk": "4d208b74-48ee-4a7f-9491-7b031654a83d", "fields": { - "element": "236b450d-874b-40c9-9945-a7307a3be8d9", + "element": "81a94dae-4fdc-49e4-a96a-e6c2640f5ad7", "name": "folio", "type": "text", - "value": "2r", + "value": "1v", "entity": null, "worker_version": null, "worker_run": null @@ -1544,12 +1541,12 @@ }, { "model": "documents.metadata", - "pk": "46142d6e-2716-4b13-899d-e25557674722", + "pk": "4da1ca8d-7f6c-4150-8bb3-3777158907e9", "fields": { - "element": "a433b9be-bf1d-4abd-840d-68401750c442", - "name": "number", + "element": "dc12e918-17f0-4672-b767-4c9c7a229785", + "name": "folio", "type": "text", - "value": "1", + "value": "1r", "entity": null, "worker_version": null, "worker_run": null @@ -1557,12 +1554,12 @@ }, { "model": "documents.metadata", - "pk": "6764ffd2-7a40-4fb2-aa5d-b07be43ec12a", + "pk": "5386ae6b-3f68-4798-91d8-1dffc86f9e3b", "fields": { - "element": "700c1fd5-1f67-4180-aea0-9d6533df44a4", - "name": "folio", + "element": "92a40b24-7f3d-49a0-9244-18857ef3472d", + "name": "number", "type": "text", - "value": "1r", + "value": "2", "entity": null, "worker_version": null, "worker_run": null @@ -1570,12 +1567,12 @@ }, { "model": "documents.metadata", - "pk": "6b1e5c6f-c428-4bfe-84d1-5d70579a9e7b", + "pk": "5b4a8070-3021-4aa5-a8ea-8cd32576605d", "fields": { - "element": "7d480460-0ab0-4471-a445-f72f2be75b9a", - "name": "number", + "element": "c9f0ed74-71a7-4a6c-aa6e-4af9a10a7b07", + "name": "folio", "type": "text", - "value": "4", + "value": "1r", "entity": null, "worker_version": null, "worker_run": null @@ -1583,12 +1580,12 @@ }, { "model": "documents.metadata", - "pk": "7d543dfd-2e55-41fe-a396-41fd5f9aa37a", + "pk": "61fe6253-a49c-46bf-a1ee-dd541d2870f8", "fields": { - "element": "173b6549-a747-446d-b073-567ec53f4a10", + "element": "ba868f93-f024-4501-9405-454536822065", "name": "folio", "type": "text", - "value": "1r", + "value": "2r", "entity": null, "worker_version": null, "worker_run": null @@ -1596,9 +1593,9 @@ }, { "model": "documents.metadata", - "pk": "8587b8a7-9b30-4018-9295-c069a2d18662", + "pk": "9a9607bf-623e-4976-bea0-24e2ec2a93ab", "fields": { - "element": "eedc30d8-ef94-40f6-843e-1900d15e47de", + "element": "5f5a3194-9d00-4977-bd8e-69fd1c80f896", "name": "number", "type": "text", "value": "5", @@ -1609,9 +1606,9 @@ }, { "model": "documents.metadata", - "pk": "8ab6a879-c132-4712-a985-212c3ba5ccb9", + "pk": "c03c034a-2d4d-4ac8-a76d-a3a0ba76e018", "fields": { - "element": "2dbf8cc9-cc10-4604-8eb5-de5f3718aa17", + "element": "b0e720f7-2cfb-4ec1-aa3c-df623c3b24c7", "name": "folio", "type": "text", "value": "1v", @@ -1622,9 +1619,9 @@ }, { "model": "documents.metadata", - "pk": "a85ec19b-c732-4485-9655-4b6f9ba236fe", + "pk": "c2229da6-59ed-4635-a611-8d69c50207b8", "fields": { - "element": "93c849a1-9e56-4fc8-a3a7-14200103482c", + "element": "29ce75c4-1429-410e-bb71-deb1babf8fd9", "name": "folio", "type": "text", "value": "2r", @@ -1635,12 +1632,12 @@ }, { "model": "documents.metadata", - "pk": "c6840a9a-5db5-45d5-aeef-e231571b499e", + "pk": "d32794ff-aba4-4257-b59a-01b398e470c8", "fields": { - "element": "d23ebc38-5318-46fc-bc1a-62466806723d", + "element": "677bc0da-2881-499f-817d-805e1dba35bf", "name": "number", "type": "text", - "value": "3", + "value": "4", "entity": null, "worker_version": null, "worker_run": null @@ -1648,12 +1645,12 @@ }, { "model": "documents.metadata", - "pk": "f8240bb3-b50b-46a6-924c-7ebf057db537", + "pk": "f86c291d-b1de-4c92-9bc6-c150ba08ab83", "fields": { - "element": "21e28831-aac0-4e11-b44a-4bcbd0f4ddf7", + "element": "d06899de-4201-48ec-8d4f-2414b1e8ea9e", "name": "number", "type": "text", - "value": "2", + "value": "1", "entity": null, "worker_version": null, "worker_run": null @@ -1676,12 +1673,12 @@ }, { "model": "images.image", - "pk": "0fceb46b-af14-4568-984e-ac26ceb06fa4", + "pk": "1cbb097f-9577-44ea-960e-54a2f81eca06", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img4", + "path": "img3", "width": 1000, "height": 1000, "hash": null, @@ -1690,12 +1687,12 @@ }, { "model": "images.image", - "pk": "7b3e5017-0c57-45da-aef8-fff14feba411", + "pk": "32ce959e-a9a0-4f6b-be79-e185b7181055", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img5", + "path": "img2", "width": 1000, "height": 1000, "hash": null, @@ -1704,12 +1701,12 @@ }, { "model": "images.image", - "pk": "a43940c0-254f-4920-b725-7f063bcc0b50", + "pk": "4c59cb4d-7832-4362-82e3-2b62370ea778", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img6", + "path": "img5", "width": 1000, "height": 1000, "hash": null, @@ -1718,12 +1715,12 @@ }, { "model": "images.image", - "pk": "a4fef864-b712-41df-97cf-29b774450df8", + "pk": "749a8cd8-e467-40dd-a04f-1078460d59c5", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img2", + "path": "img4", "width": 1000, "height": 1000, "hash": null, @@ -1732,12 +1729,12 @@ }, { "model": "images.image", - "pk": "bd3c8ee4-358a-4a50-90f6-1080b910d615", + "pk": "83e3f3a6-c940-4439-b9c8-72c60ad280fa", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img1", + "path": "img6", "width": 1000, "height": 1000, "hash": null, @@ -1746,12 +1743,12 @@ }, { "model": "images.image", - "pk": "e48347c1-2047-4e9a-b567-52a9e7b71ac6", + "pk": "e3e69ede-2d38-4ad9-adeb-7cf37da22a85", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img3", + "path": "img1", "width": 1000, "height": 1000, "hash": null, @@ -1760,56 +1757,56 @@ }, { "model": "users.right", - "pk": "007844fb-44e9-42ff-925f-954e98292c50", + "pk": "4792d973-4724-4e9e-b524-4559fa3629ba", "fields": { - "user": 2, + "user": 4, "group": null, "content_type": 34, - "content_id": "d4c0ee9b-6c8e-4667-823b-01cdbf709161", - "level": 100 - } -}, -{ - "model": "users.right", - "pk": "3f108462-43fd-417f-adbf-f2efcae42d99", - "fields": { - "user": 2, - "group": null, - "content_type": 11, - "content_id": "0464874a-12cd-4bb5-a06f-37a872a82e5a", + "content_id": "cc190b64-fc54-4ae6-8907-9866df928d6d", "level": 10 } }, { "model": "users.right", - "pk": "6c838d5b-602d-4a59-a890-e0e7b45892d3", + "pk": "68e7e725-68ea-4804-a707-56fa812c484d", "fields": { "user": 3, "group": null, "content_type": 34, - "content_id": "d4c0ee9b-6c8e-4667-823b-01cdbf709161", + "content_id": "cc190b64-fc54-4ae6-8907-9866df928d6d", "level": 50 } }, { "model": "users.right", - "pk": "8e0946ec-f183-4777-9b01-fad1260274d8", + "pk": "b180fd9c-826a-41f5-8e62-2410e67d39e3", "fields": { - "user": 4, + "user": 2, "group": null, - "content_type": 34, - "content_id": "d4c0ee9b-6c8e-4667-823b-01cdbf709161", + "content_type": 11, + "content_id": "dd6f9265-24cf-4773-9e61-a42853278337", "level": 10 } }, { "model": "users.right", - "pk": "bb2da668-ad2c-4869-900a-fabc8edc1c81", + "pk": "cf3580b2-1b6c-4ba7-aa25-29549bca89ae", "fields": { "user": 2, "group": null, "content_type": 19, - "content_id": "35d72d0a-7d7a-4165-ad65-a863725a470f", + "content_id": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", + "level": 100 + } +}, +{ + "model": "users.right", + "pk": "d78873f2-9c48-4451-bf4e-eacfb1f4902b", + "fields": { + "user": 2, + "group": null, + "content_type": 34, + "content_id": "cc190b64-fc54-4ae6-8907-9866df928d6d", "level": 100 } }, @@ -1817,7 +1814,7 @@ "model": "users.user", "pk": 1, "fields": { - "password": "pbkdf2_sha256$390000$QSd65IybrTHuN13us8Mqz3$5D0bK0ZjilS/hgJNYMtiBeGqIyPXT2pS1opEuL2Xw5A=", + "password": "pbkdf2_sha256$390000$Lp3r8epd7MAvwpnIvJlfyz$EvnViNTJylIcdh3xVfE0ZYRPrZlFIyMTl8mBzqOHzKo=", "last_login": null, "email": "root@root.fr", "display_name": "Admin", @@ -1832,7 +1829,7 @@ "model": "users.user", "pk": 2, "fields": { - "password": "pbkdf2_sha256$390000$TpW8NPlptDOAWz4DsGYUPB$CsXsGa2P8pwWcYLAFkF40X3F8wNyqMl+eDNB/OLs3gw=", + "password": "pbkdf2_sha256$390000$G1mEZRqMbJxh2GKqYnE48G$9dRtzWLGIepaEOCg5QH9X0d0nH+adcvrTU2UHs8SUDs=", "last_login": null, "email": "user@user.fr", "display_name": "Test user", @@ -1875,7 +1872,7 @@ }, { "model": "users.group", - "pk": "d4c0ee9b-6c8e-4667-823b-01cdbf709161", + "pk": "cc190b64-fc54-4ae6-8907-9866df928d6d", "fields": { "name": "User group", "public": false, @@ -3909,19 +3906,19 @@ }, { "model": "ponos.farm", - "pk": "0464874a-12cd-4bb5-a06f-37a872a82e5a", + "pk": "dd6f9265-24cf-4773-9e61-a42853278337", "fields": { "name": "Wheat farm", - "seed": "752dbcf9ba697d6affdd82339c81ca2db28f9b046961a317e0c509561bbc3ad7" + "seed": "9deb13000bdfc3a10d044b7e03b0c45f6d82f2824159198e9f89177c7e499684" } }, { "model": "training.dataset", - "pk": "2d515087-c048-42a1-a21a-5c1ba589f455", + "pk": "b9d67974-4bb9-47f7-b1e8-62577fe2c831", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", "creator": 2, "task": null, "name": "First Dataset", @@ -3931,11 +3928,11 @@ }, { "model": "training.dataset", - "pk": "3a350d60-ce8d-4e26-a764-92b1ff02b3f8", + "pk": "f0391be7-aca4-4c28-adca-756822a79193", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "35d72d0a-7d7a-4165-ad65-a863725a470f", + "corpus": "206d6f86-a96c-4fd7-a097-0e5fa82de5d3", "creator": 2, "task": null, "name": "Second Dataset", @@ -3945,50 +3942,50 @@ }, { "model": "training.datasetset", - "pk": "04b3fdac-fd31-48b7-8d39-cfe68ebbe464", + "pk": "0117927b-cf13-4352-9e57-2f32697b4e6e", "fields": { - "name": "training", - "dataset": "2d515087-c048-42a1-a21a-5c1ba589f455" + "name": "test", + "dataset": "f0391be7-aca4-4c28-adca-756822a79193" } }, { "model": "training.datasetset", - "pk": "35188db8-ac84-4edf-8f85-b747da5d20ab", + "pk": "4dc67765-b447-49c3-8cc9-8171bdfaaecb", "fields": { - "name": "test", - "dataset": "2d515087-c048-42a1-a21a-5c1ba589f455" + "name": "validation", + "dataset": "f0391be7-aca4-4c28-adca-756822a79193" } }, { "model": "training.datasetset", - "pk": "70e0b644-45cc-4fa7-8290-f9a56801d664", + "pk": "6d44b8d1-a821-4bf3-a0a2-bafcc3503ffd", "fields": { - "name": "validation", - "dataset": "2d515087-c048-42a1-a21a-5c1ba589f455" + "name": "training", + "dataset": "f0391be7-aca4-4c28-adca-756822a79193" } }, { "model": "training.datasetset", - "pk": "8a800950-7647-4001-8a19-fc2175061a24", + "pk": "7ea0c470-a45f-4365-8d25-d723143d8208", "fields": { "name": "training", - "dataset": "3a350d60-ce8d-4e26-a764-92b1ff02b3f8" + "dataset": "b9d67974-4bb9-47f7-b1e8-62577fe2c831" } }, { "model": "training.datasetset", - "pk": "8c412165-7e72-4509-afc8-e4e5d13f428c", + "pk": "d02fcb33-bce7-4bea-a605-b97f8c26542c", "fields": { - "name": "validation", - "dataset": "3a350d60-ce8d-4e26-a764-92b1ff02b3f8" + "name": "test", + "dataset": "b9d67974-4bb9-47f7-b1e8-62577fe2c831" } }, { "model": "training.datasetset", - "pk": "da8eb663-d2f0-489f-bcb5-6660386ba80b", + "pk": "da1c1b41-6290-4f32-8087-fdb925dc6643", "fields": { - "name": "test", - "dataset": "3a350d60-ce8d-4e26-a764-92b1ff02b3f8" + "name": "validation", + "dataset": "b9d67974-4bb9-47f7-b1e8-62577fe2c831" } } ] diff --git a/arkindex/documents/tests/test_retrieve_elements.py b/arkindex/documents/tests/test_retrieve_elements.py index 5ad132151a6f9b6fb2f3467830cfe34dac8ef9d7..6556490cbfb08607a889e990098befe59c86a947 100644 --- a/arkindex/documents/tests/test_retrieve_elements.py +++ b/arkindex/documents/tests/test_retrieve_elements.py @@ -155,7 +155,6 @@ class TestRetrieveElements(FixtureAPITestCase): process = Process.objects.create( mode=ProcessMode.Workers, creator=self.user, - generate_thumbnails=True, farm=Farm.objects.first(), corpus=self.corpus ) diff --git a/arkindex/process/builder.py b/arkindex/process/builder.py index 6a122eeb075bcd2610ec38f5bcfb1388c79b730b..74619b170ed571970446e106b51d35595f3052be 100644 --- a/arkindex/process/builder.py +++ b/arkindex/process/builder.py @@ -62,24 +62,6 @@ class ProcessBuilder(object): for parent_slug in parent_slugs ) + 1 - def _add_thumbnails(self, import_task_slug: str) -> None: - """ - Automatically adds a thumbnail generation task at the end of each distributed chunk - If a specific parent slug is provided, attach the thumbnails generation task to it. - """ - if not self.process.generate_thumbnails: - return - - chunks = self._get_elements_json_chunks() - for index, chunk in enumerate(chunks, start=1): - slug = "thumbnails" - if len(chunks) > 1: - slug += f"_{index}" - elements_path = shlex.quote(path.join("/data", import_task_slug, chunk)) - command = f"python3 -m arkindex_tasks.generate_thumbnails {elements_path}" - self._build_task(command=command, slug=slug, env=self.base_env) - self.tasks_parents[slug].append(import_task_slug) - def _build_task( self, command, @@ -204,8 +186,6 @@ class ProcessBuilder(object): def validate_dataset(self) -> None: self.validate_gpu_requirement() self.validate_archived() - if self.process.generate_thumbnails: - raise ValidationError("Thumbnails generation is incompatible with dataset mode processes.") def validate(self) -> None: """ @@ -275,8 +255,6 @@ class ProcessBuilder(object): slug=import_task_slug, env=self.base_env, ) - # Add thumbnails - self._add_thumbnails(import_task_slug=import_task_slug) # Distribute worker run tasks worker_runs = list(self.process.worker_runs.all()) diff --git a/arkindex/process/migrations/0033_remove_process_generate_thumbnails.py b/arkindex/process/migrations/0033_remove_process_generate_thumbnails.py new file mode 100644 index 0000000000000000000000000000000000000000..02a0afd653a0fc76b1a9454f2b349ba18b2cc79c --- /dev/null +++ b/arkindex/process/migrations/0033_remove_process_generate_thumbnails.py @@ -0,0 +1,17 @@ +# Generated by Django 4.1.7 on 2024-03-27 16:38 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("process", "0032_processdatasetset_model"), + ] + + operations = [ + migrations.RemoveField( + model_name="process", + name="generate_thumbnails", + ), + ] diff --git a/arkindex/process/models.py b/arkindex/process/models.py index ba269d422b4b8fccdabd9242b006139ddf561a01..94d041202912e84b7f43ced2a9b347311fd3936d 100644 --- a/arkindex/process/models.py +++ b/arkindex/process/models.py @@ -135,9 +135,6 @@ class Process(IndexableModel): # Used to include sub-elements of the actual query in Workers processes load_children = models.BooleanField(default=False) - # Whether or not to add a thumbnail generation task - generate_thumbnails = models.BooleanField(default=False) - chunks = models.PositiveIntegerField( default=1, validators=[ diff --git a/arkindex/process/serializers/imports.py b/arkindex/process/serializers/imports.py index 349781accf6c32d2fb65593ec193a9f240dddb99..830e01541b8814e63ec65e34fe137caa5280c8e9 100644 --- a/arkindex/process/serializers/imports.py +++ b/arkindex/process/serializers/imports.py @@ -258,9 +258,6 @@ class FilesProcessSerializer(serializers.ModelSerializer): # Automatically set the creator on the process creator = serializers.HiddenField(default=serializers.CurrentUserDefault()) - # Always start the process with thumbnail generation enabled - generate_thumbnails = serializers.HiddenField(default=True) - default_error_messages = { "mode_not_allowed": "This mode is not allowed when importing from files", "files_required": "At least one file is required to start an import process", @@ -287,7 +284,6 @@ class FilesProcessSerializer(serializers.ModelSerializer): "element_type", "farm_id", "creator", - "generate_thumbnails", ) def validate_mode(self, mode): @@ -389,7 +385,6 @@ class StartProcessSerializer(serializers.Serializer): validators=[MaxValueValidator(lambda: settings.MAX_CHUNKS)], default=1, ) - thumbnails = serializers.BooleanField(default=False, source="generate_thumbnails") farm = serializers.PrimaryKeyRelatedField(queryset=Farm.objects.all(), default=None, allow_null=True) use_cache = serializers.BooleanField(default=False) use_gpu = serializers.BooleanField(default=False, allow_null=True) @@ -421,8 +416,6 @@ class StartProcessSerializer(serializers.Serializer): elif not any(ds.dataset.corpus_id == self.instance.corpus.id for ds in self.instance.sets.all()): errors["non_field_errors"].append("At least one of the process sets must be from the same corpus as the process.") - if validated_data.get("generate_thumbnails"): - errors["thumbnails"].append("Thumbnails generation is not supported on Dataset processes.") if validated_data.get("worker_activity"): errors["worker_activity"].append("Worker activities are not supported on Dataset processes.") if validated_data.get("use_cache"): @@ -481,14 +474,7 @@ class StartProcessSerializer(serializers.Serializer): ) else: - if validated_data.get("worker_activity"): - errors["worker_activity"].append("The process must have workers attached to handle their activity.") - if validated_data.get("use_cache"): - errors["use_cache"].append("The process must have workers attached to use cached results.") - if validated_data.get("use_gpu"): - errors["use_gpu"].append("The process must have workers attached to use GPUs.") - if not validated_data.get("generate_thumbnails"): - errors["__all__"].append("The process must either use thumbnail generation or have worker runs.") + errors["__all__"].append("The process must have worker runs to be started.") if errors: raise ValidationError(errors) diff --git a/arkindex/process/tests/test_create_process.py b/arkindex/process/tests/test_create_process.py index e64131810d51a5e8375be7b8fad3ec9c482d85ff..ef88844880e576939715cf2cf436feac8c5bb46b 100644 --- a/arkindex/process/tests/test_create_process.py +++ b/arkindex/process/tests/test_create_process.py @@ -117,10 +117,14 @@ class TestCreateProcess(FixtureAPITestCase): }) # The process needs to be started to produce a workflow + process.worker_runs.create( + version=self.version_1 + ) + response = self.client.post( reverse("api:process-start", kwargs={"pk": str(process.id)}), # The process needs a worker run or thumbnails generation to start - {"thumbnails": "true"} + {} ) self.assertEqual(response.status_code, status.HTTP_201_CREATED) process.refresh_from_db() @@ -487,10 +491,13 @@ class TestCreateProcess(FixtureAPITestCase): self.assertEqual(process.elements.get(), page) # The process needs to be started to produce a workflow + process.worker_runs.create( + version=self.version_1 + ) + response = self.client.post( reverse("api:process-start", kwargs={"pk": str(process.id)}), - # The process needs a worker run or thumbnails generation to start - {"thumbnails": "true"} + {} ) self.assertEqual(response.status_code, status.HTTP_201_CREATED) process.refresh_from_db() @@ -533,46 +540,6 @@ class TestCreateProcess(FixtureAPITestCase): process = Process.objects.get(id=data["id"]) self.assertEqual(process.name, "blah") - def test_thumbnails_generation_only(self): - """ - Generating thumbnails without any worker must generate a process task - and a thumbnails task, when the process is started - """ - self.client.force_login(self.user) - corpus_type = self.corpus.types.first() - response = self.client.post( - reverse("api:corpus-process"), - { - "corpus": str(self.corpus.id), - "element_type": corpus_type.slug, - }, - format="json" - ) - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - data = response.json() - process = Process.objects.get(id=data["id"]) - self.assertFalse(process.tasks.exists()) - - response = self.client.post( - reverse("api:process-start", kwargs={"pk": str(process.id)}), - { - "chunks": 3, - "thumbnails": True, - } - ) - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - process.refresh_from_db() - - self.assertEqual(process.tasks.count(), 4) - init_task = process.tasks.get(slug="initialisation") - self.assertEqual(init_task.command, f"python -m arkindex_tasks.init_elements {process.id} --chunks-number 3") - - for i in range(1, 4): - self.assertEqual( - process.tasks.get(slug=f"thumbnails_{i}").command, - f"python3 -m arkindex_tasks.generate_thumbnails /data/initialisation/elements_chunk_{i}.json" - ) - @override_settings( ARKINDEX_TASKS_IMAGE="registry.teklia.com/tasks", PONOS_DEFAULT_ENV={} diff --git a/arkindex/process/tests/test_processes.py b/arkindex/process/tests/test_processes.py index 84d6dcb9253147c24bcd704bde68579ee5e4b458..31d7de782d22fda2b928677b48d2f013b07d6727 100644 --- a/arkindex/process/tests/test_processes.py +++ b/arkindex/process/tests/test_processes.py @@ -2168,7 +2168,7 @@ class TestProcesses(FixtureAPITestCase): self.assertEqual( response.json(), - {"__all__": ["The process must either use thumbnail generation or have worker runs."]}, + {"__all__": ["The process must have worker runs to be started."]}, ) def test_start_process_unavailable_worker_version(self): @@ -2355,7 +2355,6 @@ class TestProcesses(FixtureAPITestCase): response = self.client.post( reverse("api:process-start", kwargs={"pk": str(process2.id)}), { - "thumbnails": True, "use_cache": True, "worker_activity": True, } @@ -2363,7 +2362,6 @@ class TestProcesses(FixtureAPITestCase): self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertDictEqual(response.json(), { - "thumbnails": ["Thumbnails generation is not supported on Dataset processes."], "use_cache": ["Caching is not supported on Dataset processes."], "worker_activity": ["Worker activities are not supported on Dataset processes."], }) @@ -2509,7 +2507,6 @@ class TestProcesses(FixtureAPITestCase): ({"chunks": 0}, {"chunks": ["Ensure this value is greater than or equal to 1."]}), ({"chunks": 20}, {"chunks": ["Ensure this value is less than or equal to 10."]}), ({"chunks": "max"}, {"chunks": ["A valid integer is required."]}), - ({"thumbnails": "gloubiboulga"}, {"thumbnails": ["Must be a valid boolean."]}) ] for (params, check) in wrong_params_checks: with self.subTest(**params), self.assertNumQueries(5): @@ -2539,7 +2536,7 @@ class TestProcesses(FixtureAPITestCase): def test_start_process_workers_parameters(self): """ - It should be possible to pass chunks and thumbnails parameters when starting a workers process + It should be possible to pass chunks parameters when starting a workers process """ process = self.corpus.processes.create(creator=self.user, mode=ProcessMode.Workers) # Add a worker run to this process @@ -2548,7 +2545,7 @@ class TestProcesses(FixtureAPITestCase): self.client.force_login(self.user) response = self.client.post( reverse("api:process-start", kwargs={"pk": str(process.id)}), - {"chunks": 3, "thumbnails": "true"} + {"chunks": 3} ) self.assertEqual(response.status_code, status.HTTP_201_CREATED) process.refresh_from_db() @@ -2558,9 +2555,6 @@ class TestProcesses(FixtureAPITestCase): f"{run.task_slug}_1", f"{run.task_slug}_2", f"{run.task_slug}_3", - "thumbnails_1", - "thumbnails_2", - "thumbnails_3" ]) def test_start_process_dataset_chunks(self): @@ -2608,10 +2602,7 @@ class TestProcesses(FixtureAPITestCase): ) self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertDictEqual(response.json(), { - "__all__": ["The process must either use thumbnail generation or have worker runs."], - "use_cache": ["The process must have workers attached to use cached results."], - "worker_activity": ["The process must have workers attached to handle their activity."], - "use_gpu": ["The process must have workers attached to use GPUs."], + "__all__": ["The process must have worker runs to be started."] }) process.refresh_from_db() self.assertFalse(process.use_cache) diff --git a/arkindex/sql_validation/process_elements_filter_ml_class.sql b/arkindex/sql_validation/process_elements_filter_ml_class.sql index b8169c5012492220d26060dd17b9274dc2a2939b..773198cab05df817c099f57ffb9ba01b3127611d 100644 --- a/arkindex/sql_validation/process_elements_filter_ml_class.sql +++ b/arkindex/sql_validation/process_elements_filter_ml_class.sql @@ -29,7 +29,6 @@ SELECT "process_process"."id", "process_process"."name_contains", "process_process"."ml_class_id", "process_process"."load_children", - "process_process"."generate_thumbnails", "process_process"."chunks", "process_process"."use_cache", "process_process"."use_gpu", diff --git a/arkindex/sql_validation/process_elements_filter_type.sql b/arkindex/sql_validation/process_elements_filter_type.sql index a0413952bd0533ffa389574029f32f3a3329274c..6710d5e0f85a9237dae975069b430d4d7d7e96fc 100644 --- a/arkindex/sql_validation/process_elements_filter_type.sql +++ b/arkindex/sql_validation/process_elements_filter_type.sql @@ -29,7 +29,6 @@ SELECT "process_process"."id", "process_process"."name_contains", "process_process"."ml_class_id", "process_process"."load_children", - "process_process"."generate_thumbnails", "process_process"."chunks", "process_process"."use_cache", "process_process"."use_gpu", diff --git a/arkindex/sql_validation/process_elements_top_level.sql b/arkindex/sql_validation/process_elements_top_level.sql index 68df166d1ab7c0c419d43b281a6c55f411521ae6..3087532fd0d1af1d4ba9ccc640a4c043230453ea 100644 --- a/arkindex/sql_validation/process_elements_top_level.sql +++ b/arkindex/sql_validation/process_elements_top_level.sql @@ -29,7 +29,6 @@ SELECT "process_process"."id", "process_process"."name_contains", "process_process"."ml_class_id", "process_process"."load_children", - "process_process"."generate_thumbnails", "process_process"."chunks", "process_process"."use_cache", "process_process"."use_gpu", diff --git a/arkindex/sql_validation/process_elements_with_image.sql b/arkindex/sql_validation/process_elements_with_image.sql index ec4b65bf479428be8287aed7263fd7471ba8e6fc..9d89dc7c0ec86556af2927dece2c53a23268d167 100644 --- a/arkindex/sql_validation/process_elements_with_image.sql +++ b/arkindex/sql_validation/process_elements_with_image.sql @@ -29,7 +29,6 @@ SELECT "process_process"."id", "process_process"."name_contains", "process_process"."ml_class_id", "process_process"."load_children", - "process_process"."generate_thumbnails", "process_process"."chunks", "process_process"."use_cache", "process_process"."use_gpu",