diff --git a/arkindex_worker/worker/entity.py b/arkindex_worker/worker/entity.py index 173b6c34d3c025d909e30a1ced077c0cab56bfd7..5e2b6cf64180ef804a7f7dbc332c894a3d54e3a6 100644 --- a/arkindex_worker/worker/entity.py +++ b/arkindex_worker/worker/entity.py @@ -40,9 +40,6 @@ class EntityMixin(object): :type element: Element or CachedElement :param name str: Name of the entity. :param type EntityType: Type of the entity. - :param corpus: UUID of the corpus to create an entity on, or None to use the - value of the ``ARKINDEX_CORPUS_ID`` environment variable. - :type corpus: str or None """ assert element and isinstance( element, (Element, CachedElement) diff --git a/tests/test_elements_worker/test_classifications.py b/tests/test_elements_worker/test_classifications.py index 047f9ae6e1d2915a2397c7b81db00efa56193b24..e6831b32fa7acf75d0ab4a8b9f16d54c7156b42f 100644 --- a/tests/test_elements_worker/test_classifications.py +++ b/tests/test_elements_worker/test_classifications.py @@ -36,7 +36,10 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker): assert [ (call.request.method, call.request.url) for call in responses.calls ] == BASE_API_CALLS + [ - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), ] assert mock_elements_worker.classes == { "12341234-1234-1234-1234-123412341234": {"good": "0000"} @@ -46,9 +49,9 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker): def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses): # A missing class is now created automatically - mock_elements_worker.corpus_id = "12341234-1234-1234-1234-123412341234" + mock_elements_worker.corpus_id = "12341234-1234-1234-1234-123412341234" mock_elements_worker.classes = { - "12341234-1234-1234-1234-123412341234": {"good": "0000"} + "12341234-1234-1234-1234-123412341234": {"good": "0000"} } responses.add( @@ -145,9 +148,18 @@ def test_get_ml_class_reload(responses, mock_elements_worker): assert [ (call.request.method, call.request.url) for call in responses.calls ] == BASE_API_CALLS + [ - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), - ("POST", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), + ( + "POST", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), ] diff --git a/tests/test_elements_worker/test_elements.py b/tests/test_elements_worker/test_elements.py index 6ad91b512d877510372539bdb6431f5222799c5b..97ae3a564153573c6c73aec6d601cc295e162d48 100644 --- a/tests/test_elements_worker/test_elements.py +++ b/tests/test_elements_worker/test_elements.py @@ -289,11 +289,26 @@ def test_load_corpus_classes_api_error(responses, mock_elements_worker): (call.request.method, call.request.url) for call in responses.calls ] == BASE_API_CALLS + [ # We do 5 retries - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), ] assert not mock_elements_worker.classes @@ -331,7 +346,10 @@ def test_load_corpus_classes(responses, mock_elements_worker): assert [ (call.request.method, call.request.url) for call in responses.calls ] == BASE_API_CALLS + [ - ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"), + ( + "GET", + f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/", + ), ] assert mock_elements_worker.classes == { "12341234-1234-1234-1234-123412341234": {