Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • workers/base-worker
1 result
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
Showing
with 168 additions and 18 deletions
VERSION
View file @ 87c26ec2
0.3.1-beta2 0.3.1-rc1
arkindex_worker/cache.py
View file @ 87c26ec2
...@@ -95,6 +95,7 @@ class CachedElement(Model): ...@@ -95,6 +95,7 @@ class CachedElement(Model):
mirrored = BooleanField(default=False) mirrored = BooleanField(default=False)
initial = BooleanField(default=False) initial = BooleanField(default=False)
worker_version_id = UUIDField(null=True) worker_version_id = UUIDField(null=True)
worker_run_id = UUIDField(null=True)
confidence = FloatField(null=True) confidence = FloatField(null=True)
class Meta: class Meta:
...@@ -173,6 +174,7 @@ class CachedTranscription(Model): ...@@ -173,6 +174,7 @@ class CachedTranscription(Model):
confidence = FloatField() confidence = FloatField()
orientation = CharField(max_length=50) orientation = CharField(max_length=50)
worker_version_id = UUIDField(null=True) worker_version_id = UUIDField(null=True)
worker_run_id = UUIDField(null=True)
class Meta: class Meta:
database = db database = db
...@@ -190,6 +192,7 @@ class CachedClassification(Model): ...@@ -190,6 +192,7 @@ class CachedClassification(Model):
confidence = FloatField() confidence = FloatField()
state = CharField(max_length=10) state = CharField(max_length=10)
worker_version_id = UUIDField(null=True) worker_version_id = UUIDField(null=True)
worker_run_id = UUIDField(null=True)
class Meta: class Meta:
database = db database = db
...@@ -207,6 +210,7 @@ class CachedEntity(Model): ...@@ -207,6 +210,7 @@ class CachedEntity(Model):
validated = BooleanField(default=False) validated = BooleanField(default=False)
metas = JSONField(null=True) metas = JSONField(null=True)
worker_version_id = UUIDField(null=True) worker_version_id = UUIDField(null=True)
worker_run_id = UUIDField(null=True)
class Meta: class Meta:
database = db database = db
...@@ -225,6 +229,7 @@ class CachedTranscriptionEntity(Model): ...@@ -225,6 +229,7 @@ class CachedTranscriptionEntity(Model):
offset = IntegerField(constraints=[Check("offset >= 0")]) offset = IntegerField(constraints=[Check("offset >= 0")])
length = IntegerField(constraints=[Check("length > 0")]) length = IntegerField(constraints=[Check("length > 0")])
worker_version_id = UUIDField(null=True) worker_version_id = UUIDField(null=True)
worker_run_id = UUIDField(null=True)
confidence = FloatField(null=True) confidence = FloatField(null=True)
class Meta: class Meta:
......
arkindex_worker/worker/classification.py
View file @ 87c26ec2
...@@ -105,6 +105,7 @@ class ClassificationMixin(object): ...@@ -105,6 +105,7 @@ class ClassificationMixin(object):
"element": str(element.id), "element": str(element.id),
"ml_class": self.get_ml_class_id(ml_class), "ml_class": self.get_ml_class_id(ml_class),
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
"confidence": confidence, "confidence": confidence,
"high_confidence": high_confidence, "high_confidence": high_confidence,
}, },
...@@ -121,6 +122,7 @@ class ClassificationMixin(object): ...@@ -121,6 +122,7 @@ class ClassificationMixin(object):
"confidence": created["confidence"], "confidence": created["confidence"],
"state": created["state"], "state": created["state"],
"worker_version_id": self.worker_version_id, "worker_version_id": self.worker_version_id,
"worker_run_id": self.worker_run_id,
} }
] ]
CachedClassification.insert_many(to_insert).execute() CachedClassification.insert_many(to_insert).execute()
...@@ -130,15 +132,23 @@ class ClassificationMixin(object): ...@@ -130,15 +132,23 @@ class ClassificationMixin(object):
) )
except ErrorResponse as e: except ErrorResponse as e:
# Detect already existing classification # Detect already existing classification
if ( if e.status_code == 400 and "non_field_errors" in e.content:
e.status_code == 400 if (
and "non_field_errors" in e.content "The fields element, worker_version, ml_class must make a unique set."
and "The fields element, worker_version, ml_class must make a unique set." in e.content["non_field_errors"]
in e.content["non_field_errors"] ):
): logger.warning(
logger.warning( f"This worker version has already set {ml_class} on element {element.id}"
f"This worker version has already set {ml_class} on element {element.id}" )
) elif (
"The fields element, worker_run, ml_class must make a unique set."
in e.content["non_field_errors"]
):
logger.warning(
f"This worker run has already set {ml_class} on element {element.id}"
)
else:
raise
return return
# Propagate any other API error # Propagate any other API error
...@@ -202,6 +212,7 @@ class ClassificationMixin(object): ...@@ -202,6 +212,7 @@ class ClassificationMixin(object):
body={ body={
"parent": str(element.id), "parent": str(element.id),
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
"classifications": classifications, "classifications": classifications,
}, },
)["classifications"] )["classifications"]
...@@ -220,6 +231,7 @@ class ClassificationMixin(object): ...@@ -220,6 +231,7 @@ class ClassificationMixin(object):
"confidence": created_cl["confidence"], "confidence": created_cl["confidence"],
"state": created_cl["state"], "state": created_cl["state"],
"worker_version_id": self.worker_version_id, "worker_version_id": self.worker_version_id,
"worker_run_id": self.worker_run_id,
} }
for created_cl in created_cls for created_cl in created_cls
] ]
......
arkindex_worker/worker/element.py
View file @ 87c26ec2
...@@ -139,6 +139,7 @@ class ElementMixin(object): ...@@ -139,6 +139,7 @@ class ElementMixin(object):
"polygon": polygon, "polygon": polygon,
"parent": element.id, "parent": element.id,
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
"confidence": confidence, "confidence": confidence,
}, },
) )
...@@ -234,6 +235,7 @@ class ElementMixin(object): ...@@ -234,6 +235,7 @@ class ElementMixin(object):
id=parent.id, id=parent.id,
body={ body={
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
"elements": elements, "elements": elements,
}, },
) )
...@@ -266,6 +268,7 @@ class ElementMixin(object): ...@@ -266,6 +268,7 @@ class ElementMixin(object):
"image_id": image_id, "image_id": image_id,
"polygon": element["polygon"], "polygon": element["polygon"],
"worker_version_id": self.worker_version_id, "worker_version_id": self.worker_version_id,
"worker_run_id": self.worker_run_id,
"confidence": element.get("confidence"), "confidence": element.get("confidence"),
} }
for idx, element in enumerate(elements) for idx, element in enumerate(elements)
......
arkindex_worker/worker/entity.py
View file @ 87c26ec2
...@@ -71,6 +71,7 @@ class EntityMixin(object): ...@@ -71,6 +71,7 @@ class EntityMixin(object):
"validated": validated, "validated": validated,
"corpus": self.corpus_id, "corpus": self.corpus_id,
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
}, },
) )
self.report.add_entity(element.id, entity["id"], type.value, name) self.report.add_entity(element.id, entity["id"], type.value, name)
...@@ -141,6 +142,7 @@ class EntityMixin(object): ...@@ -141,6 +142,7 @@ class EntityMixin(object):
"length": length, "length": length,
"offset": offset, "offset": offset,
"worker_version_id": self.worker_version_id, "worker_version_id": self.worker_version_id,
"worker_run_id": self.worker_run_id,
} }
if confidence is not None: if confidence is not None:
body["confidence"] = confidence body["confidence"] = confidence
...@@ -161,6 +163,7 @@ class EntityMixin(object): ...@@ -161,6 +163,7 @@ class EntityMixin(object):
offset=offset, offset=offset,
length=length, length=length,
worker_version_id=self.worker_version_id, worker_version_id=self.worker_version_id,
worker_run_id=self.worker_run_id,
confidence=confidence, confidence=confidence,
) )
except IntegrityError as e: except IntegrityError as e:
......
arkindex_worker/worker/metadata.py
View file @ 87c26ec2
...@@ -102,6 +102,7 @@ class MetaDataMixin(object): ...@@ -102,6 +102,7 @@ class MetaDataMixin(object):
"value": value, "value": value,
"entity_id": entity, "entity_id": entity,
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
}, },
) )
self.report.add_metadata(element.id, metadata["id"], type.value, name) self.report.add_metadata(element.id, metadata["id"], type.value, name)
......
arkindex_worker/worker/transcription.py
View file @ 87c26ec2
...@@ -83,6 +83,7 @@ class TranscriptionMixin(object): ...@@ -83,6 +83,7 @@ class TranscriptionMixin(object):
body={ body={
"text": text, "text": text,
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
"confidence": confidence, "confidence": confidence,
"orientation": orientation.value, "orientation": orientation.value,
}, },
...@@ -101,6 +102,7 @@ class TranscriptionMixin(object): ...@@ -101,6 +102,7 @@ class TranscriptionMixin(object):
"confidence": created["confidence"], "confidence": created["confidence"],
"orientation": created["orientation"], "orientation": created["orientation"],
"worker_version_id": self.worker_version_id, "worker_version_id": self.worker_version_id,
"worker_run_id": self.worker_run_id,
} }
] ]
CachedTranscription.insert_many(to_insert).execute() CachedTranscription.insert_many(to_insert).execute()
...@@ -171,6 +173,7 @@ class TranscriptionMixin(object): ...@@ -171,6 +173,7 @@ class TranscriptionMixin(object):
"CreateTranscriptions", "CreateTranscriptions",
body={ body={
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
"transcriptions": transcriptions_payload, "transcriptions": transcriptions_payload,
}, },
)["transcriptions"] )["transcriptions"]
...@@ -189,6 +192,7 @@ class TranscriptionMixin(object): ...@@ -189,6 +192,7 @@ class TranscriptionMixin(object):
"confidence": created_tr["confidence"], "confidence": created_tr["confidence"],
"orientation": created_tr["orientation"], "orientation": created_tr["orientation"],
"worker_version_id": self.worker_version_id, "worker_version_id": self.worker_version_id,
"worker_run_id": self.worker_run_id,
} }
for created_tr in created_trs for created_tr in created_trs
] ]
...@@ -284,6 +288,7 @@ class TranscriptionMixin(object): ...@@ -284,6 +288,7 @@ class TranscriptionMixin(object):
body={ body={
"element_type": sub_element_type, "element_type": sub_element_type,
"worker_version": self.worker_version_id, "worker_version": self.worker_version_id,
"worker_run_id": self.worker_run_id,
"transcriptions": transcriptions_payload, "transcriptions": transcriptions_payload,
"return_elements": True, "return_elements": True,
}, },
...@@ -321,6 +326,7 @@ class TranscriptionMixin(object): ...@@ -321,6 +326,7 @@ class TranscriptionMixin(object):
"image_id": element.image_id, "image_id": element.image_id,
"polygon": transcription["polygon"], "polygon": transcription["polygon"],
"worker_version_id": self.worker_version_id, "worker_version_id": self.worker_version_id,
"worker_run_id": self.worker_run_id,
} }
) )
...@@ -336,6 +342,7 @@ class TranscriptionMixin(object): ...@@ -336,6 +342,7 @@ class TranscriptionMixin(object):
"orientation", TextOrientation.HorizontalLeftToRight "orientation", TextOrientation.HorizontalLeftToRight
).value, ).value,
"worker_version_id": self.worker_version_id, "worker_version_id": self.worker_version_id,
"worker_run_id": self.worker_run_id,
} }
) )
......
tests/test_cache.py
View file @ 87c26ec2
...@@ -58,12 +58,12 @@ def test_create_tables(tmp_path): ...@@ -58,12 +58,12 @@ def test_create_tables(tmp_path):
init_cache_db(db_path) init_cache_db(db_path)
create_tables() create_tables()
expected_schema = """CREATE TABLE "classifications" ("id" TEXT NOT NULL PRIMARY KEY, "element_id" TEXT NOT NULL, "class_name" TEXT NOT NULL, "confidence" REAL NOT NULL, "state" VARCHAR(10) NOT NULL, "worker_version_id" TEXT, FOREIGN KEY ("element_id") REFERENCES "elements" ("id")) expected_schema = """CREATE TABLE "classifications" ("id" TEXT NOT NULL PRIMARY KEY, "element_id" TEXT NOT NULL, "class_name" TEXT NOT NULL, "confidence" REAL NOT NULL, "state" VARCHAR(10) NOT NULL, "worker_version_id" TEXT, "worker_run_id" TEXT, FOREIGN KEY ("element_id") REFERENCES "elements" ("id"))
CREATE TABLE "elements" ("id" TEXT NOT NULL PRIMARY KEY, "parent_id" TEXT, "type" VARCHAR(50) NOT NULL, "image_id" TEXT, "polygon" text, "rotation_angle" INTEGER NOT NULL, "mirrored" INTEGER NOT NULL, "initial" INTEGER NOT NULL, "worker_version_id" TEXT, "confidence" REAL, FOREIGN KEY ("image_id") REFERENCES "images" ("id")) CREATE TABLE "elements" ("id" TEXT NOT NULL PRIMARY KEY, "parent_id" TEXT, "type" VARCHAR(50) NOT NULL, "image_id" TEXT, "polygon" text, "rotation_angle" INTEGER NOT NULL, "mirrored" INTEGER NOT NULL, "initial" INTEGER NOT NULL, "worker_version_id" TEXT, "worker_run_id" TEXT, "confidence" REAL, FOREIGN KEY ("image_id") REFERENCES "images" ("id"))
CREATE TABLE "entities" ("id" TEXT NOT NULL PRIMARY KEY, "type" VARCHAR(50) NOT NULL, "name" TEXT NOT NULL, "validated" INTEGER NOT NULL, "metas" text, "worker_version_id" TEXT) CREATE TABLE "entities" ("id" TEXT NOT NULL PRIMARY KEY, "type" VARCHAR(50) NOT NULL, "name" TEXT NOT NULL, "validated" INTEGER NOT NULL, "metas" text, "worker_version_id" TEXT, "worker_run_id" TEXT)
CREATE TABLE "images" ("id" TEXT NOT NULL PRIMARY KEY, "width" INTEGER NOT NULL, "height" INTEGER NOT NULL, "url" TEXT NOT NULL) CREATE TABLE "images" ("id" TEXT NOT NULL PRIMARY KEY, "width" INTEGER NOT NULL, "height" INTEGER NOT NULL, "url" TEXT NOT NULL)
CREATE TABLE "transcription_entities" ("transcription_id" TEXT NOT NULL, "entity_id" TEXT NOT NULL, "offset" INTEGER NOT NULL CHECK (offset >= 0), "length" INTEGER NOT NULL CHECK (length > 0), "worker_version_id" TEXT, "confidence" REAL, PRIMARY KEY ("transcription_id", "entity_id"), FOREIGN KEY ("transcription_id") REFERENCES "transcriptions" ("id"), FOREIGN KEY ("entity_id") REFERENCES "entities" ("id")) CREATE TABLE "transcription_entities" ("transcription_id" TEXT NOT NULL, "entity_id" TEXT NOT NULL, "offset" INTEGER NOT NULL CHECK (offset >= 0), "length" INTEGER NOT NULL CHECK (length > 0), "worker_version_id" TEXT, "worker_run_id" TEXT, "confidence" REAL, PRIMARY KEY ("transcription_id", "entity_id"), FOREIGN KEY ("transcription_id") REFERENCES "transcriptions" ("id"), FOREIGN KEY ("entity_id") REFERENCES "entities" ("id"))
CREATE TABLE "transcriptions" ("id" TEXT NOT NULL PRIMARY KEY, "element_id" TEXT NOT NULL, "text" TEXT NOT NULL, "confidence" REAL NOT NULL, "orientation" VARCHAR(50) NOT NULL, "worker_version_id" TEXT, FOREIGN KEY ("element_id") REFERENCES "elements" ("id"))""" CREATE TABLE "transcriptions" ("id" TEXT NOT NULL PRIMARY KEY, "element_id" TEXT NOT NULL, "text" TEXT NOT NULL, "confidence" REAL NOT NULL, "orientation" VARCHAR(50) NOT NULL, "worker_version_id" TEXT, "worker_run_id" TEXT, FOREIGN KEY ("element_id") REFERENCES "elements" ("id"))"""
actual_schema = "\n".join( actual_schema = "\n".join(
[ [
......
tests/test_elements_worker/test_classifications.py
View file @ 87c26ec2
...@@ -250,6 +250,7 @@ def test_create_classification_wrong_ml_class(mock_elements_worker, responses): ...@@ -250,6 +250,7 @@ def test_create_classification_wrong_ml_class(mock_elements_worker, responses):
"element": "12341234-1234-1234-1234-123412341234", "element": "12341234-1234-1234-1234-123412341234",
"ml_class": "new-ml-class-1234", "ml_class": "new-ml-class-1234",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
"high_confidence": True, "high_confidence": True,
}, },
...@@ -401,6 +402,7 @@ def test_create_classification(responses, mock_elements_worker): ...@@ -401,6 +402,7 @@ def test_create_classification(responses, mock_elements_worker):
"element": "12341234-1234-1234-1234-123412341234", "element": "12341234-1234-1234-1234-123412341234",
"ml_class": "0000", "ml_class": "0000",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
"high_confidence": True, "high_confidence": True,
} }
...@@ -426,6 +428,7 @@ def test_create_classification_with_cache(responses, mock_elements_worker_with_c ...@@ -426,6 +428,7 @@ def test_create_classification_with_cache(responses, mock_elements_worker_with_c
"element": "12341234-1234-1234-1234-123412341234", "element": "12341234-1234-1234-1234-123412341234",
"ml_class": "0000", "ml_class": "0000",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
"high_confidence": True, "high_confidence": True,
"state": "pending", "state": "pending",
...@@ -450,6 +453,7 @@ def test_create_classification_with_cache(responses, mock_elements_worker_with_c ...@@ -450,6 +453,7 @@ def test_create_classification_with_cache(responses, mock_elements_worker_with_c
"element": "12341234-1234-1234-1234-123412341234", "element": "12341234-1234-1234-1234-123412341234",
"ml_class": "0000", "ml_class": "0000",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
"high_confidence": True, "high_confidence": True,
} }
...@@ -468,11 +472,14 @@ def test_create_classification_with_cache(responses, mock_elements_worker_with_c ...@@ -468,11 +472,14 @@ def test_create_classification_with_cache(responses, mock_elements_worker_with_c
confidence=0.42, confidence=0.42,
state="pending", state="pending",
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
) )
] ]
def test_create_classification_duplicate(responses, mock_elements_worker): def test_create_classification_duplicate_worker_version(
responses, mock_elements_worker
):
mock_elements_worker.classes = { mock_elements_worker.classes = {
"11111111-1111-1111-1111-111111111111": {"a_class": "0000"} "11111111-1111-1111-1111-111111111111": {"a_class": "0000"}
} }
...@@ -506,6 +513,50 @@ def test_create_classification_duplicate(responses, mock_elements_worker): ...@@ -506,6 +513,50 @@ def test_create_classification_duplicate(responses, mock_elements_worker):
"element": "12341234-1234-1234-1234-123412341234", "element": "12341234-1234-1234-1234-123412341234",
"ml_class": "0000", "ml_class": "0000",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42,
"high_confidence": True,
}
# Classification has NOT been created
assert mock_elements_worker.report.report_data["elements"] == {}
def test_create_classification_duplicate_worker_run(responses, mock_elements_worker):
mock_elements_worker.classes = {
"11111111-1111-1111-1111-111111111111": {"a_class": "0000"}
}
elt = Element({"id": "12341234-1234-1234-1234-123412341234"})
responses.add(
responses.POST,
"http://testserver/api/v1/classifications/",
status=400,
json={
"non_field_errors": [
"The fields element, worker_run, ml_class must make a unique set."
]
},
)
mock_elements_worker.create_classification(
element=elt,
ml_class="a_class",
confidence=0.42,
high_confidence=True,
)
assert len(responses.calls) == len(BASE_API_CALLS) + 1
assert [
(call.request.method, call.request.url) for call in responses.calls
] == BASE_API_CALLS + [
("POST", "http://testserver/api/v1/classifications/"),
]
assert json.loads(responses.calls[-1].request.body) == {
"element": "12341234-1234-1234-1234-123412341234",
"ml_class": "0000",
"worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
"high_confidence": True, "high_confidence": True,
} }
...@@ -827,6 +878,7 @@ def test_create_classifications(responses, mock_elements_worker_with_cache): ...@@ -827,6 +878,7 @@ def test_create_classifications(responses, mock_elements_worker_with_cache):
json={ json={
"parent": str(elt.id), "parent": str(elt.id),
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"classifications": [ "classifications": [
{ {
"id": "00000000-0000-0000-0000-000000000000", "id": "00000000-0000-0000-0000-000000000000",
...@@ -860,6 +912,7 @@ def test_create_classifications(responses, mock_elements_worker_with_cache): ...@@ -860,6 +912,7 @@ def test_create_classifications(responses, mock_elements_worker_with_cache):
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"parent": str(elt.id), "parent": str(elt.id),
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"classifications": classes, "classifications": classes,
} }
...@@ -872,6 +925,7 @@ def test_create_classifications(responses, mock_elements_worker_with_cache): ...@@ -872,6 +925,7 @@ def test_create_classifications(responses, mock_elements_worker_with_cache):
confidence=0.75, confidence=0.75,
state="pending", state="pending",
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
CachedClassification( CachedClassification(
id=UUID("11111111-1111-1111-1111-111111111111"), id=UUID("11111111-1111-1111-1111-111111111111"),
...@@ -880,5 +934,6 @@ def test_create_classifications(responses, mock_elements_worker_with_cache): ...@@ -880,5 +934,6 @@ def test_create_classifications(responses, mock_elements_worker_with_cache):
confidence=0.25, confidence=0.25,
state="pending", state="pending",
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
] ]
tests/test_elements_worker/test_elements.py
View file @ 87c26ec2
...@@ -574,6 +574,7 @@ def test_create_sub_element(responses, mock_elements_worker, slim_output): ...@@ -574,6 +574,7 @@ def test_create_sub_element(responses, mock_elements_worker, slim_output):
"polygon": [[1, 1], [2, 2], [2, 1], [1, 2]], "polygon": [[1, 1], [2, 2], [2, 1], [1, 2]],
"parent": "12341234-1234-1234-1234-123412341234", "parent": "12341234-1234-1234-1234-123412341234",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": None, "confidence": None,
} }
if slim_output: if slim_output:
...@@ -619,6 +620,7 @@ def test_create_sub_element_confidence(responses, mock_elements_worker): ...@@ -619,6 +620,7 @@ def test_create_sub_element_confidence(responses, mock_elements_worker):
"polygon": [[1, 1], [2, 2], [2, 1], [1, 2]], "polygon": [[1, 1], [2, 2], [2, 1], [1, 2]],
"parent": "12341234-1234-1234-1234-123412341234", "parent": "12341234-1234-1234-1234-123412341234",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
} }
assert sub_element_id == "12345678-1234-1234-1234-123456789123" assert sub_element_id == "12345678-1234-1234-1234-123456789123"
...@@ -994,6 +996,7 @@ def test_create_elements_cached_element(responses, mock_elements_worker_with_cac ...@@ -994,6 +996,7 @@ def test_create_elements_cached_element(responses, mock_elements_worker_with_cac
} }
], ],
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
assert created_ids == [{"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08"}] assert created_ids == [{"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08"}]
...@@ -1007,6 +1010,7 @@ def test_create_elements_cached_element(responses, mock_elements_worker_with_cac ...@@ -1007,6 +1010,7 @@ def test_create_elements_cached_element(responses, mock_elements_worker_with_cac
image_id="c0fec0fe-c0fe-c0fe-c0fe-c0fec0fec0fe", image_id="c0fec0fe-c0fe-c0fe-c0fe-c0fec0fec0fe",
polygon=[[1, 1], [2, 2], [2, 1], [1, 2]], polygon=[[1, 1], [2, 2], [2, 1], [1, 2]],
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
] ]
...@@ -1061,6 +1065,7 @@ def test_create_elements(responses, mock_elements_worker_with_cache, tmp_path): ...@@ -1061,6 +1065,7 @@ def test_create_elements(responses, mock_elements_worker_with_cache, tmp_path):
} }
], ],
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
assert created_ids == [{"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08"}] assert created_ids == [{"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08"}]
...@@ -1075,6 +1080,7 @@ def test_create_elements(responses, mock_elements_worker_with_cache, tmp_path): ...@@ -1075,6 +1080,7 @@ def test_create_elements(responses, mock_elements_worker_with_cache, tmp_path):
image_id="c0fec0fe-c0fe-c0fe-c0fe-c0fec0fec0fe", image_id="c0fec0fe-c0fe-c0fe-c0fe-c0fec0fec0fe",
polygon=[[1, 1], [2, 2], [2, 1], [1, 2]], polygon=[[1, 1], [2, 2], [2, 1], [1, 2]],
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
confidence=None, confidence=None,
) )
] ]
...@@ -1134,6 +1140,7 @@ def test_create_elements_confidence( ...@@ -1134,6 +1140,7 @@ def test_create_elements_confidence(
} }
], ],
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
assert created_ids == [{"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08"}] assert created_ids == [{"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08"}]
...@@ -1148,6 +1155,7 @@ def test_create_elements_confidence( ...@@ -1148,6 +1155,7 @@ def test_create_elements_confidence(
image_id="c0fec0fe-c0fe-c0fe-c0fe-c0fec0fec0fe", image_id="c0fec0fe-c0fe-c0fe-c0fe-c0fec0fec0fe",
polygon=[[1, 1], [2, 2], [2, 1], [1, 2]], polygon=[[1, 1], [2, 2], [2, 1], [1, 2]],
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
confidence=0.42, confidence=0.42,
) )
] ]
...@@ -1392,6 +1400,7 @@ def test_list_element_children(responses, mock_elements_worker): ...@@ -1392,6 +1400,7 @@ def test_list_element_children(responses, mock_elements_worker):
"best_classes": None, "best_classes": None,
"has_children": None, "has_children": None,
"worker_version_id": None, "worker_version_id": None,
"worker_run_id": None,
}, },
{ {
"id": "1111", "id": "1111",
...@@ -1403,6 +1412,7 @@ def test_list_element_children(responses, mock_elements_worker): ...@@ -1403,6 +1412,7 @@ def test_list_element_children(responses, mock_elements_worker):
"best_classes": None, "best_classes": None,
"has_children": None, "has_children": None,
"worker_version_id": None, "worker_version_id": None,
"worker_run_id": None,
}, },
{ {
"id": "2222", "id": "2222",
...@@ -1414,6 +1424,7 @@ def test_list_element_children(responses, mock_elements_worker): ...@@ -1414,6 +1424,7 @@ def test_list_element_children(responses, mock_elements_worker):
"best_classes": None, "best_classes": None,
"has_children": None, "has_children": None,
"worker_version_id": None, "worker_version_id": None,
"worker_run_id": None,
}, },
] ]
responses.add( responses.add(
...@@ -1456,6 +1467,7 @@ def test_list_element_children_manual_worker_version(responses, mock_elements_wo ...@@ -1456,6 +1467,7 @@ def test_list_element_children_manual_worker_version(responses, mock_elements_wo
"best_classes": None, "best_classes": None,
"has_children": None, "has_children": None,
"worker_version_id": None, "worker_version_id": None,
"worker_run_id": None,
} }
] ]
responses.add( responses.add(
......
tests/test_elements_worker/test_entities.py
View file @ 87c26ec2
...@@ -187,6 +187,7 @@ def test_create_entity(responses, mock_elements_worker): ...@@ -187,6 +187,7 @@ def test_create_entity(responses, mock_elements_worker):
"validated": None, "validated": None,
"corpus": "11111111-1111-1111-1111-111111111111", "corpus": "11111111-1111-1111-1111-111111111111",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
assert entity_id == "12345678-1234-1234-1234-123456789123" assert entity_id == "12345678-1234-1234-1234-123456789123"
...@@ -220,6 +221,7 @@ def test_create_entity_with_cache(responses, mock_elements_worker_with_cache): ...@@ -220,6 +221,7 @@ def test_create_entity_with_cache(responses, mock_elements_worker_with_cache):
"validated": None, "validated": None,
"corpus": "11111111-1111-1111-1111-111111111111", "corpus": "11111111-1111-1111-1111-111111111111",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
assert entity_id == "12345678-1234-1234-1234-123456789123" assert entity_id == "12345678-1234-1234-1234-123456789123"
...@@ -232,6 +234,7 @@ def test_create_entity_with_cache(responses, mock_elements_worker_with_cache): ...@@ -232,6 +234,7 @@ def test_create_entity_with_cache(responses, mock_elements_worker_with_cache):
validated=False, validated=False,
metas={}, metas={},
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
) )
] ]
...@@ -419,6 +422,7 @@ def test_create_transcription_entity_no_confidence(responses, mock_elements_work ...@@ -419,6 +422,7 @@ def test_create_transcription_entity_no_confidence(responses, mock_elements_work
"offset": 5, "offset": 5,
"length": 10, "length": 10,
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
...@@ -457,6 +461,7 @@ def test_create_transcription_entity_with_confidence(responses, mock_elements_wo ...@@ -457,6 +461,7 @@ def test_create_transcription_entity_with_confidence(responses, mock_elements_wo
"offset": 5, "offset": 5,
"length": 10, "length": 10,
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.33, "confidence": 0.33,
} }
...@@ -496,6 +501,7 @@ def test_create_transcription_entity_confidence_none(responses, mock_elements_wo ...@@ -496,6 +501,7 @@ def test_create_transcription_entity_confidence_none(responses, mock_elements_wo
"offset": 5, "offset": 5,
"length": 10, "length": 10,
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
...@@ -513,12 +519,14 @@ def test_create_transcription_entity_with_cache( ...@@ -513,12 +519,14 @@ def test_create_transcription_entity_with_cache(
confidence=0.42, confidence=0.42,
orientation=TextOrientation.HorizontalLeftToRight, orientation=TextOrientation.HorizontalLeftToRight,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
) )
CachedEntity.create( CachedEntity.create(
id=UUID("11111111-1111-1111-1111-111111111111"), id=UUID("11111111-1111-1111-1111-111111111111"),
type="person", type="person",
name="Bob Bob", name="Bob Bob",
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
) )
responses.add( responses.add(
...@@ -553,6 +561,7 @@ def test_create_transcription_entity_with_cache( ...@@ -553,6 +561,7 @@ def test_create_transcription_entity_with_cache(
"offset": 5, "offset": 5,
"length": 10, "length": 10,
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
# Check that created transcription entity was properly stored in SQLite cache # Check that created transcription entity was properly stored in SQLite cache
...@@ -563,6 +572,7 @@ def test_create_transcription_entity_with_cache( ...@@ -563,6 +572,7 @@ def test_create_transcription_entity_with_cache(
offset=5, offset=5,
length=10, length=10,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
) )
] ]
...@@ -581,12 +591,14 @@ def test_create_transcription_entity_with_confidence_with_cache( ...@@ -581,12 +591,14 @@ def test_create_transcription_entity_with_confidence_with_cache(
confidence=0.42, confidence=0.42,
orientation=TextOrientation.HorizontalLeftToRight, orientation=TextOrientation.HorizontalLeftToRight,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
) )
CachedEntity.create( CachedEntity.create(
id=UUID("11111111-1111-1111-1111-111111111111"), id=UUID("11111111-1111-1111-1111-111111111111"),
type="person", type="person",
name="Bob Bob", name="Bob Bob",
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
) )
responses.add( responses.add(
...@@ -623,6 +635,7 @@ def test_create_transcription_entity_with_confidence_with_cache( ...@@ -623,6 +635,7 @@ def test_create_transcription_entity_with_confidence_with_cache(
"offset": 5, "offset": 5,
"length": 10, "length": 10,
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.77, "confidence": 0.77,
} }
...@@ -634,6 +647,7 @@ def test_create_transcription_entity_with_confidence_with_cache( ...@@ -634,6 +647,7 @@ def test_create_transcription_entity_with_confidence_with_cache(
offset=5, offset=5,
length=10, length=10,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
confidence=0.77, confidence=0.77,
) )
] ]
......
tests/test_elements_worker/test_metadata.py
View file @ 87c26ec2
...@@ -194,6 +194,7 @@ def test_create_metadata(responses, mock_elements_worker): ...@@ -194,6 +194,7 @@ def test_create_metadata(responses, mock_elements_worker):
"value": "La Turbine, Grenoble 38000", "value": "La Turbine, Grenoble 38000",
"entity_id": None, "entity_id": None,
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
} }
assert metadata_id == "12345678-1234-1234-1234-123456789123" assert metadata_id == "12345678-1234-1234-1234-123456789123"
...@@ -221,8 +222,8 @@ def test_create_metadatas(responses, mock_elements_worker, metadatas): ...@@ -221,8 +222,8 @@ def test_create_metadatas(responses, mock_elements_worker, metadatas):
"http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/bulk/", "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/bulk/",
status=201, status=201,
json={ json={
"worker_version": mock_elements_worker.worker_version_id, "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": mock_elements_worker.worker_run_id, "worker_run_id": "56785678-5678-5678-5678-567856785678",
"metadata_list": [ "metadata_list": [
{ {
"id": "fake_metadata_id", "id": "fake_metadata_id",
......
tests/test_elements_worker/test_transcriptions.py
View file @ 87c26ec2
...@@ -134,6 +134,7 @@ def test_create_transcription_default_orientation(responses, mock_elements_worke ...@@ -134,6 +134,7 @@ def test_create_transcription_default_orientation(responses, mock_elements_worke
"text": "Animula vagula blandula", "text": "Animula vagula blandula",
"confidence": 0.42, "confidence": 0.42,
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
}, },
) )
mock_elements_worker.create_transcription( mock_elements_worker.create_transcription(
...@@ -144,6 +145,7 @@ def test_create_transcription_default_orientation(responses, mock_elements_worke ...@@ -144,6 +145,7 @@ def test_create_transcription_default_orientation(responses, mock_elements_worke
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"text": "Animula vagula blandula", "text": "Animula vagula blandula",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
"orientation": "horizontal-lr", "orientation": "horizontal-lr",
} }
...@@ -160,6 +162,7 @@ def test_create_transcription_orientation(responses, mock_elements_worker): ...@@ -160,6 +162,7 @@ def test_create_transcription_orientation(responses, mock_elements_worker):
"text": "Animula vagula blandula", "text": "Animula vagula blandula",
"confidence": 0.42, "confidence": 0.42,
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
}, },
) )
mock_elements_worker.create_transcription( mock_elements_worker.create_transcription(
...@@ -171,6 +174,7 @@ def test_create_transcription_orientation(responses, mock_elements_worker): ...@@ -171,6 +174,7 @@ def test_create_transcription_orientation(responses, mock_elements_worker):
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"text": "Animula vagula blandula", "text": "Animula vagula blandula",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
"orientation": "vertical-lr", "orientation": "vertical-lr",
} }
...@@ -230,6 +234,7 @@ def test_create_transcription(responses, mock_elements_worker): ...@@ -230,6 +234,7 @@ def test_create_transcription(responses, mock_elements_worker):
"text": "i am a line", "text": "i am a line",
"confidence": 0.42, "confidence": 0.42,
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
}, },
) )
...@@ -249,6 +254,7 @@ def test_create_transcription(responses, mock_elements_worker): ...@@ -249,6 +254,7 @@ def test_create_transcription(responses, mock_elements_worker):
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"text": "i am a line", "text": "i am a line",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"confidence": 0.42, "confidence": 0.42,
"orientation": "horizontal-lr", "orientation": "horizontal-lr",
} }
...@@ -267,6 +273,7 @@ def test_create_transcription_with_cache(responses, mock_elements_worker_with_ca ...@@ -267,6 +273,7 @@ def test_create_transcription_with_cache(responses, mock_elements_worker_with_ca
"confidence": 0.42, "confidence": 0.42,
"orientation": "horizontal-lr", "orientation": "horizontal-lr",
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
}, },
) )
...@@ -286,6 +293,7 @@ def test_create_transcription_with_cache(responses, mock_elements_worker_with_ca ...@@ -286,6 +293,7 @@ def test_create_transcription_with_cache(responses, mock_elements_worker_with_ca
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"text": "i am a line", "text": "i am a line",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"orientation": "horizontal-lr", "orientation": "horizontal-lr",
"confidence": 0.42, "confidence": 0.42,
} }
...@@ -299,6 +307,7 @@ def test_create_transcription_with_cache(responses, mock_elements_worker_with_ca ...@@ -299,6 +307,7 @@ def test_create_transcription_with_cache(responses, mock_elements_worker_with_ca
confidence=0.42, confidence=0.42,
orientation=TextOrientation.HorizontalLeftToRight, orientation=TextOrientation.HorizontalLeftToRight,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
) )
] ]
...@@ -317,6 +326,7 @@ def test_create_transcription_orientation_with_cache( ...@@ -317,6 +326,7 @@ def test_create_transcription_orientation_with_cache(
"confidence": 0.42, "confidence": 0.42,
"orientation": "vertical-lr", "orientation": "vertical-lr",
"worker_version_id": "12341234-1234-1234-1234-123412341234", "worker_version_id": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
}, },
) )
mock_elements_worker_with_cache.create_transcription( mock_elements_worker_with_cache.create_transcription(
...@@ -328,6 +338,7 @@ def test_create_transcription_orientation_with_cache( ...@@ -328,6 +338,7 @@ def test_create_transcription_orientation_with_cache(
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"text": "Animula vagula blandula", "text": "Animula vagula blandula",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"orientation": "vertical-lr", "orientation": "vertical-lr",
"confidence": 0.42, "confidence": 0.42,
} }
...@@ -345,12 +356,14 @@ def test_create_transcription_orientation_with_cache( ...@@ -345,12 +356,14 @@ def test_create_transcription_orientation_with_cache(
"mirrored": False, "mirrored": False,
"initial": False, "initial": False,
"worker_version_id": None, "worker_version_id": None,
"worker_run_id": None,
"confidence": None, "confidence": None,
}, },
"text": "Animula vagula blandula", "text": "Animula vagula blandula",
"confidence": 0.42, "confidence": 0.42,
"orientation": TextOrientation.VerticalLeftToRight.value, "orientation": TextOrientation.VerticalLeftToRight.value,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
} }
] ]
...@@ -663,6 +676,7 @@ def test_create_transcriptions(responses, mock_elements_worker_with_cache): ...@@ -663,6 +676,7 @@ def test_create_transcriptions(responses, mock_elements_worker_with_cache):
status=200, status=200,
json={ json={
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"transcriptions": [ "transcriptions": [
{ {
"id": "00000000-0000-0000-0000-000000000000", "id": "00000000-0000-0000-0000-000000000000",
...@@ -695,6 +709,7 @@ def test_create_transcriptions(responses, mock_elements_worker_with_cache): ...@@ -695,6 +709,7 @@ def test_create_transcriptions(responses, mock_elements_worker_with_cache):
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"transcriptions": [ "transcriptions": [
{ {
"element_id": "11111111-1111-1111-1111-111111111111", "element_id": "11111111-1111-1111-1111-111111111111",
...@@ -720,6 +735,7 @@ def test_create_transcriptions(responses, mock_elements_worker_with_cache): ...@@ -720,6 +735,7 @@ def test_create_transcriptions(responses, mock_elements_worker_with_cache):
confidence=0.75, confidence=0.75,
orientation=TextOrientation.HorizontalLeftToRight, orientation=TextOrientation.HorizontalLeftToRight,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
CachedTranscription( CachedTranscription(
id=UUID("11111111-1111-1111-1111-111111111111"), id=UUID("11111111-1111-1111-1111-111111111111"),
...@@ -728,6 +744,7 @@ def test_create_transcriptions(responses, mock_elements_worker_with_cache): ...@@ -728,6 +744,7 @@ def test_create_transcriptions(responses, mock_elements_worker_with_cache):
confidence=0.42, confidence=0.42,
orientation=TextOrientation.HorizontalLeftToRight, orientation=TextOrientation.HorizontalLeftToRight,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
] ]
...@@ -755,6 +772,7 @@ def test_create_transcriptions_orientation(responses, mock_elements_worker_with_ ...@@ -755,6 +772,7 @@ def test_create_transcriptions_orientation(responses, mock_elements_worker_with_
status=200, status=200,
json={ json={
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"transcriptions": [ "transcriptions": [
{ {
"id": "00000000-0000-0000-0000-000000000000", "id": "00000000-0000-0000-0000-000000000000",
...@@ -780,6 +798,7 @@ def test_create_transcriptions_orientation(responses, mock_elements_worker_with_ ...@@ -780,6 +798,7 @@ def test_create_transcriptions_orientation(responses, mock_elements_worker_with_
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"transcriptions": [ "transcriptions": [
{ {
"element_id": "11111111-1111-1111-1111-111111111111", "element_id": "11111111-1111-1111-1111-111111111111",
...@@ -810,12 +829,14 @@ def test_create_transcriptions_orientation(responses, mock_elements_worker_with_ ...@@ -810,12 +829,14 @@ def test_create_transcriptions_orientation(responses, mock_elements_worker_with_
"mirrored": False, "mirrored": False,
"initial": False, "initial": False,
"worker_version_id": None, "worker_version_id": None,
"worker_run_id": None,
"confidence": None, "confidence": None,
}, },
"text": "Animula vagula blandula", "text": "Animula vagula blandula",
"confidence": 0.12, "confidence": 0.12,
"orientation": TextOrientation.HorizontalRightToLeft.value, "orientation": TextOrientation.HorizontalRightToLeft.value,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
}, },
{ {
"id": UUID("11111111-1111-1111-1111-111111111111"), "id": UUID("11111111-1111-1111-1111-111111111111"),
...@@ -829,12 +850,14 @@ def test_create_transcriptions_orientation(responses, mock_elements_worker_with_ ...@@ -829,12 +850,14 @@ def test_create_transcriptions_orientation(responses, mock_elements_worker_with_
"mirrored": False, "mirrored": False,
"initial": False, "initial": False,
"worker_version_id": None, "worker_version_id": None,
"worker_run_id": None,
"confidence": None, "confidence": None,
}, },
"text": "Hospes comesque corporis", "text": "Hospes comesque corporis",
"confidence": 0.21, "confidence": 0.21,
"orientation": TextOrientation.VerticalLeftToRight.value, "orientation": TextOrientation.VerticalLeftToRight.value,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
}, },
] ]
...@@ -1307,6 +1330,7 @@ def test_create_element_transcriptions(responses, mock_elements_worker): ...@@ -1307,6 +1330,7 @@ def test_create_element_transcriptions(responses, mock_elements_worker):
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"element_type": "page", "element_type": "page",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"transcriptions": [ "transcriptions": [
{ {
"polygon": [[100, 150], [700, 150], [700, 200], [100, 200]], "polygon": [[100, 150], [700, 150], [700, 200], [100, 200]],
...@@ -1392,6 +1416,7 @@ def test_create_element_transcriptions_with_cache( ...@@ -1392,6 +1416,7 @@ def test_create_element_transcriptions_with_cache(
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"element_type": "page", "element_type": "page",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"transcriptions": [ "transcriptions": [
{ {
"polygon": [[100, 150], [700, 150], [700, 200], [100, 200]], "polygon": [[100, 150], [700, 150], [700, 200], [100, 200]],
...@@ -1440,6 +1465,7 @@ def test_create_element_transcriptions_with_cache( ...@@ -1440,6 +1465,7 @@ def test_create_element_transcriptions_with_cache(
type="page", type="page",
polygon="[[100, 150], [700, 150], [700, 200], [100, 200]]", polygon="[[100, 150], [700, 150], [700, 200], [100, 200]]",
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
CachedElement( CachedElement(
id=UUID("22222222-2222-2222-2222-222222222222"), id=UUID("22222222-2222-2222-2222-222222222222"),
...@@ -1447,6 +1473,7 @@ def test_create_element_transcriptions_with_cache( ...@@ -1447,6 +1473,7 @@ def test_create_element_transcriptions_with_cache(
type="page", type="page",
polygon="[[0, 0], [2000, 0], [2000, 3000], [0, 3000]]", polygon="[[0, 0], [2000, 0], [2000, 3000], [0, 3000]]",
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
] ]
assert list(CachedTranscription.select()) == [ assert list(CachedTranscription.select()) == [
...@@ -1457,6 +1484,7 @@ def test_create_element_transcriptions_with_cache( ...@@ -1457,6 +1484,7 @@ def test_create_element_transcriptions_with_cache(
confidence=0.5, confidence=0.5,
orientation=TextOrientation.HorizontalLeftToRight.value, orientation=TextOrientation.HorizontalLeftToRight.value,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
CachedTranscription( CachedTranscription(
id=UUID("67896789-6789-6789-6789-678967896789"), id=UUID("67896789-6789-6789-6789-678967896789"),
...@@ -1465,6 +1493,7 @@ def test_create_element_transcriptions_with_cache( ...@@ -1465,6 +1493,7 @@ def test_create_element_transcriptions_with_cache(
confidence=0.75, confidence=0.75,
orientation=TextOrientation.HorizontalLeftToRight.value, orientation=TextOrientation.HorizontalLeftToRight.value,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
CachedTranscription( CachedTranscription(
id=UUID("78907890-7890-7890-7890-789078907890"), id=UUID("78907890-7890-7890-7890-789078907890"),
...@@ -1473,6 +1502,7 @@ def test_create_element_transcriptions_with_cache( ...@@ -1473,6 +1502,7 @@ def test_create_element_transcriptions_with_cache(
confidence=0.9, confidence=0.9,
orientation=TextOrientation.HorizontalLeftToRight.value, orientation=TextOrientation.HorizontalLeftToRight.value,
worker_version_id=UUID("12341234-1234-1234-1234-123412341234"), worker_version_id=UUID("12341234-1234-1234-1234-123412341234"),
worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
), ),
] ]
...@@ -1534,6 +1564,7 @@ def test_create_transcriptions_orientation_with_cache( ...@@ -1534,6 +1564,7 @@ def test_create_transcriptions_orientation_with_cache(
assert json.loads(responses.calls[-1].request.body) == { assert json.loads(responses.calls[-1].request.body) == {
"element_type": "page", "element_type": "page",
"worker_version": "12341234-1234-1234-1234-123412341234", "worker_version": "12341234-1234-1234-1234-123412341234",
"worker_run_id": "56785678-5678-5678-5678-567856785678",
"transcriptions": [ "transcriptions": [
{ {
"polygon": [[100, 150], [700, 150], [700, 200], [100, 200]], "polygon": [[100, 150], [700, 150], [700, 200], [100, 200]],
...@@ -1588,12 +1619,14 @@ def test_create_transcriptions_orientation_with_cache( ...@@ -1588,12 +1619,14 @@ def test_create_transcriptions_orientation_with_cache(
"mirrored": False, "mirrored": False,
"initial": False, "initial": False,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
"confidence": None, "confidence": None,
}, },
"text": "Animula vagula blandula", "text": "Animula vagula blandula",
"confidence": 0.5, "confidence": 0.5,
"orientation": TextOrientation.HorizontalLeftToRight.value, "orientation": TextOrientation.HorizontalLeftToRight.value,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
}, },
{ {
"id": UUID("67896789-6789-6789-6789-678967896789"), "id": UUID("67896789-6789-6789-6789-678967896789"),
...@@ -1607,12 +1640,14 @@ def test_create_transcriptions_orientation_with_cache( ...@@ -1607,12 +1640,14 @@ def test_create_transcriptions_orientation_with_cache(
"mirrored": False, "mirrored": False,
"initial": False, "initial": False,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
"confidence": None, "confidence": None,
}, },
"text": "Hospes comesque corporis", "text": "Hospes comesque corporis",
"confidence": 0.75, "confidence": 0.75,
"orientation": TextOrientation.VerticalLeftToRight.value, "orientation": TextOrientation.VerticalLeftToRight.value,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
}, },
{ {
"id": UUID("78907890-7890-7890-7890-789078907890"), "id": UUID("78907890-7890-7890-7890-789078907890"),
...@@ -1626,12 +1661,14 @@ def test_create_transcriptions_orientation_with_cache( ...@@ -1626,12 +1661,14 @@ def test_create_transcriptions_orientation_with_cache(
"mirrored": False, "mirrored": False,
"initial": False, "initial": False,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
"confidence": None, "confidence": None,
}, },
"text": "Quae nunc abibis in loca", "text": "Quae nunc abibis in loca",
"confidence": 0.9, "confidence": 0.9,
"orientation": TextOrientation.HorizontalRightToLeft.value, "orientation": TextOrientation.HorizontalRightToLeft.value,
"worker_version_id": UUID("12341234-1234-1234-1234-123412341234"), "worker_version_id": UUID("12341234-1234-1234-1234-123412341234"),
"worker_run_id": UUID("56785678-5678-5678-5678-567856785678"),
}, },
] ]
......