diff --git a/arkindex/documents/export/classification.sql b/arkindex/documents/export/classification.sql index 9cb1acb1cfc5371e3be696de9d249862b95ec6e2..c534831f0a903219957836ed783711e494f9d680 100644 --- a/arkindex/documents/export/classification.sql +++ b/arkindex/documents/export/classification.sql @@ -7,7 +7,6 @@ SELECT classification.confidence, -- SQLite has no boolean type, so high_confidence becomes an integer (0 or 1) classification.high_confidence::integer, - classification.worker_version_id, classification.worker_run_id FROM documents_classification classification INNER JOIN documents_element element ON (element.id = classification.element_id) diff --git a/arkindex/documents/export/element.sql b/arkindex/documents/export/element.sql index 3c6c1a7d1feb0116ad7bb0a4f0ab86c5aa16d810..f8cc7077a202673fc1833343cfcb1886b7288241 100644 --- a/arkindex/documents/export/element.sql +++ b/arkindex/documents/export/element.sql @@ -10,7 +10,6 @@ SELECT element.image_id, element.rotation_angle, element.mirrored::integer, - element.worker_version_id, element.worker_run_id, element.confidence FROM documents_element element diff --git a/arkindex/documents/export/entity.sql b/arkindex/documents/export/entity.sql index 8949691cf68c210f2baa2cbb220598b5911a2d1b..95c9da1c44e77de0eeab272f2b68357482a76703 100644 --- a/arkindex/documents/export/entity.sql +++ b/arkindex/documents/export/entity.sql @@ -5,7 +5,6 @@ SELECT entity.validated::integer, moderator.email, hstore_to_json(entity.metas), - entity.worker_version_id, entity.worker_run_id FROM documents_entity entity LEFT JOIN users_user moderator ON (moderator.id = entity.moderator_id) diff --git a/arkindex/documents/export/indexes.sql b/arkindex/documents/export/indexes.sql index dc75e7cfc1244555d274b6d1c7b16268d65a231d..656b23ff143c3256b9d53b7b7e7bf29cecb17dc0 100644 --- a/arkindex/documents/export/indexes.sql +++ b/arkindex/documents/export/indexes.sql @@ -3,32 +3,26 @@ CREATE INDEX image_server_id ON image (server_id); CREATE INDEX worker_run_worker_version_id ON worker_run (worker_version_id); CREATE INDEX element_image_id ON element (image_id); -CREATE INDEX element_worker_version_id ON element (worker_version_id); CREATE INDEX element_worker_run_id ON element (worker_run_id); CREATE INDEX element_path_parent_id ON element_path (parent_id); CREATE INDEX element_path_child_id ON element_path (child_id); CREATE INDEX transcription_element_id ON transcription (element_id); -CREATE INDEX transcription_worker_version_id ON transcription (worker_version_id); CREATE INDEX transcription_worker_run_id ON transcription (worker_run_id); CREATE INDEX classification_element_id ON classification (element_id); -CREATE INDEX classification_worker_version_id ON classification (worker_version_id); CREATE INDEX classification_worker_run_id ON classification (worker_run_id); -CREATE INDEX entity_worker_version_id ON entity (worker_version_id); CREATE INDEX entity_worker_run_id ON entity (worker_run_id); CREATE INDEX entity_type_id ON entity (type_id); CREATE INDEX transcription_entity_transcription_id ON transcription_entity (transcription_id); CREATE INDEX transcription_entity_entity_id ON transcription_entity (entity_id); -CREATE INDEX transcription_entity_worker_version_id ON transcription_entity (worker_version_id); CREATE INDEX transcription_entity_worker_run_id ON transcription_entity (worker_run_id); CREATE INDEX metadata_element_id ON metadata (element_id); CREATE INDEX metadata_entity_id ON metadata (entity_id); -CREATE INDEX metadata_worker_version_id ON metadata (worker_version_id); CREATE INDEX metadata_worker_run_id ON metadata (worker_run_id); CREATE INDEX dataset_element_element_id ON dataset_element (element_id); diff --git a/arkindex/documents/export/metadata.sql b/arkindex/documents/export/metadata.sql index 714b73b208263ca2026caa7a9226113315d25125..5b4d21b7a896a5eea7666c034a398de71f55504c 100644 --- a/arkindex/documents/export/metadata.sql +++ b/arkindex/documents/export/metadata.sql @@ -5,7 +5,6 @@ SELECT metadata.type, metadata.value, metadata.entity_id, - metadata.worker_version_id, metadata.worker_run_id FROM documents_metadata metadata INNER JOIN documents_element element ON (element.id = metadata.element_id) diff --git a/arkindex/documents/export/structure.sql b/arkindex/documents/export/structure.sql index f640ed8bbcfd005ea5ffdbdec6143cd1513c4186..b3eca511e3689527efa56d9c459b30eabe9c6c9f 100644 --- a/arkindex/documents/export/structure.sql +++ b/arkindex/documents/export/structure.sql @@ -62,18 +62,15 @@ CREATE TABLE element ( image_id VARCHAR(37), rotation_angle INTEGER NOT NULL DEFAULT 0, mirrored INTEGER NOT NULL DEFAULT 0, - worker_version_id VARCHAR(37), worker_run_id VARCHAR(37), confidence REAL, PRIMARY KEY (id), FOREIGN KEY (image_id) REFERENCES image (id) ON DELETE CASCADE, - FOREIGN KEY (worker_version_id) REFERENCES worker_version (id) ON DELETE CASCADE, FOREIGN KEY (worker_run_id) REFERENCES worker_run (id) ON DELETE CASCADE, CHECK ((image_id IS NULL AND polygon IS NULL) OR (image_id IS NOT NULL AND polygon IS NOT NULL)), CHECK (rotation_angle >= 0 AND rotation_angle <= 359), CHECK (mirrored = 0 OR mirrored = 1), - CHECK (confidence IS NULL OR (confidence >= 0 AND confidence <= 1)), - CHECK (worker_run_id IS NULL OR worker_version_id IS NOT NULL) + CHECK (confidence IS NULL OR (confidence >= 0 AND confidence <= 1)) ); CREATE TABLE element_path ( @@ -94,11 +91,9 @@ CREATE TABLE transcription ( text TEXT NOT NULL, confidence REAL, orientation TEXT NOT NULL DEFAULT 'horizontal-lr', - worker_version_id VARCHAR(37), worker_run_id VARCHAR(37), PRIMARY KEY (id), FOREIGN KEY (element_id) REFERENCES element (id) ON DELETE CASCADE, - FOREIGN KEY (worker_version_id) REFERENCES worker_version (id) ON DELETE CASCADE, FOREIGN KEY (worker_run_id) REFERENCES worker_run (id) ON DELETE CASCADE, CHECK (confidence IS NULL OR (confidence >= 0 AND confidence <= 1)), CHECK (orientation IN ('horizontal-lr', 'horizontal-rl', 'vertical-lr', 'vertical-rl')) @@ -112,15 +107,12 @@ CREATE TABLE classification ( moderator VARCHAR(255), confidence REAL NOT NULL, high_confidence INTEGER NOT NULL DEFAULT 0, - worker_version_id VARCHAR(37), worker_run_id VARCHAR(37), PRIMARY KEY (id), FOREIGN KEY (element_id) REFERENCES element (id) ON DELETE CASCADE, - FOREIGN KEY (worker_version_id) REFERENCES worker_version (id) ON DELETE CASCADE, FOREIGN KEY (worker_run_id) REFERENCES worker_run (id) ON DELETE CASCADE, CHECK (confidence >= 0 AND confidence <= 1), - CHECK (high_confidence = 0 OR high_confidence = 1), - CHECK (worker_run_id IS NULL OR worker_version_id IS NOT NULL) + CHECK (high_confidence = 0 OR high_confidence = 1) ); CREATE TABLE entity ( @@ -130,14 +122,11 @@ CREATE TABLE entity ( validated INTEGER NOT NULL DEFAULT 0, moderator VARCHAR(255), metas TEXT, - worker_version_id VARCHAR(37), worker_run_id VARCHAR(37), PRIMARY KEY (id), - FOREIGN KEY (worker_version_id) REFERENCES worker_version (id) ON DELETE CASCADE, FOREIGN KEY (worker_run_id) REFERENCES worker_run (id) ON DELETE CASCADE, FOREIGN KEY (type_id) REFERENCES entity_type (id) ON DELETE CASCADE, - CHECK (validated = 0 OR validated = 1), - CHECK (worker_run_id IS NULL OR worker_version_id IS NOT NULL) + CHECK (validated = 0 OR validated = 1) ); CREATE TABLE entity_type ( @@ -154,18 +143,15 @@ CREATE TABLE transcription_entity ( entity_id VARCHAR(37) NOT NULL, offset INTEGER NOT NULL, length INTEGER NOT NULL, - worker_version_id VARCHAR(37), worker_run_id VARCHAR(37), confidence REAL, PRIMARY KEY (id), FOREIGN KEY (transcription_id) REFERENCES transcription (id) ON DELETE CASCADE, FOREIGN KEY (entity_id) REFERENCES entity (id) ON DELETE CASCADE, - FOREIGN KEY (worker_version_id) REFERENCES worker_version (id) ON DELETE CASCADE, FOREIGN KEY (worker_run_id) REFERENCES worker_run (id) ON DELETE CASCADE, - UNIQUE (transcription_id, entity_id, offset, length, worker_version_id, worker_run_id), + UNIQUE (transcription_id, entity_id, offset, length, worker_run_id), CHECK (offset >= 0 AND length >= 0), - CHECK (confidence IS NULL OR (confidence >= 0 AND confidence <= 1)), - CHECK (worker_run_id IS NULL OR worker_version_id IS NOT NULL) + CHECK (confidence IS NULL OR (confidence >= 0 AND confidence <= 1)) ); CREATE TABLE metadata ( @@ -175,14 +161,11 @@ CREATE TABLE metadata ( type VARCHAR(50) NOT NULL, value TEXT NOT NULL, entity_id VARCHAR(37), - worker_version_id VARCHAR(37), worker_run_id VARCHAR(37), PRIMARY KEY (id), FOREIGN KEY (element_id) REFERENCES element (id) ON DELETE CASCADE, FOREIGN KEY (entity_id) REFERENCES entity (id) ON DELETE SET NULL, - FOREIGN KEY (worker_version_id) REFERENCES worker_version (id) ON DELETE CASCADE, - FOREIGN KEY (worker_run_id) REFERENCES worker_run (id) ON DELETE CASCADE, - CHECK (worker_run_id IS NULL OR worker_version_id IS NOT NULL) + FOREIGN KEY (worker_run_id) REFERENCES worker_run (id) ON DELETE CASCADE ); CREATE TABLE dataset ( diff --git a/arkindex/documents/export/transcription.sql b/arkindex/documents/export/transcription.sql index 0f71045d41b7c5774401390fa7958da2315fa20c..b06c82e25d95ee62775126c6e45ec659ed182ca8 100644 --- a/arkindex/documents/export/transcription.sql +++ b/arkindex/documents/export/transcription.sql @@ -4,7 +4,6 @@ SELECT transcription.text, transcription.confidence, transcription.orientation, - transcription.worker_version_id, transcription.worker_run_id FROM documents_transcription transcription INNER JOIN documents_element element ON (element.id = transcription.element_id) diff --git a/arkindex/documents/export/transcription_entity.sql b/arkindex/documents/export/transcription_entity.sql index 52c9984de6d78437e5ada3481baf7a669150cfc8..c31d1535391e9411f022839f5a28ee5cb5c48c25 100644 --- a/arkindex/documents/export/transcription_entity.sql +++ b/arkindex/documents/export/transcription_entity.sql @@ -6,7 +6,6 @@ SELECT te.entity_id, te.offset, te.length, - te.worker_version_id, te.worker_run_id, te.confidence FROM documents_transcriptionentity te diff --git a/arkindex/documents/export/worker_version.sql b/arkindex/documents/export/worker_version.sql index 381bdf19e6c3c0bc7b47370593b75dd1d26d5f67..b99e66ea6a983ac333d11b74714eb3e632411a3d 100644 --- a/arkindex/documents/export/worker_version.sql +++ b/arkindex/documents/export/worker_version.sql @@ -3,33 +3,34 @@ -- fills up the RAM. Adding DISTINCT to all the SELECT queries of the UNION -- slows this query down by ~20%. Using multiple INs instead of a UNION makes -- this query twice as slow. -SELECT version.id, worker.name, worker.slug, workertype.slug, version.version, revision.hash, repository.url -FROM process_workerversion version +SELECT DISTINCT version.id, worker.name, worker.slug, workertype.slug, version.version, revision.hash, repository.url +FROM process_workerrun run +INNER JOIN process_workerversion version ON (run.version_id = version.id) INNER JOIN process_worker worker ON (version.worker_id = worker.id) INNER JOIN process_workertype workertype ON (worker.type_id = workertype.id) LEFT JOIN process_repository repository ON (worker.repository_id = repository.id) LEFT JOIN process_revision revision ON (version.revision_id = revision.id) -WHERE version.id IN ( - SELECT worker_version_id FROM documents_element WHERE corpus_id = '{corpus_id}'::uuid +WHERE run.id IN ( + SELECT worker_run_id FROM documents_element WHERE corpus_id = '{corpus_id}'::uuid UNION - SELECT worker_version_id FROM documents_entity WHERE corpus_id = '{corpus_id}'::uuid + SELECT worker_run_id FROM documents_entity WHERE corpus_id = '{corpus_id}'::uuid UNION - SELECT classification.worker_version_id + SELECT classification.worker_run_id FROM documents_classification classification INNER JOIN documents_element element ON (element.id = classification.element_id) WHERE element.corpus_id = '{corpus_id}'::uuid UNION - SELECT transcription.worker_version_id + SELECT transcription.worker_run_id FROM documents_transcription transcription INNER JOIN documents_element element ON (element.id = transcription.element_id) WHERE element.corpus_id = '{corpus_id}'::uuid UNION - SELECT te.worker_version_id + SELECT te.worker_run_id FROM documents_transcriptionentity te INNER JOIN documents_entity entity ON (te.entity_id = entity.id) WHERE entity.corpus_id = '{corpus_id}'::uuid UNION - SELECT md.worker_version_id + SELECT md.worker_run_id FROM documents_metadata md INNER JOIN documents_element element ON (md.element_id = element.id) WHERE element.corpus_id = '{corpus_id}'::uuid diff --git a/arkindex/documents/fixtures/data.json b/arkindex/documents/fixtures/data.json index 2e0128bc2c0270be8c7833ae9636d5d59c280c54..d94044f342db476770198e0d1613549f345080a9 100644 --- a/arkindex/documents/fixtures/data.json +++ b/arkindex/documents/fixtures/data.json @@ -1,7 +1,7 @@ [ { "model": "process.process", - "pk": "16c067b2-dd65-4960-bd2d-d2a04ac8f898", + "pk": "0be71517-084c-435b-be54-8dba120c86fd", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -29,18 +29,18 @@ }, { "model": "process.process", - "pk": "917dc05e-df5f-4ff4-8a17-d8815e644d33", + "pk": "74b5620c-6d18-4ac6-b685-f900c5d6c19d", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "name": "Process fixture", + "name": null, "creator": 2, - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "mode": "workers", + "corpus": null, + "mode": "local", "activity_state": "disabled", "started": null, "finished": null, - "farm": "2ef1cf21-aef3-4aea-832f-f3b480ce3a61", + "farm": null, "element": null, "folder_type": null, "element_type": null, @@ -57,18 +57,18 @@ }, { "model": "process.process", - "pk": "d71398a6-289f-4f6b-b2d4-66a442329949", + "pk": "d4cada0d-d5b3-48ed-bffc-db53c8cf5e75", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "name": null, + "name": "Process fixture", "creator": 2, - "corpus": null, - "mode": "local", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "mode": "workers", "activity_state": "disabled", "started": null, "finished": null, - "farm": null, + "farm": "283c0517-96d3-4f61-8847-7245b131ad32", "element": null, "folder_type": null, "element_type": null, @@ -85,11 +85,11 @@ }, { "model": "process.worker", - "pk": "4de9956e-7d09-4aa3-b953-f8ddaef03cde", + "pk": "25d91339-d832-4d88-a9f9-a1888577964a", "fields": { - "name": "File import", - "slug": "file_import", - "type": "d5e68ae6-dc01-4f25-979e-b1af90b443bd", + "name": "Custom worker", + "slug": "custom", + "type": "e50aaede-98de-439a-bc81-30996d467a35", "description": "", "repository": null, "public": false, @@ -98,11 +98,11 @@ }, { "model": "process.worker", - "pk": "9c82784a-7375-4027-9933-bf987c55a461", + "pk": "373d2b71-e62c-48d5-bbbb-5ad0a7b350db", "fields": { - "name": "Custom worker", - "slug": "custom", - "type": "bd476bd6-d868-49b5-b863-e4c34645497c", + "name": "Recognizer", + "slug": "reco", + "type": "9a219473-8d92-4dfe-8888-5a4b447581e3", "description": "", "repository": null, "public": false, @@ -111,11 +111,11 @@ }, { "model": "process.worker", - "pk": "9d81875d-4299-44f2-bb93-6c154a8bdc48", + "pk": "39e29762-5353-4cde-b909-964a87584224", "fields": { - "name": "Worker requiring a GPU", - "slug": "worker-gpu", - "type": "e1475345-e858-46e2-a730-dd7cd8c61d2a", + "name": "Document layout analyser", + "slug": "dla", + "type": "0137a4d7-e9fa-4e5c-b91c-7d3cdb16f53c", "description": "", "repository": null, "public": false, @@ -124,11 +124,11 @@ }, { "model": "process.worker", - "pk": "a73fb242-c599-4051-9d67-46a73bed4490", + "pk": "3d6138ea-96cd-47ad-bb51-02eae6120a37", "fields": { - "name": "Document layout analyser", - "slug": "dla", - "type": "96ee14e4-3189-416c-8d95-4ab97cf48f14", + "name": "Elements Initialisation Worker", + "slug": "initialisation", + "type": "30c46054-6ef6-407e-8490-1c9e0e80e29b", "description": "", "repository": null, "public": false, @@ -137,11 +137,11 @@ }, { "model": "process.worker", - "pk": "b02cd1fc-85d3-4f3b-a1e6-805f7ee7a4e6", + "pk": "5cd08382-8a64-499a-a648-12c5bc0509d2", "fields": { - "name": "Recognizer", - "slug": "reco", - "type": "a71b8c19-5f3d-41ac-98f4-c0b523e5efc6", + "name": "Worker requiring a GPU", + "slug": "worker-gpu", + "type": "09be5419-06d7-44ef-9147-692290f9d6f1", "description": "", "repository": null, "public": false, @@ -150,11 +150,11 @@ }, { "model": "process.worker", - "pk": "e3f226c1-9518-4970-b8f5-d884b8a52c1b", + "pk": "651dd631-7904-4ba7-a1f7-f4789f938e63", "fields": { - "name": "Elements Initialisation Worker", - "slug": "initialisation", - "type": "e1ec3043-fc47-448b-b6d8-fa2696a89aa9", + "name": "File import", + "slug": "file_import", + "type": "627f9595-3f0c-4ca1-bc7a-f8274de8030c", "description": "", "repository": null, "public": false, @@ -163,11 +163,11 @@ }, { "model": "process.worker", - "pk": "ffc1c283-c222-441b-8387-ef7045d95e37", + "pk": "7d080fa4-f74c-40c2-8b30-b20da5a459c2", "fields": { "name": "Generic worker with a Model", "slug": "generic", - "type": "a71b8c19-5f3d-41ac-98f4-c0b523e5efc6", + "type": "9a219473-8d92-4dfe-8888-5a4b447581e3", "description": "", "repository": null, "public": false, @@ -176,7 +176,7 @@ }, { "model": "process.workertype", - "pk": "96ee14e4-3189-416c-8d95-4ab97cf48f14", + "pk": "0137a4d7-e9fa-4e5c-b91c-7d3cdb16f53c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -186,27 +186,27 @@ }, { "model": "process.workertype", - "pk": "a71b8c19-5f3d-41ac-98f4-c0b523e5efc6", + "pk": "09be5419-06d7-44ef-9147-692290f9d6f1", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "recognizer", - "display_name": "Recognizer" + "slug": "worker", + "display_name": "Worker requiring a GPU" } }, { "model": "process.workertype", - "pk": "bd476bd6-d868-49b5-b863-e4c34645497c", + "pk": "30c46054-6ef6-407e-8490-1c9e0e80e29b", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "custom", - "display_name": "Custom" + "slug": "init", + "display_name": "Elements Initialisation" } }, { "model": "process.workertype", - "pk": "d5e68ae6-dc01-4f25-979e-b1af90b443bd", + "pk": "627f9595-3f0c-4ca1-bc7a-f8274de8030c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -216,36 +216,36 @@ }, { "model": "process.workertype", - "pk": "e1475345-e858-46e2-a730-dd7cd8c61d2a", + "pk": "9a219473-8d92-4dfe-8888-5a4b447581e3", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "worker", - "display_name": "Worker requiring a GPU" + "slug": "recognizer", + "display_name": "Recognizer" } }, { "model": "process.workertype", - "pk": "e1ec3043-fc47-448b-b6d8-fa2696a89aa9", + "pk": "e50aaede-98de-439a-bc81-30996d467a35", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "slug": "init", - "display_name": "Elements Initialisation" + "slug": "custom", + "display_name": "Custom" } }, { "model": "process.workerversion", - "pk": "3abbeb14-d57a-4aa9-bf02-b02c30b6a756", + "pk": "07b1e1b0-ff6a-4a34-bb18-84aef5b07b98", "fields": { - "worker": "a73fb242-c599-4051-9d67-46a73bed4490", + "worker": "5cd08382-8a64-499a-a648-12c5bc0509d2", "revision": null, "version": 1, "configuration": { "test": 42 }, "state": "available", - "gpu_usage": "disabled", + "gpu_usage": "required", "model_usage": "disabled", "docker_image_iid": "registry.somewhere.com/something:latest", "created": "2020-02-02T01:23:45.678Z", @@ -254,17 +254,17 @@ }, { "model": "process.workerversion", - "pk": "84887328-74af-4778-a01c-4085eb5bb952", + "pk": "2de8eb65-a6c6-4fff-b42d-d37915cb20e3", "fields": { - "worker": "9d81875d-4299-44f2-bb93-6c154a8bdc48", + "worker": "7d080fa4-f74c-40c2-8b30-b20da5a459c2", "revision": null, "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", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z" @@ -272,12 +272,14 @@ }, { "model": "process.workerversion", - "pk": "97868871-a58b-440a-858d-93b6c719c290", + "pk": "397bb48a-6832-44cc-929a-b3984bb9597f", "fields": { - "worker": "4de9956e-7d09-4aa3-b953-f8ddaef03cde", + "worker": "39e29762-5353-4cde-b909-964a87584224", "revision": null, "version": 1, - "configuration": {}, + "configuration": { + "test": 42 + }, "state": "available", "gpu_usage": "disabled", "model_usage": "disabled", @@ -288,27 +290,25 @@ }, { "model": "process.workerversion", - "pk": "c80c470f-856b-4ccc-ba1b-ed37744efc56", + "pk": "5a4732e0-0313-4d5f-aa2e-5200336184e3", "fields": { - "worker": "9c82784a-7375-4027-9933-bf987c55a461", + "worker": "651dd631-7904-4ba7-a1f7-f4789f938e63", "revision": null, "version": 1, - "configuration": { - "custom": "value" - }, - "state": "created", + "configuration": {}, + "state": "available", "gpu_usage": "disabled", "model_usage": "disabled", - "docker_image_iid": null, + "docker_image_iid": "registry.somewhere.com/something:latest", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z" } }, { "model": "process.workerversion", - "pk": "d2534c7f-b6fa-4c99-90e4-6ee49c778d49", + "pk": "631e4733-829f-47c7-b841-69f32fa62a52", "fields": { - "worker": "e3f226c1-9518-4970-b8f5-d884b8a52c1b", + "worker": "3d6138ea-96cd-47ad-bb51-02eae6120a37", "revision": null, "version": 1, "configuration": { @@ -326,27 +326,27 @@ }, { "model": "process.workerversion", - "pk": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", + "pk": "dc3e5c0d-52a4-4d7d-8f84-7102c4e8d9d2", "fields": { - "worker": "b02cd1fc-85d3-4f3b-a1e6-805f7ee7a4e6", + "worker": "25d91339-d832-4d88-a9f9-a1888577964a", "revision": null, "version": 1, "configuration": { - "test": 42 + "custom": "value" }, - "state": "available", + "state": "created", "gpu_usage": "disabled", "model_usage": "disabled", - "docker_image_iid": "registry.somewhere.com/something:latest", + "docker_image_iid": null, "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z" } }, { "model": "process.workerversion", - "pk": "fc9235f4-63f0-4b19-ab43-b47d23fbada4", + "pk": "e7d35774-1afa-4b51-af32-40b350b12832", "fields": { - "worker": "ffc1c283-c222-441b-8387-ef7045d95e37", + "worker": "373d2b71-e62c-48d5-bbbb-5ad0a7b350db", "revision": null, "version": 1, "configuration": { @@ -354,7 +354,7 @@ }, "state": "available", "gpu_usage": "disabled", - "model_usage": "required", + "model_usage": "disabled", "docker_image_iid": "registry.somewhere.com/something:latest", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z" @@ -362,10 +362,10 @@ }, { "model": "process.workerrun", - "pk": "0f7b4923-e9e8-4643-b210-918384353a4c", + "pk": "0813e0b8-64c7-409e-8223-a347ddf3c64a", "fields": { - "process": "917dc05e-df5f-4ff4-8a17-d8815e644d33", - "version": "d2534c7f-b6fa-4c99-90e4-6ee49c778d49", + "process": "d4cada0d-d5b3-48ed-bffc-db53c8cf5e75", + "version": "631e4733-829f-47c7-b841-69f32fa62a52", "model_version": null, "parents": "[]", "configuration": null, @@ -378,10 +378,10 @@ }, { "model": "process.workerrun", - "pk": "157fc68d-edfd-43f9-b701-7345fe1e0dda", + "pk": "5af05ed4-874c-43bc-85df-00544ea40fb7", "fields": { - "process": "d71398a6-289f-4f6b-b2d4-66a442329949", - "version": "c80c470f-856b-4ccc-ba1b-ed37744efc56", + "process": "0be71517-084c-435b-be54-8dba120c86fd", + "version": "dc3e5c0d-52a4-4d7d-8f84-7102c4e8d9d2", "model_version": null, "parents": "[]", "configuration": null, @@ -394,12 +394,12 @@ }, { "model": "process.workerrun", - "pk": "b369549d-05a3-4ac5-8ad6-abe3ce536565", + "pk": "83c242f7-03f3-4c33-962d-83147b7ddf63", "fields": { - "process": "917dc05e-df5f-4ff4-8a17-d8815e644d33", - "version": "3abbeb14-d57a-4aa9-bf02-b02c30b6a756", + "process": "d4cada0d-d5b3-48ed-bffc-db53c8cf5e75", + "version": "397bb48a-6832-44cc-929a-b3984bb9597f", "model_version": null, - "parents": "[\"0f7b4923-e9e8-4643-b210-918384353a4c\"]", + "parents": "[\"0813e0b8-64c7-409e-8223-a347ddf3c64a\"]", "configuration": null, "summary": "Worker Document layout analyser @ version 1", "created": "2020-02-02T01:23:45.678Z", @@ -410,14 +410,14 @@ }, { "model": "process.workerrun", - "pk": "455a6f40-6477-47d9-9837-4f0bf1b54160", + "pk": "f3bad6e3-9188-4433-ac9e-e06b5f958d5b", "fields": { - "process": "917dc05e-df5f-4ff4-8a17-d8815e644d33", - "version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", + "process": "74b5620c-6d18-4ac6-b685-f900c5d6c19d", + "version": "dc3e5c0d-52a4-4d7d-8f84-7102c4e8d9d2", "model_version": null, - "parents": "[\"b369549d-05a3-4ac5-8ad6-abe3ce536565\"]", + "parents": "[]", "configuration": null, - "summary": "Worker Recognizer @ version 1", + "summary": "Worker Custom worker @ version 1", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false, @@ -426,14 +426,14 @@ }, { "model": "process.workerrun", - "pk": "b9bfa1a9-91ed-4bd7-99b2-92379e8d669d", + "pk": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", "fields": { - "process": "16c067b2-dd65-4960-bd2d-d2a04ac8f898", - "version": "c80c470f-856b-4ccc-ba1b-ed37744efc56", + "process": "d4cada0d-d5b3-48ed-bffc-db53c8cf5e75", + "version": "e7d35774-1afa-4b51-af32-40b350b12832", "model_version": null, - "parents": "[]", + "parents": "[\"83c242f7-03f3-4c33-962d-83147b7ddf63\"]", "configuration": null, - "summary": "Worker Custom worker @ version 1", + "summary": "Worker Recognizer @ version 1", "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "has_results": false, @@ -442,7 +442,7 @@ }, { "model": "documents.corpus", - "pk": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", + "pk": "12944eab-1b0e-4653-aa66-4c0231e722bf", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -455,11 +455,11 @@ }, { "model": "documents.elementtype", - "pk": "2e86d496-efb6-46d8-95ad-5baa953ea3bc", + "pk": "2c577a34-0084-494c-9555-52bc5b74a89b", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "slug": "act", - "display_name": "Act", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "slug": "surface", + "display_name": "Surface", "folder": false, "indexable": false, "color": "28b62c" @@ -467,21 +467,21 @@ }, { "model": "documents.elementtype", - "pk": "416d4b18-15c8-42f2-ad76-bd5d4635cde1", + "pk": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "slug": "volume", - "display_name": "Volume", - "folder": true, + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "slug": "word", + "display_name": "Word", + "folder": false, "indexable": false, "color": "28b62c" } }, { "model": "documents.elementtype", - "pk": "b51dfc79-ccb4-47f9-8a16-4722a8bc9bc6", + "pk": "b06e116b-d9d3-4a86-a4f2-f680ed34179e", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", "slug": "text_line", "display_name": "Line", "folder": false, @@ -491,23 +491,23 @@ }, { "model": "documents.elementtype", - "pk": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", + "pk": "b70df426-120d-4938-a100-7819e5366ac5", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "slug": "word", - "display_name": "Word", - "folder": false, + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "slug": "volume", + "display_name": "Volume", + "folder": true, "indexable": false, "color": "28b62c" } }, { "model": "documents.elementtype", - "pk": "e402564f-784a-4a57-80e2-a42decfb8a57", + "pk": "b7aa6340-4883-4fe0-93d8-89a01611caad", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "slug": "surface", - "display_name": "Surface", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "slug": "page", + "display_name": "Page", "folder": false, "indexable": false, "color": "28b62c" @@ -515,11 +515,11 @@ }, { "model": "documents.elementtype", - "pk": "f7d341e7-c949-4248-a22e-67145c9c701b", + "pk": "dceeed29-83b0-4ab9-b161-c4fcc402ca05", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "slug": "page", - "display_name": "Page", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "slug": "act", + "display_name": "Act", "folder": false, "indexable": false, "color": "28b62c" @@ -527,279 +527,279 @@ }, { "model": "documents.elementpath", - "pk": "007f3190-6f6f-4eb2-a0b6-1279c3395a51", + "pk": "0ff047bc-cefb-485e-aa34-b963702bd400", "fields": { - "element": "690861ed-336b-425f-8553-600df019e9c4", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\"]", - "ordering": 2 + "element": "2e6fdf3b-f6ef-491b-ac48-8e7aecce7014", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"6e739e39-da6a-4535-9160-23eab0604f83\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "0f7b8a97-d404-49b2-8eb6-0d8e716b0b57", + "pk": "17f0675b-2c21-492b-8a4b-7ce9c748651e", "fields": { - "element": "a93b0603-bd06-4783-9f27-f2e008b7aaa8", - "path": "[]", - "ordering": 0 + "element": "57428dc4-260a-4463-a11e-f9e9884d97b6", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"51ce7553-ad98-4092-838d-ad778dcb2a92\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "1047cc24-90dc-4d10-bafa-96746d42cdf3", + "pk": "26e1a979-d695-4746-b58f-e5c1460c9806", "fields": { - "element": "0c075318-7182-4426-9290-b55be576ec59", - "path": "[\"a93b0603-bd06-4783-9f27-f2e008b7aaa8\"]", - "ordering": 1 + "element": "57dc759a-b8be-4411-bfa3-cd884c24b37f", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "378ef8d6-48d1-4b23-9895-d1c936bdde80", + "pk": "389a2fe8-bf7f-403f-a71a-5be706fcbf99", "fields": { - "element": "4a532a27-b419-4b36-a821-1dd69d1dd121", - "path": "[\"a93b0603-bd06-4783-9f27-f2e008b7aaa8\"]", - "ordering": 2 + "element": "b728983a-ec3e-4f4d-b1ad-b71c31e39868", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\"]", + "ordering": 3 } }, { "model": "documents.elementpath", - "pk": "41a35e36-40d7-4f3f-bba0-427206cc6589", + "pk": "4132b920-47bd-4f7e-9ccd-25d6fd942b5d", "fields": { - "element": "65808af4-0ad8-43c7-b850-f28e72b47217", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"eba59781-a3e1-4c68-b144-69f75db971d3\"]", + "element": "fc22eb47-6281-4a56-b474-b91993e9eead", + "path": "[\"90852275-3fb0-463d-a11f-0f131bfb9cce\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "43fb0aeb-5e65-4826-b877-3a309d82389c", + "pk": "455bbb86-c1e2-4648-b987-4f15c2576379", "fields": { - "element": "573690a4-da05-4416-bf1d-c4af1699f95b", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\"]", - "ordering": 1 + "element": "2a437eca-2495-4717-92d2-0ca98f32641f", + "path": "[]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "477929ad-dc07-4f57-9770-1bfea2f74d0c", + "pk": "662acc1d-f714-43c6-b1b8-9193719fd0fa", "fields": { - "element": "20aca762-3dfd-48b6-a179-344ebf3fee72", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"573690a4-da05-4416-bf1d-c4af1699f95b\"]", + "element": "bab1b193-41c7-4202-838d-7c4d430746ad", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"6e739e39-da6a-4535-9160-23eab0604f83\"]", "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "50a9bbcb-2650-4e8a-b265-c6fe50f875b5", + "pk": "7147ecb2-019b-4e04-a84e-e7259ec85393", "fields": { - "element": "9f803dfc-cbb6-449b-875a-256bc6a30584", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"1aeeeb1a-dd31-4098-af23-c62571d8986b\"]", - "ordering": 0 + "element": "b42aa9f3-9347-45a5-9771-c0fe64d7014c", + "path": "[\"90852275-3fb0-463d-a11f-0f131bfb9cce\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "636b5856-5686-4492-ba42-43ec1af56d72", + "pk": "7d22c577-6fc2-4c7e-9857-994bf17673cc", "fields": { - "element": "66e00a82-5003-4bb3-893c-5cdf37e77a9c", - "path": "[\"a93b0603-bd06-4783-9f27-f2e008b7aaa8\"]", - "ordering": 0 + "element": "cdcd154e-eccc-4a12-98bd-64d991bc3eee", + "path": "[\"90852275-3fb0-463d-a11f-0f131bfb9cce\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "68a2177c-c360-4ff1-9f76-a6ba37c06efb", + "pk": "81573e8d-e906-433a-9205-65b4b4c67a4c", "fields": { - "element": "9791123f-701d-45ea-ba1e-134394d9463b", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"90687aac-b1eb-4411-9a9e-a1e3a40a4fa2\"]", - "ordering": 0 + "element": "36fd659e-9c36-4532-b5a1-ecf08f05e139", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\"]", + "ordering": 7 } }, { "model": "documents.elementpath", - "pk": "6a4ad6fb-fa2a-415a-8a58-8b71f138c36f", + "pk": "87c56fe2-28c3-46d7-80d9-09a8fb9deacc", "fields": { - "element": "eba59781-a3e1-4c68-b144-69f75db971d3", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\"]", - "ordering": 3 + "element": "78546795-a66d-4e94-bc65-9f78221992d0", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"57dc759a-b8be-4411-bfa3-cd884c24b37f\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "70f98ddb-d8f5-4ce5-b936-29b02ba6b419", + "pk": "96ef9196-b83d-48d0-bfa5-674dae27aa03", "fields": { - "element": "1aeeeb1a-dd31-4098-af23-c62571d8986b", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\"]", - "ordering": 7 + "element": "81343790-315a-4121-8ff1-70f2757993d5", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"36fd659e-9c36-4532-b5a1-ecf08f05e139\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "73f1d311-d48e-46d8-9c3c-77e9375bdd9c", + "pk": "9757c057-a114-4841-b9da-3f8e391d17ff", "fields": { - "element": "983316a5-b031-4fa7-89fd-aae42417a9d8", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\"]", - "ordering": 6 + "element": "2a643cde-c821-429d-aae7-b6d7ef974c8b", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"51ce7553-ad98-4092-838d-ad778dcb2a92\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "81264500-d64a-4d1a-a457-ec6fba8fdbaf", + "pk": "9b6c268f-e328-4a36-bb2d-3d74d518efe3", "fields": { - "element": "ca3d8598-b514-4748-a54a-e2e1792ad89a", - "path": "[]", - "ordering": 0 + "element": "36f889af-a83b-47b7-ab80-fbf7bdd5c08d", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\"]", + "ordering": 4 } }, { "model": "documents.elementpath", - "pk": "819b862e-c3e1-439f-80bc-df6d5d74fa25", + "pk": "a1888d2c-d953-478f-b027-476f9e597164", "fields": { - "element": "3da1a67c-3401-4e42-9bb2-c67cac191de9", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\"]", + "element": "876a65aa-6179-453e-a2e2-d558cc3dc3ce", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\"]", "ordering": 5 } }, { "model": "documents.elementpath", - "pk": "8c33e6c7-fa37-4ef0-b9ac-2b43f7b31594", + "pk": "a21aa2d1-cb06-4715-8445-ed65ff1aa8ea", "fields": { - "element": "a2e582de-68ee-4f91-ba51-027a3aa23d07", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"690861ed-336b-425f-8553-600df019e9c4\"]", - "ordering": 2 + "element": "73277712-ccbc-4bc1-b2ad-6fa75571a705", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"57dc759a-b8be-4411-bfa3-cd884c24b37f\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "983ab2c5-2764-431b-9aa4-0f4821016822", + "pk": "ab9fcc5b-d06a-4397-9b9f-9d9edd6e93b7", "fields": { - "element": "18dc9df8-948d-41fa-9b1d-6a06f7466a7d", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"690861ed-336b-425f-8553-600df019e9c4\"]", - "ordering": 0 + "element": "51ce7553-ad98-4092-838d-ad778dcb2a92", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "9d4ffbcc-a704-4191-9d80-8376d37cf476", + "pk": "b43356f8-aa58-4a16-bb5d-d7a9400d65f6", "fields": { - "element": "85be3773-2185-4a3d-a12b-36637f76ef41", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"90687aac-b1eb-4411-9a9e-a1e3a40a4fa2\"]", - "ordering": 1 + "element": "85bc5401-69a7-4d96-bea3-cc47bc6e651c", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\"]", + "ordering": 6 } }, { "model": "documents.elementpath", - "pk": "ac48db85-5b0b-40d5-889a-e57f666f838a", + "pk": "ba4e53f2-cf3a-4c2c-9d6a-2b1e17ff691b", "fields": { - "element": "b2d6b333-8de4-40fa-9d81-e7935d4b7ef4", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"573690a4-da05-4416-bf1d-c4af1699f95b\"]", - "ordering": 2 + "element": "41a9fb39-6df5-45b6-8348-d1c866595432", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"36f889af-a83b-47b7-ab80-fbf7bdd5c08d\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "b282c6e1-a7e3-4ad6-8b2a-b90bdd805483", + "pk": "c989185f-863c-4c84-8914-f9980416b5c7", "fields": { - "element": "d6cfbf1a-72bb-4e7d-b966-10a1afc7a071", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"3da1a67c-3401-4e42-9bb2-c67cac191de9\"]", + "element": "90852275-3fb0-463d-a11f-0f131bfb9cce", + "path": "[]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "b571f1b5-4fce-407b-8086-728295151309", + "pk": "d334d7aa-18c2-40b2-8717-9aae460b3159", "fields": { - "element": "479a21dc-9760-43c7-a81a-e213938b6edf", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"40a78ecb-b2ae-4b22-85c8-2f79a951c634\"]", + "element": "e67230f0-028c-4ed0-bf9c-7a1c94f2a733", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"6e739e39-da6a-4535-9160-23eab0604f83\"]", "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "bcc83a61-56a3-4418-938d-ac08ce3cd9ba", + "pk": "d7771c3c-ff0d-4d0a-8ed2-90409b464bc1", "fields": { - "element": "368d861e-3a1e-458d-8235-166b8442f964", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"573690a4-da05-4416-bf1d-c4af1699f95b\"]", - "ordering": 0 + "element": "6e739e39-da6a-4535-9160-23eab0604f83", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "cf6590f5-0cab-434e-9465-f5be37db77d9", + "pk": "e03f286f-fd42-413f-a265-f456aab57254", "fields": { - "element": "6a221ff4-6b95-4791-84ee-76c3b5e9f934", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"40a78ecb-b2ae-4b22-85c8-2f79a951c634\"]", - "ordering": 0 + "element": "0f7d6bc9-1195-467d-9651-76ed97b30707", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"57dc759a-b8be-4411-bfa3-cd884c24b37f\"]", + "ordering": 3 } }, { "model": "documents.elementpath", - "pk": "dba419fa-bcf9-433d-b9a9-5f2972d7e997", + "pk": "e43f7440-7bc7-47e4-bd56-788c671e59ca", "fields": { - "element": "ef10eecc-0153-48c0-9b02-882bc34b667d", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"40a78ecb-b2ae-4b22-85c8-2f79a951c634\"]", - "ordering": 3 + "element": "dc29c21d-52c1-4e9b-83f5-74d71e5b41bd", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"85bc5401-69a7-4d96-bea3-cc47bc6e651c\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "e189f724-a198-4ca8-a82f-57076a5261df", + "pk": "e81bac50-dcea-461a-a3a5-86391186d90d", "fields": { - "element": "40a78ecb-b2ae-4b22-85c8-2f79a951c634", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\"]", + "element": "a75d3f97-41bc-4587-82aa-c3d065e2fe29", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"876a65aa-6179-453e-a2e2-d558cc3dc3ce\"]", "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "e41bb02e-2df3-46ad-9ecc-7b2434c0c8e2", + "pk": "ef600b5f-4a2c-45ac-826c-133c645f463e", "fields": { - "element": "90687aac-b1eb-4411-9a9e-a1e3a40a4fa2", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\"]", - "ordering": 4 + "element": "bdee8f49-2fa8-4168-928e-d73f4ce672f2", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"b728983a-ec3e-4f4d-b1ad-b71c31e39868\"]", + "ordering": 0 } }, { "model": "documents.elementpath", - "pk": "e60ad009-27cf-4eb1-b4ee-1f385dae71d9", + "pk": "f386ac6b-1749-4ca3-bf25-bec671d29057", "fields": { - "element": "5a6dcb2d-a9fd-4ea2-81d2-5f45b0a9b619", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"983316a5-b031-4fa7-89fd-aae42417a9d8\"]", - "ordering": 0 + "element": "9190e5ca-153a-44b2-b339-ae9e0befb4c0", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"36f889af-a83b-47b7-ab80-fbf7bdd5c08d\"]", + "ordering": 1 } }, { "model": "documents.elementpath", - "pk": "fd2e1c96-dc39-4dc9-83f5-a0d28f2532d5", + "pk": "f7a52461-4758-455a-81bb-eafc50482b49", "fields": { - "element": "1f40a863-465c-443c-93f5-7cd69197c595", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"690861ed-336b-425f-8553-600df019e9c4\"]", - "ordering": 1 + "element": "ff8c551d-28a2-479d-b33e-561cd258498a", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"51ce7553-ad98-4092-838d-ad778dcb2a92\"]", + "ordering": 2 } }, { "model": "documents.elementpath", - "pk": "fece74d2-7048-4243-ac47-cc8d7ef2857a", + "pk": "fcb8f15c-65ad-44af-bd18-2c95be36ae70", "fields": { - "element": "52ed329e-e8aa-4d06-b990-79b358652bce", - "path": "[\"ca3d8598-b514-4748-a54a-e2e1792ad89a\", \"40a78ecb-b2ae-4b22-85c8-2f79a951c634\"]", - "ordering": 1 + "element": "308f43b9-325c-442e-8f82-a21a8c46c9a7", + "path": "[\"2a437eca-2495-4717-92d2-0ca98f32641f\", \"57dc759a-b8be-4411-bfa3-cd884c24b37f\"]", + "ordering": 0 } }, { "model": "documents.element", - "pk": "0c075318-7182-4426-9290-b55be576ec59", + "pk": "0f7d6bc9-1195-467d-9651-76ed97b30707", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "f7d341e7-c949-4248-a22e-67145c9c701b", - "name": "Volume 2, page 1v", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b06e116b-d9d3-4a86-a4f2-f680ed34179e", + "name": "Text line", "creator": null, "worker_version": null, "worker_run": null, - "image": "b8c7f16a-47e8-4902-b386-8e810c62bcc9", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "0a404dd6-7b53-4f10-ab8e-601ef5f22f97", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -807,18 +807,18 @@ }, { "model": "documents.element", - "pk": "18dc9df8-948d-41fa-9b1d-6a06f7466a7d", + "pk": "2a437eca-2495-4717-92d2-0ca98f32641f", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "PARIS", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b70df426-120d-4938-a100-7819e5366ac5", + "name": "Volume 1", "creator": null, "worker_version": null, "worker_run": null, - "image": "1f3ecb14-bb23-4e54-973f-050d2531d607", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -826,18 +826,18 @@ }, { "model": "documents.element", - "pk": "1aeeeb1a-dd31-4098-af23-c62571d8986b", + "pk": "2a643cde-c821-429d-aae7-b6d7ef974c8b", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "2e86d496-efb6-46d8-95ad-5baa953ea3bc", - "name": "Act 5", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "30d880ab-43c1-4f62-955f-41bb2f1a0802", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -845,18 +845,18 @@ }, { "model": "documents.element", - "pk": "1f40a863-465c-443c-93f5-7cd69197c595", + "pk": "2e6fdf3b-f6ef-491b-ac48-8e7aecce7014", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "ROY", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "1f3ecb14-bb23-4e54-973f-050d2531d607", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "f2a146eb-9cab-4bfb-b97b-59b16137c200", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -864,18 +864,18 @@ }, { "model": "documents.element", - "pk": "20aca762-3dfd-48b6-a179-344ebf3fee72", + "pk": "308f43b9-325c-442e-8f82-a21a8c46c9a7", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "ROY", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "PARIS", "creator": null, "worker_version": null, "worker_run": null, - "image": "c329f6cf-4eb2-4c58-b60f-c66567176e8d", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "0a404dd6-7b53-4f10-ab8e-601ef5f22f97", + "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -883,18 +883,18 @@ }, { "model": "documents.element", - "pk": "368d861e-3a1e-458d-8235-166b8442f964", + "pk": "36f889af-a83b-47b7-ab80-fbf7bdd5c08d", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "PARIS", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "dceeed29-83b0-4ab9-b161-c4fcc402ca05", + "name": "Act 2", "creator": null, "worker_version": null, "worker_run": null, - "image": "c329f6cf-4eb2-4c58-b60f-c66567176e8d", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -902,13 +902,13 @@ }, { "model": "documents.element", - "pk": "3da1a67c-3401-4e42-9bb2-c67cac191de9", + "pk": "36fd659e-9c36-4532-b5a1-ecf08f05e139", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "2e86d496-efb6-46d8-95ad-5baa953ea3bc", - "name": "Act 3", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "dceeed29-83b0-4ab9-b161-c4fcc402ca05", + "name": "Act 5", "creator": null, "worker_version": null, "worker_run": null, @@ -921,18 +921,18 @@ }, { "model": "documents.element", - "pk": "40a78ecb-b2ae-4b22-85c8-2f79a951c634", + "pk": "41a9fb39-6df5-45b6-8348-d1c866595432", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "f7d341e7-c949-4248-a22e-67145c9c701b", - "name": "Volume 1, page 1r", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2c577a34-0084-494c-9555-52bc5b74a89b", + "name": "Surface B", "creator": null, "worker_version": null, "worker_run": null, - "image": "ef7ee326-fcf0-4647-b482-ffafbffd354c", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "0a404dd6-7b53-4f10-ab8e-601ef5f22f97", + "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -940,18 +940,18 @@ }, { "model": "documents.element", - "pk": "479a21dc-9760-43c7-a81a-e213938b6edf", + "pk": "51ce7553-ad98-4092-838d-ad778dcb2a92", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "DATUM", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b7aa6340-4883-4fe0-93d8-89a01611caad", + "name": "Volume 1, page 2r", "creator": null, "worker_version": null, "worker_run": null, - "image": "ef7ee326-fcf0-4647-b482-ffafbffd354c", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": "30d880ab-43c1-4f62-955f-41bb2f1a0802", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -959,18 +959,18 @@ }, { "model": "documents.element", - "pk": "4a532a27-b419-4b36-a821-1dd69d1dd121", + "pk": "57428dc4-260a-4463-a11e-f9e9884d97b6", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "f7d341e7-c949-4248-a22e-67145c9c701b", - "name": "Volume 2, page 2r", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "566dd35a-8f1e-4e43-9807-b346b9790127", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "30d880ab-43c1-4f62-955f-41bb2f1a0802", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -978,18 +978,18 @@ }, { "model": "documents.element", - "pk": "52ed329e-e8aa-4d06-b990-79b358652bce", + "pk": "57dc759a-b8be-4411-bfa3-cd884c24b37f", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "ROY", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b7aa6340-4883-4fe0-93d8-89a01611caad", + "name": "Volume 1, page 1r", "creator": null, "worker_version": null, "worker_run": null, - "image": "ef7ee326-fcf0-4647-b482-ffafbffd354c", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "0a404dd6-7b53-4f10-ab8e-601ef5f22f97", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -997,17 +997,17 @@ }, { "model": "documents.element", - "pk": "573690a4-da05-4416-bf1d-c4af1699f95b", + "pk": "6e739e39-da6a-4535-9160-23eab0604f83", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "f7d341e7-c949-4248-a22e-67145c9c701b", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b7aa6340-4883-4fe0-93d8-89a01611caad", "name": "Volume 1, page 1v", "creator": null, "worker_version": null, "worker_run": null, - "image": "c329f6cf-4eb2-4c58-b60f-c66567176e8d", + "image": "f2a146eb-9cab-4bfb-b97b-59b16137c200", "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, @@ -1016,18 +1016,18 @@ }, { "model": "documents.element", - "pk": "5a6dcb2d-a9fd-4ea2-81d2-5f45b0a9b619", + "pk": "73277712-ccbc-4bc1-b2ad-6fa75571a705", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "e402564f-784a-4a57-80e2-a42decfb8a57", - "name": "Surface E", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "1f3ecb14-bb23-4e54-973f-050d2531d607", - "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)", + "image": "0a404dd6-7b53-4f10-ab8e-601ef5f22f97", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1035,18 +1035,18 @@ }, { "model": "documents.element", - "pk": "65808af4-0ad8-43c7-b850-f28e72b47217", + "pk": "78546795-a66d-4e94-bc65-9f78221992d0", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "e402564f-784a-4a57-80e2-a42decfb8a57", - "name": "Surface A", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "ef7ee326-fcf0-4647-b482-ffafbffd354c", - "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)", + "image": "0a404dd6-7b53-4f10-ab8e-601ef5f22f97", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1054,18 +1054,18 @@ }, { "model": "documents.element", - "pk": "66e00a82-5003-4bb3-893c-5cdf37e77a9c", + "pk": "81343790-315a-4121-8ff1-70f2757993d5", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "f7d341e7-c949-4248-a22e-67145c9c701b", - "name": "Volume 2, page 1r", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2c577a34-0084-494c-9555-52bc5b74a89b", + "name": "Surface F", "creator": null, "worker_version": null, "worker_run": null, - "image": "403de131-d7fb-421e-9a4c-6601a6523f42", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": "30d880ab-43c1-4f62-955f-41bb2f1a0802", + "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1073,18 +1073,18 @@ }, { "model": "documents.element", - "pk": "690861ed-336b-425f-8553-600df019e9c4", + "pk": "85bc5401-69a7-4d96-bea3-cc47bc6e651c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "f7d341e7-c949-4248-a22e-67145c9c701b", - "name": "Volume 1, page 2r", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "dceeed29-83b0-4ab9-b161-c4fcc402ca05", + "name": "Act 4", "creator": null, "worker_version": null, "worker_run": null, - "image": "1f3ecb14-bb23-4e54-973f-050d2531d607", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1092,18 +1092,18 @@ }, { "model": "documents.element", - "pk": "6a221ff4-6b95-4791-84ee-76c3b5e9f934", + "pk": "876a65aa-6179-453e-a2e2-d558cc3dc3ce", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "PARIS", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "dceeed29-83b0-4ab9-b161-c4fcc402ca05", + "name": "Act 3", "creator": null, "worker_version": null, "worker_run": null, - "image": "ef7ee326-fcf0-4647-b482-ffafbffd354c", - "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1111,18 +1111,18 @@ }, { "model": "documents.element", - "pk": "85be3773-2185-4a3d-a12b-36637f76ef41", + "pk": "90852275-3fb0-463d-a11f-0f131bfb9cce", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "e402564f-784a-4a57-80e2-a42decfb8a57", - "name": "Surface C", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b70df426-120d-4938-a100-7819e5366ac5", + "name": "Volume 2", "creator": null, "worker_version": null, "worker_run": null, - "image": "c329f6cf-4eb2-4c58-b60f-c66567176e8d", - "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1130,18 +1130,18 @@ }, { "model": "documents.element", - "pk": "90687aac-b1eb-4411-9a9e-a1e3a40a4fa2", + "pk": "9190e5ca-153a-44b2-b339-ae9e0befb4c0", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "2e86d496-efb6-46d8-95ad-5baa953ea3bc", - "name": "Act 2", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2c577a34-0084-494c-9555-52bc5b74a89b", + "name": "Surface C", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "f2a146eb-9cab-4bfb-b97b-59b16137c200", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1149,18 +1149,18 @@ }, { "model": "documents.element", - "pk": "9791123f-701d-45ea-ba1e-134394d9463b", + "pk": "a75d3f97-41bc-4587-82aa-c3d065e2fe29", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "e402564f-784a-4a57-80e2-a42decfb8a57", - "name": "Surface B", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2c577a34-0084-494c-9555-52bc5b74a89b", + "name": "Surface D", "creator": null, "worker_version": null, "worker_run": null, - "image": "ef7ee326-fcf0-4647-b482-ffafbffd354c", - "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", + "image": "30d880ab-43c1-4f62-955f-41bb2f1a0802", + "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1168,18 +1168,18 @@ }, { "model": "documents.element", - "pk": "983316a5-b031-4fa7-89fd-aae42417a9d8", + "pk": "b42aa9f3-9347-45a5-9771-c0fe64d7014c", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "2e86d496-efb6-46d8-95ad-5baa953ea3bc", - "name": "Act 4", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b7aa6340-4883-4fe0-93d8-89a01611caad", + "name": "Volume 2, page 2r", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "a68a053f-ef37-4f96-bd06-08bb2f31a978", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1187,18 +1187,18 @@ }, { "model": "documents.element", - "pk": "9f803dfc-cbb6-449b-875a-256bc6a30584", + "pk": "b728983a-ec3e-4f4d-b1ad-b71c31e39868", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "e402564f-784a-4a57-80e2-a42decfb8a57", - "name": "Surface F", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "dceeed29-83b0-4ab9-b161-c4fcc402ca05", + "name": "Act 1", "creator": null, "worker_version": null, "worker_run": null, - "image": "1f3ecb14-bb23-4e54-973f-050d2531d607", - "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)", + "image": null, + "polygon": null, "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1206,18 +1206,18 @@ }, { "model": "documents.element", - "pk": "a2e582de-68ee-4f91-ba51-027a3aa23d07", + "pk": "bab1b193-41c7-4202-838d-7c4d430746ad", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "DATUM", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "ROY", "creator": null, "worker_version": null, "worker_run": null, - "image": "1f3ecb14-bb23-4e54-973f-050d2531d607", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": "f2a146eb-9cab-4bfb-b97b-59b16137c200", + "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1225,18 +1225,18 @@ }, { "model": "documents.element", - "pk": "a93b0603-bd06-4783-9f27-f2e008b7aaa8", + "pk": "bdee8f49-2fa8-4168-928e-d73f4ce672f2", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "416d4b18-15c8-42f2-ad76-bd5d4635cde1", - "name": "Volume 2", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2c577a34-0084-494c-9555-52bc5b74a89b", + "name": "Surface A", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "0a404dd6-7b53-4f10-ab8e-601ef5f22f97", + "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1244,18 +1244,18 @@ }, { "model": "documents.element", - "pk": "b2d6b333-8de4-40fa-9d81-e7935d4b7ef4", + "pk": "cdcd154e-eccc-4a12-98bd-64d991bc3eee", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "c6f98d68-76c0-4e0b-b979-f558b23a44f6", - "name": "DATUM", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b7aa6340-4883-4fe0-93d8-89a01611caad", + "name": "Volume 2, page 1v", "creator": null, "worker_version": null, "worker_run": null, - "image": "c329f6cf-4eb2-4c58-b60f-c66567176e8d", - "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", + "image": "8ec1120e-29b7-43cd-b298-1d3ec7144f4f", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1263,18 +1263,18 @@ }, { "model": "documents.element", - "pk": "ca3d8598-b514-4748-a54a-e2e1792ad89a", + "pk": "dc29c21d-52c1-4e9b-83f5-74d71e5b41bd", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "416d4b18-15c8-42f2-ad76-bd5d4635cde1", - "name": "Volume 1", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2c577a34-0084-494c-9555-52bc5b74a89b", + "name": "Surface E", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "30d880ab-43c1-4f62-955f-41bb2f1a0802", + "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1282,18 +1282,18 @@ }, { "model": "documents.element", - "pk": "d6cfbf1a-72bb-4e7d-b966-10a1afc7a071", + "pk": "e67230f0-028c-4ed0-bf9c-7a1c94f2a733", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "e402564f-784a-4a57-80e2-a42decfb8a57", - "name": "Surface D", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "1f3ecb14-bb23-4e54-973f-050d2531d607", - "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)", + "image": "f2a146eb-9cab-4bfb-b97b-59b16137c200", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1301,18 +1301,18 @@ }, { "model": "documents.element", - "pk": "eba59781-a3e1-4c68-b144-69f75db971d3", + "pk": "fc22eb47-6281-4a56-b474-b91993e9eead", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "2e86d496-efb6-46d8-95ad-5baa953ea3bc", - "name": "Act 1", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "b7aa6340-4883-4fe0-93d8-89a01611caad", + "name": "Volume 2, page 1r", "creator": null, "worker_version": null, "worker_run": null, - "image": null, - "polygon": null, + "image": "0775b12d-856e-417f-8ab2-b80dceb11e13", + "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1320,18 +1320,18 @@ }, { "model": "documents.element", - "pk": "ef10eecc-0153-48c0-9b02-882bc34b667d", + "pk": "ff8c551d-28a2-479d-b33e-561cd258498a", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "b51dfc79-ccb4-47f9-8a16-4722a8bc9bc6", - "name": "Text line", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "2d308dfa-ab53-4e37-b534-e5b1f9c48c83", + "name": "DATUM", "creator": null, "worker_version": null, "worker_run": null, - "image": "ef7ee326-fcf0-4647-b482-ffafbffd354c", - "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)", + "image": "30d880ab-43c1-4f62-955f-41bb2f1a0802", + "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)", "rotation_angle": 0, "mirrored": false, "confidence": null @@ -1339,104 +1339,104 @@ }, { "model": "documents.entitytype", - "pk": "11defe23-4da1-4243-bab9-75e304dc6c11", + "pk": "1d33aeb5-e74a-4ab8-87ec-87a70c01e32d", "fields": { - "name": "location", + "name": "number", "color": "ff0000", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae" + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf" } }, { "model": "documents.entitytype", - "pk": "630cc3f1-ed3f-43a5-8360-af06e8b151f6", + "pk": "632e0ab8-cd7e-421e-b0a1-0dac4b82c30e", "fields": { - "name": "organization", + "name": "location", "color": "ff0000", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae" + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf" } }, { "model": "documents.entitytype", - "pk": "92e3ded9-2282-48bc-b350-12b3a61aa7e5", + "pk": "a77409be-80c0-4b9c-b36f-b5c8d002898b", "fields": { - "name": "number", + "name": "organization", "color": "ff0000", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae" + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf" } }, { "model": "documents.entitytype", - "pk": "97ce73e5-6994-4183-97f1-bc90a7072a8d", + "pk": "e43239b3-2313-4d91-8ddf-5ac1d6f65e71", "fields": { "name": "person", "color": "ff0000", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae" + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf" } }, { "model": "documents.entitytype", - "pk": "d8d56fad-2c21-4638-a68b-dd885f86a1b7", + "pk": "f025012c-e72b-44d5-971d-5e25906bdb15", "fields": { "name": "date", "color": "ff0000", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae" + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf" } }, { "model": "documents.transcription", - "pk": "3ef86837-e573-4731-b460-39f162820713", + "pk": "0ed2e41b-c334-48bd-9d78-c1295b3169d7", "fields": { - "element": "18dc9df8-948d-41fa-9b1d-6a06f7466a7d", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, - "text": "PARIS", + "element": "57428dc4-260a-4463-a11e-f9e9884d97b6", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "48bab082-d4cc-42a2-9d15-6997af2a072f", + "pk": "2422c008-aeb8-4a52-ae47-c51f83619bd8", "fields": { - "element": "a2e582de-68ee-4f91-ba51-027a3aa23d07", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, - "text": "DATUM", + "element": "2a643cde-c821-429d-aae7-b6d7ef974c8b", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "9547248e-720c-49ad-85f5-199fa792cd0b", + "pk": "45b9462a-1f97-4c03-b059-ad0618f9e858", "fields": { - "element": "6a221ff4-6b95-4791-84ee-76c3b5e9f934", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, - "text": "PARIS", + "element": "57dc759a-b8be-4411-bfa3-cd884c24b37f", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", + "text": "Lorem ipsum dolor sit amet", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "ba85f6a9-f8c0-4c89-bce9-811e06cacf90", + "pk": "52de6ce3-c61e-4c61-9adc-eb0f207008d5", "fields": { - "element": "40a78ecb-b2ae-4b22-85c8-2f79a951c634", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, - "text": "Lorem ipsum dolor sit amet", + "element": "78546795-a66d-4e94-bc65-9f78221992d0", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "bad50644-ad1a-44d2-b06b-0d62ed626c8f", + "pk": "9eda35bb-7541-45d0-aa54-24300574407b", "fields": { - "element": "479a21dc-9760-43c7-a81a-e213938b6edf", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, + "element": "e67230f0-028c-4ed0-bf9c-7a1c94f2a733", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 @@ -1444,11 +1444,11 @@ }, { "model": "documents.transcription", - "pk": "cfb48bc3-28ff-4be1-bebe-e3904b125fe5", + "pk": "a7e27520-0b55-49e9-bf39-9c9054568289", "fields": { - "element": "52ed329e-e8aa-4d06-b990-79b358652bce", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, + "element": "bab1b193-41c7-4202-838d-7c4d430746ad", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 @@ -1456,87 +1456,87 @@ }, { "model": "documents.transcription", - "pk": "d4565f45-3de1-4b42-a338-06bc57e63dca", + "pk": "ca3288be-4c17-4b9c-a0e8-f14a6aa2d111", "fields": { - "element": "368d861e-3a1e-458d-8235-166b8442f964", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, - "text": "PARIS", + "element": "73277712-ccbc-4bc1-b2ad-6fa75571a705", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", + "text": "ROY", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "d49ef54b-d348-4280-bf44-8ed37298b8c1", + "pk": "e004e6dd-4e9a-43b8-aa27-23cf1fca158e", "fields": { - "element": "1f40a863-465c-443c-93f5-7cd69197c595", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, - "text": "ROY", + "element": "2e6fdf3b-f6ef-491b-ac48-8e7aecce7014", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "d99c687a-fbd1-42f3-9f29-e111f503a994", + "pk": "e816de90-1c2a-4762-bf23-41bc11cf4530", "fields": { - "element": "b2d6b333-8de4-40fa-9d81-e7935d4b7ef4", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, - "text": "DATUM", + "element": "308f43b9-325c-442e-8f82-a21a8c46c9a7", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", + "text": "PARIS", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.transcription", - "pk": "f9bcd5a2-0e5b-4879-8daf-90b15c97b6aa", + "pk": "fa224809-6a5f-4257-b534-96990902e7cb", "fields": { - "element": "20aca762-3dfd-48b6-a179-344ebf3fee72", - "worker_version": "f844a6c6-e1eb-4ce4-a91a-bda73ffcac97", - "worker_run": null, - "text": "ROY", + "element": "ff8c551d-28a2-479d-b33e-561cd258498a", + "worker_version": "e7d35774-1afa-4b51-af32-40b350b12832", + "worker_run": "fc83b191-fb73-4f8c-a37d-d07e3de33a4e", + "text": "DATUM", "orientation": "horizontal-lr", "confidence": 1.0 } }, { "model": "documents.allowedmetadata", - "pk": "bac21bf0-180e-4f0c-a712-bcb70fdef56b", + "pk": "85b1275b-bb58-4c69-9c82-ae5d3aa7586c", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", "type": "location", "name": "location" } }, { "model": "documents.allowedmetadata", - "pk": "bf3726be-a17c-45d9-9a15-9b67604b5af1", + "pk": "adeb590d-3024-4dce-8403-0c3baa52bd9a", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "date", - "name": "date" + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "text", + "name": "folio" } }, { "model": "documents.allowedmetadata", - "pk": "f9122b8b-49b9-4531-8749-90ff5af05f25", + "pk": "c51d1752-ea5b-4f0f-954f-19ef89e4755e", "fields": { - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", - "type": "text", - "name": "folio" + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", + "type": "date", + "name": "date" } }, { "model": "documents.metadata", - "pk": "191714d6-0925-4d5a-965f-40827efdf015", + "pk": "114ad13d-68a1-42a4-9488-3f41303a12e6", "fields": { - "element": "66e00a82-5003-4bb3-893c-5cdf37e77a9c", - "name": "folio", + "element": "36fd659e-9c36-4532-b5a1-ecf08f05e139", + "name": "number", "type": "text", - "value": "1r", + "value": "5", "entity": null, "worker_version": null, "worker_run": null @@ -1544,12 +1544,12 @@ }, { "model": "documents.metadata", - "pk": "2188bd1e-8108-4c1f-81ad-a21ee3311082", + "pk": "36351208-9b63-48a2-ba61-f3cd4e61b508", "fields": { - "element": "573690a4-da05-4416-bf1d-c4af1699f95b", + "element": "b42aa9f3-9347-45a5-9771-c0fe64d7014c", "name": "folio", "type": "text", - "value": "1v", + "value": "2r", "entity": null, "worker_version": null, "worker_run": null @@ -1557,12 +1557,12 @@ }, { "model": "documents.metadata", - "pk": "3c115dfb-d6b8-4698-a3ed-ed12b828129a", + "pk": "4b2c9758-14f1-4dfb-8f10-980d4b6674ab", "fields": { - "element": "90687aac-b1eb-4411-9a9e-a1e3a40a4fa2", - "name": "number", + "element": "cdcd154e-eccc-4a12-98bd-64d991bc3eee", + "name": "folio", "type": "text", - "value": "2", + "value": "1v", "entity": null, "worker_version": null, "worker_run": null @@ -1570,9 +1570,9 @@ }, { "model": "documents.metadata", - "pk": "5bf7c0db-752d-4ee8-8277-309f59211b56", + "pk": "85eee757-c23e-4660-b8f6-3f6fcb5cc8ef", "fields": { - "element": "4a532a27-b419-4b36-a821-1dd69d1dd121", + "element": "51ce7553-ad98-4092-838d-ad778dcb2a92", "name": "folio", "type": "text", "value": "2r", @@ -1583,12 +1583,12 @@ }, { "model": "documents.metadata", - "pk": "5f737ae7-4b4b-4e52-b180-1e48aa89a460", + "pk": "8790d53b-c209-474a-9bb4-e7005356fb26", "fields": { - "element": "40a78ecb-b2ae-4b22-85c8-2f79a951c634", - "name": "folio", + "element": "876a65aa-6179-453e-a2e2-d558cc3dc3ce", + "name": "number", "type": "text", - "value": "1r", + "value": "3", "entity": null, "worker_version": null, "worker_run": null @@ -1596,9 +1596,9 @@ }, { "model": "documents.metadata", - "pk": "61f6a231-7990-42da-ae25-bfd7be6efb6d", + "pk": "879dded1-10be-43a7-9b25-d0b008792294", "fields": { - "element": "0c075318-7182-4426-9290-b55be576ec59", + "element": "6e739e39-da6a-4535-9160-23eab0604f83", "name": "folio", "type": "text", "value": "1v", @@ -1609,12 +1609,12 @@ }, { "model": "documents.metadata", - "pk": "6cea22a1-b6de-4787-b9a6-90da820c93bc", + "pk": "98140d77-ba6b-4b2d-9c13-d7c8e2c9194a", "fields": { - "element": "3da1a67c-3401-4e42-9bb2-c67cac191de9", - "name": "number", + "element": "fc22eb47-6281-4a56-b474-b91993e9eead", + "name": "folio", "type": "text", - "value": "3", + "value": "1r", "entity": null, "worker_version": null, "worker_run": null @@ -1622,12 +1622,12 @@ }, { "model": "documents.metadata", - "pk": "9c371c8a-2880-44f1-a996-ad69f83c371d", + "pk": "a31ae1f2-a1f3-4b2d-88ac-045361a21ff2", "fields": { - "element": "1aeeeb1a-dd31-4098-af23-c62571d8986b", + "element": "85bc5401-69a7-4d96-bea3-cc47bc6e651c", "name": "number", "type": "text", - "value": "5", + "value": "4", "entity": null, "worker_version": null, "worker_run": null @@ -1635,12 +1635,12 @@ }, { "model": "documents.metadata", - "pk": "c95bd09c-624e-44fd-afa5-76b37bf7d3bb", + "pk": "c72ed6c2-24ee-4b50-951c-3a2f4714592e", "fields": { - "element": "983316a5-b031-4fa7-89fd-aae42417a9d8", + "element": "36f889af-a83b-47b7-ab80-fbf7bdd5c08d", "name": "number", "type": "text", - "value": "4", + "value": "2", "entity": null, "worker_version": null, "worker_run": null @@ -1648,12 +1648,12 @@ }, { "model": "documents.metadata", - "pk": "d9c1d3ca-e908-47ea-b2b3-9999b09fee1c", + "pk": "d102c307-bd1a-492e-8dd4-d04d9bdbf439", "fields": { - "element": "690861ed-336b-425f-8553-600df019e9c4", - "name": "folio", + "element": "b728983a-ec3e-4f4d-b1ad-b71c31e39868", + "name": "number", "type": "text", - "value": "2r", + "value": "1", "entity": null, "worker_version": null, "worker_run": null @@ -1661,12 +1661,12 @@ }, { "model": "documents.metadata", - "pk": "f5a5e2e5-60b4-4105-94d4-1c30d0c6b480", + "pk": "e41db6a4-1800-4848-b528-a747e0bcc66e", "fields": { - "element": "eba59781-a3e1-4c68-b144-69f75db971d3", - "name": "number", + "element": "57dc759a-b8be-4411-bfa3-cd884c24b37f", + "name": "folio", "type": "text", - "value": "1", + "value": "1r", "entity": null, "worker_version": null, "worker_run": null @@ -1689,12 +1689,12 @@ }, { "model": "images.image", - "pk": "1f3ecb14-bb23-4e54-973f-050d2531d607", + "pk": "0775b12d-856e-417f-8ab2-b80dceb11e13", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img3", + "path": "img4", "width": 1000, "height": 1000, "hash": null, @@ -1703,12 +1703,12 @@ }, { "model": "images.image", - "pk": "403de131-d7fb-421e-9a4c-6601a6523f42", + "pk": "0a404dd6-7b53-4f10-ab8e-601ef5f22f97", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img4", + "path": "img1", "width": 1000, "height": 1000, "hash": null, @@ -1717,12 +1717,12 @@ }, { "model": "images.image", - "pk": "566dd35a-8f1e-4e43-9807-b346b9790127", + "pk": "30d880ab-43c1-4f62-955f-41bb2f1a0802", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img6", + "path": "img3", "width": 1000, "height": 1000, "hash": null, @@ -1731,7 +1731,7 @@ }, { "model": "images.image", - "pk": "b8c7f16a-47e8-4902-b386-8e810c62bcc9", + "pk": "8ec1120e-29b7-43cd-b298-1d3ec7144f4f", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", @@ -1745,12 +1745,12 @@ }, { "model": "images.image", - "pk": "c329f6cf-4eb2-4c58-b60f-c66567176e8d", + "pk": "a68a053f-ef37-4f96-bd06-08bb2f31a978", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img2", + "path": "img6", "width": 1000, "height": 1000, "hash": null, @@ -1759,12 +1759,12 @@ }, { "model": "images.image", - "pk": "ef7ee326-fcf0-4647-b482-ffafbffd354c", + "pk": "f2a146eb-9cab-4bfb-b97b-59b16137c200", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", "server": 1, - "path": "img1", + "path": "img2", "width": 1000, "height": 1000, "hash": null, @@ -1773,56 +1773,56 @@ }, { "model": "users.right", - "pk": "45f61da8-62be-435a-9f4d-99b374f7db5a", + "pk": "84d8e8fe-54dc-4fd8-9029-6c1a177bfafa", "fields": { "user": 2, "group": null, - "content_type": 34, - "content_id": "5f00641e-47a8-42f3-b488-51b766f9b7a3", + "content_type": 21, + "content_id": "12944eab-1b0e-4653-aa66-4c0231e722bf", "level": 100 } }, { "model": "users.right", - "pk": "5b2ff5ab-045b-450e-b282-aeb0d7a1c79d", + "pk": "c8f5b27a-a329-452f-80d4-4e3b06cd5aab", "fields": { - "user": 3, + "user": 4, "group": null, "content_type": 34, - "content_id": "5f00641e-47a8-42f3-b488-51b766f9b7a3", - "level": 50 + "content_id": "9f46c025-7bfb-4322-b5bb-76fded823477", + "level": 10 } }, { "model": "users.right", - "pk": "893dd76e-24bc-4719-b0f2-7aeb96f7e3af", + "pk": "d9dd9193-316d-4a74-99a8-31ed99c7ef9d", "fields": { - "user": 4, + "user": 3, "group": null, "content_type": 34, - "content_id": "5f00641e-47a8-42f3-b488-51b766f9b7a3", - "level": 10 + "content_id": "9f46c025-7bfb-4322-b5bb-76fded823477", + "level": 50 } }, { "model": "users.right", - "pk": "8c61605a-ebce-496b-86bf-b8c95e7c9b74", + "pk": "ebc94e97-90e8-4990-afbd-6bd9fdfe286a", "fields": { "user": 2, "group": null, "content_type": 13, - "content_id": "2ef1cf21-aef3-4aea-832f-f3b480ce3a61", + "content_id": "283c0517-96d3-4f61-8847-7245b131ad32", "level": 10 } }, { "model": "users.right", - "pk": "f41680b0-896d-42de-9430-b735433b2950", + "pk": "fd4b1f5f-03bf-4f08-84bc-acd5eb7da40e", "fields": { "user": 2, "group": null, - "content_type": 21, - "content_id": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", + "content_type": 34, + "content_id": "9f46c025-7bfb-4322-b5bb-76fded823477", "level": 100 } }, @@ -1830,7 +1830,7 @@ "model": "users.user", "pk": 1, "fields": { - "password": "pbkdf2_sha256$600000$WjJ9ofomAouE1GDpXprfMT$WXG/rsOyU+Yl/oeIdHe1b06v/0L9TpTpdbB4p3tFBwg=", + "password": "pbkdf2_sha256$720000$86ridKIpMBH5NW2YIPeV87$cNItTxjDwpROD4YpvGIJ1v3KtDbuizX88BeAj6iS9X0=", "last_login": null, "email": "root@root.fr", "display_name": "Admin", @@ -1845,7 +1845,7 @@ "model": "users.user", "pk": 2, "fields": { - "password": "pbkdf2_sha256$600000$isDEKLFCkhVkUra1zR4wvU$KdrrV7ub+vl9nCSPwZpsQAeZsZCu3vjn4OJNtWyE/0s=", + "password": "pbkdf2_sha256$720000$rQFnfpWrnGXT4tUT6T2UF5$gmOmD5LFgYwELEKHmAT3BKTPvq7ssh+sSzGLZjMzsHc=", "last_login": null, "email": "user@user.fr", "display_name": "Test user", @@ -1888,7 +1888,7 @@ }, { "model": "users.group", - "pk": "5f00641e-47a8-42f3-b488-51b766f9b7a3", + "pk": "9f46c025-7bfb-4322-b5bb-76fded823477", "fields": { "name": "User group", "public": false, @@ -3850,19 +3850,19 @@ }, { "model": "ponos.farm", - "pk": "2ef1cf21-aef3-4aea-832f-f3b480ce3a61", + "pk": "283c0517-96d3-4f61-8847-7245b131ad32", "fields": { "name": "Wheat farm", - "seed": "ddf0a69d541942edb89376b20f16e12fbb08850059d44b3ecb57e69be66957e6" + "seed": "744e8c9a9b201cccdfdaf543db13c2775a9c3dd0d17fb4cf8ba19707a1bf3f14" } }, { "model": "training.dataset", - "pk": "0758d75b-2214-4507-a097-6665c8880fb3", + "pk": "9894c9f7-be52-4cb7-8e3a-193a518184ee", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", "creator": 2, "task": null, "name": "Second Dataset", @@ -3873,11 +3873,11 @@ }, { "model": "training.dataset", - "pk": "5a644df2-d88d-4cc5-8a58-58ec6166fa47", + "pk": "b9152505-b3e9-473a-b1c4-e277f564a6d9", "fields": { "created": "2020-02-02T01:23:45.678Z", "updated": "2020-02-02T01:23:45.678Z", - "corpus": "044e41fa-d1d1-4a9e-a59b-02a78c681dae", + "corpus": "12944eab-1b0e-4653-aa66-4c0231e722bf", "creator": 2, "task": null, "name": "First Dataset", @@ -3888,50 +3888,50 @@ }, { "model": "training.datasetset", - "pk": "28cd6986-a8e5-4f19-9259-09bcecf69e0f", + "pk": "19cbad25-ec14-4ea4-adcb-8963c59d892a", "fields": { - "name": "test", - "dataset": "0758d75b-2214-4507-a097-6665c8880fb3" + "name": "train", + "dataset": "b9152505-b3e9-473a-b1c4-e277f564a6d9" } }, { "model": "training.datasetset", - "pk": "3e70465b-d098-4168-85cb-2e4b052162b0", + "pk": "881a2377-9c28-48ac-a148-0f5926b88c25", "fields": { - "name": "dev", - "dataset": "0758d75b-2214-4507-a097-6665c8880fb3" + "name": "test", + "dataset": "9894c9f7-be52-4cb7-8e3a-193a518184ee" } }, { "model": "training.datasetset", - "pk": "6e1d5dd1-3a30-4014-88d1-adf6c56996a0", + "pk": "9861921d-ea65-4ec9-9d2e-063187ef38e9", "fields": { "name": "dev", - "dataset": "5a644df2-d88d-4cc5-8a58-58ec6166fa47" + "dataset": "9894c9f7-be52-4cb7-8e3a-193a518184ee" } }, { "model": "training.datasetset", - "pk": "7d2b5b13-5b00-4c7c-98a4-6e5d5c01b958", + "pk": "c62b45a1-864b-4be0-a642-0e36ae068edf", "fields": { - "name": "train", - "dataset": "5a644df2-d88d-4cc5-8a58-58ec6166fa47" + "name": "test", + "dataset": "b9152505-b3e9-473a-b1c4-e277f564a6d9" } }, { "model": "training.datasetset", - "pk": "cd9b0ab6-e00a-4ee7-8133-7d9bc8881491", + "pk": "d8b49d2f-85d6-402f-a45c-7ce0977ca93c", "fields": { - "name": "test", - "dataset": "5a644df2-d88d-4cc5-8a58-58ec6166fa47" + "name": "dev", + "dataset": "b9152505-b3e9-473a-b1c4-e277f564a6d9" } }, { "model": "training.datasetset", - "pk": "e2516b99-644f-4359-aaf8-59549e53eae7", + "pk": "f901c2a3-0520-4357-a1e9-9dd4926f9061", "fields": { "name": "train", - "dataset": "0758d75b-2214-4507-a097-6665c8880fb3" + "dataset": "9894c9f7-be52-4cb7-8e3a-193a518184ee" } } ] diff --git a/arkindex/documents/management/commands/build_fixtures.py b/arkindex/documents/management/commands/build_fixtures.py index a489d041ba000580168ddcb72797bb525364bf00..4d8c3a089a73d48198bd69d21e023cb4c9feab5b 100644 --- a/arkindex/documents/management/commands/build_fixtures.py +++ b/arkindex/documents/management/commands/build_fixtures.py @@ -362,6 +362,7 @@ class Command(BaseCommand): element.add_parent(page) element.transcriptions.create( worker_run=reco_run, + worker_version=recognizer_worker, text=word, confidence=1.0, ) @@ -369,6 +370,7 @@ class Command(BaseCommand): # Create a page transcription on page 1 p1_1.transcriptions.create( worker_run=reco_run, + worker_version=recognizer_worker, text="Lorem ipsum dolor sit amet", confidence=1.0, ) diff --git a/arkindex/documents/management/commands/load_export.py b/arkindex/documents/management/commands/load_export.py index 5b2fc0538f7d78713dc37de44c2746948a2b2ebc..55ec306ee4752ba525ca7c99e850a55e76aff2ce 100644 --- a/arkindex/documents/management/commands/load_export.py +++ b/arkindex/documents/management/commands/load_export.py @@ -107,7 +107,6 @@ SQL_ELEMENT_QUERY = """ polygon, rotation_angle, mirrored, - worker_version_id, worker_run_id, confidence FROM element @@ -202,7 +201,7 @@ class Command(BaseCommand): image_id=row["image_id"], rotation_angle=row["rotation_angle"], mirrored=row["mirrored"], - worker_version_id=self.worker_version_map[row["worker_version_id"]] if row["worker_version_id"] else None, + worker_version_id=self.worker_run_version_map[row["worker_run_id"]] if row["worker_run_id"] else None, worker_run_id=self.worker_run_map[row["worker_run_id"]] if row["worker_run_id"] else None, confidence=row["confidence"], corpus=self.corpus @@ -231,7 +230,7 @@ class Command(BaseCommand): validated=row["validated"], moderator=User.objects.get(email=row["moderator"]) if row["moderator"] else None, metas=json.loads(row["metas"]) if row["metas"] else None, - worker_version_id=self.worker_version_map[row["worker_version_id"]] if row["worker_version_id"] else None, + worker_version_id=self.worker_run_version_map[row["worker_run_id"]] if row["worker_run_id"] else None, worker_run_id=self.worker_run_map[row["worker_run_id"]] if row["worker_run_id"] else None, corpus=self.corpus )] @@ -251,7 +250,7 @@ class Command(BaseCommand): text=row["text"], confidence=row["confidence"], orientation=row["orientation"], - worker_version_id=self.worker_version_map[row["worker_version_id"]] if row["worker_version_id"] else None, + worker_version_id=self.worker_run_version_map[row["worker_run_id"]] if row["worker_run_id"] else None, worker_run_id=self.worker_run_map[row["worker_run_id"]] if row["worker_run_id"] else None, )] @@ -262,7 +261,7 @@ class Command(BaseCommand): entity_id=row["entity_id"], offset=row["offset"], length=row["length"], - worker_version_id=self.worker_version_map[row["worker_version_id"]] if row["worker_version_id"] else None, + worker_version_id=self.worker_run_version_map[row["worker_run_id"]] if row["worker_run_id"] else None, worker_run_id=self.worker_run_map[row["worker_run_id"]] if row["worker_run_id"] else None, confidence=row["confidence"], )] @@ -275,7 +274,7 @@ class Command(BaseCommand): type=row["type"], value=row["value"], entity_id=row["entity_id"], - worker_version_id=self.worker_version_map[row["worker_version_id"]] if row["worker_version_id"] else None, + worker_version_id=self.worker_run_version_map[row["worker_run_id"]] if row["worker_run_id"] else None, worker_run_id=self.worker_run_map[row["worker_run_id"]] if row["worker_run_id"] else None, )] @@ -288,7 +287,7 @@ class Command(BaseCommand): moderator=User.objects.get(email=row["moderator"]) if row["moderator"] else None, confidence=row["confidence"], high_confidence=row["high_confidence"], - worker_version_id=self.worker_version_map[row["worker_version_id"]] if row["worker_version_id"] else None, + worker_version_id=self.worker_run_version_map[row["worker_run_id"]] if row["worker_run_id"] else None, worker_run_id=self.worker_run_map[row["worker_run_id"]] if row["worker_run_id"] else None, )] @@ -442,6 +441,8 @@ class Command(BaseCommand): def create_worker_run(self, row): worker_version_id = self.worker_version_map[row["worker_version_id"]] + self.worker_run_version_map[row["id"]] = worker_version_id + model_version, configuration = None, None if row["model_version_id"]: @@ -565,6 +566,9 @@ class Command(BaseCommand): self.worker_type_map = self.create_objects(WorkerType, self.create_worker_type, SQL_WORKER_TYPE_QUERY) self.worker_map = self.create_objects(Worker, self.create_worker, SQL_WORKER_VERSION_QUERY) self.worker_version_map = self.create_objects(WorkerVersion, self.create_worker_version, SQL_WORKER_VERSION_QUERY) + # Maps SQLite worker run IDs to Postgres worker version IDs. + # This is filled by create_worker_run and is used to add the deprecated worker version IDs on ML results. + self.worker_run_version_map = {} self.worker_run_map = self.create_objects(WorkerRun, self.create_worker_run, SQL_WORKER_RUN_QUERY) # Create images and servers diff --git a/arkindex/documents/tests/commands/test_load_export.py b/arkindex/documents/tests/commands/test_load_export.py index cfb8a2b546f20a2a746347601f3bd0d17b9e3007..f1fca7354850915d69a84adf1d68c36b4b619a8b 100644 --- a/arkindex/documents/tests/commands/test_load_export.py +++ b/arkindex/documents/tests/commands/test_load_export.py @@ -181,6 +181,7 @@ class TestLoadExport(FixtureTestCase): offset=0, length=1, worker_version=reco_version, + worker_run=reco_run, confidence=0.42, ) diff --git a/arkindex/documents/tests/tasks/test_export.py b/arkindex/documents/tests/tasks/test_export.py index 65e3f8d72cd71b1accf8babf57106816adb47124..9831b8eed4f1f7e73a91d17e3bbb45d855255a97 100644 --- a/arkindex/documents/tests/tasks/test_export.py +++ b/arkindex/documents/tests/tasks/test_export.py @@ -23,7 +23,7 @@ from arkindex.documents.models import ( from arkindex.images.models import Image, ImageServer from arkindex.process.models import Worker, WorkerType, WorkerVersion, WorkerVersionState from arkindex.project.tests import FixtureTestCase -from arkindex.training.models import DatasetElement +from arkindex.training.models import DatasetElement, Model, ModelVersion TABLE_NAMES = { "export_version", @@ -73,13 +73,23 @@ class TestExport(FixtureTestCase): element.save() transcription = Transcription.objects.first() version = WorkerVersion.objects.get(worker__slug="reco") + run = version.worker_runs.first() metadata_version = self._make_worker_version() + metadata_run = run.process.worker_runs.create( + version=metadata_version, + model_version=ModelVersion.objects.create( + model=Model.objects.create(name="Some model"), + ), + configuration=metadata_version.worker.configurations.create(name="Some configuration"), + ) + element.metadatas.create( type=MetaType.Numeric, name="Score", value=1, worker_version=metadata_version, + worker_run=metadata_run, ) element.classifications.create( @@ -107,6 +117,7 @@ class TestExport(FixtureTestCase): offset=1, length=1, worker_version=version, + worker_run=run, ) transcription.transcription_entities.create( @@ -114,6 +125,7 @@ class TestExport(FixtureTestCase): offset=0, length=1, worker_version=version, + worker_run=run, confidence=0.42, ) @@ -208,6 +220,28 @@ class TestExport(FixtureTestCase): ] ) + self.assertCountEqual( + db.execute("SELECT id, worker_version_id, model_version_id, model_id, model_name, configuration_id FROM worker_run").fetchall(), + [ + ( + str(run.id), + str(version.id), + None, + None, + None, + None, + ), + ( + str(metadata_run.id), + str(metadata_version.id), + str(metadata_run.model_version_id), + str(metadata_run.model_version.model_id), + str(metadata_run.model_version.model.name), + str(metadata_run.configuration_id), + ), + ] + ) + actual_rows = db.execute(""" SELECT id, @@ -218,7 +252,6 @@ class TestExport(FixtureTestCase): rotation_angle, mirrored, confidence, - worker_version_id, worker_run_id, image_id, polygon @@ -246,11 +279,6 @@ class TestExport(FixtureTestCase): element.confidence ] - if element.worker_version_id: - row.append(str(element.worker_version_id)) - else: - row.append(None) - if element.worker_run_id: row.append(str(element.worker_run_id)) else: @@ -293,7 +321,6 @@ class TestExport(FixtureTestCase): text, confidence, orientation, - worker_version_id, worker_run_id FROM transcription """).fetchall(), @@ -304,7 +331,6 @@ class TestExport(FixtureTestCase): transcription.text, transcription.confidence, transcription.orientation.value, - str(transcription.worker_version_id) if transcription.worker_version_id else None, str(transcription.worker_run_id) if transcription.worker_run_id else None, ) for transcription in Transcription.objects.filter(element__corpus=self.corpus) @@ -321,7 +347,6 @@ class TestExport(FixtureTestCase): moderator, confidence, high_confidence, - worker_version_id, worker_run_id FROM classification """).fetchall(), @@ -334,7 +359,6 @@ class TestExport(FixtureTestCase): classification.moderator.email if classification.moderator else None, classification.confidence, int(classification.high_confidence), - str(classification.worker_version_id) if classification.worker_version_id else None, str(classification.worker_run_id) if classification.worker_run_id else None, ) for classification in Classification.objects.filter(element__corpus=self.corpus) @@ -350,7 +374,6 @@ class TestExport(FixtureTestCase): type, value, entity_id, - worker_version_id, worker_run_id FROM metadata """).fetchall(), @@ -362,7 +385,6 @@ class TestExport(FixtureTestCase): metadata.type.value, metadata.value, str(metadata.entity_id) if metadata.entity_id else None, - str(metadata.worker_version_id) if metadata.worker_version_id else None, str(metadata.worker_run_id) if metadata.worker_run_id else None, ) for metadata in MetaData.objects.filter(element__corpus=self.corpus) @@ -378,7 +400,6 @@ class TestExport(FixtureTestCase): validated, moderator, metas, - worker_version_id, worker_run_id FROM entity """).fetchall(), @@ -390,7 +411,6 @@ class TestExport(FixtureTestCase): int(entity.validated), entity.moderator.email if entity.moderator else None, json.dumps(entity.metas) if entity.metas else None, - str(entity.worker_version_id) if entity.worker_version_id else None, str(entity.worker_run_id) if entity.worker_run_id else None, ) for entity in self.corpus.entities.all() @@ -416,7 +436,6 @@ class TestExport(FixtureTestCase): entity_id, offset, length, - worker_version_id, worker_run_id, confidence FROM transcription_entity @@ -427,7 +446,6 @@ class TestExport(FixtureTestCase): str(transcription_entity.entity_id), transcription_entity.offset, transcription_entity.length, - str(transcription_entity.worker_version_id) if transcription_entity.worker_version_id else None, str(transcription_entity.worker_run_id) if transcription_entity.worker_run_id else None, transcription_entity.confidence, ) diff --git a/arkindex/documents/tests/test_children_elements.py b/arkindex/documents/tests/test_children_elements.py index 1eeb278e71b8e8e91e13cc74bc0f9641c070bb37..66eb2dbc47611d6e423f9a4e541d32d22a19b100 100644 --- a/arkindex/documents/tests/test_children_elements.py +++ b/arkindex/documents/tests/test_children_elements.py @@ -317,7 +317,7 @@ class TestChildrenElements(FixtureAPITestCase): ) def test_element_children_worker_version_filter(self): - self.corpus.elements.filter(name__contains="page 1r").update(worker_version=self.worker_version) + self.corpus.elements.filter(name__contains="page 1r").update(worker_version=self.worker_version, worker_run=self.worker_run) with self.assertNumQueries(6): response = self.client.get( @@ -1074,8 +1074,8 @@ class TestChildrenElements(FixtureAPITestCase): def test_transcription_worker_version_filter(self): recognizer = WorkerVersion.objects.get(worker__slug="reco") - Transcription.objects.filter(text="PARIS").update(worker_version=None) - Transcription.objects.filter(text="ROY").update(worker_version=self.worker_version) + Transcription.objects.filter(text="PARIS").update(worker_version=None, worker_run=None) + Transcription.objects.filter(text="ROY").update(worker_version=self.worker_version, worker_run=self.worker_run) cases = [ (str(recognizer.id), ["Volume 1, page 1r", "DATUM", "DATUM", "DATUM"]), @@ -1095,7 +1095,7 @@ class TestChildrenElements(FixtureAPITestCase): ) def test_transcription_worker_run_filter(self): - Transcription.objects.filter(text="PARIS").update(worker_run=None) + Transcription.objects.exclude(text="ROY").update(worker_run=None) Transcription.objects.filter(text="ROY").update(worker_run=self.worker_run) cases = [ diff --git a/arkindex/documents/tests/test_corpus_elements.py b/arkindex/documents/tests/test_corpus_elements.py index 20039f678adbd7ce25f6d5596d54514bb7d0faf4..5d5cc86e3b13785d9bffc6674cdeaff6bcf033b7 100644 --- a/arkindex/documents/tests/test_corpus_elements.py +++ b/arkindex/documents/tests/test_corpus_elements.py @@ -17,6 +17,7 @@ class TestListElements(FixtureAPITestCase): def setUpTestData(cls): super().setUpTestData() cls.worker_version = WorkerVersion.objects.get(worker__slug="reco") + cls.worker_run = cls.worker_version.worker_runs.first() def _get_prefetch_data(self, query): """ @@ -348,8 +349,8 @@ class TestListElements(FixtureAPITestCase): ) def test_list_elements_filter_no_worker_version(self): - self.corpus.elements.update(worker_version=self.worker_version) - self.corpus.elements.filter(name__contains="Volume 2").update(worker_version=None) + self.corpus.elements.update(worker_version=self.worker_version, worker_run=self.worker_run) + self.corpus.elements.filter(name__contains="Volume 2").update(worker_version=None, worker_run=None) with self.assertNumQueries(5): response = self.client.get( @@ -374,7 +375,7 @@ class TestListElements(FixtureAPITestCase): ) def test_list_elements_filter_worker_version(self): - self.corpus.elements.filter(name__contains="Volume 2").update(worker_version=self.worker_version) + self.corpus.elements.filter(name__contains="Volume 2").update(worker_version=self.worker_version, worker_run=self.worker_run) with self.assertNumQueries(6): response = self.client.get( @@ -939,8 +940,8 @@ class TestListElements(FixtureAPITestCase): def test_transcription_worker_version_filter(self): dla = WorkerVersion.objects.get(worker__slug="dla") - Transcription.objects.filter(text="PARIS").update(worker_version=None) - Transcription.objects.filter(text="ROY").update(worker_version=dla) + Transcription.objects.filter(text="PARIS").update(worker_version=None, worker_run=None) + Transcription.objects.filter(text="ROY").update(worker_version=dla, worker_run=dla.worker_runs.first()) cases = [ (str(self.worker_version.id), ["DATUM", "DATUM", "DATUM", "Volume 1, page 1r"]), diff --git a/arkindex/documents/tests/test_edit_transcriptions.py b/arkindex/documents/tests/test_edit_transcriptions.py index a302bb452db99f9f465a4bf158a2365b6c475ef3..92093e9a04dcfc026cbdc6c3bc93840b0db30185 100644 --- a/arkindex/documents/tests/test_edit_transcriptions.py +++ b/arkindex/documents/tests/test_edit_transcriptions.py @@ -21,7 +21,7 @@ class TestEditTranscription(FixtureAPITestCase): element = Element.objects.get_descending(page.id).filter(type__slug="word", name="PARIS").get() cls.line = cls.corpus.elements.filter(type__slug="text_line").first() cls.ml_transcription = element.transcriptions.get(text="PARIS") - cls.worker_version = cls.ml_transcription.worker_version + cls.worker_run = cls.ml_transcription.worker_run private_corpus = Corpus.objects.create(name="Private") cls.private_page = private_corpus.elements.create(type=page.type) location_type = EntityType.objects.get(name="location", corpus=cls.corpus) @@ -59,7 +59,7 @@ class TestEditTranscription(FixtureAPITestCase): "worker_run": None, }) - def test_get_worker_version(self): + def test_get_worker_run(self): """ Retrieve a transcription produced by a ML worker """ @@ -71,7 +71,10 @@ class TestEditTranscription(FixtureAPITestCase): "confidence": 1.0, "text": "PARIS", "orientation": TextOrientation.HorizontalLeftToRight.value, - "worker_run": None, + "worker_run": { + "id": str(self.worker_run.id), + "summary": "Worker Recognizer @ version 1", + }, }) def test_get_verified_user(self): diff --git a/arkindex/documents/tests/test_transcriptions.py b/arkindex/documents/tests/test_transcriptions.py index c2fee40d7c730fb668a266a79508f6cfccf43177..f5f59dff0e205ffa76f4e93d6b2fc4bf542f3cba 100644 --- a/arkindex/documents/tests/test_transcriptions.py +++ b/arkindex/documents/tests/test_transcriptions.py @@ -61,7 +61,10 @@ class TestTranscriptions(FixtureAPITestCase): "confidence": 1.0, "orientation": TextOrientation.HorizontalLeftToRight.value, "element": None, - "worker_run": None, + "worker_run": { + "id": str(self.worker_run.id), + "summary": "Worker Recognizer @ version 1", + }, }, { "id": str(tr2.id), @@ -249,53 +252,33 @@ class TestTranscriptions(FixtureAPITestCase): ]) def test_list_worker_run_transcriptions(self): - worker_transcription = self.page.transcriptions.create( - text="something", - worker_version=self.worker_version_2, - worker_run=self.worker_run, - confidence=0.369, - ) + worker_transcription = self.page.transcriptions.get(worker_run=self.worker_run) self.client.force_login(self.user) with self.assertNumQueries(5): response = self.client.get( reverse("api:element-transcriptions", kwargs={"pk": str(self.page.id)}), - data={"recursive": "true", "worker_run": str(self.worker_run.id)} + data={"worker_run": str(self.worker_run.id)} ) self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertListEqual(response.json()["results"], [ { "id": str(worker_transcription.id), - "text": "something", - "confidence": 0.369, + "text": "Lorem ipsum dolor sit amet", + "confidence": 1.0, "orientation": TextOrientation.HorizontalLeftToRight.value, - "element": { - "id": str(self.page.id), - "name": "Volume 1, page 1r", - "type": "page", - "zone": { - "id": str(self.page.id), - "polygon": [[0, 0], [0, 1000], [1000, 1000], [1000, 0], [0, 0]], - }, - "rotation_angle": 0, - "mirrored": False - }, + "element": None, "worker_run": { "id": str(self.worker_run.id), - "summary": self.worker_run.summary + "summary": "Worker Recognizer @ version 1", }, } ]) def test_list_worker_run_and_wrong_version(self): - self.page.transcriptions.create( - text="something", - worker_version=self.worker_version_2, - worker_run=self.worker_run, - confidence=0.369, - ) + self.worker_version_1.transcriptions.update(worker_version=self.worker_version_2) self.client.force_login(self.user)