From 62e6f52094d2c89e49d7a4ba252fc7f167f50ad8 Mon Sep 17 00:00:00 2001 From: ml bonhomme <bonhomme@teklia.com> Date: Mon, 10 Jun 2024 07:35:06 +0000 Subject: [PATCH] Update dataset set default names --- arkindex/documents/fixtures/data.json | 1152 ++++++++--------- .../management/commands/build_fixtures.py | 4 +- .../tests/test_process_dataset_sets.py | 18 +- arkindex/training/serializers.py | 2 +- .../training/tests/test_dataset_sets_api.py | 8 +- arkindex/training/tests/test_datasets_api.py | 226 ++-- 6 files changed, 705 insertions(+), 705 deletions(-) diff --git a/arkindex/documents/fixtures/data.json b/arkindex/documents/fixtures/data.json index 8a5f5bc415..69cac4dcf9 100644 --- a/arkindex/documents/fixtures/data.json +++ b/arkindex/documents/fixtures/data.json @@ -1,18 +1,18 @@ [ { "model": "process.process", - "pk": "271ba763-77d4-41d3-bb75-22542c077955", + "pk": "426e5df7-9504-453b-8fa4-7186427d8c8c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "name": null, - "creator": 1, - "corpus": null, - "mode": "local", + "name": "Process fixture", + "creator": 2, + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "mode": "workers", "activity_state": "disabled", "started": null, "finished": null, - "farm": null, + "farm": "fb4aa7c7-0231-4a1c-ad7a-2a3b947fba9d", "element": null, "folder_type": null, "element_type": null, @@ -30,7 +30,7 @@ }, { "model": "process.process", - "pk": "4911ee59-9bd8-42f1-bba4-3afb67c52ffa", + "pk": "837d6a44-73e6-4fbf-89c6-83f48cbf9d6c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -59,18 +59,18 @@ }, { "model": "process.process", - "pk": "8717133c-b44d-477c-94f1-264ea8c11c75", + "pk": "84c93d80-49e9-47c8-b28d-e2572d08287e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "name": "Process fixture", - "creator": 2, - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "mode": "workers", + "name": null, + "creator": 1, + "corpus": null, + "mode": "local", "activity_state": "disabled", "started": null, "finished": null, - "farm": "2bf8674f-b9fc-44bb-a87b-9e90c4a0ff09", + "farm": null, "element": null, "folder_type": null, "element_type": null, @@ -88,204 +88,206 @@ }, { "model": "process.repository", - "pk": "ae186f3b-95d6-4de1-8523-707304d26fb7", + "pk": "429c9e5b-e9a5-4c1f-9c1e-ac2b87d3df42", "fields": { - "url": "http://my_repo.fake/workers/worker" + "url": "http://gitlab/repo" } }, { "model": "process.repository", - "pk": "d70e443f-bad2-4d10-9bb2-b194f8aff97c", + "pk": "b9e52237-66c4-47e8-9043-7dd7d8169ef2", "fields": { - "url": "http://gitlab/repo" + "url": "http://my_repo.fake/workers/worker" } }, { "model": "process.revision", - "pk": "215a2dd1-1e91-4d90-a9cb-c10f0c2e05f1", + "pk": "3a8b413f-5414-44dc-b553-a4119f7c03f3", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "repo": "d70e443f-bad2-4d10-9bb2-b194f8aff97c", - "hash": "42", - "message": "Salve", - "author": "Some user" + "repo": "b9e52237-66c4-47e8-9043-7dd7d8169ef2", + "hash": "1337", + "message": "My w0rk3r", + "author": "Test user" } }, { "model": "process.revision", - "pk": "30ee2a98-02f3-4ab1-868c-9f62995d41dc", + "pk": "69286310-9ee2-4cfa-9e42-d04185b15463", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "repo": "ae186f3b-95d6-4de1-8523-707304d26fb7", - "hash": "1337", - "message": "My w0rk3r", - "author": "Test user" + "repo": "429c9e5b-e9a5-4c1f-9c1e-ac2b87d3df42", + "hash": "42", + "message": "Salve", + "author": "Some user" } }, { "model": "process.worker", - "pk": "89bf6f26-3e46-498c-837d-df90a1ebadd5", + "pk": "2678f913-03fc-47d8-a787-521fd791abfa", "fields": { "name": "Generic worker with a Model", "slug": "generic", - "type": "705dda79-1bf2-4221-b57c-2139c82f1518", + "type": "683b4336-b36d-4deb-8d0e-e3214b78f545", "description": "", - "repository": "ae186f3b-95d6-4de1-8523-707304d26fb7", + "repository": "b9e52237-66c4-47e8-9043-7dd7d8169ef2", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "b898c41f-4437-4082-b629-5919c4036282", + "pk": "279ec75c-2bd0-47af-a689-f72d4f19164b", "fields": { - "name": "Custom worker", - "slug": "custom", - "type": "8ddd1c85-282a-402f-9773-132b9b162515", + "name": "Document layout analyser", + "slug": "dla", + "type": "a215f2a3-2c4e-42b3-a22b-929897ae0bf4", "description": "", - "repository": null, + "repository": "b9e52237-66c4-47e8-9043-7dd7d8169ef2", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "d77cf1b6-ddd1-4ef5-a5de-a525f5ffddea", + "pk": "2905858b-3b74-4401-9b1b-1a81d5c867bd", "fields": { - "name": "Document layout analyser", - "slug": "dla", - "type": "f5b2443f-f9c1-4b32-906b-1e07f4d505bd", + "name": "Elements Initialisation Worker", + "slug": "initialisation", + "type": "917449af-54d2-415a-9439-1ec8da27ee89", "description": "", - "repository": "ae186f3b-95d6-4de1-8523-707304d26fb7", + "repository": null, "public": false, "archived": null } }, { "model": "process.worker", - "pk": "db5c9afd-0111-4434-ab82-7db5a6a883a3", + "pk": "30412f39-754e-467c-9f13-30027dac778e", "fields": { - "name": "Worker requiring a GPU", - "slug": "worker-gpu", - "type": "0878b8fd-560e-450f-acc2-23d79d1d0e5e", + "name": "File import", + "slug": "file_import", + "type": "599a3bbf-157d-4d19-8597-e42abe300bdb", "description": "", - "repository": "ae186f3b-95d6-4de1-8523-707304d26fb7", + "repository": "b9e52237-66c4-47e8-9043-7dd7d8169ef2", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "dcc918ca-7a68-4bab-9413-6485a63154b5", + "pk": "6722ef9a-80b4-4948-a846-a00513fdd51f", "fields": { - "name": "Elements Initialisation Worker", - "slug": "initialisation", - "type": "2ac6c6cb-0f5d-426e-8b69-f48ebba2a463", + "name": "Worker requiring a GPU", + "slug": "worker-gpu", + "type": "a43b20a7-62df-4fd5-84b8-60a777e2aa17", "description": "", - "repository": null, + "repository": "b9e52237-66c4-47e8-9043-7dd7d8169ef2", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "f91fec5c-5001-4107-8d7b-a9fd742e88a5", + "pk": "8e505c08-34bc-4f5c-98df-57cfd825376f", "fields": { "name": "Recognizer", "slug": "reco", - "type": "705dda79-1bf2-4221-b57c-2139c82f1518", + "type": "683b4336-b36d-4deb-8d0e-e3214b78f545", "description": "", - "repository": "ae186f3b-95d6-4de1-8523-707304d26fb7", + "repository": "b9e52237-66c4-47e8-9043-7dd7d8169ef2", "public": false, "archived": null } }, { "model": "process.worker", - "pk": "fb77a9dc-b6f7-4467-b0d0-2d520042f22c", + "pk": "d29f84ae-6adc-4d26-80f1-6b48bb1945fd", "fields": { - "name": "File import", - "slug": "file_import", - "type": "b8cd80a8-435b-467a-b025-c021f006127c", + "name": "Custom worker", + "slug": "custom", + "type": "fac8c366-144d-4af7-906c-10a4ea36fba9", "description": "", - "repository": "ae186f3b-95d6-4de1-8523-707304d26fb7", + "repository": null, "public": false, "archived": null } }, { "model": "process.workertype", - "pk": "0878b8fd-560e-450f-acc2-23d79d1d0e5e", + "pk": "599a3bbf-157d-4d19-8597-e42abe300bdb", "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": "2ac6c6cb-0f5d-426e-8b69-f48ebba2a463", + "pk": "683b4336-b36d-4deb-8d0e-e3214b78f545", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "init", - "display_name": "Elements Initialisation" + "slug": "recognizer", + "display_name": "Recognizer" } }, { "model": "process.workertype", - "pk": "705dda79-1bf2-4221-b57c-2139c82f1518", + "pk": "917449af-54d2-415a-9439-1ec8da27ee89", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "recognizer", - "display_name": "Recognizer" + "slug": "init", + "display_name": "Elements Initialisation" } }, { "model": "process.workertype", - "pk": "8ddd1c85-282a-402f-9773-132b9b162515", + "pk": "a215f2a3-2c4e-42b3-a22b-929897ae0bf4", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "custom", - "display_name": "Custom" + "slug": "dla", + "display_name": "Document Layout Analysis" } }, { "model": "process.workertype", - "pk": "b8cd80a8-435b-467a-b025-c021f006127c", + "pk": "a43b20a7-62df-4fd5-84b8-60a777e2aa17", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "import", - "display_name": "Import" + "slug": "worker", + "display_name": "Worker requiring a GPU" } }, { "model": "process.workertype", - "pk": "f5b2443f-f9c1-4b32-906b-1e07f4d505bd", + "pk": "fac8c366-144d-4af7-906c-10a4ea36fba9", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "dla", - "display_name": "Document Layout Analysis" + "slug": "custom", + "display_name": "Custom" } }, { "model": "process.workerversion", - "pk": "0e2d488f-5a96-4c72-81e5-1b18bcc9977e", + "pk": "1b57e070-2124-435a-82c9-8476f1ff9fa9", "fields": { - "worker": "fb77a9dc-b6f7-4467-b0d0-2d520042f22c", - "revision": "30ee2a98-02f3-4ab1-868c-9f62995d41dc", + "worker": "2678f913-03fc-47d8-a787-521fd791abfa", + "revision": "3a8b413f-5414-44dc-b553-a4119f7c03f3", "version": null, - "configuration": {}, + "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", @@ -294,35 +296,35 @@ }, { "model": "process.workerversion", - "pk": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "pk": "2a5bab6e-2b9c-4275-a728-7ca2ea72d593", "fields": { - "worker": "f91fec5c-5001-4107-8d7b-a9fd742e88a5", - "revision": "30ee2a98-02f3-4ab1-868c-9f62995d41dc", - "version": null, + "worker": "d29f84ae-6adc-4d26-80f1-6b48bb1945fd", + "revision": null, + "version": 1, "configuration": { - "test": 42 + "custom": "value" }, - "state": "available", + "state": "created", "gpu_usage": "disabled", "model_usage": "disabled", "docker_image": null, - "docker_image_iid": "registry.somewhere.com/something:latest", + "docker_image_iid": null, "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z" } }, { "model": "process.workerversion", - "pk": "a42da263-ad70-4221-abde-0fdc8a66219f", + "pk": "ad580f59-7159-4637-a238-55288c8afa3c", "fields": { - "worker": "db5c9afd-0111-4434-ab82-7db5a6a883a3", - "revision": "30ee2a98-02f3-4ab1-868c-9f62995d41dc", + "worker": "279ec75c-2bd0-47af-a689-f72d4f19164b", + "revision": "3a8b413f-5414-44dc-b553-a4119f7c03f3", "version": null, "configuration": { "test": 42 }, "state": "available", - "gpu_usage": "required", + "gpu_usage": "disabled", "model_usage": "disabled", "docker_image": null, "docker_image_iid": "registry.somewhere.com/something:latest", @@ -332,16 +334,16 @@ }, { "model": "process.workerversion", - "pk": "a6056dcc-ff17-4a69-bf64-3f9304b2201b", + "pk": "b4360014-ae61-4445-a8d5-05be65a4edc6", "fields": { - "worker": "d77cf1b6-ddd1-4ef5-a5de-a525f5ffddea", - "revision": "30ee2a98-02f3-4ab1-868c-9f62995d41dc", + "worker": "6722ef9a-80b4-4948-a846-a00513fdd51f", + "revision": "3a8b413f-5414-44dc-b553-a4119f7c03f3", "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", @@ -351,28 +353,26 @@ }, { "model": "process.workerversion", - "pk": "a67fc631-7c4c-47a1-8583-a5992a45af27", + "pk": "b47d5a18-ed1e-4a67-821f-a34d8769ee6d", "fields": { - "worker": "b898c41f-4437-4082-b629-5919c4036282", - "revision": null, - "version": 1, - "configuration": { - "custom": "value" - }, - "state": "created", + "worker": "30412f39-754e-467c-9f13-30027dac778e", + "revision": "3a8b413f-5414-44dc-b553-a4119f7c03f3", + "version": null, + "configuration": {}, + "state": "available", "gpu_usage": "disabled", "model_usage": "disabled", "docker_image": null, - "docker_image_iid": null, + "docker_image_iid": "registry.somewhere.com/something:latest", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z" } }, { "model": "process.workerversion", - "pk": "abb805c7-349d-414b-aa51-13d0baae576c", + "pk": "e4fdaded-dd3d-40d7-a638-abe8ab702fb6", "fields": { - "worker": "dcc918ca-7a68-4bab-9413-6485a63154b5", + "worker": "2905858b-3b74-4401-9b1b-1a81d5c867bd", "revision": null, "version": 1, "configuration": { @@ -391,17 +391,17 @@ }, { "model": "process.workerversion", - "pk": "dea2c11b-c0b9-48fd-942d-0b953202f712", + "pk": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "fields": { - "worker": "89bf6f26-3e46-498c-837d-df90a1ebadd5", - "revision": "30ee2a98-02f3-4ab1-868c-9f62995d41dc", + "worker": "8e505c08-34bc-4f5c-98df-57cfd825376f", + "revision": "3a8b413f-5414-44dc-b553-a4119f7c03f3", "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", @@ -410,14 +410,14 @@ }, { "model": "process.workerrun", - "pk": "7594fc28-2492-468b-beec-a95adecdce97", + "pk": "2deaccaf-bdd8-418b-9be8-783426f7a516", "fields": { - "process": "271ba763-77d4-41d3-bb75-22542c077955", - "version": "a67fc631-7c4c-47a1-8583-a5992a45af27", + "process": "426e5df7-9504-453b-8fa4-7186427d8c8c", + "version": "e4fdaded-dd3d-40d7-a638-abe8ab702fb6", "model_version": null, "parents": "[]", "configuration": null, - "summary": "Worker Custom worker @ version 1", + "summary": "Worker Elements Initialisation Worker @ version 1", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false @@ -425,14 +425,14 @@ }, { "model": "process.workerrun", - "pk": "ea815f3a-d66a-4580-bbb7-bca8518ebb2d", + "pk": "245414f5-3648-46da-8675-ea9249ca9ea1", "fields": { - "process": "8717133c-b44d-477c-94f1-264ea8c11c75", - "version": "abb805c7-349d-414b-aa51-13d0baae576c", + "process": "426e5df7-9504-453b-8fa4-7186427d8c8c", + "version": "ad580f59-7159-4637-a238-55288c8afa3c", "model_version": null, - "parents": "[]", + "parents": "[\"2deaccaf-bdd8-418b-9be8-783426f7a516\"]", "configuration": null, - "summary": "Worker Elements Initialisation Worker @ version 1", + "summary": "Worker Document layout analyser @ ad580f", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false @@ -440,14 +440,14 @@ }, { "model": "process.workerrun", - "pk": "8156a265-c7ae-46bf-8b0d-8e84c07567e1", + "pk": "94ec79b9-2061-4c8c-9ee4-b048fba2b58a", "fields": { - "process": "8717133c-b44d-477c-94f1-264ea8c11c75", - "version": "a6056dcc-ff17-4a69-bf64-3f9304b2201b", + "process": "837d6a44-73e6-4fbf-89c6-83f48cbf9d6c", + "version": "2a5bab6e-2b9c-4275-a728-7ca2ea72d593", "model_version": null, - "parents": "[\"ea815f3a-d66a-4580-bbb7-bca8518ebb2d\"]", + "parents": "[]", "configuration": null, - "summary": "Worker Document layout analyser @ a6056d", + "summary": "Worker Custom worker @ version 1", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false @@ -455,14 +455,14 @@ }, { "model": "process.workerrun", - "pk": "9207d106-37b7-4920-9754-8f05fd0d58a3", + "pk": "e33d74f4-9bea-4f8f-80f6-4c574b90a8d2", "fields": { - "process": "8717133c-b44d-477c-94f1-264ea8c11c75", - "version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "process": "426e5df7-9504-453b-8fa4-7186427d8c8c", + "version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "model_version": null, - "parents": "[\"8156a265-c7ae-46bf-8b0d-8e84c07567e1\"]", + "parents": "[\"245414f5-3648-46da-8675-ea9249ca9ea1\"]", "configuration": null, - "summary": "Worker Recognizer @ a34401", + "summary": "Worker Recognizer @ f00617", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false @@ -470,10 +470,10 @@ }, { "model": "process.workerrun", - "pk": "ed5d5b45-56d6-44af-a1c1-3acf382ef11a", + "pk": "f8d3343a-186a-4660-b534-ef3979192bd7", "fields": { - "process": "4911ee59-9bd8-42f1-bba4-3afb67c52ffa", - "version": "a67fc631-7c4c-47a1-8583-a5992a45af27", + "process": "84c93d80-49e9-47c8-b28d-e2572d08287e", + "version": "2a5bab6e-2b9c-4275-a728-7ca2ea72d593", "model_version": null, "parents": "[]", "configuration": null, @@ -485,7 +485,7 @@ }, { "model": "documents.corpus", - "pk": "69d8f34c-476d-4bb6-803e-f59a618eeea4", + "pk": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -498,11 +498,11 @@ }, { "model": "documents.elementtype", - "pk": "26a0c682-ece0-4782-b98e-07ad1fdb30b4", + "pk": "2046b2ce-bf98-4c29-82a5-5b16604a7db5", "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "slug": "surface", - "display_name": "Surface", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "slug": "act", + "display_name": "Act", "folder": false, "indexable": false, "color": "28b62c" @@ -510,11 +510,11 @@ }, { "model": "documents.elementtype", - "pk": "6434f1a8-1cc5-42b8-9ebd-b4b15ec6f687", + "pk": "42624fe0-a82a-444a-9329-51bf7d4e3462", "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "slug": "act", - "display_name": "Act", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "slug": "surface", + "display_name": "Surface", "folder": false, "indexable": false, "color": "28b62c" @@ -522,11 +522,11 @@ }, { "model": "documents.elementtype", - "pk": "6ad0873d-8546-4fc0-b458-817f58eb1d02", + "pk": "4f5cdf06-6df6-423d-a47a-67c082fb5099", "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "slug": "page", - "display_name": "Page", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "slug": "text_line", + "display_name": "Line", "folder": false, "indexable": false, "color": "28b62c" @@ -534,9 +534,9 @@ }, { "model": "documents.elementtype", - "pk": "b20b08e4-b6ca-4b9b-9e65-52ad08aef52c", + "pk": "573da26c-e860-4e98-aa7e-56e7f040eeee", "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "slug": "volume", "display_name": "Volume", "folder": true, @@ -546,11 +546,11 @@ }, { "model": "documents.elementtype", - "pk": "bf269e5a-b61f-46dd-bb0e-7a2e74a7b76e", + "pk": "9e698b00-1a35-4dae-9026-781504f05585", "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "slug": "text_line", - "display_name": "Line", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "slug": "page", + "display_name": "Page", "folder": false, "indexable": false, "color": "28b62c" @@ -558,9 +558,9 @@ }, { "model": "documents.elementtype", - "pk": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", + "pk": "d22d7782-aa3e-43bf-b448-fa4996f98033", "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "slug": "word", "display_name": "Word", "folder": false, @@ -570,279 +570,279 @@ }, { "model": "documents.elementpath", - "pk": "04aaeb52-51bf-4312-be4a-a729e1f78949", + "pk": "002e7dc3-29f1-4bce-b424-1e55d518332d", "fields": { - "element": "871bb123-5bd3-4115-beb8-c46ec316036e", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"d7f0a1fe-e70a-4bb3-8430-6602a31fb950\"]", - "ordering": 2 + "element": "d2673a72-5bce-410c-9250-c38552c37e1a", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "09926340-2333-450a-8f28-77d0a995a5c9", + "pk": "01af45ed-fc29-4b94-a9db-abfb83dd284c", "fields": { - "element": "8e38d0bc-0f9d-43d6-8e16-ff1fbe6f32b4", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"c4ad038c-48a5-418d-a1cf-f11c275cd980\"]", + "element": "1980fd7b-611f-403f-be8b-199051fcb381", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"4dc9662a-0c78-4f61-b2b2-d066f9e50be9\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "0e027cf4-43c6-496e-8c60-793d29639d2e", + "pk": "0cb872df-e32e-4200-a9b1-e2851e81c72e", "fields": { - "element": "55a0b990-311e-4fa8-b338-40ec7a4c595d", + "element": "a91fd052-0be7-4baa-a381-c74432f5ab8a", "path": "[]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "1e7a517b-9033-4bce-8bc8-87e12591b48c", + "pk": "20fbb9a1-9bf0-4435-9eb1-28636fa48dbb", "fields": { - "element": "7448a18b-d8e5-4183-9834-45c8ad958a6b", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"ce9c2be6-9728-4c8b-8656-700a6a5395f6\"]", - "ordering": 0 + "element": "ae5e750a-12d5-44b8-95e5-36b9bc18b0e0", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"ec6cb9f9-793b-4b45-9d8a-f743ffcb3606\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "2021e32c-a124-42d4-b325-53255bac6d2d", + "pk": "22f3292e-b05d-4fd4-9c8b-648fa4657ad3", "fields": { - "element": "8865f631-5659-4f66-bdd3-ecf26b2726ab", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\"]", + "element": "4d3a637a-8112-4f74-808a-2e6110c72a35", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"4dc9662a-0c78-4f61-b2b2-d066f9e50be9\"]", "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "365d7122-1182-49f1-a8f2-64eab18ea73e", + "pk": "35f67ee4-e5c4-4ee4-9810-a1adaf0520a6", "fields": { - "element": "c4ad038c-48a5-418d-a1cf-f11c275cd980", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\"]", + "element": "12696972-1dae-449d-80c5-a0c5110156d9", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\"]", "ordering": 7 } }, { "model": "documents.elementpath", - "pk": "436f1a42-a6bc-4528-9883-e7f708e96362", + "pk": "3afcb369-6be7-4939-8193-185a4da1738c", "fields": { - "element": "9e325c7d-5114-426e-aef4-ba0ff34635ee", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"d7f0a1fe-e70a-4bb3-8430-6602a31fb950\"]", - "ordering": 1 + "element": "4712384f-c4fa-42a2-b900-9b0d0aa7c1c7", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"640f7d63-1ce9-4932-b909-d59fd8382e0d\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "43c43c7c-98f0-4adc-86f2-8581a297599a", + "pk": "43411b33-1614-481b-84ca-b6bca97ff991", "fields": { - "element": "67d47169-b52c-4d32-8fdb-a92d770a2da9", - "path": "[\"247a5c18-2f4d-4eeb-8864-77fcd7d04c87\"]", - "ordering": 0 + "element": "640f7d63-1ce9-4932-b909-d59fd8382e0d", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "46f5d012-898f-4b9f-af03-726ecdb6c41c", + "pk": "4a2c411c-5fd1-478c-865f-02dabd72cc69", "fields": { - "element": "c406d93a-c892-4c5d-88f4-2dc7596a9b67", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\"]", - "ordering": 4 + "element": "f87f773e-7622-4342-a5e8-446acc3600d3", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"ec6cb9f9-793b-4b45-9d8a-f743ffcb3606\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "498f6854-3256-4026-9b24-b8aedbab1dd2", + "pk": "5a11ea5e-36fa-41fc-9dc0-59047f895ba0", "fields": { - "element": "48f54de8-00cc-42fb-a2d5-21eb8eb1d4ca", - "path": "[\"247a5c18-2f4d-4eeb-8864-77fcd7d04c87\"]", + "element": "25d5ae34-f6fc-4a6d-90ff-1a63181c7f6b", + "path": "[\"a91fd052-0be7-4baa-a381-c74432f5ab8a\"]", "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "49cfc5fc-5cfd-42af-8d4f-5b3c4fd63abb", + "pk": "6778be86-94bd-42f3-9340-6f5718a5daa1", "fields": { - "element": "def59e54-794a-4293-8d5d-7421782fecbe", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"8865f631-5659-4f66-bdd3-ecf26b2726ab\"]", - "ordering": 1 + "element": "61556be7-5e75-40c1-a551-ff329a4ecfe8", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"19fa4694-1579-4e3b-9c78-f2953f402d55\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "5b27ee56-a61d-4464-953f-fe6aa646988b", + "pk": "731d58c5-7e6d-4360-a024-17905ace3986", "fields": { - "element": "6e432577-6618-4f10-9b37-3b2d0a54965f", - "path": "[\"247a5c18-2f4d-4eeb-8864-77fcd7d04c87\"]", - "ordering": 1 + "element": "d1cd81f4-0be7-4d85-a39c-405190e412ac", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"13dcc584-4c57-4939-8ebf-38a3997d6681\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "60c89317-aeba-4946-ae72-bdea42e58aa7", + "pk": "8737b82b-4a9b-443d-963f-bd26c00aaf71", "fields": { - "element": "329be8bc-e476-4edd-b3f0-9362503428f3", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"8865f631-5659-4f66-bdd3-ecf26b2726ab\"]", - "ordering": 2 + "element": "ec6cb9f9-793b-4b45-9d8a-f743ffcb3606", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "6b89315f-6a75-4966-9cc2-f311859a6b51", + "pk": "874e8e1e-8802-456f-8518-2c779cc47f36", "fields": { - "element": "247a5c18-2f4d-4eeb-8864-77fcd7d04c87", + "element": "813de565-e1b7-4c4e-8e51-67ae486a7616", "path": "[]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "8060fa66-9d3f-4bf4-bf89-89e31ab17f5e", + "pk": "8951ae13-b5d0-4049-b633-6ca44c628cce", "fields": { - "element": "2a88df72-e127-4f4a-ab95-32e1f9520377", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"f0d7bfe5-7ace-43a0-bf8c-0874ed47675b\"]", + "element": "cc1d9aed-7e02-4bc0-a883-a3803d375370", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"d2673a72-5bce-410c-9250-c38552c37e1a\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "8d6831c9-9c3b-42f3-bed9-389260b0fcf9", + "pk": "8c586310-1b56-4ea1-a848-5ee7d259eeb7", "fields": { - "element": "80c05833-9df7-4c46-a79a-b6c17caf148c", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\"]", - "ordering": 3 + "element": "fe7d0a83-3138-48bf-961c-cd5b98f42423", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"ec6cb9f9-793b-4b45-9d8a-f743ffcb3606\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "8d9e514a-450d-494b-bf08-e8582a945c29", + "pk": "8e09ebe4-4354-4c53-ba38-5bf4d0a0f8d8", "fields": { - "element": "b218fd2b-da3e-4498-a4de-2d36bf0cb2ae", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"b2622e77-12b7-4377-b203-fd67b6dda823\"]", - "ordering": 0 + "element": "5380459b-67b4-4756-991b-af5838034a5d", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"ec6cb9f9-793b-4b45-9d8a-f743ffcb3606\"]", + "ordering": 3 } }, { "model": "documents.elementpath", - "pk": "8ed13961-cf7e-4d9d-b47e-13dadad1afbf", + "pk": "8f788444-e1db-4364-b65e-a2291063cf62", "fields": { - "element": "eb0b5a7f-87f3-456d-944a-98a169abf930", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"d7f0a1fe-e70a-4bb3-8430-6602a31fb950\"]", - "ordering": 0 + "element": "13dcc584-4c57-4939-8ebf-38a3997d6681", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\"]", + "ordering": 3 } }, { "model": "documents.elementpath", - "pk": "8f7851d9-85b0-4057-a82b-18a35ef045ae", + "pk": "a181faa6-fd38-43d9-b8da-125519c75492", "fields": { - "element": "b67bbddb-1821-4444-8910-9d12a7bb3d82", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"f0d7bfe5-7ace-43a0-bf8c-0874ed47675b\"]", - "ordering": 2 + "element": "95eab395-3caf-4308-91af-bd2de4e3f903", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"2d7f3ffc-0d68-4ce6-9501-192fb7389439\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "957fa04f-c0a8-4e44-9705-c9b0e228282d", + "pk": "b0d741cb-4bb0-4d93-8418-951eec9dbad9", "fields": { - "element": "91b9f5f7-a9df-4cf6-b786-9226e178ae2a", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"c406d93a-c892-4c5d-88f4-2dc7596a9b67\"]", + "element": "9bb9ac52-bf63-4855-8de1-33507d69ff61", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"12696972-1dae-449d-80c5-a0c5110156d9\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "9c2dd666-b28b-4e77-a8bc-0a76358267e4", + "pk": "b2ecc8f4-325a-43b0-aca3-c45c7f32404b", "fields": { - "element": "f0d7bfe5-7ace-43a0-bf8c-0874ed47675b", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\"]", - "ordering": 0 + "element": "d5120897-d198-45b8-99fc-c806128dc492", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"d2673a72-5bce-410c-9250-c38552c37e1a\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "9ffdabed-9149-4cd8-a20a-b91563bef67b", + "pk": "b54366f8-3904-441a-8808-b295f7ef53bf", "fields": { - "element": "b2622e77-12b7-4377-b203-fd67b6dda823", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\"]", - "ordering": 6 + "element": "19fa4694-1579-4e3b-9c78-f2953f402d55", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\"]", + "ordering": 5 } }, { "model": "documents.elementpath", - "pk": "ac404dd5-bbab-4475-9144-1cb008875b88", + "pk": "c2e48b44-1b52-41c1-ab38-6f6bd75c2a8f", "fields": { - "element": "7b2d9bc7-66f8-4d9d-bbb0-0cc4058843f4", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"f0d7bfe5-7ace-43a0-bf8c-0874ed47675b\"]", - "ordering": 3 + "element": "498fc569-228a-4bef-b777-524edf9aa357", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"640f7d63-1ce9-4932-b909-d59fd8382e0d\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "bc74c2a9-fded-4b45-b190-792a017dd97b", + "pk": "c8fe0b3b-ae9f-4a4f-a781-2d04b11d471c", "fields": { - "element": "ce9c2be6-9728-4c8b-8656-700a6a5395f6", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\"]", - "ordering": 5 + "element": "b9f61d7c-d230-4a2e-8cb7-29f0df30223b", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"d2673a72-5bce-410c-9250-c38552c37e1a\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "bc93d6c3-2d5b-460c-9ffb-e076adc324eb", + "pk": "c9f8a64c-5328-4d23-8e6c-4662e7f49558", "fields": { - "element": "7c456640-4157-4cdc-8289-d318f11b3133", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"c406d93a-c892-4c5d-88f4-2dc7596a9b67\"]", - "ordering": 1 + "element": "4dc9662a-0c78-4f61-b2b2-d066f9e50be9", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\"]", + "ordering": 4 } }, { "model": "documents.elementpath", - "pk": "c6dd8a34-f917-44ba-b1a4-ad09aa788ecf", + "pk": "d1d74e3f-4398-4e61-a3a7-fd2cef8a9b99", "fields": { - "element": "3c2692d9-72f6-40ee-a026-7b571e4c347d", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"8865f631-5659-4f66-bdd3-ecf26b2726ab\"]", + "element": "d532d5f6-3f00-4cde-888e-ac1dfb23270e", + "path": "[\"a91fd052-0be7-4baa-a381-c74432f5ab8a\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "cb5aa2b0-793d-48b9-860d-8632503be6cb", + "pk": "d2801368-b054-4027-9218-9f79a20a97f6", "fields": { - "element": "bf2da511-ff53-46cf-aa2e-022d087f8944", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"80c05833-9df7-4c46-a79a-b6c17caf148c\"]", - "ordering": 0 + "element": "0b831f72-d975-466c-b627-415974d39728", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\", \"640f7d63-1ce9-4932-b909-d59fd8382e0d\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "e2ab1626-b119-49a6-8201-1fe657ed1ef4", + "pk": "dfdc3c49-0b34-4164-9d45-8e092c0439cf", "fields": { - "element": "4150b66d-8984-4fb5-a2f7-91aba8a1893e", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\", \"f0d7bfe5-7ace-43a0-bf8c-0874ed47675b\"]", + "element": "d1beed1a-1651-407a-9ffb-ee57dabca7bc", + "path": "[\"a91fd052-0be7-4baa-a381-c74432f5ab8a\"]", "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "e4cd8b5c-08fc-4bf2-983e-e3f61c0af105", + "pk": "e0a77f72-30fd-4322-a7d8-9a0f65af48c3", "fields": { - "element": "d7f0a1fe-e70a-4bb3-8430-6602a31fb950", - "path": "[\"55a0b990-311e-4fa8-b338-40ec7a4c595d\"]", - "ordering": 2 + "element": "2d7f3ffc-0d68-4ce6-9501-192fb7389439", + "path": "[\"813de565-e1b7-4c4e-8e51-67ae486a7616\"]", + "ordering": 6 } }, { "model": "documents.element", - "pk": "247a5c18-2f4d-4eeb-8864-77fcd7d04c87", + "pk": "0b831f72-d975-466c-b627-415974d39728", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "b20b08e4-b6ca-4b9b-9e65-52ad08aef52c", - "name": "Volume 2", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "c8a30310-5071-4eb7-b4f7-00bd700237df", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -850,18 +850,18 @@ }, { "model": "documents.element", - "pk": "2a88df72-e127-4f4a-ab95-32e1f9520377", + "pk": "12696972-1dae-449d-80c5-a0c5110156d9", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", - "name": "PARIS", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "2046b2ce-bf98-4c29-82a5-5b16604a7db5", + "name": "Act 5", "creator": null, "worker_version": null, "worker_run": null, - "image": "ed514c38-7c9b-4193-b293-729d2521848d", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -869,18 +869,18 @@ }, { "model": "documents.element", - "pk": "329be8bc-e476-4edd-b3f0-9362503428f3", + "pk": "13dcc584-4c57-4939-8ebf-38a3997d6681", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", - "name": "DATUM", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "2046b2ce-bf98-4c29-82a5-5b16604a7db5", + "name": "Act 1", "creator": null, "worker_version": null, "worker_run": null, - "image": "d54a0fa2-bb2e-4004-9b1f-30a5b43dd956", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -888,18 +888,18 @@ }, { "model": "documents.element", - "pk": "3c2692d9-72f6-40ee-a026-7b571e4c347d", + "pk": "1980fd7b-611f-403f-be8b-199051fcb381", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", - "name": "PARIS", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "42624fe0-a82a-444a-9329-51bf7d4e3462", + "name": "Surface B", "creator": null, "worker_version": null, "worker_run": null, - "image": "d54a0fa2-bb2e-4004-9b1f-30a5b43dd956", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": "de1922b2-ec28-41d3-a85d-57da90cf6cfb", + "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -907,18 +907,18 @@ }, { "model": "documents.element", - "pk": "4150b66d-8984-4fb5-a2f7-91aba8a1893e", + "pk": "19fa4694-1579-4e3b-9c78-f2953f402d55", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", - "name": "ROY", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "2046b2ce-bf98-4c29-82a5-5b16604a7db5", + "name": "Act 3", "creator": null, "worker_version": null, "worker_run": null, - "image": "ed514c38-7c9b-4193-b293-729d2521848d", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -926,17 +926,17 @@ }, { "model": "documents.element", - "pk": "48f54de8-00cc-42fb-a2d5-21eb8eb1d4ca", + "pk": "25d5ae34-f6fc-4a6d-90ff-1a63181c7f6b", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6ad0873d-8546-4fc0-b458-817f58eb1d02", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "9e698b00-1a35-4dae-9026-781504f05585", "name": "Volume 2, page 2r", "creator": null, "worker_version": null, "worker_run": null, - "image": "4c80befb-70c0-4cf5-a615-a8a16375fd8f", + "image": "b2aabf63-61a8-4651-b5cd-33bc2a85e36e", "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, @@ -945,13 +945,13 @@ }, { "model": "documents.element", - "pk": "55a0b990-311e-4fa8-b338-40ec7a4c595d", + "pk": "2d7f3ffc-0d68-4ce6-9501-192fb7389439", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "b20b08e4-b6ca-4b9b-9e65-52ad08aef52c", - "name": "Volume 1", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "2046b2ce-bf98-4c29-82a5-5b16604a7db5", + "name": "Act 4", "creator": null, "worker_version": null, "worker_run": null, @@ -964,18 +964,18 @@ }, { "model": "documents.element", - "pk": "67d47169-b52c-4d32-8fdb-a92d770a2da9", + "pk": "4712384f-c4fa-42a2-b900-9b0d0aa7c1c7", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6ad0873d-8546-4fc0-b458-817f58eb1d02", - "name": "Volume 2, page 1r", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "949105b1-bf09-4bc0-bc4e-c091530da74e", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "c8a30310-5071-4eb7-b4f7-00bd700237df", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -983,18 +983,18 @@ }, { "model": "documents.element", - "pk": "6e432577-6618-4f10-9b37-3b2d0a54965f", + "pk": "498fc569-228a-4bef-b777-524edf9aa357", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6ad0873d-8546-4fc0-b458-817f58eb1d02", - "name": "Volume 2, page 1v", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "f5a4d250-a179-4b05-a294-b65b3a7f1a9e", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "c8a30310-5071-4eb7-b4f7-00bd700237df", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1002,18 +1002,18 @@ }, { "model": "documents.element", - "pk": "7448a18b-d8e5-4183-9834-45c8ad958a6b", + "pk": "4d3a637a-8112-4f74-808a-2e6110c72a35", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "26a0c682-ece0-4782-b98e-07ad1fdb30b4", - "name": "Surface D", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "42624fe0-a82a-444a-9329-51bf7d4e3462", + "name": "Surface C", "creator": null, "worker_version": null, "worker_run": null, - "image": "f1cb9166-4d0a-458f-bacd-5f067464b9a3", - "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)", + "image": "739b25d6-065c-4309-b2e4-f8ac000e6741", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1021,18 +1021,18 @@ }, { "model": "documents.element", - "pk": "7b2d9bc7-66f8-4d9d-bbb0-0cc4058843f4", + "pk": "4dc9662a-0c78-4f61-b2b2-d066f9e50be9", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "bf269e5a-b61f-46dd-bb0e-7a2e74a7b76e", - "name": "Text line", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "2046b2ce-bf98-4c29-82a5-5b16604a7db5", + "name": "Act 2", "creator": null, "worker_version": null, "worker_run": null, - "image": "ed514c38-7c9b-4193-b293-729d2521848d", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1040,18 +1040,18 @@ }, { "model": "documents.element", - "pk": "7c456640-4157-4cdc-8289-d318f11b3133", + "pk": "5380459b-67b4-4756-991b-af5838034a5d", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "26a0c682-ece0-4782-b98e-07ad1fdb30b4", - "name": "Surface C", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "4f5cdf06-6df6-423d-a47a-67c082fb5099", + "name": "Text line", "creator": null, "worker_version": null, "worker_run": null, - "image": "d54a0fa2-bb2e-4004-9b1f-30a5b43dd956", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "de1922b2-ec28-41d3-a85d-57da90cf6cfb", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1059,18 +1059,18 @@ }, { "model": "documents.element", - "pk": "80c05833-9df7-4c46-a79a-b6c17caf148c", + "pk": "61556be7-5e75-40c1-a551-ff329a4ecfe8", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6434f1a8-1cc5-42b8-9ebd-b4b15ec6f687", - "name": "Act 1", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "42624fe0-a82a-444a-9329-51bf7d4e3462", + "name": "Surface D", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "c8a30310-5071-4eb7-b4f7-00bd700237df", + "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1078,18 +1078,18 @@ }, { "model": "documents.element", - "pk": "871bb123-5bd3-4115-beb8-c46ec316036e", + "pk": "640f7d63-1ce9-4932-b909-d59fd8382e0d", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", - "name": "DATUM", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "9e698b00-1a35-4dae-9026-781504f05585", + "name": "Volume 1, page 2r", "creator": null, "worker_version": null, "worker_run": null, - "image": "f1cb9166-4d0a-458f-bacd-5f067464b9a3", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": "c8a30310-5071-4eb7-b4f7-00bd700237df", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1097,18 +1097,18 @@ }, { "model": "documents.element", - "pk": "8865f631-5659-4f66-bdd3-ecf26b2726ab", + "pk": "813de565-e1b7-4c4e-8e51-67ae486a7616", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6ad0873d-8546-4fc0-b458-817f58eb1d02", - "name": "Volume 1, page 1v", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "573da26c-e860-4e98-aa7e-56e7f040eeee", + "name": "Volume 1", "creator": null, "worker_version": null, "worker_run": null, - "image": "d54a0fa2-bb2e-4004-9b1f-30a5b43dd956", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1116,18 +1116,18 @@ }, { "model": "documents.element", - "pk": "8e38d0bc-0f9d-43d6-8e16-ff1fbe6f32b4", + "pk": "95eab395-3caf-4308-91af-bd2de4e3f903", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "26a0c682-ece0-4782-b98e-07ad1fdb30b4", - "name": "Surface F", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "42624fe0-a82a-444a-9329-51bf7d4e3462", + "name": "Surface E", "creator": null, "worker_version": null, "worker_run": null, - "image": "f1cb9166-4d0a-458f-bacd-5f067464b9a3", - "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", + "image": "c8a30310-5071-4eb7-b4f7-00bd700237df", + "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1135,17 +1135,17 @@ }, { "model": "documents.element", - "pk": "91b9f5f7-a9df-4cf6-b786-9226e178ae2a", + "pk": "9bb9ac52-bf63-4855-8de1-33507d69ff61", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "26a0c682-ece0-4782-b98e-07ad1fdb30b4", - "name": "Surface B", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "42624fe0-a82a-444a-9329-51bf7d4e3462", + "name": "Surface F", "creator": null, "worker_version": null, "worker_run": null, - "image": "ed514c38-7c9b-4193-b293-729d2521848d", + "image": "c8a30310-5071-4eb7-b4f7-00bd700237df", "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", "rotation_angle": 0, "mirrored": false, @@ -1154,18 +1154,18 @@ }, { "model": "documents.element", - "pk": "9e325c7d-5114-426e-aef4-ba0ff34635ee", + "pk": "a91fd052-0be7-4baa-a381-c74432f5ab8a", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", - "name": "ROY", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "573da26c-e860-4e98-aa7e-56e7f040eeee", + "name": "Volume 2", "creator": null, "worker_version": null, "worker_run": null, - "image": "f1cb9166-4d0a-458f-bacd-5f067464b9a3", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1173,18 +1173,18 @@ }, { "model": "documents.element", - "pk": "b218fd2b-da3e-4498-a4de-2d36bf0cb2ae", + "pk": "ae5e750a-12d5-44b8-95e5-36b9bc18b0e0", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "26a0c682-ece0-4782-b98e-07ad1fdb30b4", - "name": "Surface E", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "f1cb9166-4d0a-458f-bacd-5f067464b9a3", - "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)", + "image": "de1922b2-ec28-41d3-a85d-57da90cf6cfb", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1192,18 +1192,18 @@ }, { "model": "documents.element", - "pk": "b2622e77-12b7-4377-b203-fd67b6dda823", + "pk": "b9f61d7c-d230-4a2e-8cb7-29f0df30223b", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6434f1a8-1cc5-42b8-9ebd-b4b15ec6f687", - "name": "Act 4", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "739b25d6-065c-4309-b2e4-f8ac000e6741", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1211,18 +1211,18 @@ }, { "model": "documents.element", - "pk": "b67bbddb-1821-4444-8910-9d12a7bb3d82", + "pk": "cc1d9aed-7e02-4bc0-a883-a3803d375370", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", - "name": "DATUM", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "ed514c38-7c9b-4193-b293-729d2521848d", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": "739b25d6-065c-4309-b2e4-f8ac000e6741", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1230,18 +1230,18 @@ }, { "model": "documents.element", - "pk": "bf2da511-ff53-46cf-aa2e-022d087f8944", + "pk": "d1beed1a-1651-407a-9ffb-ee57dabca7bc", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "26a0c682-ece0-4782-b98e-07ad1fdb30b4", - "name": "Surface A", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "9e698b00-1a35-4dae-9026-781504f05585", + "name": "Volume 2, page 1v", "creator": null, "worker_version": null, "worker_run": null, - "image": "ed514c38-7c9b-4193-b293-729d2521848d", - "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)", + "image": "d1ee80ce-9106-4680-a133-cc96ace159e5", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1249,18 +1249,18 @@ }, { "model": "documents.element", - "pk": "c406d93a-c892-4c5d-88f4-2dc7596a9b67", + "pk": "d1cd81f4-0be7-4d85-a39c-405190e412ac", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6434f1a8-1cc5-42b8-9ebd-b4b15ec6f687", - "name": "Act 2", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "42624fe0-a82a-444a-9329-51bf7d4e3462", + "name": "Surface A", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "de1922b2-ec28-41d3-a85d-57da90cf6cfb", + "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1268,18 +1268,18 @@ }, { "model": "documents.element", - "pk": "c4ad038c-48a5-418d-a1cf-f11c275cd980", + "pk": "d2673a72-5bce-410c-9250-c38552c37e1a", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6434f1a8-1cc5-42b8-9ebd-b4b15ec6f687", - "name": "Act 5", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "9e698b00-1a35-4dae-9026-781504f05585", + "name": "Volume 1, page 1v", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "739b25d6-065c-4309-b2e4-f8ac000e6741", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1287,18 +1287,18 @@ }, { "model": "documents.element", - "pk": "ce9c2be6-9728-4c8b-8656-700a6a5395f6", + "pk": "d5120897-d198-45b8-99fc-c806128dc492", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6434f1a8-1cc5-42b8-9ebd-b4b15ec6f687", - "name": "Act 3", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "739b25d6-065c-4309-b2e4-f8ac000e6741", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1306,17 +1306,17 @@ }, { "model": "documents.element", - "pk": "d7f0a1fe-e70a-4bb3-8430-6602a31fb950", + "pk": "d532d5f6-3f00-4cde-888e-ac1dfb23270e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6ad0873d-8546-4fc0-b458-817f58eb1d02", - "name": "Volume 1, page 2r", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "9e698b00-1a35-4dae-9026-781504f05585", + "name": "Volume 2, page 1r", "creator": null, "worker_version": null, "worker_run": null, - "image": "f1cb9166-4d0a-458f-bacd-5f067464b9a3", + "image": "152f12ae-61dc-42cd-afac-efb2eed8bbee", "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, @@ -1325,18 +1325,18 @@ }, { "model": "documents.element", - "pk": "def59e54-794a-4293-8d5d-7421782fecbe", + "pk": "ec6cb9f9-793b-4b45-9d8a-f743ffcb3606", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", - "name": "ROY", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "9e698b00-1a35-4dae-9026-781504f05585", + "name": "Volume 1, page 1r", "creator": null, "worker_version": null, "worker_run": null, - "image": "d54a0fa2-bb2e-4004-9b1f-30a5b43dd956", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "de1922b2-ec28-41d3-a85d-57da90cf6cfb", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1344,17 +1344,17 @@ }, { "model": "documents.element", - "pk": "eb0b5a7f-87f3-456d-944a-98a169abf930", + "pk": "f87f773e-7622-4342-a5e8-446acc3600d3", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "db01d4c2-6aa1-4941-b6a1-eeb5f38a7ee9", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "f1cb9166-4d0a-458f-bacd-5f067464b9a3", + "image": "de1922b2-ec28-41d3-a85d-57da90cf6cfb", "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, @@ -1363,18 +1363,18 @@ }, { "model": "documents.element", - "pk": "f0d7bfe5-7ace-43a0-bf8c-0874ed47675b", + "pk": "fe7d0a83-3138-48bf-961c-cd5b98f42423", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "6ad0873d-8546-4fc0-b458-817f58eb1d02", - "name": "Volume 1, page 1r", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", + "type": "d22d7782-aa3e-43bf-b448-fa4996f98033", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "ed514c38-7c9b-4193-b293-729d2521848d", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "de1922b2-ec28-41d3-a85d-57da90cf6cfb", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1382,55 +1382,55 @@ }, { "model": "documents.entitytype", - "pk": "209c6f8f-90c2-4f53-b240-8acc31718c63", + "pk": "14bf7625-6651-4989-a4b0-caccc4efd0bf", "fields": { "name": "person", "color": "ff0000", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4" + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba" } }, { "model": "documents.entitytype", - "pk": "2c1ec25d-460d-4b34-97df-883c9a2180cb", + "pk": "4e8c67f9-5fda-4242-90f7-ef295f45a52a", "fields": { - "name": "number", + "name": "organization", "color": "ff0000", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4" + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba" } }, { "model": "documents.entitytype", - "pk": "54e2d005-5b7d-4bcf-a909-c2bec78f8b4c", + "pk": "507dd1ed-3b24-46af-90ba-9b90abff9af6", "fields": { - "name": "date", + "name": "number", "color": "ff0000", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4" + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba" } }, { "model": "documents.entitytype", - "pk": "b9be1ed2-7bba-4f61-a15e-70ea45adc530", + "pk": "54cf1c46-2e9b-4c09-acb8-8be33a9e033e", "fields": { "name": "location", "color": "ff0000", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4" + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba" } }, { "model": "documents.entitytype", - "pk": "e3a46c68-9532-4b55-bf24-48d38bc81a20", + "pk": "9d5550f5-49e4-4db7-b1d2-398a84c03092", "fields": { - "name": "organization", + "name": "date", "color": "ff0000", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4" + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba" } }, { "model": "documents.transcription", - "pk": "164eb133-28e6-40f8-bcff-3ee824aca10e", + "pk": "33cc6487-947b-415f-a5e0-e876415db6b0", "fields": { - "element": "b67bbddb-1821-4444-8910-9d12a7bb3d82", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "ae5e750a-12d5-44b8-95e5-36b9bc18b0e0", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, "text": "DATUM", "orientation": "horizontal-lr", @@ -1439,22 +1439,22 @@ }, { "model": "documents.transcription", - "pk": "2e181f49-b7f4-452c-aa34-38ff5d6d2a96", + "pk": "402e7a5e-918d-4f34-99af-eb5a67bc4a67", "fields": { - "element": "eb0b5a7f-87f3-456d-944a-98a169abf930", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "d5120897-d198-45b8-99fc-c806128dc492", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, - "text": "PARIS", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "3aa20398-1c59-4bd4-81ab-eb67247ae0b8", + "pk": "be1f59c3-be5a-4a34-a024-e84aca3fa427", "fields": { - "element": "2a88df72-e127-4f4a-ab95-32e1f9520377", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "cc1d9aed-7e02-4bc0-a883-a3803d375370", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, "text": "PARIS", "orientation": "horizontal-lr", @@ -1463,136 +1463,123 @@ }, { "model": "documents.transcription", - "pk": "69042dc6-8ced-4cb7-aeb2-9a2ef90ccaed", + "pk": "d16c87b9-e117-499b-ad0d-2dcac95297e2", "fields": { - "element": "f0d7bfe5-7ace-43a0-bf8c-0874ed47675b", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "0b831f72-d975-466c-b627-415974d39728", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, - "text": "Lorem ipsum dolor sit amet", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "7b5ef36d-82df-4cbc-9703-8945924c7023", + "pk": "d6f72c12-9b6c-4aef-a995-5a5826c3c6df", "fields": { - "element": "def59e54-794a-4293-8d5d-7421782fecbe", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "f87f773e-7622-4342-a5e8-446acc3600d3", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, - "text": "ROY", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "9d05b243-f5a5-4d74-9044-4d62e07a7c1a", + "pk": "d709e5d9-51b6-458a-b830-53aa04cea6f3", "fields": { - "element": "3c2692d9-72f6-40ee-a026-7b571e4c347d", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "fe7d0a83-3138-48bf-961c-cd5b98f42423", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, - "text": "PARIS", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "af383b3e-b71d-4619-a85d-6234b7f98399", + "pk": "e2871f16-cb0a-4d1a-96fb-f38e03c536bd", "fields": { - "element": "4150b66d-8984-4fb5-a2f7-91aba8a1893e", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "ec6cb9f9-793b-4b45-9d8a-f743ffcb3606", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, - "text": "ROY", + "text": "Lorem ipsum dolor sit amet", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "c7c0d5df-bdef-4d1e-9e43-7000c8dc515d", + "pk": "eb092b75-6fda-49a9-bd76-25f9429838a6", "fields": { - "element": "329be8bc-e476-4edd-b3f0-9362503428f3", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "b9f61d7c-d230-4a2e-8cb7-29f0df30223b", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, - "text": "DATUM", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "e0e88ecc-dd09-49c0-9952-62b2bd340deb", + "pk": "ecd6ab17-1d34-4993-9efe-be966a215e5d", "fields": { - "element": "871bb123-5bd3-4115-beb8-c46ec316036e", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "498fc569-228a-4bef-b777-524edf9aa357", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, - "text": "DATUM", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "eda463ca-1966-405b-bd71-43fabab60be7", + "pk": "f70df96c-29b5-415a-843b-b2a444054773", "fields": { - "element": "9e325c7d-5114-426e-aef4-ba0ff34635ee", - "worker_version": "a34401be-d3a1-4540-b71c-fa4e30abaf12", + "element": "4712384f-c4fa-42a2-b900-9b0d0aa7c1c7", + "worker_version": "f006179d-ff9a-449c-bfc5-c6f6a9e809cf", "worker_run": null, - "text": "ROY", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.allowedmetadata", - "pk": "298c9f0e-c615-448f-b63a-c200a2ea7061", - "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", - "type": "text", - "name": "folio" - } -}, -{ - "model": "documents.allowedmetadata", - "pk": "72c41776-331a-4284-a0e4-5b3ed0548b7d", + "pk": "73186b18-6bc2-461e-873d-2c43c59934e8", "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "type": "date", "name": "date" } }, { "model": "documents.allowedmetadata", - "pk": "dd01e636-9907-48f7-8d1b-b2d5d55a5a7c", + "pk": "a8b472bf-dfee-4a6a-ac65-a54d6dc546cc", "fields": { - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "type": "location", "name": "location" } }, { - "model": "documents.metadata", - "pk": "48f1389a-156e-478b-ae6c-dc48b6982114", + "model": "documents.allowedmetadata", + "pk": "d6892f8f-c21a-4c62-996e-95b79e7fe7dd", "fields": { - "element": "67d47169-b52c-4d32-8fdb-a92d770a2da9", - "name": "folio", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "type": "text", - "value": "1r", - "entity": null, - "worker_version": null, - "worker_run": null + "name": "folio" } }, { "model": "documents.metadata", - "pk": "5379a65d-933b-4be1-9c6c-b8b2b85372ae", + "pk": "35542ebc-009e-4f40-9a4a-6b2805b30677", "fields": { - "element": "b2622e77-12b7-4377-b203-fd67b6dda823", + "element": "12696972-1dae-449d-80c5-a0c5110156d9", "name": "number", "type": "text", - "value": "4", + "value": "5", "entity": null, "worker_version": null, "worker_run": null @@ -1600,12 +1587,12 @@ }, { "model": "documents.metadata", - "pk": "55074526-3a72-455b-8940-02e6d7399982", + "pk": "3d657aae-062d-4a43-876b-bc83cd99c641", "fields": { - "element": "d7f0a1fe-e70a-4bb3-8430-6602a31fb950", + "element": "d532d5f6-3f00-4cde-888e-ac1dfb23270e", "name": "folio", "type": "text", - "value": "2r", + "value": "1r", "entity": null, "worker_version": null, "worker_run": null @@ -1613,12 +1600,12 @@ }, { "model": "documents.metadata", - "pk": "594ae590-93d4-4822-9f28-686dc669d750", + "pk": "54382fa5-4a9b-44a2-86b5-8ec4c7940dd1", "fields": { - "element": "48f54de8-00cc-42fb-a2d5-21eb8eb1d4ca", + "element": "d2673a72-5bce-410c-9250-c38552c37e1a", "name": "folio", "type": "text", - "value": "2r", + "value": "1v", "entity": null, "worker_version": null, "worker_run": null @@ -1626,12 +1613,12 @@ }, { "model": "documents.metadata", - "pk": "59d6e25f-4120-4a47-bbbc-d60f8fc800ae", + "pk": "7efbfc25-43f3-4dee-a377-7e0dc6bcde9e", "fields": { - "element": "c406d93a-c892-4c5d-88f4-2dc7596a9b67", + "element": "13dcc584-4c57-4939-8ebf-38a3997d6681", "name": "number", "type": "text", - "value": "2", + "value": "1", "entity": null, "worker_version": null, "worker_run": null @@ -1639,12 +1626,12 @@ }, { "model": "documents.metadata", - "pk": "6e1ca5a5-e642-411e-836e-4c00695cc27a", + "pk": "b8c80d94-430d-4d7f-8f5b-489c97db6366", "fields": { - "element": "6e432577-6618-4f10-9b37-3b2d0a54965f", + "element": "25d5ae34-f6fc-4a6d-90ff-1a63181c7f6b", "name": "folio", "type": "text", - "value": "1v", + "value": "2r", "entity": null, "worker_version": null, "worker_run": null @@ -1652,12 +1639,12 @@ }, { "model": "documents.metadata", - "pk": "863bc3ae-1553-44a2-bc99-be71c05b06b9", + "pk": "c4077ea9-9872-464e-acd1-931f539f2baa", "fields": { - "element": "ce9c2be6-9728-4c8b-8656-700a6a5395f6", + "element": "2d7f3ffc-0d68-4ce6-9501-192fb7389439", "name": "number", "type": "text", - "value": "3", + "value": "4", "entity": null, "worker_version": null, "worker_run": null @@ -1665,12 +1652,12 @@ }, { "model": "documents.metadata", - "pk": "b9d188ce-a17e-4e18-b088-b9cf602e7d0d", + "pk": "c447cfa3-510e-491d-b6de-59442d80a6e1", "fields": { - "element": "f0d7bfe5-7ace-43a0-bf8c-0874ed47675b", + "element": "640f7d63-1ce9-4932-b909-d59fd8382e0d", "name": "folio", "type": "text", - "value": "1r", + "value": "2r", "entity": null, "worker_version": null, "worker_run": null @@ -1678,12 +1665,25 @@ }, { "model": "documents.metadata", - "pk": "d3755e23-75d3-428b-a207-94139c7b9621", + "pk": "d5a77cb6-6435-4055-8910-fbca5a0e0a9f", "fields": { - "element": "8865f631-5659-4f66-bdd3-ecf26b2726ab", + "element": "19fa4694-1579-4e3b-9c78-f2953f402d55", + "name": "number", + "type": "text", + "value": "3", + "entity": null, + "worker_version": null, + "worker_run": null + } +}, +{ + "model": "documents.metadata", + "pk": "dbdbbb85-2bf1-415f-8337-1e9ee97054fe", + "fields": { + "element": "ec6cb9f9-793b-4b45-9d8a-f743ffcb3606", "name": "folio", "type": "text", - "value": "1v", + "value": "1r", "entity": null, "worker_version": null, "worker_run": null @@ -1691,12 +1691,12 @@ }, { "model": "documents.metadata", - "pk": "e461907c-2eb9-45a0-b93d-d114e451a9ef", + "pk": "e5134aa3-e92e-4f73-95c2-dac3c2830f94", "fields": { - "element": "80c05833-9df7-4c46-a79a-b6c17caf148c", + "element": "4dc9662a-0c78-4f61-b2b2-d066f9e50be9", "name": "number", "type": "text", - "value": "1", + "value": "2", "entity": null, "worker_version": null, "worker_run": null @@ -1704,12 +1704,12 @@ }, { "model": "documents.metadata", - "pk": "e5130b1f-a022-448c-8b5a-eb783d1c16af", + "pk": "fb4ab719-6663-4681-b652-f68b2447ddb6", "fields": { - "element": "c4ad038c-48a5-418d-a1cf-f11c275cd980", - "name": "number", + "element": "d1beed1a-1651-407a-9ffb-ee57dabca7bc", + "name": "folio", "type": "text", - "value": "5", + "value": "1v", "entity": null, "worker_version": null, "worker_run": null @@ -1732,12 +1732,12 @@ }, { "model": "images.image", - "pk": "4c80befb-70c0-4cf5-a615-a8a16375fd8f", + "pk": "152f12ae-61dc-42cd-afac-efb2eed8bbee", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img6", + "path": "img4", "width": 1000, "height": 1000, "hash": null, @@ -1746,12 +1746,12 @@ }, { "model": "images.image", - "pk": "949105b1-bf09-4bc0-bc4e-c091530da74e", + "pk": "739b25d6-065c-4309-b2e4-f8ac000e6741", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img4", + "path": "img2", "width": 1000, "height": 1000, "hash": null, @@ -1760,12 +1760,12 @@ }, { "model": "images.image", - "pk": "d54a0fa2-bb2e-4004-9b1f-30a5b43dd956", + "pk": "b2aabf63-61a8-4651-b5cd-33bc2a85e36e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img2", + "path": "img6", "width": 1000, "height": 1000, "hash": null, @@ -1774,12 +1774,12 @@ }, { "model": "images.image", - "pk": "ed514c38-7c9b-4193-b293-729d2521848d", + "pk": "c8a30310-5071-4eb7-b4f7-00bd700237df", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img1", + "path": "img3", "width": 1000, "height": 1000, "hash": null, @@ -1788,12 +1788,12 @@ }, { "model": "images.image", - "pk": "f1cb9166-4d0a-458f-bacd-5f067464b9a3", + "pk": "d1ee80ce-9106-4680-a133-cc96ace159e5", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img3", + "path": "img5", "width": 1000, "height": 1000, "hash": null, @@ -1802,12 +1802,12 @@ }, { "model": "images.image", - "pk": "f5a4d250-a179-4b05-a294-b65b3a7f1a9e", + "pk": "de1922b2-ec28-41d3-a85d-57da90cf6cfb", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img5", + "path": "img1", "width": 1000, "height": 1000, "hash": null, @@ -1816,56 +1816,56 @@ }, { "model": "users.right", - "pk": "295881c0-4d6e-46e4-8950-12f7f7ee815f", + "pk": "07908dcf-cd81-4609-83d6-c8b926987984", "fields": { "user": 3, "group": null, "content_type": 32, - "content_id": "f53424a3-e8b1-4ce6-8e12-98a5f786a04d", + "content_id": "4010fae2-a254-4435-8d6d-e6fec27cc1e4", "level": 50 } }, { "model": "users.right", - "pk": "2af2e843-25f0-4dcc-84a1-1a63d34e3d1e", + "pk": "40f64538-3ff8-4b01-9c60-a4e8b6b100c2", "fields": { "user": 2, "group": null, "content_type": 11, - "content_id": "2bf8674f-b9fc-44bb-a87b-9e90c4a0ff09", + "content_id": "fb4aa7c7-0231-4a1c-ad7a-2a3b947fba9d", "level": 10 } }, { "model": "users.right", - "pk": "86943e53-1b12-4291-8ef8-7496f40e8cbe", + "pk": "8505a44b-3984-4c9a-9828-053dc4bcc60e", "fields": { "user": 2, "group": null, "content_type": 32, - "content_id": "f53424a3-e8b1-4ce6-8e12-98a5f786a04d", + "content_id": "4010fae2-a254-4435-8d6d-e6fec27cc1e4", "level": 100 } }, { "model": "users.right", - "pk": "bc8ad4f4-e694-4cae-8aa5-d32854ab119d", + "pk": "b03aa330-76fa-4cdc-af1d-e3ccdf14cc5c", "fields": { "user": 2, "group": null, "content_type": 19, - "content_id": "69d8f34c-476d-4bb6-803e-f59a618eeea4", + "content_id": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "level": 100 } }, { "model": "users.right", - "pk": "fcd5f168-4367-4564-a343-2243d3083910", + "pk": "eb0c361b-8c4a-4a9e-85d2-b1504fda12cc", "fields": { "user": 4, "group": null, "content_type": 32, - "content_id": "f53424a3-e8b1-4ce6-8e12-98a5f786a04d", + "content_id": "4010fae2-a254-4435-8d6d-e6fec27cc1e4", "level": 10 } }, @@ -1873,7 +1873,7 @@ "model": "users.user", "pk": 1, "fields": { - "password": "pbkdf2_sha256$390000$qdKc1Kkm7RAOxmqRFz0Yyq$pBMqSrHicCd8nnoOgF3/BMiEnf5tHNWaRvnSJMESUZw=", + "password": "pbkdf2_sha256$390000$Bzx70AhImHu7uIz6kF1yDV$bPqu3tLjpL8TdxdpiGL5KvZovPbxWn7bz1QU5BdTX70=", "last_login": null, "email": "root@root.fr", "display_name": "Admin", @@ -1888,7 +1888,7 @@ "model": "users.user", "pk": 2, "fields": { - "password": "pbkdf2_sha256$390000$GZOQoT0MGTY0QOz19f5Gym$B3Howfj4B/0RDd7HJ3wcpiptzeGVlnZ35TpIsI92TY4=", + "password": "pbkdf2_sha256$390000$SUY9oKPZalXfjd47H8ZdXJ$ZZ1MymCoMub887/pjOAZwxnI+okJbWb+6gqcxgA1hWA=", "last_login": null, "email": "user@user.fr", "display_name": "Test user", @@ -1931,7 +1931,7 @@ }, { "model": "users.group", - "pk": "f53424a3-e8b1-4ce6-8e12-98a5f786a04d", + "pk": "4010fae2-a254-4435-8d6d-e6fec27cc1e4", "fields": { "name": "User group", "public": false, @@ -3893,19 +3893,19 @@ }, { "model": "ponos.farm", - "pk": "2bf8674f-b9fc-44bb-a87b-9e90c4a0ff09", + "pk": "fb4aa7c7-0231-4a1c-ad7a-2a3b947fba9d", "fields": { "name": "Wheat farm", - "seed": "d3d01fdb9cb1054d0e626e859530b8858f18820716f7b4b5e4905a7c37830e82" + "seed": "c75f3f28eb0fec73f3bbe3d783ba39def0d1acdc4861d5b65e2d03bb8574559c" } }, { "model": "training.dataset", - "pk": "4a6de779-492e-401f-b8c5-dbfebacc3783", + "pk": "02ef42cf-27dc-45b5-aa56-347e4b879b75", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "creator": 2, "task": null, "name": "Second Dataset", @@ -3916,11 +3916,11 @@ }, { "model": "training.dataset", - "pk": "a29b70e8-09d6-44ff-8399-e0ac65dda9dc", + "pk": "d9fa73fa-4e6b-40a3-aabb-3b113e4e4e7c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "69d8f34c-476d-4bb6-803e-f59a618eeea4", + "corpus": "9b958f01-72af-4030-ab5c-7bbcb79c96ba", "creator": 2, "task": null, "name": "First Dataset", @@ -3931,50 +3931,50 @@ }, { "model": "training.datasetset", - "pk": "0b2d4331-b22b-4f17-bc81-60cd8104151a", + "pk": "16660130-8175-4f8c-86f2-3cb0ad1e7426", "fields": { - "name": "test", - "dataset": "a29b70e8-09d6-44ff-8399-e0ac65dda9dc" + "name": "train", + "dataset": "02ef42cf-27dc-45b5-aa56-347e4b879b75" } }, { "model": "training.datasetset", - "pk": "4440ea66-a811-4d88-94db-4a295de41314", + "pk": "2b513ae4-0d44-42f5-b353-9253c2551f11", "fields": { - "name": "test", - "dataset": "4a6de779-492e-401f-b8c5-dbfebacc3783" + "name": "train", + "dataset": "d9fa73fa-4e6b-40a3-aabb-3b113e4e4e7c" } }, { "model": "training.datasetset", - "pk": "6395408a-7989-48f6-bed9-4192fb3d8746", + "pk": "353078ea-131b-4ce3-ab9a-e3cec28115e8", "fields": { - "name": "validation", - "dataset": "a29b70e8-09d6-44ff-8399-e0ac65dda9dc" + "name": "test", + "dataset": "d9fa73fa-4e6b-40a3-aabb-3b113e4e4e7c" } }, { "model": "training.datasetset", - "pk": "67b6c24e-5579-4929-975a-9f567cf52cc5", + "pk": "bd86ece2-8ffc-410e-b746-fcce2b8e2690", "fields": { - "name": "training", - "dataset": "a29b70e8-09d6-44ff-8399-e0ac65dda9dc" + "name": "dev", + "dataset": "d9fa73fa-4e6b-40a3-aabb-3b113e4e4e7c" } }, { "model": "training.datasetset", - "pk": "72aea178-a1ce-44a4-a1f9-2820a4178413", + "pk": "dba75cc5-3642-4ea3-bff4-f72e1104ebfd", "fields": { - "name": "validation", - "dataset": "4a6de779-492e-401f-b8c5-dbfebacc3783" + "name": "dev", + "dataset": "02ef42cf-27dc-45b5-aa56-347e4b879b75" } }, { "model": "training.datasetset", - "pk": "add520a1-5f45-43a2-b19a-a02bbb5254cf", + "pk": "ed22bb51-e708-496f-8fde-e5784b107c82", "fields": { - "name": "training", - "dataset": "4a6de779-492e-401f-b8c5-dbfebacc3783" + "name": "test", + "dataset": "02ef42cf-27dc-45b5-aa56-347e4b879b75" } } ] diff --git a/arkindex/documents/management/commands/build_fixtures.py b/arkindex/documents/management/commands/build_fixtures.py index 66324490d8..22b8225491 100644 --- a/arkindex/documents/management/commands/build_fixtures.py +++ b/arkindex/documents/management/commands/build_fixtures.py @@ -295,10 +295,10 @@ class Command(BaseCommand): dataset_2 = corpus.datasets.create(name="Second Dataset", description="dataset number two", creator=user) # Create their sets DatasetSet.objects.bulk_create( - DatasetSet(name=name, dataset_id=dataset_1.id) for name in ["training", "validation", "test"] + DatasetSet(name=name, dataset_id=dataset_1.id) for name in ["train", "dev", "test"] ) DatasetSet.objects.bulk_create( - DatasetSet(name=name, dataset_id=dataset_2.id) for name in ["training", "validation", "test"] + DatasetSet(name=name, dataset_id=dataset_2.id) for name in ["train", "dev", "test"] ) # Create 2 volumes diff --git a/arkindex/process/tests/test_process_dataset_sets.py b/arkindex/process/tests/test_process_dataset_sets.py index 2e4f841c5a..f314f3e1a0 100644 --- a/arkindex/process/tests/test_process_dataset_sets.py +++ b/arkindex/process/tests/test_process_dataset_sets.py @@ -29,7 +29,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): ) DatasetSet.objects.bulk_create([ DatasetSet(dataset_id=cls.private_dataset.id, name=set_name) - for set_name in ["validation", "training", "test"] + for set_name in ["dev", "train", "test"] ]) cls.test_user = User.objects.create(email="katsuragi@nerv.co.jp", verified_email=True) cls.private_corpus.memberships.create(user=cls.test_user, level=Role.Admin.value) @@ -327,7 +327,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): # Destroy process dataset set def test_destroy_requires_login(self): - train_set = self.dataset1.sets.get(name="training") + train_set = self.dataset1.sets.get(name="train") with self.assertNumQueries(0): response = self.client.delete( reverse("api:process-set", kwargs={"process": self.dataset_process.id, "set": train_set.id}), @@ -335,7 +335,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) def test_destroy_process_does_not_exist(self): - train_set = self.dataset1.sets.get(name="training") + train_set = self.dataset1.sets.get(name="train") self.client.force_login(self.test_user) wrong_id = uuid.uuid4() with self.assertNumQueries(3): @@ -356,7 +356,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): self.assertDictEqual(response.json(), {"set": [f'Invalid pk "{str(wrong_id)}" - object does not exist.']}) def test_destroy_not_found(self): - train_set = self.dataset2.sets.get(name="training") + train_set = self.dataset2.sets.get(name="train") self.assertFalse(ProcessDatasetSet.objects.filter(process=self.dataset_process, set=train_set).exists()) self.client.force_login(self.test_user) with self.assertNumQueries(5): @@ -367,7 +367,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): @patch("arkindex.project.mixins.get_max_level", return_value=None) def test_destroy_process_access_level(self, get_max_level_mock): - train_set = self.dataset1.sets.get(name="training") + train_set = self.dataset1.sets.get(name="train") self.client.force_login(self.test_user) with self.assertNumQueries(3): response = self.client.delete( @@ -395,7 +395,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): self.assertFalse(ProcessDatasetSet.objects.filter(process=self.dataset_process, set=test_set).exists()) def test_destroy_process_mode(self): - train_set = self.dataset1.sets.get(name="training") + train_set = self.dataset1.sets.get(name="train") cases = set(ProcessMode) - {ProcessMode.Dataset, ProcessMode.Local} for mode in cases: with self.subTest(mode=mode): @@ -412,7 +412,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): self.assertEqual(response.json(), {"process": ['Dataset sets can only be added to or removed from processes of mode "dataset".']}) def test_destroy_process_mode_local(self): - train_set = self.dataset1.sets.get(name="training") + train_set = self.dataset1.sets.get(name="train") self.client.force_login(self.user) local_process = Process.objects.get(creator=self.user, mode=ProcessMode.Local) with self.assertNumQueries(3): @@ -423,7 +423,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): self.assertEqual(response.json(), {"detail": "You do not have admin access to this process."}) def test_destroy_started(self): - train_set = self.dataset1.sets.get(name="training") + train_set = self.dataset1.sets.get(name="train") self.client.force_login(self.test_user) self.dataset_process.tasks.create(run=0, depth=0, slug="makrout") @@ -436,7 +436,7 @@ class TestProcessDatasetSets(FixtureAPITestCase): self.assertDictEqual(response.json(), {"process": ["Dataset sets cannot be updated on processes that have already started."]}) def test_destroy(self): - train_set = self.dataset1.sets.get(name="training") + train_set = self.dataset1.sets.get(name="train") self.assertTrue(ProcessDatasetSet.objects.filter(process=self.dataset_process, set=train_set).exists()) self.client.force_login(self.test_user) with self.assertNumQueries(6): diff --git a/arkindex/training/serializers.py b/arkindex/training/serializers.py index 3915a0be27..855434b8ed 100644 --- a/arkindex/training/serializers.py +++ b/arkindex/training/serializers.py @@ -601,7 +601,7 @@ class DatasetSerializer(serializers.ModelSerializer): set_names = serializers.ListField( child=serializers.CharField(max_length=50), write_only=True, - default=serializers.CreateOnlyDefault(["training", "validation", "test"]) + default=serializers.CreateOnlyDefault(["train", "dev", "test"]) ) sets = DatasetSetSerializer(many=True, read_only=True) diff --git a/arkindex/training/tests/test_dataset_sets_api.py b/arkindex/training/tests/test_dataset_sets_api.py index 17f43037e4..d5c3f630ef 100644 --- a/arkindex/training/tests/test_dataset_sets_api.py +++ b/arkindex/training/tests/test_dataset_sets_api.py @@ -23,7 +23,7 @@ class TestDatasetSetsAPI(FixtureAPITestCase): private_user = User.objects.create(email="ikarigendou@mail.com", display_name="Commander Ikari", verified_email=True) cls.private_corpus = Corpus.objects.create(name="Private Project") cls.private_dataset = Dataset.objects.create(corpus=cls.private_corpus, name="Private Dataset", creator=private_user) - cls.train_set = cls.dataset.sets.get(name="training") + cls.train_set = cls.dataset.sets.get(name="train") cls.train_set.set_elements.create(element=cls.page) cls.train_set.set_elements.create(element=cls.line) cls.dataset_process = Process.objects.create( @@ -126,7 +126,7 @@ class TestDatasetSetsAPI(FixtureAPITestCase): with self.assertNumQueries(5): response = self.client.post( reverse("api:dataset-sets", kwargs={"pk": self.dataset.pk}), - data={"name": "training"}, + data={"name": "train"}, format="json" ) self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) @@ -254,7 +254,7 @@ class TestDatasetSetsAPI(FixtureAPITestCase): with self.assertNumQueries(6): response = self.client.put( reverse("api:dataset-set", kwargs={"dataset": self.dataset.pk, "set": self.train_set.pk}), - data={"name": "validation"}, + data={"name": "dev"}, format="json" ) self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) @@ -383,7 +383,7 @@ class TestDatasetSetsAPI(FixtureAPITestCase): with self.assertNumQueries(6): response = self.client.patch( reverse("api:dataset-set", kwargs={"dataset": self.dataset.pk, "set": self.train_set.pk}), - data={"name": "validation"}, + data={"name": "dev"}, format="json" ) self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) diff --git a/arkindex/training/tests/test_datasets_api.py b/arkindex/training/tests/test_datasets_api.py index b824eae2ee..d24571674e 100644 --- a/arkindex/training/tests/test_datasets_api.py +++ b/arkindex/training/tests/test_datasets_api.py @@ -292,9 +292,9 @@ class TestDatasetsAPI(FixtureAPITestCase): for ds in created_dataset.sets.order_by("name") ], "set_elements": { - "training": 0, + "train": 0, "test": 0, - "validation": 0, + "dev": 0, }, "state": "open", "creator": "Test user", @@ -328,9 +328,9 @@ class TestDatasetsAPI(FixtureAPITestCase): for ds in created_dataset.sets.order_by("name") ], "set_elements": { - "training": 0, + "train": 0, "test": 0, - "validation": 0, + "dev": 0, }, "state": "open", "creator": "Test user", @@ -601,7 +601,7 @@ class TestDatasetsAPI(FixtureAPITestCase): def test_update_forbidden_unique_elements(self): self.dataset.unique_elements = False self.dataset.save() - test_set, train_set, validation_set = self.dataset.sets.all().order_by("name") + _, test_set, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.vol) test_set.set_elements.create(element=self.vol) self.client.force_login(self.user) @@ -651,7 +651,7 @@ class TestDatasetsAPI(FixtureAPITestCase): ) self.assertEqual(response.status_code, status.HTTP_200_OK) self.dataset.refresh_from_db() - self.assertEqual(response.json()["set_elements"], {"test": 0, "training": 0, "validation": 0}) + self.assertEqual(response.json()["set_elements"], {"test": 0, "train": 0, "dev": 0}) self.assertEqual(self.dataset.state, DatasetState.Complete) self.assertEqual(self.dataset.task_id, self.task.id) @@ -834,7 +834,7 @@ class TestDatasetsAPI(FixtureAPITestCase): self.assertEqual(self.dataset.name, "First Dataset") self.assertEqual(self.dataset.description, "Omedeto!") self.assertEqual(self.dataset.unique_elements, False) - self.assertCountEqual(list(self.dataset.sets.values_list("name", flat=True)), ["training", "test", "validation"]) + self.assertCountEqual(list(self.dataset.sets.values_list("name", flat=True)), ["train", "test", "dev"]) def test_partial_update_empty_or_blank_description_or_name(self): self.client.force_login(self.user) @@ -853,7 +853,7 @@ class TestDatasetsAPI(FixtureAPITestCase): def test_partial_update_forbidden_unique_elements(self): self.dataset.unique_elements = False self.dataset.save() - test_set, train_set, validation_set = self.dataset.sets.all().order_by("name") + _, test_set, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.vol) test_set.set_elements.create(element=self.vol) self.client.force_login(self.user) @@ -1055,7 +1055,7 @@ class TestDatasetsAPI(FixtureAPITestCase): } for ds in self.dataset.sets.order_by("name") ], - "set_elements": {"test": 0, "training": 0, "validation": 0}, + "set_elements": {"test": 0, "train": 0, "dev": 0}, "creator": "Test user", "task_id": None, "corpus_id": str(self.corpus.id), @@ -1161,12 +1161,12 @@ class TestDatasetsAPI(FixtureAPITestCase): """ DestroyDataset also deletes DatasetElements """ - test_set, train_set, validation_set = self.dataset.sets.all().order_by("name") + dev_set, test_set, train_set = self.dataset.sets.all().order_by("name") test_set.set_elements.create(element_id=self.vol.id) - train_set.set_elements.create(element_id=self.vol.id, set="training") - train_set.set_elements.create(element_id=self.page1.id, set="training") - validation_set.set_elements.create(element_id=self.page2.id, set="validation") - validation_set.set_elements.create(element_id=self.page3.id, set="validation") + train_set.set_elements.create(element_id=self.vol.id, set="train") + train_set.set_elements.create(element_id=self.page1.id, set="train") + dev_set.set_elements.create(element_id=self.page2.id, set="dev") + dev_set.set_elements.create(element_id=self.page3.id, set="dev") # Remove dataset sets from process ProcessDatasetSet.objects.filter(process_id=self.process.id, set__dataset_id=self.dataset.id).delete() self.client.force_login(self.user) @@ -1210,13 +1210,13 @@ class TestDatasetsAPI(FixtureAPITestCase): self.assertEqual(filter_rights_mock.call_args, call(self.user, Corpus, Role.Guest.value)) def test_list_elements_set_filter_wrong_set(self): - test_set = self.dataset.sets.order_by("name").first() + test_set = self.dataset.sets.get(name="test") test_set.set_elements.create(element_id=self.page1.id) self.client.force_login(self.user) with self.assertNumQueries(4): response = self.client.get( reverse("api:dataset-elements", kwargs={"pk": str(self.dataset.id)}), - data={"set": "training"} + data={"set": "train"} ) self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertDictEqual(response.json(), { @@ -1227,14 +1227,14 @@ class TestDatasetsAPI(FixtureAPITestCase): }) def test_list_elements_set_filter(self): - test_set, train_set, _ = self.dataset.sets.all().order_by("name") + _, test_set, train_set = self.dataset.sets.all().order_by("name") test_set.set_elements.create(element_id=self.page1.id) train_set.set_elements.create(element_id=self.page2.id) self.client.force_login(self.user) with self.assertNumQueries(6): response = self.client.get( reverse("api:dataset-elements", kwargs={"pk": self.dataset.pk}), - data={"set": "training", "with_count": "true"}, + data={"set": "train", "with_count": "true"}, ) self.assertEqual(response.status_code, status.HTTP_200_OK) data = response.json() @@ -1243,15 +1243,15 @@ class TestDatasetsAPI(FixtureAPITestCase): self.assertEqual(len(results), 1) dataset_element = results[0] self.assertEqual(dataset_element["element"]["id"], str(self.page2.id)) - self.assertEqual(dataset_element["set"], "training") + self.assertEqual(dataset_element["set"], "train") @patch("arkindex.documents.models.Element.thumbnail", MagicMock(s3_url="s3_url")) def test_list_elements(self): - test_set, train_set, validation_set = self.dataset.sets.all().order_by("name") + dev_set, test_set, train_set = self.dataset.sets.all().order_by("name") test_set.set_elements.create(element_id=self.vol.id) train_set.set_elements.create(element_id=self.page1.id) - validation_set.set_elements.create(element_id=self.page2.id) - validation_set.set_elements.create(element_id=self.page3.id) + dev_set.set_elements.create(element_id=self.page2.id) + dev_set.set_elements.create(element_id=self.page3.id) self.page3.confidence = 0.42 self.page3.mirrored = True self.page3.rotation_angle = 42 @@ -1261,7 +1261,7 @@ class TestDatasetsAPI(FixtureAPITestCase): # test needs to be insensitive to element id changes when regenerating test fixtures elements = { self.page1.id: { - "set": "training", + "set": "train", "element": { "id": str(self.page1.id), "confidence": None, @@ -1310,7 +1310,7 @@ class TestDatasetsAPI(FixtureAPITestCase): }, }, self.page2.id: { - "set": "validation", + "set": "dev", "element": { "id": str(self.page2.id), "confidence": None, @@ -1359,7 +1359,7 @@ class TestDatasetsAPI(FixtureAPITestCase): }, }, self.page3.id: { - "set": "validation", + "set": "dev", "element": { "id": str(self.page3.id), "confidence": 0.42, @@ -1544,7 +1544,7 @@ class TestDatasetsAPI(FixtureAPITestCase): self.assertListEqual(response.json(), ["You can only add elements to a dataset in an open state."]) def test_add_element_already_exists(self): - test_set = self.dataset.sets.order_by("name").first() + test_set = self.dataset.sets.get(name="test") test_set.set_elements.create(element=self.page1) self.dataset.unique_elements = False self.dataset.save() @@ -1559,22 +1559,22 @@ class TestDatasetsAPI(FixtureAPITestCase): self.assertDictEqual(response.json(), {"non_field_errors": ["This element is already part of this set."]}) def test_add_element(self): - train_set = self.dataset.sets.get(name="training") + train_set = self.dataset.sets.get(name="train") self.client.force_login(self.user) with self.assertNumQueries(12): response = self.client.post( reverse("api:dataset-elements", kwargs={"pk": self.dataset.id}), - data={"set": "training", "element_id": str(self.page1.id)}, + data={"set": "train", "element_id": str(self.page1.id)}, format="json", ) self.assertEqual(response.status_code, status.HTTP_201_CREATED) self.assertQuerysetEqual( train_set.set_elements.values_list("set__name", "element__name").order_by("element__name"), - [("training", "Volume 1, page 1r")] + [("train", "Volume 1, page 1r")] ) def test_add_element_forbid_dupes(self): - test_set, train_set, validation_set = self.dataset.sets.all().order_by("name") + train_set = self.dataset.sets.get(name="train") train_set.set_elements.create(element=self.page1) self.client.force_login(self.user) with self.assertNumQueries(6): @@ -1585,13 +1585,13 @@ class TestDatasetsAPI(FixtureAPITestCase): ) self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertDictEqual(response.json(), { - "element_id": ["The dataset requires unique elements and this element is already present in set training."] + "element_id": ["The dataset requires unique elements and this element is already present in set train."] }) def test_add_element_allow_dupes(self): self.dataset.unique_elements = False self.dataset.save() - test_set, train_set, validation_set = self.dataset.sets.all().order_by("name") + train_set = self.dataset.sets.get(name="train") train_set.set_elements.create(element=self.page1) self.client.force_login(self.user) with self.assertNumQueries(11): @@ -1610,7 +1610,7 @@ class TestDatasetsAPI(FixtureAPITestCase): ), [ ("test", "Volume 1, page 1r"), - ("training", "Volume 1, page 1r"), + ("train", "Volume 1, page 1r"), ] ) @@ -1706,7 +1706,7 @@ class TestDatasetsAPI(FixtureAPITestCase): def test_add_from_selection_completed_dataset(self): """A dataset in the Complete state is immutable""" - test_set = self.dataset.sets.first() + test_set = self.dataset.sets.get(name="test") self.client.force_login(self.user) self.dataset.state = DatasetState.Complete self.dataset.save() @@ -1722,11 +1722,11 @@ class TestDatasetsAPI(FixtureAPITestCase): }) def test_add_from_selection(self): - train_set = self.dataset.sets.get(name="training") + train_set = self.dataset.sets.get(name="train") train_set.set_elements.create(element=self.page1) self.assertQuerysetEqual( train_set.set_elements.values_list("set__name", "element__name").order_by("element__name"), - [("training", "Volume 1, page 1r")] + [("train", "Volume 1, page 1r")] ) self.user.selected_elements.set([self.vol, self.page1, self.page2]) @@ -1741,14 +1741,14 @@ class TestDatasetsAPI(FixtureAPITestCase): self.assertQuerysetEqual( train_set.set_elements.values_list("set__name", "element__name").order_by("element__name"), [ - ("training", "Volume 1"), - ("training", "Volume 1, page 1r"), - ("training", "Volume 1, page 1v"), + ("train", "Volume 1"), + ("train", "Volume 1, page 1r"), + ("train", "Volume 1, page 1v"), ] ) def test_add_from_selection_forbid_dupes(self): - test_set, train_set, validation_set = self.dataset.sets.all().order_by("name") + _, test_set, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.vol) self.user.selected_elements.set([self.vol, self.page1]) @@ -1761,11 +1761,11 @@ class TestDatasetsAPI(FixtureAPITestCase): ) self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertDictEqual(response.json(), { - "set_id": ["The dataset requires unique elements and some elements are already present in set training."] + "set_id": ["The dataset requires unique elements and some elements are already present in set train."] }) def test_add_from_selection_allow_dupes(self): - test_set, train_set, validation_set = self.dataset.sets.all().order_by("name") + _, test_set, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.vol) self.user.selected_elements.set([self.vol, self.page1]) test_set = self.dataset.sets.get(name="test") @@ -1790,7 +1790,7 @@ class TestDatasetsAPI(FixtureAPITestCase): [ ("test", "Volume 1"), ("test", "Volume 1, page 1r"), - ("training", "Volume 1"), + ("train", "Volume 1"), ] ) @@ -1818,7 +1818,7 @@ class TestDatasetsAPI(FixtureAPITestCase): """ A non authenticated user can list datasets of a public element """ - train_set = self.dataset.sets.get(name="training") + train_set = self.dataset.sets.get(name="train") train_set.set_elements.create(element=self.vol) with self.assertNumQueries(4): response = self.client.get(reverse("api:element-sets", kwargs={"pk": str(self.vol.id)})) @@ -1849,7 +1849,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset.updated.isoformat().replace("+00:00", "Z"), }, - "set": "training", + "set": "train", "previous": None, "next": None }] @@ -1857,10 +1857,10 @@ class TestDatasetsAPI(FixtureAPITestCase): def test_element_datasets(self): self.client.force_login(self.user) - _, train_set, validation_set = self.dataset.sets.all().order_by("name") + dev_set, _, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.page1, set="train") - validation_set.set_elements.create(element=self.page1, set="validation") - train_set_2 = self.dataset2.sets.get(name="training") + dev_set.set_elements.create(element=self.page1, set="dev") + train_set_2 = self.dataset2.sets.get(name="train") train_set_2.set_elements.create(element=self.page1, set="train") with self.assertNumQueries(6): response = self.client.get(reverse("api:element-sets", kwargs={"pk": str(self.page1.id)})) @@ -1891,7 +1891,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset.updated.isoformat().replace("+00:00", "Z"), }, - "set": "training", + "set": "dev", "previous": None, "next": None }, { @@ -1915,7 +1915,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset.updated.isoformat().replace("+00:00", "Z"), }, - "set": "validation", + "set": "train", "previous": None, "next": None }, { @@ -1939,7 +1939,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset2.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset2.updated.isoformat().replace("+00:00", "Z"), }, - "set": "training", + "set": "train", "previous": None, "next": None }] @@ -1947,10 +1947,10 @@ class TestDatasetsAPI(FixtureAPITestCase): def test_element_datasets_with_neighbors_false(self): self.client.force_login(self.user) - _, train_set, validation_set = self.dataset.sets.all().order_by("name") - train_set_2 = self.dataset2.sets.get(name="training") + dev_set, _, train_set = self.dataset.sets.all().order_by("name") + train_set_2 = self.dataset2.sets.get(name="train") train_set.set_elements.create(element=self.page1) - validation_set.set_elements.create(element=self.page1) + dev_set.set_elements.create(element=self.page1) train_set_2.set_elements.create(element=self.page1) with self.assertNumQueries(6): response = self.client.get(reverse("api:element-sets", kwargs={"pk": str(self.page1.id)}), {"with_neighbors": False}) @@ -1981,7 +1981,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset.updated.isoformat().replace("+00:00", "Z"), }, - "set": "training", + "set": "dev", "previous": None, "next": None }, { @@ -2005,7 +2005,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset.updated.isoformat().replace("+00:00", "Z"), }, - "set": "validation", + "set": "train", "previous": None, "next": None }, { @@ -2029,7 +2029,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset2.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset2.updated.isoformat().replace("+00:00", "Z"), }, - "set": "training", + "set": "train", "previous": None, "next": None }] @@ -2037,12 +2037,12 @@ class TestDatasetsAPI(FixtureAPITestCase): def test_element_datasets_with_neighbors(self): self.client.force_login(self.user) - _, train_set, validation_set = self.dataset.sets.all().order_by("name") - train_set_2 = self.dataset2.sets.get(name="training") + dev_set, _, train_set = self.dataset.sets.all().order_by("name") + train_set_2 = self.dataset2.sets.get(name="train") train_set.set_elements.create(element=self.page1) train_set.set_elements.create(element=self.page2) train_set.set_elements.create(element=self.page3) - validation_set.set_elements.create(element=self.page1) + dev_set.set_elements.create(element=self.page1) train_set_2.set_elements.create(element=self.page1) train_set_2.set_elements.create(element=self.page3) @@ -2082,17 +2082,9 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset.updated.isoformat().replace("+00:00", "Z"), }, - "set": "training", - "previous": ( - sorted_dataset_elements[page1_index_1 - 1] - if page1_index_1 - 1 >= 0 - else None - ), - "next": ( - sorted_dataset_elements[page1_index_1 + 1] - if page1_index_1 + 1 <= 2 - else None - ) + "set": "dev", + "previous": None, + "next": None }, { "dataset": { "id": str(self.dataset.id), @@ -2114,9 +2106,17 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset.updated.isoformat().replace("+00:00", "Z"), }, - "set": "validation", - "previous": None, - "next": None + "set": "train", + "previous": ( + sorted_dataset_elements[page1_index_1 - 1] + if page1_index_1 - 1 >= 0 + else None + ), + "next": ( + sorted_dataset_elements[page1_index_1 + 1] + if page1_index_1 + 1 <= 2 + else None + ) }, { "dataset": { "id": str(self.dataset2.id), @@ -2138,7 +2138,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "created": self.dataset2.created.isoformat().replace("+00:00", "Z"), "updated": self.dataset2.updated.isoformat().replace("+00:00", "Z"), }, - "set": "training", + "set": "train", "previous": ( sorted_dataset2_elements[page1_index_2 - 1] if page1_index_2 == 1 @@ -2214,10 +2214,10 @@ class TestDatasetsAPI(FixtureAPITestCase): self.dataset.unique_elements = False self.dataset.task = self.task self.dataset.save() - test_set, _, validation_set = self.dataset.sets.all().order_by("name") + dev_set, test_set, _ = self.dataset.sets.all().order_by("name") test_set.set_elements.create(element=self.page1) - validation_set.set_elements.create(element=self.page1) - validation_set.set_elements.create(element=self.vol) + dev_set.set_elements.create(element=self.page1) + dev_set.set_elements.create(element=self.vol) self.assertCountEqual(self.corpus.datasets.values_list("name", flat=True), ["First Dataset", "Second Dataset"]) self.client.force_login(self.user) @@ -2234,7 +2234,7 @@ class TestDatasetsAPI(FixtureAPITestCase): ]) data = response.json() clone = self.corpus.datasets.get(id=data["id"]) - test_clone, train_clone, val_clone = clone.sets.all().order_by("name") + dev_clone, test_clone, train_clone = clone.sets.all().order_by("name") self.assertEqual(clone.creator, self.user) self.assertEqual(clone.unique_elements, False) data.pop("created") @@ -2248,7 +2248,7 @@ class TestDatasetsAPI(FixtureAPITestCase): "description": self.dataset.description, "creator": self.user.display_name, "corpus_id": str(self.corpus.id), - "set_elements": {"test": 1, "training": 0, "validation": 2}, + "set_elements": {"test": 1, "train": 0, "dev": 2}, "state": DatasetState.Open.value, "task_id": str(self.task.id), "unique_elements": False, @@ -2256,7 +2256,7 @@ class TestDatasetsAPI(FixtureAPITestCase): ) self.assertCountEqual(cloned_sets, [ { - "name": "training", + "name": "train", "id": str(train_clone.id) }, { @@ -2264,16 +2264,16 @@ class TestDatasetsAPI(FixtureAPITestCase): "id": str(test_clone.id) }, { - "name": "validation", - "id": str(val_clone.id) + "name": "dev", + "id": str(dev_clone.id) } ]) self.assertQuerysetEqual( DatasetElement.objects.filter(set__dataset_id=clone.id).values_list("set__name", "element__name").order_by("element__name", "set__name"), [ - ("validation", "Volume 1"), + ("dev", "Volume 1"), + ("dev", "Volume 1, page 1r"), ("test", "Volume 1, page 1r"), - ("validation", "Volume 1, page 1r"), ] ) @@ -2297,7 +2297,7 @@ class TestDatasetsAPI(FixtureAPITestCase): data.pop("created") data.pop("updated") clone = Dataset.objects.get(id=data["id"]) - test_clone, train_clone, val_clone = clone.sets.all().order_by("name") + dev_clone, test_clone, train_clone = clone.sets.all().order_by("name") cloned_sets = data.pop("sets") self.assertDictEqual( response.json(), @@ -2315,7 +2315,7 @@ class TestDatasetsAPI(FixtureAPITestCase): ) self.assertCountEqual(cloned_sets, [ { - "name": "training", + "name": "train", "id": str(train_clone.id) }, { @@ -2323,8 +2323,8 @@ class TestDatasetsAPI(FixtureAPITestCase): "id": str(test_clone.id) }, { - "name": "validation", - "id": str(val_clone.id) + "name": "dev", + "id": str(dev_clone.id) } ]) @@ -2349,7 +2349,7 @@ class TestDatasetsAPI(FixtureAPITestCase): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": str(self.dataset.id), "element": str(self.page1.id)}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) @@ -2360,29 +2360,29 @@ class TestDatasetsAPI(FixtureAPITestCase): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": str(self.dataset.id), "element": str(self.page1.id)}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) @patch("arkindex.project.mixins.has_access", return_value=False) def test_destroy_dataset_element_requires_contributor(self, has_access_mock): self.client.force_login(self.read_user) - _, train_set, validation_set = self.dataset.sets.all().order_by("name") + dev_set, _, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.page1) - validation_set.set_elements.create(element=self.page1) + dev_set.set_elements.create(element=self.page1) self.assertEqual(train_set.set_elements.count(), 1) - self.assertEqual(validation_set.set_elements.count(), 1) + self.assertEqual(dev_set.set_elements.count(), 1) with self.assertNumQueries(3): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": str(self.dataset.id), "element": str(self.page1.id)}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) self.assertDictEqual(response.json(), {"detail": "You need a Contributor access to the dataset to perform this action."}) self.dataset.refresh_from_db() self.assertEqual(train_set.set_elements.count(), 1) - self.assertEqual(validation_set.set_elements.count(), 1) + self.assertEqual(dev_set.set_elements.count(), 1) self.assertEqual(has_access_mock.call_count, 1) self.assertEqual(has_access_mock.call_args, call(self.read_user, self.corpus, Role.Contributor.value, skip_public=False)) @@ -2399,24 +2399,24 @@ class TestDatasetsAPI(FixtureAPITestCase): def test_destroy_dataset_element_requires_open_dataset(self): self.client.force_login(self.user) - _, train_set, validation_set = self.dataset.sets.all().order_by("name") + dev_set, _, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.page1) - validation_set.set_elements.create(element=self.page1) + dev_set.set_elements.create(element=self.page1) self.dataset.state = DatasetState.Error self.dataset.save() self.assertEqual(train_set.set_elements.count(), 1) - self.assertEqual(validation_set.set_elements.count(), 1) + self.assertEqual(dev_set.set_elements.count(), 1) with self.assertNumQueries(3): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": str(self.dataset.id), "element": str(self.page1.id)}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertDictEqual(response.json(), {"dataset": ["Elements can only be removed from open Datasets."]}) self.dataset.refresh_from_db() self.assertEqual(train_set.set_elements.count(), 1) - self.assertEqual(validation_set.set_elements.count(), 1) + self.assertEqual(dev_set.set_elements.count(), 1) def test_destroy_dataset_element_dataset_doesnt_exist(self): self.client.force_login(self.user) @@ -2424,7 +2424,7 @@ class TestDatasetsAPI(FixtureAPITestCase): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "element": str(self.page1.id)}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) self.assertDictEqual(response.json(), {"detail": "Not found."}) @@ -2446,52 +2446,52 @@ class TestDatasetsAPI(FixtureAPITestCase): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": str(self.dataset.id), "element": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) self.assertDictEqual(response.json(), {"detail": "Not found."}) def test_destroy_dataset_element_element_not_in_dataset(self): - train_set = self.dataset.sets.get(name="training") + train_set = self.dataset.sets.get(name="train") train_set.set_elements.create(element=self.page1, set="train") self.client.force_login(self.user) with self.assertNumQueries(3): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": str(self.dataset.id), "element": str(self.page2.id)}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) self.assertDictEqual(response.json(), {"detail": "Not found."}) def test_destroy_dataset_element_wrong_set(self): - _, train_set, validation_set = self.dataset.sets.all().order_by("name") + dev_set, _, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.page1) - validation_set.set_elements.create(element=self.page1) + dev_set.set_elements.create(element=self.page1) self.client.force_login(self.user) with self.assertNumQueries(3): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": str(self.dataset.id), "element": str(self.page2.id)}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) self.assertDictEqual(response.json(), {"detail": "Not found."}) def test_destroy_dataset_element(self): self.client.force_login(self.user) - _, train_set, validation_set = self.dataset.sets.all().order_by("name") + dev_set, _, train_set = self.dataset.sets.all().order_by("name") train_set.set_elements.create(element=self.page1) - validation_set.set_elements.create(element=self.page1) + dev_set.set_elements.create(element=self.page1) self.assertEqual(train_set.set_elements.count(), 1) - self.assertEqual(validation_set.set_elements.count(), 1) + self.assertEqual(dev_set.set_elements.count(), 1) with self.assertNumQueries(4): response = self.client.delete(reverse( "api:dataset-element", kwargs={"dataset": str(self.dataset.id), "element": str(self.page1.id)}) - + "?set=training" + + "?set=train" ) self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) self.dataset.refresh_from_db() self.assertEqual(train_set.set_elements.count(), 0) - self.assertEqual(validation_set.set_elements.count(), 1) + self.assertEqual(dev_set.set_elements.count(), 1) -- GitLab