diff --git a/arkindex/documents/fixtures/data.json b/arkindex/documents/fixtures/data.json index 90686f494024882ac97cbabad74c34fb5025b7d8..3b1b3abcdba0e240785cf9a5a8329182f87c3c2f 100644 --- a/arkindex/documents/fixtures/data.json +++ b/arkindex/documents/fixtures/data.json @@ -1,111 +1,135 @@ [ { "model": "process.worker", - "pk": "272af429-810f-4318-b126-06b915720023", + "pk": "044a9399-a2cd-41e1-997e-199c0243c988", "fields": { - "name": "PDF export worker", - "slug": "pdf_export", - "type": "29d1e754-ae0c-43e1-a48d-ed678dbd27e1", + "name": "Elements Initialisation Worker", + "slug": "initialisation", + "type": "4f8020bd-c465-4516-b256-ca4cb2e1d048", "description": "", - "public": false, + "public": true, "archived": null, - "repository_url": null + "repository_url": null, + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", + "cost_1k_elements": "0.000" } }, { "model": "process.worker", - "pk": "62ff0bf9-18da-44d4-8e87-2ceb477dbc32", + "pk": "114d234a-e400-4978-81ee-ccf595c3963a", "fields": { - "name": "Elements Initialisation Worker", - "slug": "initialisation", - "type": "d2fe0ad7-9825-465a-8a42-fa40395cdd11", + "name": "PDF export worker", + "slug": "pdf_export", + "type": "7bafc280-cf6d-4b9e-848a-17fefa39e424", "description": "", - "public": true, + "public": false, "archived": null, - "repository_url": null + "repository_url": null, + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", + "cost_1k_elements": "0.000" } }, { "model": "process.worker", - "pk": "6e08ebb4-7dee-437b-8d26-a91e99ba1c98", + "pk": "47e1991e-f4a7-42ad-bc03-629d0aafbee0", "fields": { - "name": "Worker requiring a GPU", - "slug": "worker-gpu", - "type": "f5906e41-731b-419c-a0a5-bae201ca4ccf", + "name": "File import", + "slug": "file_import", + "type": "08c51132-07ce-4a1d-8afc-4cbb92a67605", "description": "", - "public": false, + "public": true, "archived": null, - "repository_url": null + "repository_url": null, + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", + "cost_1k_elements": "0.000" } }, { "model": "process.worker", - "pk": "7e9cc0b9-4c40-4125-be12-8bfea80a4282", + "pk": "58a5ac94-5855-4abb-ab5f-55875285c589", "fields": { "name": "Custom worker", "slug": "custom", - "type": "298b2655-611a-493a-a6ea-31ae163549a1", + "type": "ea78d2b3-f282-4353-85e0-f8f822b1ad68", "description": "", "public": false, "archived": null, - "repository_url": null + "repository_url": null, + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", + "cost_1k_elements": "0.000" } }, { "model": "process.worker", - "pk": "ab57913d-701f-4cc4-9d04-83f04b8c7a8a", + "pk": "879c54a0-2505-4741-bde6-83a7863424da", "fields": { - "name": "File import", - "slug": "file_import", - "type": "151d56fa-329b-44f2-83e1-22ba873bd436", + "name": "Recognizer", + "slug": "reco", + "type": "c38abcf2-b6aa-42e4-9580-a478a0f17cb1", "description": "", - "public": true, + "public": false, "archived": null, - "repository_url": null + "repository_url": null, + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", + "cost_1k_elements": "0.250" } }, { "model": "process.worker", - "pk": "c13d16fe-d9cc-4fde-8c0a-48a6388551c2", + "pk": "9ae7138d-926b-4889-8666-a45ef52dacb3", "fields": { - "name": "Recognizer", - "slug": "reco", - "type": "a739a233-a46b-4b0c-8ac3-c221abfaa4c9", + "name": "Worker requiring a GPU", + "slug": "worker-gpu", + "type": "472e58f8-ff15-493d-ad0c-1b886b1a7530", "description": "", "public": false, "archived": null, - "repository_url": null + "repository_url": null, + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", + "cost_1k_elements": "0.000" } }, { "model": "process.worker", - "pk": "c2722649-ffb7-4a18-b0f2-a1f6be9064d4", + "pk": "c174fd5b-2df9-42c9-9ed4-7a2685603760", "fields": { "name": "Document layout analyser", "slug": "dla", - "type": "24ca70b2-4856-4162-b130-b48354c25acb", + "type": "2d93669e-91e2-4ba5-8da0-54bd8fe9da76", "description": "", "public": false, "archived": null, - "repository_url": null + "repository_url": null, + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", + "cost_1k_elements": "0.000" } }, { "model": "process.worker", - "pk": "cd35eb01-10fd-4f79-9153-c1e76a3012c7", + "pk": "cc890f4d-474e-40c1-8eeb-b5a5ae0026d6", "fields": { "name": "Generic worker with a Model", "slug": "generic", - "type": "a739a233-a46b-4b0c-8ac3-c221abfaa4c9", + "type": "c38abcf2-b6aa-42e4-9580-a478a0f17cb1", "description": "", "public": false, "archived": null, - "repository_url": null + "repository_url": null, + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", + "cost_1k_elements": "0.000" } }, { "model": "process.workertype", - "pk": "151d56fa-329b-44f2-83e1-22ba873bd436", + "pk": "08c51132-07ce-4a1d-8afc-4cbb92a67605", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -115,7 +139,7 @@ }, { "model": "process.workertype", - "pk": "24ca70b2-4856-4162-b130-b48354c25acb", + "pk": "2d93669e-91e2-4ba5-8da0-54bd8fe9da76", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -125,80 +149,59 @@ }, { "model": "process.workertype", - "pk": "298b2655-611a-493a-a6ea-31ae163549a1", + "pk": "472e58f8-ff15-493d-ad0c-1b886b1a7530", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "custom", - "display_name": "Custom" + "slug": "worker", + "display_name": "Worker requiring a GPU" } }, { "model": "process.workertype", - "pk": "29d1e754-ae0c-43e1-a48d-ed678dbd27e1", + "pk": "4f8020bd-c465-4516-b256-ca4cb2e1d048", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "export", - "display_name": "Document export" + "slug": "init", + "display_name": "Elements Initialisation" } }, { "model": "process.workertype", - "pk": "a739a233-a46b-4b0c-8ac3-c221abfaa4c9", + "pk": "7bafc280-cf6d-4b9e-848a-17fefa39e424", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "recognizer", - "display_name": "Recognizer" + "slug": "export", + "display_name": "Document export" } }, { "model": "process.workertype", - "pk": "d2fe0ad7-9825-465a-8a42-fa40395cdd11", + "pk": "c38abcf2-b6aa-42e4-9580-a478a0f17cb1", "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": "f5906e41-731b-419c-a0a5-bae201ca4ccf", + "pk": "ea78d2b3-f282-4353-85e0-f8f822b1ad68", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "worker", - "display_name": "Worker requiring a GPU" - } -}, -{ - "model": "process.workerversion", - "pk": "54f3c9eb-86af-4308-a3f2-d20e023e2afa", - "fields": { - "worker": "cd35eb01-10fd-4f79-9153-c1e76a3012c7", - "version": 1, - "configuration": { - "test": 42 - }, - "state": "available", - "gpu_usage": "disabled", - "model_usage": "required", - "docker_image_iid": "registry.somewhere.com/something:latest", - "revision_url": null, - "branch": null, - "tag": null, - "feature": null, - "created": "2020-02-02T01:23:45.678Z", - "updated": "2020-02-02T01:23:45.678Z" + "slug": "custom", + "display_name": "Custom" } }, { "model": "process.workerversion", - "pk": "82b37102-f4c1-44d3-9404-743aaca249fd", + "pk": "1b52d6b0-6ca9-47e6-89d4-ec76f8118e3c", "fields": { - "worker": "7e9cc0b9-4c40-4125-be12-8bfea80a4282", + "worker": "58a5ac94-5855-4abb-ab5f-55875285c589", "version": 1, "configuration": { "custom": "value" @@ -217,9 +220,9 @@ }, { "model": "process.workerversion", - "pk": "a78fb453-e707-4d7e-896b-d33027898b02", + "pk": "9aa19b63-678d-447f-9235-a417d639928b", "fields": { - "worker": "62ff0bf9-18da-44d4-8e87-2ceb477dbc32", + "worker": "044a9399-a2cd-41e1-997e-199c0243c988", "version": 1, "configuration": { "docker": { @@ -240,28 +243,30 @@ }, { "model": "process.workerversion", - "pk": "ad8121f6-f012-43a7-93a9-d5367dd2e6f0", + "pk": "a2320733-fdbc-4811-95c6-897f796dc5fb", "fields": { - "worker": "ab57913d-701f-4cc4-9d04-83f04b8c7a8a", + "worker": "9ae7138d-926b-4889-8666-a45ef52dacb3", "version": 1, - "configuration": {}, + "configuration": { + "test": 42 + }, "state": "available", - "gpu_usage": "disabled", + "gpu_usage": "required", "model_usage": "disabled", "docker_image_iid": "registry.somewhere.com/something:latest", "revision_url": null, "branch": null, "tag": null, - "feature": "file_import", + "feature": null, "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z" } }, { "model": "process.workerversion", - "pk": "b315c4b9-3120-48c4-8d90-785355f60ed0", + "pk": "bb81364e-9f67-4014-a76a-e759eee4d888", "fields": { - "worker": "272af429-810f-4318-b126-06b915720023", + "worker": "114d234a-e400-4978-81ee-ccf595c3963a", "version": 1, "configuration": {}, "state": "available", @@ -278,16 +283,16 @@ }, { "model": "process.workerversion", - "pk": "b7f533de-d429-47f7-96ec-34b8cbe89c16", + "pk": "be1cffc2-36b5-4ed5-8ca8-a088d0af2dcd", "fields": { - "worker": "6e08ebb4-7dee-437b-8d26-a91e99ba1c98", + "worker": "cc890f4d-474e-40c1-8eeb-b5a5ae0026d6", "version": 1, "configuration": { "test": 42 }, "state": "available", - "gpu_usage": "required", - "model_usage": "disabled", + "gpu_usage": "disabled", + "model_usage": "required", "docker_image_iid": "registry.somewhere.com/something:latest", "revision_url": null, "branch": null, @@ -299,13 +304,11 @@ }, { "model": "process.workerversion", - "pk": "c32136a0-257a-46e4-9cd0-2016a6150c85", + "pk": "d973269b-c5ec-47b7-a067-0ed07019e94d", "fields": { - "worker": "c2722649-ffb7-4a18-b0f2-a1f6be9064d4", + "worker": "47e1991e-f4a7-42ad-bc03-629d0aafbee0", "version": 1, - "configuration": { - "test": 42 - }, + "configuration": {}, "state": "available", "gpu_usage": "disabled", "model_usage": "disabled", @@ -313,16 +316,16 @@ "revision_url": null, "branch": null, "tag": null, - "feature": null, + "feature": "file_import", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z" } }, { "model": "process.workerversion", - "pk": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", + "pk": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", "fields": { - "worker": "c13d16fe-d9cc-4fde-8c0a-48a6388551c2", + "worker": "879c54a0-2505-4741-bde6-83a7863424da", "version": 1, "configuration": { "test": 42 @@ -341,10 +344,10 @@ }, { "model": "process.workerrun", - "pk": "f179c779-54e9-4431-8f91-59356af8faa0", + "pk": "5b06c319-0293-455a-9c31-114e3c769a1d", "fields": { - "process": "23b5ee11-b4b9-41dc-9b2b-83024404d0f0", - "version": "a78fb453-e707-4d7e-896b-d33027898b02", + "process": "daff45b4-ac82-430c-86d8-d31cd9af87ba", + "version": "9aa19b63-678d-447f-9235-a417d639928b", "model_version": null, "parents": "[]", "configuration": null, @@ -356,14 +359,35 @@ "ttl": 3600 } }, +{ + "model": "process.workerversion", + "pk": "f1c4cd08-7a7f-4331-83d1-edde87e29833", + "fields": { + "worker": "c174fd5b-2df9-42c9-9ed4-7a2685603760", + "version": 1, + "configuration": { + "test": 42 + }, + "state": "available", + "gpu_usage": "disabled", + "model_usage": "disabled", + "docker_image_iid": "registry.somewhere.com/something:latest", + "revision_url": null, + "branch": null, + "tag": null, + "feature": null, + "created": "2020-02-02T01:23:45.678Z", + "updated": "2020-02-02T01:23:45.678Z" + } +}, { "model": "process.workerrun", - "pk": "38e26faa-8609-4a29-a4c7-67b7c95d9845", + "pk": "fb207bb3-398e-41db-ac04-4e57abd3cae5", "fields": { - "process": "23b5ee11-b4b9-41dc-9b2b-83024404d0f0", - "version": "c32136a0-257a-46e4-9cd0-2016a6150c85", + "process": "daff45b4-ac82-430c-86d8-d31cd9af87ba", + "version": "f1c4cd08-7a7f-4331-83d1-edde87e29833", "model_version": null, - "parents": "[\"f179c779-54e9-4431-8f91-59356af8faa0\"]", + "parents": "[\"5b06c319-0293-455a-9c31-114e3c769a1d\"]", "configuration": null, "summary": "Worker Document layout analyser @ version 1", "created": "2020-02-02T01:23:45.678Z", @@ -375,12 +399,12 @@ }, { "model": "process.workerrun", - "pk": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", + "pk": "50279c8a-340b-40f6-afc5-f6d581c8bef5", "fields": { - "process": "23b5ee11-b4b9-41dc-9b2b-83024404d0f0", - "version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", + "process": "daff45b4-ac82-430c-86d8-d31cd9af87ba", + "version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", "model_version": null, - "parents": "[\"38e26faa-8609-4a29-a4c7-67b7c95d9845\"]", + "parents": "[\"fb207bb3-398e-41db-ac04-4e57abd3cae5\"]", "configuration": null, "summary": "Worker Recognizer @ version 1", "created": "2020-02-02T01:23:45.678Z", @@ -392,10 +416,10 @@ }, { "model": "process.workerrun", - "pk": "313b7366-f528-42d0-822a-a7501da8208f", + "pk": "90cbe9c6-0b9f-4714-b537-f93c71b02a49", "fields": { - "process": "da20071c-7c8e-4111-a1df-02f71f0531d2", - "version": "82b37102-f4c1-44d3-9404-743aaca249fd", + "process": "ccab94ea-989a-4279-a9cf-28122d7c166c", + "version": "1b52d6b0-6ca9-47e6-89d4-ec76f8118e3c", "model_version": null, "parents": "[]", "configuration": null, @@ -409,10 +433,10 @@ }, { "model": "process.workerrun", - "pk": "52bd0035-6ea3-496b-85e8-37290a8758e1", + "pk": "c656c528-a968-4c69-a2d7-463afe185de9", "fields": { - "process": "b6d2604e-6cf3-44cd-9b4a-4d7dff2ce040", - "version": "82b37102-f4c1-44d3-9404-743aaca249fd", + "process": "ee420088-69ba-4055-a589-e791c2074554", + "version": "1b52d6b0-6ca9-47e6-89d4-ec76f8118e3c", "model_version": null, "parents": "[]", "configuration": null, @@ -426,7 +450,7 @@ }, { "model": "documents.corpus", - "pk": "63951d56-ce50-4d2d-9d11-cee0da8dffba", + "pk": "dde2fe30-56fa-426f-8435-7c14bd34257c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -440,9 +464,9 @@ }, { "model": "documents.elementtype", - "pk": "1d078b43-bb0d-44e6-a667-fec714dbf057", + "pk": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", "slug": "word", "display_name": "Word", "folder": false, @@ -452,9 +476,9 @@ }, { "model": "documents.elementtype", - "pk": "3be8f2aa-3e04-4a25-80af-7f92c39c057f", + "pk": "64af6681-8b66-4f45-bd8a-74226dccd0ff", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", "slug": "text_line", "display_name": "Line", "folder": false, @@ -464,11 +488,11 @@ }, { "model": "documents.elementtype", - "pk": "53d093a9-3d20-4fcf-9b55-c77e788e19a9", + "pk": "715aa814-cdea-4fe3-8765-a055141aff44", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "slug": "page", - "display_name": "Page", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "slug": "surface", + "display_name": "Surface", "folder": false, "indexable": false, "color": "28b62c" @@ -476,21 +500,21 @@ }, { "model": "documents.elementtype", - "pk": "748cabf2-e002-431f-b582-5c39ca57b44e", + "pk": "dab88056-97a7-46b8-83ef-92f56de8a892", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "slug": "surface", - "display_name": "Surface", - "folder": false, + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "slug": "volume", + "display_name": "Volume", + "folder": true, "indexable": false, "color": "28b62c" } }, { "model": "documents.elementtype", - "pk": "805d2171-94f5-45e3-ae85-fe511c88c141", + "pk": "e0e9a648-36c6-49c4-9e4e-74278b4652be", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", "slug": "act", "display_name": "Act", "folder": false, @@ -500,477 +524,477 @@ }, { "model": "documents.elementtype", - "pk": "acd7e2f0-e4c6-48e6-9bf5-e9be06e1ae6c", + "pk": "e91d04ee-d5a5-4b64-bdc9-7b097757fa00", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "slug": "volume", - "display_name": "Volume", - "folder": true, + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "slug": "page", + "display_name": "Page", + "folder": false, "indexable": false, "color": "28b62c" } }, { "model": "documents.elementpath", - "pk": "06002271-45e8-4cb6-b8f1-b94e6dd7ae8a", + "pk": "017e7702-abc8-4af9-b6fc-f3c564b75e7b", "fields": { - "element": "c49d9815-f0c8-471e-8e23-d24976505129", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"2cdad071-77b8-4e74-b05a-d87317cfbcc5\"]", - "ordering": 0 + "element": "b146eb70-b21a-4827-aa06-1dbc030558c1", + "path": "[\"09fcec5e-f874-4c85-9e2f-aa26e97549cd\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "12ad22b7-e8f5-4f7a-b2fb-648949221b1b", + "pk": "018f1780-f352-436f-bea1-6be16214b54d", "fields": { - "element": "6497f558-1aa8-4f51-a10e-d359a8d06c0b", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"dbffd4c4-a4f9-415f-b2e0-2fdab56a6358\"]", + "element": "b76b2bfc-f8e1-4143-b68b-90257005efd4", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"08dbed51-bfba-4a6c-8c53-a2c599f27e7d\"]", "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "1d7efeec-d38d-4765-8b35-e0b1e5be1fd7", + "pk": "1e6c5a54-6e38-430f-85ab-068543a04803", "fields": { - "element": "7047387b-146e-4735-a3d7-eefa9b4a64a9", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"57227959-07f9-43ea-a7ea-e05c808f13ca\"]", + "element": "aa1085fc-6c14-4829-a255-586f229dc6c2", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"9e52bb6f-cf37-4fc6-b3c6-bceb5d630374\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "1eed5fee-883a-40a0-8a5c-efe027b2068a", + "pk": "4b44fea7-2405-41db-9d66-4e29c92eb047", "fields": { - "element": "6508eb1d-b22d-4cf0-a94d-c32c9b614396", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"39d41f9e-c8eb-47c2-89b0-c43272a171ac\"]", - "ordering": 2 + "element": "0ce15654-73f0-4a95-94b9-67476b611460", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\"]", + "ordering": 3 } }, { "model": "documents.elementpath", - "pk": "1f26d9d7-1b94-4367-a2f2-353b2e1cf85c", + "pk": "54536d67-7dd7-4848-beb4-db18c7229bf3", "fields": { - "element": "2cdad071-77b8-4e74-b05a-d87317cfbcc5", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\"]", - "ordering": 7 + "element": "b151462c-ed14-4903-ba3e-92133827851c", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"409e47bb-88b0-4784-8416-a9aeddbb4e6a\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "2b4dd691-c560-4467-9910-fd7c1021f5f2", + "pk": "5b60ae45-3cb7-41eb-b356-4f12fdca8c21", "fields": { - "element": "831b2e1f-01eb-4724-978b-608b7d587f7c", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"39d41f9e-c8eb-47c2-89b0-c43272a171ac\"]", - "ordering": 0 + "element": "44585e4a-40be-4c8d-98fc-58c40f24a770", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"08dbed51-bfba-4a6c-8c53-a2c599f27e7d\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "437ee573-04e1-4ec2-aa49-c9dc8377174e", + "pk": "634ba90c-4937-4e61-b38d-82fa1ab03dbd", "fields": { - "element": "6cd4aba2-e49f-4153-8112-9eb561ac8d3b", - "path": "[\"4ac58be9-28bc-43da-bb6a-8e3eb09c2e14\"]", - "ordering": 2 + "element": "fd415b27-1321-479a-800a-fe04b2bf2325", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"82a942ac-efac-4bbc-985b-104256ce760d\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "44ca9c72-57ba-430a-870b-ec01458b1570", + "pk": "6566c9d2-4f7b-40d4-a282-9144a0cc06d3", "fields": { - "element": "f3837e86-33a2-4d0d-bfe5-b407712f8e9b", + "element": "09fcec5e-f874-4c85-9e2f-aa26e97549cd", "path": "[]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "579f577e-add9-4657-9219-f3f58e438c6b", + "pk": "701e9001-3d90-42d1-ba5b-56a343373571", "fields": { - "element": "9d9b6a50-5f16-480d-989b-0032ac1087e4", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"dbffd4c4-a4f9-415f-b2e0-2fdab56a6358\"]", - "ordering": 2 + "element": "543985d8-3728-4555-ad9e-d46a0ad506cf", + "path": "[]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "587a691e-681b-4700-95ac-d182cc8aad09", + "pk": "763bf367-a72a-4651-ab65-211511227ed1", "fields": { - "element": "39d41f9e-c8eb-47c2-89b0-c43272a171ac", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\"]", - "ordering": 2 + "element": "80803359-8485-4236-a0b8-ea3ecf3e8b0e", + "path": "[\"09fcec5e-f874-4c85-9e2f-aa26e97549cd\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "620b7a22-1921-4b82-b8ab-66833eec1116", + "pk": "767d3f3d-988c-4128-96ea-af0e8d593897", "fields": { - "element": "a463d187-d339-4f02-8307-420c5f19ac37", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"de0f901f-fa4e-4756-8e87-1ca20222bd07\"]", - "ordering": 2 + "element": "3aa34569-0092-4acf-9ca0-9f8e1265b53a", + "path": "[\"09fcec5e-f874-4c85-9e2f-aa26e97549cd\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "6f302a2f-a625-45ec-ba09-bd628889d22e", + "pk": "7df7fcbd-1223-4609-8746-fecbcc192c91", "fields": { - "element": "4ac58be9-28bc-43da-bb6a-8e3eb09c2e14", - "path": "[]", - "ordering": 0 + "element": "fe3d444f-4519-4ff2-b3e2-e9158bec475a", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"9e52bb6f-cf37-4fc6-b3c6-bceb5d630374\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "701fdd59-68d5-4af7-b891-2897a472a265", + "pk": "810e1b22-7663-4871-b9c0-5fe9028b76e0", "fields": { - "element": "bc176daf-0894-4560-abaa-5b74ee8a3426", - "path": "[\"4ac58be9-28bc-43da-bb6a-8e3eb09c2e14\"]", + "element": "409e47bb-88b0-4784-8416-a9aeddbb4e6a", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\"]", "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "724be080-f751-4e91-84e7-f43e18f4899b", + "pk": "83cc40bf-e2e8-4830-9943-6eb58aac6978", "fields": { - "element": "b5af9a42-dcc1-408c-802d-e123cfc02180", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\"]", - "ordering": 4 + "element": "cb62e1be-c220-496a-902a-23c86827d13a", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"9e52bb6f-cf37-4fc6-b3c6-bceb5d630374\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "7e76ec75-5a02-4930-bad1-2f7901da7423", + "pk": "8eaaae3f-276a-4d20-82c7-de97ecd3f755", "fields": { - "element": "50e1ccf3-dbeb-4c29-9d77-85e05f90c426", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"8de507e6-e85c-41d1-9ef4-361fe218f9bb\"]", + "element": "5dcad4a2-8d66-4123-b2d6-c0f5ab601e4e", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"0ce15654-73f0-4a95-94b9-67476b611460\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "7ef587b9-9a90-4d91-80d0-910fd09fb893", + "pk": "9517e781-366e-4755-b12f-7327702bc228", "fields": { - "element": "60e09255-6a01-47e1-b6ba-f7ca8e657b25", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"de0f901f-fa4e-4756-8e87-1ca20222bd07\"]", + "element": "fc3bc21b-13c2-4ee3-9cc2-4ddd075156b6", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"409e47bb-88b0-4784-8416-a9aeddbb4e6a\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "8064af41-fc33-4324-aca8-8e5c881ced15", + "pk": "96083502-3dc5-4720-81b5-e63c643af113", "fields": { - "element": "1c20d68c-ac53-4910-8e30-9e38e2cfa002", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\"]", - "ordering": 5 + "element": "5dca405b-f5a0-488c-be4d-2819eb9a1532", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"409e47bb-88b0-4784-8416-a9aeddbb4e6a\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "8d3652c2-018d-4de7-8a38-302ec99d2029", + "pk": "9d28b1a3-200c-47ed-b18a-10d27357b520", "fields": { - "element": "1becb3e4-c8c0-47e7-a2b2-402446d7280e", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"39d41f9e-c8eb-47c2-89b0-c43272a171ac\"]", - "ordering": 1 + "element": "480b9c33-91a3-4ddd-b871-33262d96ba50", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\"]", + "ordering": 7 } }, { "model": "documents.elementpath", - "pk": "a4ae4629-73b3-42b2-baf9-cfdaa3f61345", + "pk": "aaa535fb-4f49-40f5-9ed5-f5c2689d47b8", "fields": { - "element": "dbffd4c4-a4f9-415f-b2e0-2fdab56a6358", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\"]", - "ordering": 0 + "element": "66db2deb-e907-43b9-8dee-c3ec78f54412", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"08dbed51-bfba-4a6c-8c53-a2c599f27e7d\"]", + "ordering": 3 } }, { "model": "documents.elementpath", - "pk": "a74529cf-b361-46cf-84fc-9ea8d22b7be6", + "pk": "af3d3a3a-4685-41fe-8c8b-77b48b2c4643", "fields": { - "element": "8de507e6-e85c-41d1-9ef4-361fe218f9bb", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\"]", - "ordering": 3 + "element": "82a942ac-efac-4bbc-985b-104256ce760d", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\"]", + "ordering": 4 } }, { "model": "documents.elementpath", - "pk": "a88a155b-f39c-4ee1-a820-4d9c471d8b6c", + "pk": "b5d6bfaf-25d2-4605-98b1-63544b25b631", "fields": { - "element": "57227959-07f9-43ea-a7ea-e05c808f13ca", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\"]", - "ordering": 6 + "element": "566d72a5-d86c-4ea6-88bd-f0450ae4053a", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"806485a5-591f-409d-9880-7114de729df7\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "afdc2429-f5c7-4a27-8beb-ab8bc45f47b9", + "pk": "d1b6bee3-c6e6-4864-a589-93856e6e7921", "fields": { - "element": "e0bdfb09-1e15-4ec2-a2dd-4c05714af2fd", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"b5af9a42-dcc1-408c-802d-e123cfc02180\"]", - "ordering": 1 + "element": "9e52bb6f-cf37-4fc6-b3c6-bceb5d630374", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "b185b192-db9c-40bb-9b22-054713fe69a7", + "pk": "d2a5fe04-8fc2-4fd6-904b-14d061dd4f8e", "fields": { - "element": "459ecf7a-849f-4105-b371-9cad0078031b", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"b5af9a42-dcc1-408c-802d-e123cfc02180\"]", + "element": "0cfb9eae-526b-4f27-94db-18a26095e87e", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"08dbed51-bfba-4a6c-8c53-a2c599f27e7d\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "c57c4dad-b747-445a-8564-6bed39a49253", + "pk": "dd306e2c-c745-4585-811c-46246d996fe7", "fields": { - "element": "7d767a0e-c46d-4f6d-9364-2ee0c1cc5df4", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"1c20d68c-ac53-4910-8e30-9e38e2cfa002\"]", + "element": "aa7b6b28-c178-4587-80dc-c6e248c65be4", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"480b9c33-91a3-4ddd-b871-33262d96ba50\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "c9a0d158-ff25-474f-8b56-9991f9cf9de1", + "pk": "de78dd61-ba31-411e-b7f7-0877bff2c17a", "fields": { - "element": "a4258522-c766-4fa9-b6ff-78c78f03573b", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"dbffd4c4-a4f9-415f-b2e0-2fdab56a6358\"]", - "ordering": 0 + "element": "743baa6a-23c5-4761-92ad-69d4239327fd", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\"]", + "ordering": 5 } }, { "model": "documents.elementpath", - "pk": "e2d2d30f-8f1a-4066-8ff9-f2f93cb7bd24", + "pk": "e9d1873f-0d61-44f7-b29c-bce0f4d24208", "fields": { - "element": "59010638-140d-49e8-b123-114f5b3729b8", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"de0f901f-fa4e-4756-8e87-1ca20222bd07\"]", - "ordering": 1 + "element": "71d9ecf1-c06a-4e0e-a619-14755faf812c", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"743baa6a-23c5-4761-92ad-69d4239327fd\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "f154a8ff-857c-40d0-bf9e-48bc88a44fa3", + "pk": "f35b430b-bf63-4a7b-a5e5-8250d351a75d", "fields": { - "element": "f6a605c8-3020-486f-9b41-81f8aed93f8d", - "path": "[\"4ac58be9-28bc-43da-bb6a-8e3eb09c2e14\"]", - "ordering": 0 + "element": "806485a5-591f-409d-9880-7114de729df7", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\"]", + "ordering": 6 } }, { "model": "documents.elementpath", - "pk": "fe830d8a-0a19-462f-b973-dfa83adeff48", + "pk": "f507b4af-61e8-49b5-ac7b-79a9902f15c0", "fields": { - "element": "de0f901f-fa4e-4756-8e87-1ca20222bd07", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\"]", - "ordering": 1 + "element": "d6251d6a-eb9d-42ab-8e9c-6cf6fdce871e", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\", \"82a942ac-efac-4bbc-985b-104256ce760d\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "ff39b5b8-ad00-46a3-89de-14a48502543c", + "pk": "fc7d2e86-ed96-4714-bf9f-4a9362797979", "fields": { - "element": "f2fa1e76-9784-49e9-91ba-9b53f19523dd", - "path": "[\"f3837e86-33a2-4d0d-bfe5-b407712f8e9b\", \"dbffd4c4-a4f9-415f-b2e0-2fdab56a6358\"]", - "ordering": 3 + "element": "08dbed51-bfba-4a6c-8c53-a2c599f27e7d", + "path": "[\"543985d8-3728-4555-ad9e-d46a0ad506cf\"]", + "ordering": 0 } }, { "model": "documents.entitytype", - "pk": "490dd132-94e7-4f36-954f-23b558b9bcc2", + "pk": "196817aa-99d6-4325-945c-664ea92566aa", "fields": { "name": "date", "color": "ff0000", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba" + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c" } }, { "model": "documents.entitytype", - "pk": "56a84ca9-0dbd-4324-8ce9-ec54a39033f2", + "pk": "1ee7ecb7-1bf4-4e51-99b5-db7234947ec6", "fields": { - "name": "number", + "name": "person", "color": "ff0000", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba" + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c" } }, { "model": "documents.entitytype", - "pk": "745dfa3a-dabf-4c0a-8307-b1b78b79b7cd", + "pk": "2a286125-52f5-4f69-8b01-2833c4d444e6", "fields": { - "name": "person", + "name": "organization", "color": "ff0000", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba" + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c" } }, { "model": "documents.entitytype", - "pk": "81aa65d0-9091-4ba9-a52c-35c7d6bb0ca7", + "pk": "492f2478-7f8e-4bde-b1a4-35be0f18795d", "fields": { "name": "location", "color": "ff0000", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba" + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c" } }, { "model": "documents.entitytype", - "pk": "9cb63e11-6047-4d46-a416-583422506c3a", + "pk": "c631dfbb-af50-42ed-a79a-ddf29fca8ed4", "fields": { - "name": "organization", + "name": "number", "color": "ff0000", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba" + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c" } }, { "model": "documents.transcription", - "pk": "0757b713-8e2f-46a0-9c7f-9ca670b40656", + "pk": "4ddc31aa-6967-4226-b291-f74dad67571b", "fields": { - "element": "9d9b6a50-5f16-480d-989b-0032ac1087e4", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "DATUM", + "element": "5dca405b-f5a0-488c-be4d-2819eb9a1532", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "14549604-fcdd-478e-a3dd-42fcb6f1fc40", + "pk": "7dd16dc1-592e-446e-9068-2dd91dd95485", "fields": { - "element": "1becb3e4-c8c0-47e7-a2b2-402446d7280e", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "ROY", + "element": "aa1085fc-6c14-4829-a255-586f229dc6c2", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "35bad62f-185b-4e81-b232-41cf20d480fa", + "pk": "8c79226e-73d4-488c-a18e-17ef7e850275", "fields": { - "element": "6497f558-1aa8-4f51-a10e-d359a8d06c0b", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "ROY", + "element": "44585e4a-40be-4c8d-98fc-58c40f24a770", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "37d96a70-7000-4478-bc0f-bbdb6ed31307", + "pk": "91a51756-d539-483a-97f4-d2a93664fbe8", "fields": { - "element": "a4258522-c766-4fa9-b6ff-78c78f03573b", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "PARIS", + "element": "fe3d444f-4519-4ff2-b3e2-e9158bec475a", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "40383971-e7b7-4e0a-9cee-32c597f82764", + "pk": "92e8da53-92e0-4a01-95c8-032587c24624", "fields": { - "element": "6508eb1d-b22d-4cf0-a94d-c32c9b614396", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "DATUM", + "element": "fc3bc21b-13c2-4ee3-9cc2-4ddd075156b6", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "813e947e-b96c-41ee-9c11-5f1f9512c6c7", + "pk": "aef88f73-1488-4f56-8b3f-258880371ac4", "fields": { - "element": "59010638-140d-49e8-b123-114f5b3729b8", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "ROY", + "element": "0cfb9eae-526b-4f27-94db-18a26095e87e", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "d4b642bf-ac25-4254-8b88-aa09bc0be2f6", + "pk": "bdba5503-6c59-4aa6-80da-de5c30772dfc", "fields": { - "element": "831b2e1f-01eb-4724-978b-608b7d587f7c", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "PARIS", + "element": "b76b2bfc-f8e1-4143-b68b-90257005efd4", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "d76419d5-2bbc-48d2-b7ac-d84ad2b8801b", + "pk": "d00ef92c-7727-4837-8d30-91036585b618", "fields": { - "element": "60e09255-6a01-47e1-b6ba-f7ca8e657b25", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "PARIS", + "element": "08dbed51-bfba-4a6c-8c53-a2c599f27e7d", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "Lorem ipsum dolor sit amet", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "ee4dfbbd-686b-471e-b6c3-79ecf504ffe9", + "pk": "f46512a2-3c9c-4bd5-af39-4ad7b8ea27c1", "fields": { - "element": "a463d187-d339-4f02-8307-420c5f19ac37", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "DATUM", + "element": "cb62e1be-c220-496a-902a-23c86827d13a", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "f9b6e10e-9599-4377-aac6-67c8137ce406", + "pk": "fd343f9f-3c2b-490a-84da-d507f7527354", "fields": { - "element": "dbffd4c4-a4f9-415f-b2e0-2fdab56a6358", - "worker_version": "e08651f4-11ad-4dbe-ba3e-7d4ec8de0892", - "worker_run": "0239ce26-d3f8-44ed-b38d-f6c792e049e6", - "text": "Lorem ipsum dolor sit amet", + "element": "b151462c-ed14-4903-ba3e-92133827851c", + "worker_version": "eee9be64-76ca-4a1d-a7ca-d1ff1a616051", + "worker_run": "50279c8a-340b-40f6-afc5-f6d581c8bef5", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.allowedmetadata", - "pk": "06f5f06c-b76b-4739-8e6a-6a647db98c1d", + "pk": "2d327148-fbb0-494d-aade-fd178f9b4185", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "location", - "name": "location" + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "text", + "name": "folio" } }, { "model": "documents.allowedmetadata", - "pk": "4adfbe49-4703-48ab-a297-8a69062f4a72", + "pk": "a6f8abcb-a8f2-4498-a6d4-aca499f4ba5f", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "date", - "name": "date" + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "location", + "name": "location" } }, { "model": "documents.allowedmetadata", - "pk": "8dd06811-8220-4cce-a5d5-421781f6767a", + "pk": "abb6760a-fef5-4660-b74b-f1d940df0471", "fields": { - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "text", - "name": "folio" + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "date", + "name": "date" } }, { "model": "documents.metadata", - "pk": "007ec832-989b-494f-8f79-8e1d6115aac1", + "pk": "0a377626-5004-40c6-baff-a16fbb3ffef7", "fields": { - "element": "6cd4aba2-e49f-4153-8112-9eb561ac8d3b", - "name": "folio", + "element": "480b9c33-91a3-4ddd-b871-33262d96ba50", + "name": "number", "type": "text", - "value": "2r", + "value": "5", "entity": null, "worker_version": null, "worker_run": null @@ -978,12 +1002,12 @@ }, { "model": "documents.metadata", - "pk": "16a2140f-e31e-4b31-b0b8-9b8dfb59fe30", + "pk": "0de95186-bad1-49a1-99ce-456f7362cf28", "fields": { - "element": "bc176daf-0894-4560-abaa-5b74ee8a3426", - "name": "folio", + "element": "806485a5-591f-409d-9880-7114de729df7", + "name": "number", "type": "text", - "value": "1v", + "value": "4", "entity": null, "worker_version": null, "worker_run": null @@ -991,12 +1015,12 @@ }, { "model": "documents.metadata", - "pk": "407a698a-d6e0-45e8-8055-422756a3df60", + "pk": "2d89e552-cdad-473f-b9d2-10d824cfc194", "fields": { - "element": "b5af9a42-dcc1-408c-802d-e123cfc02180", - "name": "number", + "element": "9e52bb6f-cf37-4fc6-b3c6-bceb5d630374", + "name": "folio", "type": "text", - "value": "2", + "value": "2r", "entity": null, "worker_version": null, "worker_run": null @@ -1004,12 +1028,12 @@ }, { "model": "documents.metadata", - "pk": "70425669-b8d1-406e-b08f-8d5466caceff", + "pk": "30fcc74c-9b12-47ad-b95a-734dffac57bb", "fields": { - "element": "f6a605c8-3020-486f-9b41-81f8aed93f8d", + "element": "b146eb70-b21a-4827-aa06-1dbc030558c1", "name": "folio", "type": "text", - "value": "1r", + "value": "2r", "entity": null, "worker_version": null, "worker_run": null @@ -1017,12 +1041,12 @@ }, { "model": "documents.metadata", - "pk": "858aa785-fd62-494b-bee0-fd40f3b6c9a2", + "pk": "3ae362dd-6f46-4443-9c67-764d0b34fbd3", "fields": { - "element": "8de507e6-e85c-41d1-9ef4-361fe218f9bb", - "name": "number", + "element": "80803359-8485-4236-a0b8-ea3ecf3e8b0e", + "name": "folio", "type": "text", - "value": "1", + "value": "1v", "entity": null, "worker_version": null, "worker_run": null @@ -1030,12 +1054,12 @@ }, { "model": "documents.metadata", - "pk": "96633ee7-dd8f-420c-8932-d28cea115a9b", + "pk": "3d945b48-4d7e-4973-90ae-d11c4efe4548", "fields": { - "element": "de0f901f-fa4e-4756-8e87-1ca20222bd07", + "element": "3aa34569-0092-4acf-9ca0-9f8e1265b53a", "name": "folio", "type": "text", - "value": "1v", + "value": "1r", "entity": null, "worker_version": null, "worker_run": null @@ -1043,9 +1067,9 @@ }, { "model": "documents.metadata", - "pk": "a0526316-88c3-4378-adbc-e872df4fa064", + "pk": "3f779f54-5c02-46bb-ad14-e115c7d4324c", "fields": { - "element": "1c20d68c-ac53-4910-8e30-9e38e2cfa002", + "element": "743baa6a-23c5-4761-92ad-69d4239327fd", "name": "number", "type": "text", "value": "3", @@ -1056,12 +1080,12 @@ }, { "model": "documents.metadata", - "pk": "aaafdad3-22a7-428f-9dbb-4938cbfcc26e", + "pk": "5e216598-2b15-42ca-a731-bba9e084aac3", "fields": { - "element": "2cdad071-77b8-4e74-b05a-d87317cfbcc5", + "element": "82a942ac-efac-4bbc-985b-104256ce760d", "name": "number", "type": "text", - "value": "5", + "value": "2", "entity": null, "worker_version": null, "worker_run": null @@ -1069,12 +1093,12 @@ }, { "model": "documents.metadata", - "pk": "c45df60f-e4c4-40ed-b742-8557ad83791d", + "pk": "92728339-0b63-4820-a853-39dd6235e9ec", "fields": { - "element": "39d41f9e-c8eb-47c2-89b0-c43272a171ac", + "element": "08dbed51-bfba-4a6c-8c53-a2c599f27e7d", "name": "folio", "type": "text", - "value": "2r", + "value": "1r", "entity": null, "worker_version": null, "worker_run": null @@ -1082,12 +1106,12 @@ }, { "model": "documents.metadata", - "pk": "de267c67-57f8-4bcb-995d-5920d2b6f19a", + "pk": "d3aae380-6381-4bb7-b591-aa9a1a88bd1f", "fields": { - "element": "57227959-07f9-43ea-a7ea-e05c808f13ca", + "element": "0ce15654-73f0-4a95-94b9-67476b611460", "name": "number", "type": "text", - "value": "4", + "value": "1", "entity": null, "worker_version": null, "worker_run": null @@ -1095,12 +1119,12 @@ }, { "model": "documents.metadata", - "pk": "f36cd04d-85dc-45c6-8155-14fd39c69387", + "pk": "e2de1db5-d7b7-431f-bb4a-d63c2ced7bd1", "fields": { - "element": "dbffd4c4-a4f9-415f-b2e0-2fdab56a6358", + "element": "409e47bb-88b0-4784-8416-a9aeddbb4e6a", "name": "folio", "type": "text", - "value": "1r", + "value": "1v", "entity": null, "worker_version": null, "worker_run": null @@ -1123,7 +1147,7 @@ }, { "model": "images.image", - "pk": "1f1ba4d8-9828-48b5-9229-7fff0905168e", + "pk": "1b9799e5-908a-48fb-bbd9-cb58815b8857", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -1137,12 +1161,12 @@ }, { "model": "images.image", - "pk": "6f7e9ea3-06b3-4b7f-9900-9676d71f5bc1", + "pk": "2e4f3461-0283-4e92-b49f-bb8a69072065", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img4", + "path": "img5", "width": 1000, "height": 1000, "hash": null, @@ -1151,12 +1175,12 @@ }, { "model": "images.image", - "pk": "819f362b-9955-4d9f-9095-1c1ecf893753", + "pk": "68c31b32-d0a0-441f-ab1f-521c90d923a3", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img2", + "path": "img3", "width": 1000, "height": 1000, "hash": null, @@ -1165,12 +1189,12 @@ }, { "model": "images.image", - "pk": "ab1312d6-3c70-4e31-a440-fdbdb2acf4be", + "pk": "6cccbf5a-c828-4e54-9750-e7e93304a87f", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img3", + "path": "img2", "width": 1000, "height": 1000, "hash": null, @@ -1179,12 +1203,12 @@ }, { "model": "images.image", - "pk": "d09bfb8d-888d-4899-ad03-2133d2efcbf3", + "pk": "a20af42c-6ed1-4ba4-a57a-994f9245f2f8", "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, @@ -1193,12 +1217,12 @@ }, { "model": "images.image", - "pk": "fc31a9cc-53bc-4519-96b1-7cbbf5dc50a2", + "pk": "b799538a-81a9-4af7-a48b-7f06d71ea762", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img1", + "path": "img4", "width": 1000, "height": 1000, "hash": null, @@ -1208,7 +1232,7 @@ { "model": "users.user", "fields": { - "password": "pbkdf2_sha256$720000$ApixV1UnAaQVRQq31fCgBR$GWHNyINgNtYkKdkIGkg0/g+ZQbJu+a4wEO4eLACL+oo=", + "password": "pbkdf2_sha256$720000$9VT2CjUgn81RTm23zRBpjh$/+pDNXQLPeMqEuBEQ3bqgGNKyWtKkZeRcuG8/XNNKhY=", "last_login": null, "email": "root@root.fr", "display_name": "Admin", @@ -1227,7 +1251,7 @@ { "model": "users.user", "fields": { - "password": "pbkdf2_sha256$720000$WHwscCnLna7TwRWdIog60g$4HHqZt1C4yZlCZhblkCQuF0iU68iI9EMz/jWkO21lR4=", + "password": "pbkdf2_sha256$720000$zuVYby3JQWctc0INmpGz8J$Torg+ZLIe+r67HKkGRG3W5mxLu5jmTnHvm0MvAG/1Gc=", "last_login": null, "email": "user@user.fr", "display_name": "Test user", @@ -1283,7 +1307,7 @@ }, { "model": "users.group", - "pk": "ebc7b824-5b6e-474f-8afc-4c68686e997d", + "pk": "86ef1653-8059-443e-828e-77ab0c931638", "fields": { "name": "User group", "public": false, @@ -1292,19 +1316,19 @@ }, { "model": "ponos.farm", - "pk": "273e9f9c-a7bc-447c-ae13-94242dae89f1", + "pk": "b285aade-eb47-4298-a882-b0e3ea8424c8", "fields": { "name": "Wheat farm", - "seed": "b3d8fe2c0d2edac0d775c82d09bc519245fc676e2025efd53c273b154c9ea417" + "seed": "6bb38c049cec8a023866a5989f71a3b9f0fea024596973542af77f78d7ffedfd" } }, { "model": "training.dataset", - "pk": "7002fe39-5bac-4414-a773-4b877dd5f03d", + "pk": "3ac49748-af41-4b5c-878b-fca1573d35dd", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", "creator": [ "user@user.fr" ], @@ -1317,11 +1341,11 @@ }, { "model": "training.dataset", - "pk": "74abd114-dea6-4ca3-a6c9-6cf0169bccb2", + "pk": "bd7ccd40-b6a9-4b33-8d32-2aad0bcbb32b", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", "creator": [ "user@user.fr" ], @@ -1334,146 +1358,146 @@ }, { "model": "training.datasetset", - "pk": "09bc5aa0-ed44-413b-b792-357d2fb24f66", + "pk": "487bb03e-662c-4c19-9707-141c99d886db", "fields": { - "name": "test", - "dataset": "7002fe39-5bac-4414-a773-4b877dd5f03d" + "name": "train", + "dataset": "3ac49748-af41-4b5c-878b-fca1573d35dd" } }, { "model": "training.datasetset", - "pk": "579e630a-63f6-449a-bb36-688b924f34d2", + "pk": "513c4ea0-15a8-4a55-a9f2-8e6030fe2e3f", "fields": { - "name": "test", - "dataset": "74abd114-dea6-4ca3-a6c9-6cf0169bccb2" + "name": "dev", + "dataset": "bd7ccd40-b6a9-4b33-8d32-2aad0bcbb32b" } }, { "model": "training.datasetset", - "pk": "a26c2ecd-f3d3-4d69-ac6d-df1343ef27ab", + "pk": "77c8b36f-d7e7-4718-9d16-b066f50c5ab8", "fields": { - "name": "dev", - "dataset": "74abd114-dea6-4ca3-a6c9-6cf0169bccb2" + "name": "test", + "dataset": "bd7ccd40-b6a9-4b33-8d32-2aad0bcbb32b" } }, { "model": "training.datasetset", - "pk": "eb9207ec-6838-483d-8cf3-8c5a974f54dd", + "pk": "8cb01b78-2048-4867-8583-bb892779d691", "fields": { "name": "train", - "dataset": "7002fe39-5bac-4414-a773-4b877dd5f03d" + "dataset": "bd7ccd40-b6a9-4b33-8d32-2aad0bcbb32b" } }, { "model": "training.datasetset", - "pk": "f56d9cf0-19f7-4d77-a6ec-091180501a31", + "pk": "c9287e45-1d55-4277-ad09-cc0730c33418", "fields": { - "name": "train", - "dataset": "74abd114-dea6-4ca3-a6c9-6cf0169bccb2" + "name": "dev", + "dataset": "3ac49748-af41-4b5c-878b-fca1573d35dd" } }, { "model": "training.datasetset", - "pk": "f87270ea-711d-4021-846a-179c19ccdb94", + "pk": "d85cc494-b1ea-48f7-8428-d5fcf9e2123e", "fields": { - "name": "dev", - "dataset": "7002fe39-5bac-4414-a773-4b877dd5f03d" + "name": "test", + "dataset": "3ac49748-af41-4b5c-878b-fca1573d35dd" } }, { "model": "users.right", - "pk": "4e60a35c-50aa-4d57-af7e-ff3d79370aab", + "pk": "132ed856-8cc1-49c9-824a-af1a1b8fb74b", "fields": { "user": [ - "user@user.fr" + "user2@user.fr" ], "group": null, "content_type": [ "users", "group" ], - "content_id": "ebc7b824-5b6e-474f-8afc-4c68686e997d", - "level": 100 + "content_id": "86ef1653-8059-443e-828e-77ab0c931638", + "level": 50 } }, { "model": "users.right", - "pk": "636f4fba-e823-408c-b272-e18a6b716d8c", + "pk": "19568619-4fe9-4a29-8e66-dd810eacb023", "fields": { "user": [ - "user3@user.fr" + "user@user.fr" ], "group": null, "content_type": [ - "users", - "group" + "documents", + "corpus" ], - "content_id": "ebc7b824-5b6e-474f-8afc-4c68686e997d", - "level": 10 + "content_id": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "level": 100 } }, { "model": "users.right", - "pk": "8419d643-13ab-4851-b087-4cf5ebee0ab1", + "pk": "7a77375f-05c1-44da-a1dc-e5a5036bd6c8", "fields": { "user": [ - "user2@user.fr" + "user3@user.fr" ], "group": null, "content_type": [ "users", "group" ], - "content_id": "ebc7b824-5b6e-474f-8afc-4c68686e997d", - "level": 50 + "content_id": "86ef1653-8059-443e-828e-77ab0c931638", + "level": 10 } }, { "model": "users.right", - "pk": "9974ded0-a68b-46c0-98c1-a65e0883b342", + "pk": "7f431d76-5949-47f7-b74c-7cc31d8f9c03", "fields": { "user": [ "user@user.fr" ], "group": null, "content_type": [ - "ponos", - "farm" + "users", + "group" ], - "content_id": "273e9f9c-a7bc-447c-ae13-94242dae89f1", - "level": 10 + "content_id": "86ef1653-8059-443e-828e-77ab0c931638", + "level": 100 } }, { "model": "users.right", - "pk": "b4d389d9-a17f-4237-a7d9-db9aec6ffe43", + "pk": "921b2503-d716-4fce-a3e3-0dcaa1eae0ef", "fields": { "user": [ "user@user.fr" ], "group": null, "content_type": [ - "documents", - "corpus" + "ponos", + "farm" ], - "content_id": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "level": 100 + "content_id": "b285aade-eb47-4298-a882-b0e3ea8424c8", + "level": 10 } }, { "model": "documents.element", - "pk": "1becb3e4-c8c0-47e7-a2b2-402446d7280e", + "pk": "08dbed51-bfba-4a6c-8c53-a2c599f27e7d", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", - "name": "ROY", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e91d04ee-d5a5-4b64-bdc9-7b097757fa00", + "name": "Volume 1, page 1r", "creator": null, "worker_version": null, "worker_run": null, - "image": "ab1312d6-3c70-4e31-a440-fdbdb2acf4be", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "a20af42c-6ed1-4ba4-a57a-994f9245f2f8", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1481,13 +1505,13 @@ }, { "model": "documents.element", - "pk": "1c20d68c-ac53-4910-8e30-9e38e2cfa002", + "pk": "09fcec5e-f874-4c85-9e2f-aa26e97549cd", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "805d2171-94f5-45e3-ae85-fe511c88c141", - "name": "Act 3", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "dab88056-97a7-46b8-83ef-92f56de8a892", + "name": "Volume 2", "creator": null, "worker_version": null, "worker_run": null, @@ -1500,13 +1524,13 @@ }, { "model": "documents.element", - "pk": "2cdad071-77b8-4e74-b05a-d87317cfbcc5", + "pk": "0ce15654-73f0-4a95-94b9-67476b611460", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "805d2171-94f5-45e3-ae85-fe511c88c141", - "name": "Act 5", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e0e9a648-36c6-49c4-9e4e-74278b4652be", + "name": "Act 1", "creator": null, "worker_version": null, "worker_run": null, @@ -1519,18 +1543,18 @@ }, { "model": "documents.element", - "pk": "39d41f9e-c8eb-47c2-89b0-c43272a171ac", + "pk": "0cfb9eae-526b-4f27-94db-18a26095e87e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "53d093a9-3d20-4fcf-9b55-c77e788e19a9", - "name": "Volume 1, page 2r", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "ab1312d6-3c70-4e31-a440-fdbdb2acf4be", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "a20af42c-6ed1-4ba4-a57a-994f9245f2f8", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1538,18 +1562,18 @@ }, { "model": "documents.element", - "pk": "459ecf7a-849f-4105-b371-9cad0078031b", + "pk": "3aa34569-0092-4acf-9ca0-9f8e1265b53a", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "748cabf2-e002-431f-b582-5c39ca57b44e", - "name": "Surface B", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e91d04ee-d5a5-4b64-bdc9-7b097757fa00", + "name": "Volume 2, page 1r", "creator": null, "worker_version": null, "worker_run": null, - "image": "fc31a9cc-53bc-4519-96b1-7cbbf5dc50a2", - "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", + "image": "b799538a-81a9-4af7-a48b-7f06d71ea762", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1557,18 +1581,18 @@ }, { "model": "documents.element", - "pk": "4ac58be9-28bc-43da-bb6a-8e3eb09c2e14", + "pk": "409e47bb-88b0-4784-8416-a9aeddbb4e6a", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "acd7e2f0-e4c6-48e6-9bf5-e9be06e1ae6c", - "name": "Volume 2", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e91d04ee-d5a5-4b64-bdc9-7b097757fa00", + "name": "Volume 1, page 1v", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "6cccbf5a-c828-4e54-9750-e7e93304a87f", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1576,18 +1600,18 @@ }, { "model": "documents.element", - "pk": "50e1ccf3-dbeb-4c29-9d77-85e05f90c426", + "pk": "44585e4a-40be-4c8d-98fc-58c40f24a770", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "748cabf2-e002-431f-b582-5c39ca57b44e", - "name": "Surface A", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "fc31a9cc-53bc-4519-96b1-7cbbf5dc50a2", - "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)", + "image": "a20af42c-6ed1-4ba4-a57a-994f9245f2f8", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1595,13 +1619,13 @@ }, { "model": "documents.element", - "pk": "57227959-07f9-43ea-a7ea-e05c808f13ca", + "pk": "480b9c33-91a3-4ddd-b871-33262d96ba50", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "805d2171-94f5-45e3-ae85-fe511c88c141", - "name": "Act 4", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e0e9a648-36c6-49c4-9e4e-74278b4652be", + "name": "Act 5", "creator": null, "worker_version": null, "worker_run": null, @@ -1614,18 +1638,18 @@ }, { "model": "documents.element", - "pk": "59010638-140d-49e8-b123-114f5b3729b8", + "pk": "543985d8-3728-4555-ad9e-d46a0ad506cf", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", - "name": "ROY", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "dab88056-97a7-46b8-83ef-92f56de8a892", + "name": "Volume 1", "creator": null, "worker_version": null, "worker_run": null, - "image": "819f362b-9955-4d9f-9095-1c1ecf893753", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1633,18 +1657,18 @@ }, { "model": "documents.element", - "pk": "60e09255-6a01-47e1-b6ba-f7ca8e657b25", + "pk": "566d72a5-d86c-4ea6-88bd-f0450ae4053a", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", - "name": "PARIS", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "715aa814-cdea-4fe3-8765-a055141aff44", + "name": "Surface E", "creator": null, "worker_version": null, "worker_run": null, - "image": "819f362b-9955-4d9f-9095-1c1ecf893753", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": "68c31b32-d0a0-441f-ab1f-521c90d923a3", + "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1652,17 +1676,17 @@ }, { "model": "documents.element", - "pk": "6497f558-1aa8-4f51-a10e-d359a8d06c0b", + "pk": "5dca405b-f5a0-488c-be4d-2819eb9a1532", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "fc31a9cc-53bc-4519-96b1-7cbbf5dc50a2", + "image": "6cccbf5a-c828-4e54-9750-e7e93304a87f", "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, @@ -1671,18 +1695,18 @@ }, { "model": "documents.element", - "pk": "6508eb1d-b22d-4cf0-a94d-c32c9b614396", + "pk": "5dcad4a2-8d66-4123-b2d6-c0f5ab601e4e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", - "name": "DATUM", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "715aa814-cdea-4fe3-8765-a055141aff44", + "name": "Surface A", "creator": null, "worker_version": null, "worker_run": null, - "image": "ab1312d6-3c70-4e31-a440-fdbdb2acf4be", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": "a20af42c-6ed1-4ba4-a57a-994f9245f2f8", + "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1690,18 +1714,18 @@ }, { "model": "documents.element", - "pk": "6cd4aba2-e49f-4153-8112-9eb561ac8d3b", + "pk": "66db2deb-e907-43b9-8dee-c3ec78f54412", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "53d093a9-3d20-4fcf-9b55-c77e788e19a9", - "name": "Volume 2, page 2r", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "64af6681-8b66-4f45-bd8a-74226dccd0ff", + "name": "Text line", "creator": null, "worker_version": null, "worker_run": null, - "image": "1f1ba4d8-9828-48b5-9229-7fff0905168e", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "a20af42c-6ed1-4ba4-a57a-994f9245f2f8", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1709,18 +1733,18 @@ }, { "model": "documents.element", - "pk": "7047387b-146e-4735-a3d7-eefa9b4a64a9", + "pk": "71d9ecf1-c06a-4e0e-a619-14755faf812c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "748cabf2-e002-431f-b582-5c39ca57b44e", - "name": "Surface E", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "715aa814-cdea-4fe3-8765-a055141aff44", + "name": "Surface D", "creator": null, "worker_version": null, "worker_run": null, - "image": "ab1312d6-3c70-4e31-a440-fdbdb2acf4be", - "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)", + "image": "68c31b32-d0a0-441f-ab1f-521c90d923a3", + "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1728,18 +1752,18 @@ }, { "model": "documents.element", - "pk": "7d767a0e-c46d-4f6d-9364-2ee0c1cc5df4", + "pk": "743baa6a-23c5-4761-92ad-69d4239327fd", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "748cabf2-e002-431f-b582-5c39ca57b44e", - "name": "Surface D", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e0e9a648-36c6-49c4-9e4e-74278b4652be", + "name": "Act 3", "creator": null, "worker_version": null, "worker_run": null, - "image": "ab1312d6-3c70-4e31-a440-fdbdb2acf4be", - "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1747,18 +1771,18 @@ }, { "model": "documents.element", - "pk": "831b2e1f-01eb-4724-978b-608b7d587f7c", + "pk": "806485a5-591f-409d-9880-7114de729df7", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", - "name": "PARIS", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e0e9a648-36c6-49c4-9e4e-74278b4652be", + "name": "Act 4", "creator": null, "worker_version": null, "worker_run": null, - "image": "ab1312d6-3c70-4e31-a440-fdbdb2acf4be", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1766,18 +1790,18 @@ }, { "model": "documents.element", - "pk": "8de507e6-e85c-41d1-9ef4-361fe218f9bb", + "pk": "80803359-8485-4236-a0b8-ea3ecf3e8b0e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "805d2171-94f5-45e3-ae85-fe511c88c141", - "name": "Act 1", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e91d04ee-d5a5-4b64-bdc9-7b097757fa00", + "name": "Volume 2, page 1v", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "2e4f3461-0283-4e92-b49f-bb8a69072065", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1785,18 +1809,18 @@ }, { "model": "documents.element", - "pk": "9d9b6a50-5f16-480d-989b-0032ac1087e4", + "pk": "82a942ac-efac-4bbc-985b-104256ce760d", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", - "name": "DATUM", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e0e9a648-36c6-49c4-9e4e-74278b4652be", + "name": "Act 2", "creator": null, "worker_version": null, "worker_run": null, - "image": "fc31a9cc-53bc-4519-96b1-7cbbf5dc50a2", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1804,18 +1828,18 @@ }, { "model": "documents.element", - "pk": "a4258522-c766-4fa9-b6ff-78c78f03573b", + "pk": "9e52bb6f-cf37-4fc6-b3c6-bceb5d630374", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", - "name": "PARIS", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e91d04ee-d5a5-4b64-bdc9-7b097757fa00", + "name": "Volume 1, page 2r", "creator": null, "worker_version": null, "worker_run": null, - "image": "fc31a9cc-53bc-4519-96b1-7cbbf5dc50a2", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": "68c31b32-d0a0-441f-ab1f-521c90d923a3", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1823,18 +1847,18 @@ }, { "model": "documents.element", - "pk": "a463d187-d339-4f02-8307-420c5f19ac37", + "pk": "aa1085fc-6c14-4829-a255-586f229dc6c2", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "1d078b43-bb0d-44e6-a667-fec714dbf057", - "name": "DATUM", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "819f362b-9955-4d9f-9095-1c1ecf893753", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": "68c31b32-d0a0-441f-ab1f-521c90d923a3", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1842,18 +1866,18 @@ }, { "model": "documents.element", - "pk": "b5af9a42-dcc1-408c-802d-e123cfc02180", + "pk": "aa7b6b28-c178-4587-80dc-c6e248c65be4", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "805d2171-94f5-45e3-ae85-fe511c88c141", - "name": "Act 2", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "715aa814-cdea-4fe3-8765-a055141aff44", + "name": "Surface F", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "68c31b32-d0a0-441f-ab1f-521c90d923a3", + "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1861,17 +1885,17 @@ }, { "model": "documents.element", - "pk": "bc176daf-0894-4560-abaa-5b74ee8a3426", + "pk": "b146eb70-b21a-4827-aa06-1dbc030558c1", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "53d093a9-3d20-4fcf-9b55-c77e788e19a9", - "name": "Volume 2, page 1v", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "e91d04ee-d5a5-4b64-bdc9-7b097757fa00", + "name": "Volume 2, page 2r", "creator": null, "worker_version": null, "worker_run": null, - "image": "d09bfb8d-888d-4899-ad03-2133d2efcbf3", + "image": "1b9799e5-908a-48fb-bbd9-cb58815b8857", "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, @@ -1880,18 +1904,18 @@ }, { "model": "documents.element", - "pk": "c49d9815-f0c8-471e-8e23-d24976505129", + "pk": "b151462c-ed14-4903-ba3e-92133827851c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "748cabf2-e002-431f-b582-5c39ca57b44e", - "name": "Surface F", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "ab1312d6-3c70-4e31-a440-fdbdb2acf4be", - "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", + "image": "6cccbf5a-c828-4e54-9750-e7e93304a87f", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1899,18 +1923,18 @@ }, { "model": "documents.element", - "pk": "dbffd4c4-a4f9-415f-b2e0-2fdab56a6358", + "pk": "b76b2bfc-f8e1-4143-b68b-90257005efd4", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "53d093a9-3d20-4fcf-9b55-c77e788e19a9", - "name": "Volume 1, page 1r", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "fc31a9cc-53bc-4519-96b1-7cbbf5dc50a2", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "a20af42c-6ed1-4ba4-a57a-994f9245f2f8", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1918,18 +1942,18 @@ }, { "model": "documents.element", - "pk": "de0f901f-fa4e-4756-8e87-1ca20222bd07", + "pk": "cb62e1be-c220-496a-902a-23c86827d13a", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "53d093a9-3d20-4fcf-9b55-c77e788e19a9", - "name": "Volume 1, page 1v", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "819f362b-9955-4d9f-9095-1c1ecf893753", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "68c31b32-d0a0-441f-ab1f-521c90d923a3", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1937,18 +1961,18 @@ }, { "model": "documents.element", - "pk": "e0bdfb09-1e15-4ec2-a2dd-4c05714af2fd", + "pk": "d6251d6a-eb9d-42ab-8e9c-6cf6fdce871e", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "748cabf2-e002-431f-b582-5c39ca57b44e", - "name": "Surface C", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "715aa814-cdea-4fe3-8765-a055141aff44", + "name": "Surface B", "creator": null, "worker_version": null, "worker_run": null, - "image": "819f362b-9955-4d9f-9095-1c1ecf893753", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "a20af42c-6ed1-4ba4-a57a-994f9245f2f8", + "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1956,18 +1980,18 @@ }, { "model": "documents.element", - "pk": "f2fa1e76-9784-49e9-91ba-9b53f19523dd", + "pk": "fc3bc21b-13c2-4ee3-9cc2-4ddd075156b6", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "3be8f2aa-3e04-4a25-80af-7f92c39c057f", - "name": "Text line", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "fc31a9cc-53bc-4519-96b1-7cbbf5dc50a2", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "6cccbf5a-c828-4e54-9750-e7e93304a87f", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1975,18 +1999,18 @@ }, { "model": "documents.element", - "pk": "f3837e86-33a2-4d0d-bfe5-b407712f8e9b", + "pk": "fd415b27-1321-479a-800a-fe04b2bf2325", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "acd7e2f0-e4c6-48e6-9bf5-e9be06e1ae6c", - "name": "Volume 1", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "715aa814-cdea-4fe3-8765-a055141aff44", + "name": "Surface C", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "6cccbf5a-c828-4e54-9750-e7e93304a87f", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1994,18 +2018,18 @@ }, { "model": "documents.element", - "pk": "f6a605c8-3020-486f-9b41-81f8aed93f8d", + "pk": "fe3d444f-4519-4ff2-b3e2-e9158bec475a", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "type": "53d093a9-3d20-4fcf-9b55-c77e788e19a9", - "name": "Volume 2, page 1r", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "type": "5d6793cc-4f92-4f88-af50-3d6e81b1b24f", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "6f7e9ea3-06b3-4b7f-9900-9676d71f5bc1", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "68c31b32-d0a0-441f-ab1f-521c90d923a3", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -2013,20 +2037,20 @@ }, { "model": "process.process", - "pk": "23b5ee11-b4b9-41dc-9b2b-83024404d0f0", + "pk": "ccab94ea-989a-4279-a9cf-28122d7c166c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "name": "Process fixture", + "name": null, "creator": [ "user@user.fr" ], - "corpus": "63951d56-ce50-4d2d-9d11-cee0da8dffba", - "mode": "workers", + "corpus": null, + "mode": "local", "activity_state": "disabled", "started": null, "finished": null, - "farm": "273e9f9c-a7bc-447c-ae13-94242dae89f1", + "farm": null, "element": null, "folder_type": null, "element_type": null, @@ -2043,20 +2067,20 @@ }, { "model": "process.process", - "pk": "b6d2604e-6cf3-44cd-9b4a-4d7dff2ce040", + "pk": "daff45b4-ac82-430c-86d8-d31cd9af87ba", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "name": null, + "name": "Process fixture", "creator": [ - "root@root.fr" + "user@user.fr" ], - "corpus": null, - "mode": "local", + "corpus": "dde2fe30-56fa-426f-8435-7c14bd34257c", + "mode": "workers", "activity_state": "disabled", "started": null, "finished": null, - "farm": null, + "farm": "b285aade-eb47-4298-a882-b0e3ea8424c8", "element": null, "folder_type": null, "element_type": null, @@ -2073,13 +2097,13 @@ }, { "model": "process.process", - "pk": "da20071c-7c8e-4111-a1df-02f71f0531d2", + "pk": "ee420088-69ba-4055-a589-e791c2074554", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "name": null, "creator": [ - "user@user.fr" + "root@root.fr" ], "corpus": null, "mode": "local", diff --git a/arkindex/documents/management/commands/build_fixtures.py b/arkindex/documents/management/commands/build_fixtures.py index 18d9ee1b4cf341215b127cff967f5b5f946dc173..87a12ff637d1ba11203d01ebe7a9a1e379e2afde 100644 --- a/arkindex/documents/management/commands/build_fixtures.py +++ b/arkindex/documents/management/commands/build_fixtures.py @@ -119,6 +119,8 @@ class Command(BaseCommand): name="Recognizer", slug="reco", type=recognizer_worker_type, + cost_cpu_hour=1.312, + cost_1k_elements=0.25, ), version=1, configuration={"test": 42}, diff --git a/arkindex/process/admin.py b/arkindex/process/admin.py index d43d5ae745b56e88c9c67af0c944e56eebb25179..3a2e99f70359ca2b745d3d04f58af1e202e1aea6 100644 --- a/arkindex/process/admin.py +++ b/arkindex/process/admin.py @@ -86,7 +86,10 @@ class WorkerConfigurationInline(admin.StackedInline): class WorkerAdmin(admin.ModelAdmin): list_display = ("name", "slug", "archived", "type") list_filter = (ArchivedListFilter, ) - fields = ("id", "name", "slug", "type", "description", "public", "archived") + fieldsets = ( + (None, {"fields": ("id", "name", "slug", "type", "description", "public", "archived")}), + ("Costs", {"fields": ("cost_cpu_hour", "cost_gpu_hour", "cost_1k_elements")}), + ) readonly_fields = ("id", ) inlines = [WorkerVersionInline, WorkerConfigurationInline] diff --git a/arkindex/process/migrations/0048_worker_cost_fields.py b/arkindex/process/migrations/0048_worker_cost_fields.py new file mode 100644 index 0000000000000000000000000000000000000000..50cca1847b9d83ef52df515f93c901235976f4c4 --- /dev/null +++ b/arkindex/process/migrations/0048_worker_cost_fields.py @@ -0,0 +1,29 @@ +# Generated by Django 5.0.8 on 2025-01-22 14:26 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("process", "0047_alter_workerversion_tag"), + ] + + operations = [ + migrations.AddField( + model_name="worker", + name="cost_1k_elements", + field=models.DecimalField(decimal_places=3, default=0, help_text="Cost for running any WorkerVersion of this worker over 1000 elements, in euros.", max_digits=8, validators=[django.core.validators.MinValueValidator(0)], verbose_name="Cost per 1000 elements"), + ), + migrations.AddField( + model_name="worker", + name="cost_cpu_hour", + field=models.DecimalField(decimal_places=3, default=0, help_text="Cost for running any WorkerVersion of this worker for an hour with `use_gpu = False` set on the WorkerRun, in euros.\n\nIrrelevant if the WorkerVersion requires GPUs.", max_digits=8, validators=[django.core.validators.MinValueValidator(0)], verbose_name="CPU cost per hour"), + ), + migrations.AddField( + model_name="worker", + name="cost_gpu_hour", + field=models.DecimalField(decimal_places=3, default=0, help_text="Cost for running any WorkerVersion of this worker for an hour with `use_gpu = True` set on the WorkerRun, in euros.\n\nIrrelevant if the WorkerVersion does not support GPUs.", max_digits=8, validators=[django.core.validators.MinValueValidator(0)], verbose_name="GPU cost per hour"), + ), + ] diff --git a/arkindex/process/models.py b/arkindex/process/models.py index ae3c90b1a304c194cb08d305945df82fc29825b0..3d5f00821cddb6d5eb9a65ab0173c4b0870499a6 100644 --- a/arkindex/process/models.py +++ b/arkindex/process/models.py @@ -1,5 +1,6 @@ import uuid from functools import partial +from textwrap import dedent from django.conf import settings from django.contrib.contenttypes.fields import GenericRelation @@ -576,6 +577,40 @@ class Worker(models.Model): objects = WorkerManager() + # Worker costs + cost_cpu_hour = models.DecimalField( + max_digits=8, + decimal_places=3, + default=0, + validators=[MinValueValidator(0)], + verbose_name="CPU cost per hour", + help_text=dedent(""" + Cost for running any WorkerVersion of this worker for an hour with `use_gpu = False` set on the WorkerRun, in euros. + + Irrelevant if the WorkerVersion requires GPUs. + """).strip(), + ) + cost_gpu_hour = models.DecimalField( + max_digits=8, + decimal_places=3, + default=0, + validators=[MinValueValidator(0)], + verbose_name="GPU cost per hour", + help_text=dedent(""" + Cost for running any WorkerVersion of this worker for an hour with `use_gpu = True` set on the WorkerRun, in euros. + + Irrelevant if the WorkerVersion does not support GPUs. + """).strip(), + ) + cost_1k_elements = models.DecimalField( + max_digits=8, + decimal_places=3, + default=0, + validators=[MinValueValidator(0)], + verbose_name="Cost per 1000 elements", + help_text="Cost for running any WorkerVersion of this worker over 1000 elements, in euros.", + ) + class Meta: constraints = [ models.UniqueConstraint( diff --git a/arkindex/process/serializers/workers.py b/arkindex/process/serializers/workers.py index e969205e36b0abfb476c013af11a2376ae8a5357..5b7604a3cc3b5620345cd4da7ed029362234d5a9 100644 --- a/arkindex/process/serializers/workers.py +++ b/arkindex/process/serializers/workers.py @@ -48,8 +48,8 @@ class WorkerSerializer(serializers.ModelSerializer): class Meta: model = Worker - fields = ("id", "name", "description", "type", "slug", "repository_url", "archived") - read_only_fields = ("id",) + fields = ("id", "name", "description", "type", "slug", "repository_url", "archived", "cost_cpu_hour", "cost_gpu_hour", "cost_1k_elements") + read_only_fields = ("id", "cost_cpu_hour", "cost_gpu_hour", "cost_1k_elements") extra_kwargs = { "description": { "style": {"base_template": "textarea.html"}, diff --git a/arkindex/process/tests/test_corpus_worker_runs.py b/arkindex/process/tests/test_corpus_worker_runs.py index e93e20bdf282c7f6149e3655b40532a70b2cdee1..590156dcc7708d2e8580e5777c0590bd2733800b 100644 --- a/arkindex/process/tests/test_corpus_worker_runs.py +++ b/arkindex/process/tests/test_corpus_worker_runs.py @@ -138,6 +138,9 @@ class TestCorpusWorkerRuns(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -165,6 +168,9 @@ class TestCorpusWorkerRuns(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } }, "parents": [], diff --git a/arkindex/process/tests/test_corpus_worker_versions.py b/arkindex/process/tests/test_corpus_worker_versions.py index a21db146aeb71f720e95abee390c791b5f6b7ce4..f7726b9b720f3c8e20adb2deeffe2dde60298c63 100644 --- a/arkindex/process/tests/test_corpus_worker_versions.py +++ b/arkindex/process/tests/test_corpus_worker_versions.py @@ -69,6 +69,9 @@ class TestCorpusWorkerVersions(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", }, @@ -95,6 +98,9 @@ class TestCorpusWorkerVersions(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", }, @@ -153,6 +159,9 @@ class TestCorpusWorkerVersions(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", }, @@ -179,6 +188,9 @@ class TestCorpusWorkerVersions(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", }, @@ -233,6 +245,9 @@ class TestCorpusWorkerVersions(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", }, @@ -274,6 +289,9 @@ class TestCorpusWorkerVersions(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", }, @@ -334,6 +352,9 @@ class TestCorpusWorkerVersions(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", } diff --git a/arkindex/process/tests/test_user_workerruns.py b/arkindex/process/tests/test_user_workerruns.py index f900d5e4f1d5fed78d812078af114fdd9e7774b8..d98a8d5a33d32c9f80f557ec477730165006fbfc 100644 --- a/arkindex/process/tests/test_user_workerruns.py +++ b/arkindex/process/tests/test_user_workerruns.py @@ -112,6 +112,9 @@ class TestUserWorkerRuns(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -154,6 +157,9 @@ class TestUserWorkerRuns(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -241,6 +247,9 @@ class TestUserWorkerRuns(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } }, "summary": "Worker Custom worker @ version 2", @@ -457,6 +466,9 @@ class TestUserWorkerRuns(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } }, "summary": f"Worker Custom worker @ version 2 with model Some model @ {str(self.model_version.id)[:6]} using configuration 'Some configuration'", diff --git a/arkindex/process/tests/worker_runs/test_create.py b/arkindex/process/tests/worker_runs/test_create.py index 0c1496ad436c2d59fa1d54447279956093552d42..41ac10e52738e197473f8d2e434c033ada84a3df 100644 --- a/arkindex/process/tests/worker_runs/test_create.py +++ b/arkindex/process/tests/worker_runs/test_create.py @@ -310,6 +310,9 @@ class TestWorkerRunsCreate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], @@ -387,6 +390,9 @@ class TestWorkerRunsCreate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], @@ -537,6 +543,9 @@ class TestWorkerRunsCreate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], @@ -594,6 +603,9 @@ class TestWorkerRunsCreate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], diff --git a/arkindex/process/tests/worker_runs/test_list.py b/arkindex/process/tests/worker_runs/test_list.py index 17ff7eae28bd65058b31bd90156e5c387bf4179d..8b0698d4a482ba9d56369be6d0f8b0e9458a2cf0 100644 --- a/arkindex/process/tests/worker_runs/test_list.py +++ b/arkindex/process/tests/worker_runs/test_list.py @@ -74,6 +74,9 @@ class TestWorkerRunsList(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], @@ -142,6 +145,9 @@ class TestWorkerRunsList(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], diff --git a/arkindex/process/tests/worker_runs/test_partial_update.py b/arkindex/process/tests/worker_runs/test_partial_update.py index fb96d9d4f5b6dbd266302a95eb2c27a2b96a6104..cb7ebb4664e613a2b70e5e93637d876c793e527c 100644 --- a/arkindex/process/tests/worker_runs/test_partial_update.py +++ b/arkindex/process/tests/worker_runs/test_partial_update.py @@ -260,6 +260,9 @@ class TestWorkerRunsPartialUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -323,6 +326,9 @@ class TestWorkerRunsPartialUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -391,6 +397,9 @@ class TestWorkerRunsPartialUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -743,6 +752,9 @@ class TestWorkerRunsPartialUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -835,6 +847,9 @@ class TestWorkerRunsPartialUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -905,6 +920,9 @@ class TestWorkerRunsPartialUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -1051,6 +1069,9 @@ class TestWorkerRunsPartialUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], diff --git a/arkindex/process/tests/worker_runs/test_retrieve.py b/arkindex/process/tests/worker_runs/test_retrieve.py index c1f9b4fbfc9e907fc16d4a23a955bef684537ffa..e253e85f25da5e605625ac07faa49e1906654593 100644 --- a/arkindex/process/tests/worker_runs/test_retrieve.py +++ b/arkindex/process/tests/worker_runs/test_retrieve.py @@ -108,6 +108,9 @@ class TestWorkerRunsRetrieve(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -170,6 +173,9 @@ class TestWorkerRunsRetrieve(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -261,6 +267,9 @@ class TestWorkerRunsRetrieve(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } }, "summary": "Worker Custom worker @ version 1", @@ -303,6 +312,9 @@ class TestWorkerRunsRetrieve(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], @@ -376,6 +388,9 @@ class TestWorkerRunsRetrieve(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "parents": [], diff --git a/arkindex/process/tests/worker_runs/test_update.py b/arkindex/process/tests/worker_runs/test_update.py index 15f94ec55f06d37e2ec95e35125a3d85c98d1f32..b412d3b9da98f1ef6af1ef23d32e7bbbd519c701 100644 --- a/arkindex/process/tests/worker_runs/test_update.py +++ b/arkindex/process/tests/worker_runs/test_update.py @@ -280,6 +280,9 @@ class TestWorkerRunsUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -343,6 +346,9 @@ class TestWorkerRunsUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, }, "use_gpu": False, @@ -414,6 +420,9 @@ class TestWorkerRunsUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -779,6 +788,9 @@ class TestWorkerRunsUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -874,6 +886,9 @@ class TestWorkerRunsUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, @@ -946,6 +961,9 @@ class TestWorkerRunsUpdate(FixtureAPITestCase): "description": "", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", } }, "use_gpu": False, diff --git a/arkindex/process/tests/worker_versions/test_create.py b/arkindex/process/tests/worker_versions/test_create.py index d060bb9e27485a1107c71f0e00d09cf7f366d4a2..69a144ea836936e25bc7146932d83dfe62750a80 100644 --- a/arkindex/process/tests/worker_versions/test_create.py +++ b/arkindex/process/tests/worker_versions/test_create.py @@ -205,6 +205,9 @@ class TestWorkerVersionCreate(FixtureAPITestCase): "description": "", "archived": False, "repository_url": "https://gitlab.com/NERV/eva", + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, }) @@ -246,6 +249,9 @@ class TestWorkerVersionCreate(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, }) diff --git a/arkindex/process/tests/worker_versions/test_list.py b/arkindex/process/tests/worker_versions/test_list.py index 4fc3d5800b9d252f60aec39e4a43a3dedf6a1f02..aea449feda955c521067af574bfb116af01984be 100644 --- a/arkindex/process/tests/worker_versions/test_list.py +++ b/arkindex/process/tests/worker_versions/test_list.py @@ -82,6 +82,9 @@ class TestWorkerVersionList(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": None, "tag": None, @@ -104,6 +107,9 @@ class TestWorkerVersionList(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": None, "tag": None, @@ -126,6 +132,9 @@ class TestWorkerVersionList(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": None, "tag": None, @@ -148,6 +157,9 @@ class TestWorkerVersionList(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": 1, "tag": None, @@ -210,6 +222,9 @@ class TestWorkerVersionList(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": None, "tag": None, @@ -232,6 +247,9 @@ class TestWorkerVersionList(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": None, "tag": None, @@ -254,6 +272,9 @@ class TestWorkerVersionList(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": 1, "tag": None, diff --git a/arkindex/process/tests/worker_versions/test_recommended_worker_version.py b/arkindex/process/tests/worker_versions/test_recommended_worker_version.py index c637af154def82e7cfe98e1d8adcd11ceb2757fc..de6990e9fd5f093672e3bd502ccde3c4ff72143f 100644 --- a/arkindex/process/tests/worker_versions/test_recommended_worker_version.py +++ b/arkindex/process/tests/worker_versions/test_recommended_worker_version.py @@ -147,6 +147,9 @@ class TestRecommendedWorkerVersion(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": None, "tag": None, @@ -178,6 +181,9 @@ class TestRecommendedWorkerVersion(FixtureAPITestCase): "description": self.worker_reco.description, "archived": bool(self.worker_reco.archived), "repository_url": self.worker_reco.repository_url, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "version": None, "tag": "0.3.1", diff --git a/arkindex/process/tests/worker_versions/test_retrieve.py b/arkindex/process/tests/worker_versions/test_retrieve.py index c77b658da7d65c3b362a0f96d7a8434910e0ad01..e8eca96df8d0bb43a791c3dcd864f03b1c4635a5 100644 --- a/arkindex/process/tests/worker_versions/test_retrieve.py +++ b/arkindex/process/tests/worker_versions/test_retrieve.py @@ -65,6 +65,9 @@ class TestWorkerVersionRetrieve(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", }) diff --git a/arkindex/process/tests/worker_versions/test_retrieve_feature.py b/arkindex/process/tests/worker_versions/test_retrieve_feature.py index c7e6cf672c813697761f69210c0d4c9ffedabbcc..7298f304ac5fe1b613eb64ce52fdaa7cdbac0ccc 100644 --- a/arkindex/process/tests/worker_versions/test_retrieve_feature.py +++ b/arkindex/process/tests/worker_versions/test_retrieve_feature.py @@ -66,6 +66,9 @@ class TestFeatureWorkerVersionRetrieve(FixtureAPITestCase): "description": "", "archived": False, "repository_url": None, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, "created": "2020-02-02T01:23:45.678000Z", }) diff --git a/arkindex/process/tests/workers/test_create.py b/arkindex/process/tests/workers/test_create.py index 2c79445c2ce1cd020497dc538cdd4487bc66ce55..7f3cf144ce8eb08750d84a1c32ac88b6eccb6432 100644 --- a/arkindex/process/tests/workers/test_create.py +++ b/arkindex/process/tests/workers/test_create.py @@ -116,6 +116,9 @@ class TestWorkerCreate(FixtureAPITestCase): "slug": "worker_post", "type": "dla", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }) @patch("arkindex.users.utils.get_max_level", return_value=Role.Guest.value) diff --git a/arkindex/process/tests/workers/test_list.py b/arkindex/process/tests/workers/test_list.py index d159139ce644be7102ece52f47d30d00c6d6e7fd..18210679375c3442d54702ad3ba2d0f437690817 100644 --- a/arkindex/process/tests/workers/test_list.py +++ b/arkindex/process/tests/workers/test_list.py @@ -56,6 +56,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "custom", "type": "custom", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, { "id": str(self.worker_dla.id), @@ -64,7 +67,9 @@ class TestWorkerList(FixtureAPITestCase): "description": "", "slug": "dla", "type": "dla", - "archived": False, + "archived": False,"cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, { "id": str(self.init_worker.id), @@ -74,6 +79,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "initialisation", "type": "init", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, { "id": str(self.worker_file_import.id), @@ -83,6 +91,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "file_import", "type": "import", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, { "id": str(self.worker_generic.id), @@ -92,6 +103,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "generic", "type": "recognizer", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, { "id": str(self.worker_pdf_export.id), @@ -101,6 +115,9 @@ class TestWorkerList(FixtureAPITestCase): "description": "", "type": "export", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, { "id": str(self.worker_reco.id), @@ -110,6 +127,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "reco", "type": "recognizer", "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }, { "id": str(self.worker_gpu.id), @@ -119,6 +139,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "worker-gpu", "type": "worker", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, ] }) @@ -152,6 +175,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "generic", "type": "recognizer", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, ] }) @@ -181,6 +207,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "reco", "type": "recognizer", "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }], }) @@ -248,6 +277,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "dla", "type": "dla", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } ] }) @@ -275,6 +307,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "dla", "type": "dla", "archived": True, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } ] }) @@ -303,6 +338,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "dla", "type": "dla", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } ] }) @@ -343,6 +381,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "dla", "type": "dla", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } ] }) @@ -374,7 +415,10 @@ class TestWorkerList(FixtureAPITestCase): "name": "Elements Initialisation Worker", "repository_url": None, "slug": "initialisation", - "type": "init" + "type": "init", + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }, { "archived": False, @@ -383,7 +427,10 @@ class TestWorkerList(FixtureAPITestCase): "name": "File import", "repository_url": None, "slug": "file_import", - "type": "import" + "type": "import", + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } ] }) @@ -413,6 +460,9 @@ class TestWorkerList(FixtureAPITestCase): "slug": "dla", "type": "dla", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", } ] }) diff --git a/arkindex/process/tests/workers/test_partial_update.py b/arkindex/process/tests/workers/test_partial_update.py index 917fd0fed461567dcbfb1718fec184b5ca60648e..72e836e37ab4e2d3f39c8e5fbb2d6c0c0ae7e765 100644 --- a/arkindex/process/tests/workers/test_partial_update.py +++ b/arkindex/process/tests/workers/test_partial_update.py @@ -101,6 +101,9 @@ class TestWorkerPartialUpdate(FixtureAPITestCase): "type": "dla", "repository_url": None, "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }) self.worker_reco.refresh_from_db() @@ -165,6 +168,9 @@ class TestWorkerPartialUpdate(FixtureAPITestCase): "type": "recognizer", "repository_url": None, "archived": new_value, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }) def test_new_type(self): @@ -190,6 +196,9 @@ class TestWorkerPartialUpdate(FixtureAPITestCase): "repository_url": None, "slug": "reco", "type": "new_type", + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }) self.worker_reco.refresh_from_db() self.assertEqual(self.worker_reco.type.slug, "new_type") diff --git a/arkindex/process/tests/workers/test_retrieve.py b/arkindex/process/tests/workers/test_retrieve.py index 59d32cf3e387f291eb074fd3d6229b3f0bf18f8f..2748cfb7f9adab91197cd07effb16dee47b59729 100644 --- a/arkindex/process/tests/workers/test_retrieve.py +++ b/arkindex/process/tests/workers/test_retrieve.py @@ -35,6 +35,9 @@ class TestWorkerRetrieve(FixtureAPITestCase): "slug": "custom", "type": "custom", "archived": False, + "cost_1k_elements": "0.000", + "cost_cpu_hour": "0.000", + "cost_gpu_hour": "0.000", }) @patch("arkindex.users.managers.BaseACLManager.filter_rights") diff --git a/arkindex/process/tests/workers/test_update.py b/arkindex/process/tests/workers/test_update.py index 64e6a491f025ea9eb8fef9ff1bcd15f8304de53e..e83272e031f2cedb4d3c498cd2bb7a1a1fd35855 100644 --- a/arkindex/process/tests/workers/test_update.py +++ b/arkindex/process/tests/workers/test_update.py @@ -133,6 +133,9 @@ class TestWorkerUpdate(FixtureAPITestCase): "type": "dla", "repository_url": "https://gitlab.com/NERV/eva", "archived": False, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }) self.worker_reco.refresh_from_db() @@ -206,6 +209,9 @@ class TestWorkerUpdate(FixtureAPITestCase): "type": "dla", "repository_url": None, "archived": new_value, + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }) def test_new_type(self): @@ -237,6 +243,9 @@ class TestWorkerUpdate(FixtureAPITestCase): "repository_url": None, "slug": "new_slug", "type": "new_type", + "cost_1k_elements": "0.250", + "cost_cpu_hour": "1.312", + "cost_gpu_hour": "0.000", }) self.worker_reco.refresh_from_db() self.assertEqual(self.worker_reco.type.slug, "new_type") diff --git a/arkindex/project/settings.py b/arkindex/project/settings.py index e7daebda121af5e1cfdf1659ee4fe726cf6c9805..b9fbcad8c7af6fb75c9cf77979ea5ca34f330e6c 100644 --- a/arkindex/project/settings.py +++ b/arkindex/project/settings.py @@ -10,6 +10,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.11/ref/settings/ """ +import decimal import os import sys import warnings @@ -46,6 +47,11 @@ ARKINDEX_ENV = conf["arkindex_env"] SECRET_KEY = conf["secret_key"] LOCAL_IMAGESERVER_ID = conf["local_imageserver_id"] +# Enabling the decimal BasicContext safeguards against a lot of weird things, including divisions +# by zero returning Infinity, when using django models DecimalField +# https://docs.python.org/3/library/decimal.html#decimal.BasicContext +decimal.setcontext(decimal.BasicContext) + ALLOWED_HOSTS = conf["allowed_hosts"] # Docker container name resolution ALLOWED_HOSTS += ["127.0.0.1", "localhost", "backend", "ark-backend"] diff --git a/arkindex/sql_validation/indexer_prefetch.sql b/arkindex/sql_validation/indexer_prefetch.sql index ccefaba5202f3df1bfb97d339a7ed8044282a9eb..74c6e2bc86bd08c3d908b82bbe0186e9c9f945b8 100644 --- a/arkindex/sql_validation/indexer_prefetch.sql +++ b/arkindex/sql_validation/indexer_prefetch.sql @@ -85,7 +85,10 @@ SELECT "process_worker"."id", "process_worker"."description", "process_worker"."public", "process_worker"."archived", - "process_worker"."repository_url" + "process_worker"."repository_url", + "process_worker"."cost_cpu_hour", + "process_worker"."cost_gpu_hour", + "process_worker"."cost_1k_elements" FROM "process_worker" WHERE "process_worker"."id" IN ('{worker_id}'::uuid); @@ -178,7 +181,10 @@ SELECT "process_worker"."id", "process_worker"."description", "process_worker"."public", "process_worker"."archived", - "process_worker"."repository_url" + "process_worker"."repository_url", + "process_worker"."cost_cpu_hour", + "process_worker"."cost_gpu_hour", + "process_worker"."cost_1k_elements" FROM "process_worker" WHERE "process_worker"."id" IN ('{worker_id}'::uuid);