Skip to content
Snippets Groups Projects

Remove ARKINDEX_CORPUS_ID usage

Merged Thibault Lavigne requested to merge remove-arkindex-corpus-id-usage into master
All threads resolved!
2 files
+ 27
28
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -12,10 +12,10 @@ from . import BASE_API_CALLS
def test_get_ml_class_id_load_classes(responses, mock_elements_worker):
mock_elements_worker.corpus_id = "12341234-1234-1234-1234-123412341234"
corpus_id = "11111111-1111-1111-1111-111111111111"
responses.add(
responses.GET,
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
status=200,
json={
"count": 1,
@@ -38,32 +38,32 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker):
] == BASE_API_CALLS + [
(
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
),
]
assert mock_elements_worker.classes == {
"12341234-1234-1234-1234-123412341234": {"good": "0000"}
"11111111-1111-1111-1111-111111111111": {"good": "0000"}
}
assert ml_class_id == "0000"
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"
corpus_id = "11111111-1111-1111-1111-111111111111"
mock_elements_worker.classes = {
"12341234-1234-1234-1234-123412341234": {"good": "0000"}
"11111111-1111-1111-1111-111111111111": {"good": "0000"}
}
responses.add(
responses.POST,
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
status=201,
json={"id": "new-ml-class-1234"},
)
# Missing class at first
assert mock_elements_worker.classes == {
"12341234-1234-1234-1234-123412341234": {"good": "0000"}
"11111111-1111-1111-1111-111111111111": {"good": "0000"}
}
ml_class_id = mock_elements_worker.get_ml_class_id("bad")
@@ -71,7 +71,7 @@ def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses):
# Now it's available
assert mock_elements_worker.classes == {
"12341234-1234-1234-1234-123412341234": {
"11111111-1111-1111-1111-111111111111": {
"good": "0000",
"bad": "new-ml-class-1234",
}
@@ -79,9 +79,8 @@ def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses):
def test_get_ml_class_id(mock_elements_worker):
mock_elements_worker.corpus_id = "12341234-1234-1234-1234-123412341234"
mock_elements_worker.classes = {
"12341234-1234-1234-1234-123412341234": {"good": "0000"}
"11111111-1111-1111-1111-111111111111": {"good": "0000"}
}
ml_class_id = mock_elements_worker.get_ml_class_id("good")
@@ -89,12 +88,12 @@ def test_get_ml_class_id(mock_elements_worker):
def test_get_ml_class_reload(responses, mock_elements_worker):
mock_elements_worker.corpus_id = "12341234-1234-1234-1234-123412341234"
corpus_id = "11111111-1111-1111-1111-111111111111"
# Add some initial classes
responses.add(
responses.GET,
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
json={
"count": 1,
"next": None,
@@ -110,7 +109,7 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
# Invalid response when trying to create class2
responses.add(
responses.POST,
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
status=400,
json={"non_field_errors": "Already exists"},
)
@@ -118,7 +117,7 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
# Add both classes (class2 is created by another process)
responses.add(
responses.GET,
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
json={
"count": 2,
"next": None,
@@ -140,7 +139,7 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
assert len(responses.calls) == len(BASE_API_CALLS) + 3
assert mock_elements_worker.classes == {
mock_elements_worker.corpus_id: {
corpus_id: {
"class1": "class1_id",
"class2": "class2_id",
}
@@ -150,15 +149,15 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
] == BASE_API_CALLS + [
(
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
),
(
"POST",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
),
(
"GET",
f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
),
]
Loading