diff --git a/arkindex_worker/worker/element.py b/arkindex_worker/worker/element.py index 0f3648c078e02beab6cb680d62198f904de51f6f..95092ee8d3c7a936d11a2b88df4435ce97315ba6 100644 --- a/arkindex_worker/worker/element.py +++ b/arkindex_worker/worker/element.py @@ -12,7 +12,7 @@ from arkindex_worker import logger from arkindex_worker.cache import CachedElement, CachedImage from arkindex_worker.models import Corpus, Element -ElementType = NamedTuple("ElemenType", name=str, slug=str, is_folder=bool) +ElementType = NamedTuple("ElementType", name=str, slug=str, is_folder=bool) class MissingTypeError(Exception): @@ -78,7 +78,7 @@ class ElementMixin(object): ) else: raise MissingTypeError( - f'Element type(s) {", ".join(sorted(missing_slugs))} were not found in the {corpus["name"]} corpus ({corpus["id"]}).' + f'Element type(s) {", ".join(sorted(missing_slugs))} were not found in the {corpus.name} corpus ({corpus.id}).' ) return True diff --git a/tests/test_elements_worker/test_elements.py b/tests/test_elements_worker/test_elements.py index d3cb20cf76f7876f8d8161e5d43d8f376d232f76..c74aa273ce87aaebd7ed9335df1aef610a982227 100644 --- a/tests/test_elements_worker/test_elements.py +++ b/tests/test_elements_worker/test_elements.py @@ -34,11 +34,7 @@ def test_check_required_types_argument_types(mock_elements_worker): assert str(e.value) == "Element type slugs must be strings." -def test_check_required_types(monkeypatch, tmp_path, mock_elements_worker, responses): - elements_path = tmp_path / "elements.json" - elements_path.write_text("[]") - monkeypatch.setenv("TASK_ELEMENTS", str(elements_path)) - +def test_check_required_types(responses): corpus_id = "12341234-1234-1234-1234-123412341234" responses.add( responses.GET, @@ -50,7 +46,7 @@ def test_check_required_types(monkeypatch, tmp_path, mock_elements_worker, respo }, ) worker = ElementsWorker() - worker.configure() + worker.setup_api_client() assert worker.check_required_types(corpus_id, "page") assert worker.check_required_types(corpus_id, "page", "folder") @@ -63,11 +59,7 @@ def test_check_required_types(monkeypatch, tmp_path, mock_elements_worker, respo ) -def test_create_missing_types(monkeypatch, tmp_path, mock_elements_worker, responses): - elements_path = tmp_path / "elements.json" - elements_path.write_text("[]") - monkeypatch.setenv("TASK_ELEMENTS", str(elements_path)) - +def test_create_missing_types(responses): corpus_id = "12341234-1234-1234-1234-123412341234" responses.add( @@ -108,7 +100,7 @@ def test_create_missing_types(monkeypatch, tmp_path, mock_elements_worker, respo ], ) worker = ElementsWorker() - worker.configure() + worker.setup_api_client() assert worker.check_required_types( corpus_id, "page", "text_line", "act", create_missing=True