Skip to content
Snippets Groups Projects
Commit 0d0fdcca authored by Manon Blanco's avatar Manon Blanco
Browse files

Replace metadatas typo

parent 31a9f9e0
No related branches found
No related tags found
1 merge request!449Replace metadatas typo
Pipeline #144382 passed
Stage: test
Stage: build
Stage: release
Stage: deploy
Hide whitespace changes
Inline Side-by-side
arkindex_worker/worker/metadata.py
+ 3
− 3
View file @ 0d0fdcca
......@@ -118,7 +118,7 @@ class MetaDataMixin(object):
],
) -> List[Dict[str, str]]:
"""
Create multiple metadatas on an existing element.
Create multiple metadata on an existing element.
This method does not support cache.
:param element: The element to create multiple metadata on.
......@@ -172,7 +172,7 @@ class MetaDataMixin(object):
logger.warning("Cannot create metadata as this worker is in read-only mode")
return
created_metadatas = self.request(
created_metadata_list = self.request(
"CreateMetaDataBulk",
id=element.id,
body={
......@@ -181,7 +181,7 @@ class MetaDataMixin(object):
},
)["metadata_list"]
return created_metadatas
return created_metadata_list
def list_element_metadata(
self, element: Union[Element, CachedElement]
......
docs/releases.md
+ 1
− 1
View file @ 0d0fdcca
......@@ -115,7 +115,7 @@ Released on **8 November 2022** • View on [Gitlab](https://gitlab.teklia.co
- A new version of the cache was released with the updated Django models.
- Improvements to our Machine Learning training API to allow workers to use models published on Arkindex.
- Support workers that have no configuration.
- Allow publishing metadatas with falsy but non-null values.
- Allow publishing metadata with falsy but non-null values.
- Add `.polygon` attribute shortcut on `Element`.
- Add a major test speedup on our worker template.
- Support cache usage on our metadata API endpoint helpers.
......
tests/test_elements_worker/test_metadata.py
+ 49
− 45
View file @ 0d0fdcca
......@@ -247,7 +247,7 @@ def test_create_metadata_cached_element(responses, mock_elements_worker_with_cac
@pytest.mark.parametrize(
"metadatas",
"metadata_list",
[
([{"type": MetaType.Text, "name": "fake_name", "value": "fake_value"}]),
(
......@@ -262,7 +262,7 @@ def test_create_metadata_cached_element(responses, mock_elements_worker_with_cac
),
],
)
def test_create_metadatas(responses, mock_elements_worker, metadatas):
def test_create_metadatas(responses, mock_elements_worker, metadata_list):
element = Element({"id": "12341234-1234-1234-1234-123412341234"})
responses.add(
responses.POST,
......@@ -273,17 +273,19 @@ def test_create_metadatas(responses, mock_elements_worker, metadatas):
"metadata_list": [
{
"id": "fake_metadata_id",
"type": metadatas[0]["type"].value,
"name": metadatas[0]["name"],
"value": metadatas[0]["value"],
"type": metadata_list[0]["type"].value,
"name": metadata_list[0]["name"],
"value": metadata_list[0]["value"],
"dates": [],
"entity_id": metadatas[0].get("entity_id"),
"entity_id": metadata_list[0].get("entity_id"),
}
],
},
)
created_metadatas = mock_elements_worker.create_metadatas(element, metadatas)
created_metadata_list = mock_elements_worker.create_metadatas(
element, metadata_list
)
assert len(responses.calls) == len(BASE_API_CALLS) + 1
assert [
......@@ -296,26 +298,26 @@ def test_create_metadatas(responses, mock_elements_worker, metadatas):
]
assert json.loads(responses.calls[-1].request.body)["metadata_list"] == [
{
"type": metadatas[0]["type"].value,
"name": metadatas[0]["name"],
"value": metadatas[0]["value"],
"entity_id": metadatas[0].get("entity_id"),
"type": metadata_list[0]["type"].value,
"name": metadata_list[0]["name"],
"value": metadata_list[0]["value"],
"entity_id": metadata_list[0].get("entity_id"),
}
]
assert created_metadatas == [
assert created_metadata_list == [
{
"id": "fake_metadata_id",
"type": metadatas[0]["type"].value,
"name": metadatas[0]["name"],
"value": metadatas[0]["value"],
"type": metadata_list[0]["type"].value,
"name": metadata_list[0]["name"],
"value": metadata_list[0]["value"],
"dates": [],
"entity_id": metadatas[0].get("entity_id"),
"entity_id": metadata_list[0].get("entity_id"),
}
]
@pytest.mark.parametrize(
"metadatas",
"metadata_list",
[
([{"type": MetaType.Text, "name": "fake_name", "value": "fake_value"}]),
(
......@@ -331,7 +333,7 @@ def test_create_metadatas(responses, mock_elements_worker, metadatas):
],
)
def test_create_metadatas_cached_element(
responses, mock_elements_worker_with_cache, metadatas
responses, mock_elements_worker_with_cache, metadata_list
):
element = CachedElement.create(
id="12341234-1234-1234-1234-123412341234", type="thing"
......@@ -345,18 +347,18 @@ def test_create_metadatas_cached_element(
"metadata_list": [
{
"id": "fake_metadata_id",
"type": metadatas[0]["type"].value,
"name": metadatas[0]["name"],
"value": metadatas[0]["value"],
"type": metadata_list[0]["type"].value,
"name": metadata_list[0]["name"],
"value": metadata_list[0]["value"],
"dates": [],
"entity_id": metadatas[0].get("entity_id"),
"entity_id": metadata_list[0].get("entity_id"),
}
],
},
)
created_metadatas = mock_elements_worker_with_cache.create_metadatas(
element, metadatas
created_metadata_list = mock_elements_worker_with_cache.create_metadatas(
element, metadata_list
)
assert len(responses.calls) == len(BASE_API_CALLS) + 1
......@@ -370,20 +372,20 @@ def test_create_metadatas_cached_element(
]
assert json.loads(responses.calls[-1].request.body)["metadata_list"] == [
{
"type": metadatas[0]["type"].value,
"name": metadatas[0]["name"],
"value": metadatas[0]["value"],
"entity_id": metadatas[0].get("entity_id"),
"type": metadata_list[0]["type"].value,
"name": metadata_list[0]["name"],
"value": metadata_list[0]["value"],
"entity_id": metadata_list[0].get("entity_id"),
}
]
assert created_metadatas == [
assert created_metadata_list == [
{
"id": "fake_metadata_id",
"type": metadatas[0]["type"].value,
"name": metadatas[0]["name"],
"value": metadatas[0]["value"],
"type": metadata_list[0]["type"].value,
"name": metadata_list[0]["name"],
"value": metadata_list[0]["value"],
"dates": [],
"entity_id": metadatas[0].get("entity_id"),
"entity_id": metadata_list[0].get("entity_id"),
}
]
......@@ -398,7 +400,7 @@ def test_create_metadatas_cached_element(
],
)
def test_create_metadatas_wrong_element(mock_elements_worker, wrong_element):
wrong_metadatas = [
wrong_metadata_list = [
{"type": MetaType.Text, "name": "fake_name", "value": "fake_value"}
]
with pytest.raises(
......@@ -406,7 +408,7 @@ def test_create_metadatas_wrong_element(mock_elements_worker, wrong_element):
match="element shouldn't be null and should be of type Element or CachedElement",
):
mock_elements_worker.create_metadatas(
element=wrong_element, metadatas=wrong_metadatas
element=wrong_element, metadatas=wrong_metadata_list
)
......@@ -421,33 +423,35 @@ def test_create_metadatas_wrong_element(mock_elements_worker, wrong_element):
)
def test_create_metadatas_wrong_type(mock_elements_worker, wrong_type):
element = Element({"id": "12341234-1234-1234-1234-123412341234"})
wrong_metadatas = [{"type": wrong_type, "name": "fake_name", "value": "fake_value"}]
wrong_metadata_list = [
{"type": wrong_type, "name": "fake_name", "value": "fake_value"}
]
with pytest.raises(
AssertionError, match="type shouldn't be null and should be of type MetaType"
):
mock_elements_worker.create_metadatas(
element=element, metadatas=wrong_metadatas
element=element, metadatas=wrong_metadata_list
)
@pytest.mark.parametrize("wrong_name", [(None), (1234), (12.5), ([1, 2, 3, 4])])
def test_create_metadatas_wrong_name(mock_elements_worker, wrong_name):
element = Element({"id": "fake_element_id"})
wrong_metadatas = [
wrong_metadata_list = [
{"type": MetaType.Text, "name": wrong_name, "value": "fake_value"}
]
with pytest.raises(
AssertionError, match="name shouldn't be null and should be of type str"
):
mock_elements_worker.create_metadatas(
element=element, metadatas=wrong_metadatas
element=element, metadatas=wrong_metadata_list
)
@pytest.mark.parametrize("wrong_value", [(None), ([1, 2, 3, 4])])
def test_create_metadatas_wrong_value(mock_elements_worker, wrong_value):
element = Element({"id": "fake_element_id"})
wrong_metadatas = [
wrong_metadata_list = [
{"type": MetaType.Text, "name": "fake_name", "value": wrong_value}
]
with pytest.raises(
......@@ -457,7 +461,7 @@ def test_create_metadatas_wrong_value(mock_elements_worker, wrong_value):
),
):
mock_elements_worker.create_metadatas(
element=element, metadatas=wrong_metadatas
element=element, metadatas=wrong_metadata_list
)
......@@ -471,7 +475,7 @@ def test_create_metadatas_wrong_value(mock_elements_worker, wrong_value):
)
def test_create_metadatas_wrong_entity(mock_elements_worker, wrong_entity):
element = Element({"id": "fake_element_id"})
wrong_metadatas = [
wrong_metadata_list = [
{
"type": MetaType.Text,
"name": "fake_name",
......@@ -481,13 +485,13 @@ def test_create_metadatas_wrong_entity(mock_elements_worker, wrong_entity):
]
with pytest.raises(AssertionError, match="entity_id should be None or a str"):
mock_elements_worker.create_metadatas(
element=element, metadatas=wrong_metadatas
element=element, metadatas=wrong_metadata_list
)
def test_create_metadatas_api_error(responses, mock_elements_worker):
element = Element({"id": "12341234-1234-1234-1234-123412341234"})
metadatas = [
metadata_list = [
{
"type": MetaType.Text,
"name": "fake_name",
......@@ -502,7 +506,7 @@ def test_create_metadatas_api_error(responses, mock_elements_worker):
)
with pytest.raises(ErrorResponse):
mock_elements_worker.create_metadatas(element, metadatas)
mock_elements_worker.create_metadatas(element, metadata_list)
assert len(responses.calls) == len(BASE_API_CALLS) + 5
assert [
......
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