Skip to content
Snippets Groups Projects
Commit 8f9243ae authored by Erwan Rouchet's avatar Erwan Rouchet
Browse files

Use worker name without UUID as Solr facet

parent 615fe14c
No related branches found
No related tags found
1 merge request!1364Use worker name without UUID as Solr facet
Hide whitespace changes
Inline Side-by-side
arkindex/documents/indexer_v2.py
+ 1
− 2
View file @ 8f9243ae
......@@ -160,8 +160,7 @@ class Indexer(object):
if not worker_version:
return
worker = worker_version.worker
return f'{worker.id.hex[:10]}-{worker.name}'
return worker_version.worker.name
def build_documents(self, elements):
BUILD_METHODS = [self.build_transcriptions, self.build_classifications, self.build_metadatas, self.build_entities]
......
arkindex/documents/tests/commands/test_reindex_v2.py
+ 9
− 9
View file @ 8f9243ae
......@@ -161,7 +161,7 @@ class TestReindexV2Command(FixtureTestCase):
'transcription_id': str(tr_1.id),
'transcription_confidence': tr_1.confidence,
'transcription_text': tr_1.text,
'transcription_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}'
'transcription_worker': self.worker.name,
},
{
'element_id': str(self.line.id),
......@@ -175,7 +175,7 @@ class TestReindexV2Command(FixtureTestCase):
'transcription_id': str(tr_2.id),
'transcription_confidence': tr_2.confidence,
'transcription_text': tr_2.text,
'transcription_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}'
'transcription_worker': self.worker.name,
}]
)
self.assertDictEqual(kwargs, {'commit': True})
......@@ -234,7 +234,7 @@ class TestReindexV2Command(FixtureTestCase):
'classification_id': str(cl_1.id),
'classification_name': cl_1.ml_class.name,
'classification_confidence': cl_1.confidence,
'classification_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'classification_worker': self.worker.name,
},
{
'element_id': str(self.line.id),
......@@ -248,7 +248,7 @@ class TestReindexV2Command(FixtureTestCase):
'classification_id': str(cl_2.id),
'classification_name': cl_2.ml_class.name,
'classification_confidence': cl_2.confidence,
'classification_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'classification_worker': self.worker.name,
}
])
self.assertDictEqual(kwargs, {'commit': True})
......@@ -312,7 +312,7 @@ class TestReindexV2Command(FixtureTestCase):
'metadata_name': md_1.name,
'metadata_text': md_1.value,
'metadata_type': md_1.type.value,
'metadata_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'metadata_worker': self.worker.name,
},
{
'element_id': str(self.line.id),
......@@ -327,7 +327,7 @@ class TestReindexV2Command(FixtureTestCase):
'metadata_name': md_2.name,
'metadata_text': md_2.value,
'metadata_type': md_2.type.value,
'metadata_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'metadata_worker': self.worker.name,
}
])
self.assertDictEqual(kwargs, {'commit': True})
......@@ -423,7 +423,7 @@ class TestReindexV2Command(FixtureTestCase):
'entity_id': str(entity_1.id),
'entity_text': entity_1.name,
'entity_type': entity_1.type.value,
'entity_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'entity_worker': self.worker.name,
},
{
'element_id': str(self.line.id),
......@@ -437,7 +437,7 @@ class TestReindexV2Command(FixtureTestCase):
'entity_id': str(entity_2.id),
'entity_text': entity_2.name,
'entity_type': entity_2.type.value,
'entity_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'entity_worker': self.worker.name,
}
])
self.assertDictEqual(kwargs, {'commit': True})
......@@ -470,7 +470,7 @@ class TestReindexV2Command(FixtureTestCase):
'element_id': str(self.line.id),
'element_text': self.line.name,
'element_type': self.line.type.display_name,
'element_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'element_worker': self.worker.name,
'element_image': None,
'parent_id': str(self.page.id),
'parent_name': self.page.name,
......
arkindex/documents/tests/test_indexer_v2.py
+ 14
− 14
View file @ 8f9243ae
......@@ -99,7 +99,7 @@ class TestIndexerV2Command(FixtureTestCase):
def test_hash_worker(self):
indexer = Indexer(None)
self.assertIsNone(indexer.hash_worker(None))
self.assertEqual(indexer.hash_worker(self.worker_version), f'{self.worker.id.hex[:10]}-{self.worker.name}')
self.assertEqual(indexer.hash_worker(self.worker_version), self.worker.name)
def test_build_element(self):
annotated_pages = self.private_corpus.elements.filter(id=self.page.id).annotate(
......@@ -116,7 +116,7 @@ class TestIndexerV2Command(FixtureTestCase):
'element_id': str(self.page.id),
'element_text': self.page.name,
'element_type': self.page.type.display_name,
'element_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'element_worker': self.worker.name,
'element_image': None
})
......@@ -138,14 +138,14 @@ class TestIndexerV2Command(FixtureTestCase):
'transcription_id': str(tr_1.id),
'transcription_confidence': tr_1.confidence,
'transcription_text': tr_1.text,
'transcription_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}'
'transcription_worker': self.worker.name,
},
{
'key': 'value',
'transcription_id': str(tr_2.id),
'transcription_confidence': tr_2.confidence,
'transcription_text': tr_2.text,
'transcription_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}'
'transcription_worker': self.worker.name,
}
])
......@@ -167,14 +167,14 @@ class TestIndexerV2Command(FixtureTestCase):
'classification_id': str(cl_1.id),
'classification_name': cl_1.ml_class.name,
'classification_confidence': cl_1.confidence,
'classification_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'classification_worker': self.worker.name,
},
{
'key': 'value',
'classification_id': str(cl_2.id),
'classification_name': cl_2.ml_class.name,
'classification_confidence': cl_2.confidence,
'classification_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'classification_worker': self.worker.name,
}
])
......@@ -201,7 +201,7 @@ class TestIndexerV2Command(FixtureTestCase):
'metadata_name': md_1.name,
'metadata_text': md_1.value,
'metadata_type': md_1.type.value,
'metadata_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'metadata_worker': self.worker.name,
},
{
'key': 'value',
......@@ -209,7 +209,7 @@ class TestIndexerV2Command(FixtureTestCase):
'metadata_name': md_2.name,
'metadata_text': md_2.value,
'metadata_type': md_2.type.value,
'metadata_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'metadata_worker': self.worker.name,
}
])
......@@ -239,14 +239,14 @@ class TestIndexerV2Command(FixtureTestCase):
'entity_id': str(entity_1.id),
'entity_text': entity_1.name,
'entity_type': entity_1.type.value,
'entity_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'entity_worker': self.worker.name,
},
{
'key': 'value',
'entity_id': str(entity_2.id),
'entity_text': entity_2.name,
'entity_type': entity_2.type.value,
'entity_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'entity_worker': self.worker.name,
}
])
......@@ -286,7 +286,7 @@ class TestIndexerV2Command(FixtureTestCase):
'element_id': str(self.page.id),
'element_text': self.page.name,
'element_type': self.page.type.display_name,
'element_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'element_worker': self.worker.name,
'element_image': zone.thumbnail_url,
'parent_id': str(self.page.id),
'parent_name': self.page.name,
......@@ -296,7 +296,7 @@ class TestIndexerV2Command(FixtureTestCase):
'element_id': str(self.page.id),
'element_text': self.page.name,
'element_type': self.page.type.display_name,
'element_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'element_worker': self.worker.name,
'element_image': zone.thumbnail_url,
'parent_id': str(self.page.id),
'parent_name': self.page.name,
......@@ -310,7 +310,7 @@ class TestIndexerV2Command(FixtureTestCase):
'element_id': str(self.page.id),
'element_text': self.page.name,
'element_type': self.page.type.display_name,
'element_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'element_worker': self.worker.name,
'element_image': zone.thumbnail_url,
'parent_id': str(self.page.id),
'parent_name': self.page.name,
......@@ -318,7 +318,7 @@ class TestIndexerV2Command(FixtureTestCase):
'entity_id': str(entity.id),
'entity_text': entity.name,
'entity_type': entity.type.value,
'entity_worker': f'{self.worker.id.hex[:10]}-{self.worker.name}',
'entity_worker': self.worker.name,
}]
)
self.assertDictEqual(kwargs, {'commit': True})
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment