Skip to content
Snippets Groups Projects
Verified Commit 239066cb authored by Yoann Schneider's avatar Yoann Schneider :tennis:
Browse files

Fix classification listing

parent a0f9a8e8
No related branches found
No related tags found
1 merge request!25Draft: Refactor and implement API version of the worker
Pipeline #171884 passed
...@@ -156,14 +156,14 @@ class Extractor(DatasetWorker): ...@@ -156,14 +156,14 @@ class Extractor(DatasetWorker):
""" """
logger.info(f"Processing element ({element})") logger.info(f"Processing element ({element})")
polygon = element.polygon
if isinstance(element, Element): if isinstance(element, Element):
image = element.image image = element.image
polygon = element.polygon
wk_version = get_object_id(element.worker_version) wk_version = get_object_id(element.worker_version)
wk_run = get_object_id(element.worker_run) wk_run = get_object_id(element.worker_run)
else: else:
image = element.zone.image image = element.zone.image
polygon = element.zone.polygon
wk_version = ( wk_version = (
element.worker_version element.worker_version
if hasattr(element, "worker_version") if hasattr(element, "worker_version")
...@@ -229,7 +229,7 @@ class Extractor(DatasetWorker): ...@@ -229,7 +229,7 @@ class Extractor(DatasetWorker):
f"Linking element {cached_element.id} to dataset ({self.cached_dataset.id})" f"Linking element {cached_element.id} to dataset ({self.cached_dataset.id})"
) )
with cache_database.atomic(): with cache_database.atomic():
cached_element: CachedDatasetElement = CachedDatasetElement.create( CachedDatasetElement.create(
id=uuid.uuid4(), id=uuid.uuid4(),
element=cached_element, element=cached_element,
dataset=self.cached_dataset, dataset=self.cached_dataset,
......
...@@ -8,7 +8,7 @@ from arkindex_worker.cache import ( ...@@ -8,7 +8,7 @@ from arkindex_worker.cache import (
CachedTranscription, CachedTranscription,
CachedTranscriptionEntity, CachedTranscriptionEntity,
) )
from arkindex_worker.models import Element, Transcription from arkindex_worker.models import Element, Set, Transcription
from arkindex_worker.worker.classification import ClassificationMixin from arkindex_worker.worker.classification import ClassificationMixin
from arkindex_worker.worker.element import ElementMixin from arkindex_worker.worker.element import ElementMixin
from arkindex_worker.worker.entity import EntityMixin from arkindex_worker.worker.entity import EntityMixin
...@@ -26,6 +26,16 @@ class DatasetExtractorFromAPI( ...@@ -26,6 +26,16 @@ class DatasetExtractorFromAPI(
TranscriptionMixin, TranscriptionMixin,
MetaDataMixin, MetaDataMixin,
): ):
def list_set_elements(self, dataset_set: Set) -> Iterator[Element]:
for element in super().list_set_elements(dataset_set):
# Classifications are not serialized in ListDatasetElements
yield Element(
**self.request(
"RetrieveElement",
id=element.id,
)
)
def list_element_children(self, *args, **kwargs) -> Iterator[Element]: def list_element_children(self, *args, **kwargs) -> Iterator[Element]:
return map( return map(
Element, super().list_element_children(*args, **kwargs, with_classes=True) Element, super().list_element_children(*args, **kwargs, with_classes=True)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment