Add more editable fields, fix for the task registry api client caching

amt/clients/clients.py

@@ -55,8 +55,9 @@ async def get_task_by_urn(self, task_type: TaskType, urn: str, version: str = "l
         return response_data
 
 
+task_registry_api_client = TaskRegistryAPIClient()
+
+
 @alru_cache(maxsize=0 if "pytest" in sys.modules else 1000)
-async def get_task_by_urn(
-    client: TaskRegistryAPIClient, task_type: TaskType, urn: str, version: str = "latest"
-) -> dict[str, Any]:
-    return await client.get_task_by_urn(task_type, urn, version)
+async def get_task_by_urn(task_type: TaskType, urn: str, version: str = "latest") -> dict[str, Any]:
+    return await task_registry_api_client.get_task_by_urn(task_type, urn, version)

amt/repositories/task_registry.py

@@ -48,7 +48,7 @@ async def _fetch_tasks_by_urns(self, task_type: TaskType, urns: Sequence[str]) -
         Fetches tasks given a list of URN's.
         If an URN is not valid, it is ignored.
         """
-        get_tasks = [get_task_by_urn(self.client, task_type, urn) for urn in urns]
+        get_tasks = [get_task_by_urn(task_type, urn) for urn in urns]
         results = await asyncio.gather(*get_tasks, return_exceptions=True)
 
         tasks: list[dict[str, Any]] = []

amt/services/instruments.py

@@ -1,7 +1,7 @@
 import logging
 from collections.abc import Sequence
 
-from amt.clients.clients import TaskRegistryAPIClient, TaskType
+from amt.clients.clients import TaskType, task_registry_api_client
 from amt.repositories.task_registry import TaskRegistryRepository
 from amt.schema.instrument import Instrument
 
@@ -24,6 +24,5 @@ async def fetch_instruments(self, urns: str | Sequence[str] | None = None) -> li
 
 
 def create_instrument_service() -> InstrumentsService:
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
     return InstrumentsService(repository)

amt/services/measures.py

@@ -1,7 +1,7 @@
 import logging
 from collections.abc import Sequence
 
-from amt.clients.clients import TaskRegistryAPIClient, TaskType
+from amt.clients.clients import TaskType, task_registry_api_client
 from amt.repositories.task_registry import TaskRegistryRepository
 from amt.schema.measure import Measure
 
@@ -24,6 +24,5 @@ async def fetch_measures(self, urns: str | Sequence[str] | None = None) -> list[
 
 
 def create_measures_service() -> MeasuresService:
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
     return MeasuresService(repository)

amt/services/requirements.py

@@ -1,7 +1,7 @@
 import logging
 from collections.abc import Sequence
 
-from amt.clients.clients import TaskRegistryAPIClient, TaskType
+from amt.clients.clients import TaskType, task_registry_api_client
 from amt.repositories.task_registry import TaskRegistryRepository
 from amt.schema.requirement import Requirement
 
@@ -24,6 +24,5 @@ async def fetch_requirements(self, urns: str | Sequence[str] | None = None) -> l
 
 
 def create_requirements_service() -> RequirementsService:
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
     return RequirementsService(repository)

tests/clients/test_clients.py

@@ -1,7 +1,7 @@
 import json
 
 import pytest
-from amt.clients.clients import TaskRegistryAPIClient, TaskType
+from amt.clients.clients import TaskType, task_registry_api_client
 from amt.core.exceptions import AMTNotFound
 from amt.schema.github import RepositoryContent
 from pytest_httpx import HTTPXMock
@@ -10,7 +10,6 @@
 
 @pytest.mark.asyncio
 async def test_task_registry_api_client_get_instrument_list(httpx_mock: HTTPXMock):
-    task_registry_api_client = TaskRegistryAPIClient()
     httpx_mock.add_response(
         url="https://task-registry.apps.digilab.network/instruments/", content=TASK_REGISTRY_LIST_PAYLOAD.encode()
     )
@@ -22,7 +21,6 @@ async def test_task_registry_api_client_get_instrument_list(httpx_mock: HTTPXMoc
 
 @pytest.mark.asyncio
 async def test_task_registry_api_client_get_instrument_list_not_succesfull(httpx_mock: HTTPXMock):
-    task_registry_api_client = TaskRegistryAPIClient()
     httpx_mock.add_response(status_code=408, url="https://task-registry.apps.digilab.network/instruments/")
 
     # then
@@ -33,7 +31,6 @@ async def test_task_registry_api_client_get_instrument_list_not_succesfull(httpx
 @pytest.mark.asyncio
 async def test_task_registry_api_client_get_instrument(httpx_mock: HTTPXMock):
     # given
-    task_registry_api_client = TaskRegistryAPIClient()
     httpx_mock.add_response(
         url="https://task-registry.apps.digilab.network/instruments/urn/urn:nl:aivt:tr:iama:1.0?version=latest",
         content=TASK_REGISTRY_CONTENT_PAYLOAD.encode(),
@@ -49,7 +46,6 @@ async def test_task_registry_api_client_get_instrument(httpx_mock: HTTPXMock):
 
 @pytest.mark.asyncio
 async def test_task_registry_api_client_get_instrument_not_succesfull(httpx_mock: HTTPXMock):
-    task_registry_api_client = TaskRegistryAPIClient()
     httpx_mock.add_response(
         status_code=408,
         url="https://task-registry.apps.digilab.network/instruments/urn/urn:nl:aivt:tr:iama:1.0?version=latest",

tests/repositories/test_task_registry.py

@@ -1,5 +1,5 @@
 import pytest
-from amt.clients.clients import TaskRegistryAPIClient, TaskType
+from amt.clients.clients import TaskType, task_registry_api_client
 from amt.core.exceptions import AMTInstrumentError
 from amt.repositories.task_registry import TaskRegistryRepository
 from pytest_httpx import HTTPXMock
@@ -10,8 +10,7 @@
 @pytest.mark.asyncio
 async def test_fetch_tasks_all():
     # given
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
 
     # when
     instrument_result = await repository.fetch_tasks(TaskType.INSTRUMENTS)
@@ -28,8 +27,7 @@ async def test_fetch_tasks_all():
 @pytest.mark.asyncio
 async def test_fetch_task_with_urn():
     # given
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
     instrument_urn = "urn:nl:aivt:tr:iama:1.0"
     requirement_urn = "urn:nl:ak:ver:aia-08"
     measure_urn = "urn:nl:ak:mtr:dat-02"
@@ -57,8 +55,7 @@ async def test_fetch_task_with_urn():
 @pytest.mark.asyncio
 async def test_fetch_task_with_urns():
     # given
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
     urns = ["urn:nl:aivt:tr:iama:1.0", "urn:nl:aivt:tr:aiia:1.0"]
 
     # when
@@ -76,8 +73,7 @@ async def test_fetch_task_with_urns():
 @pytest.mark.asyncio
 async def test_fetch_task_with_invalid_urn():
     # given
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
     urn = "invalid"
 
     # when
@@ -91,8 +87,7 @@ async def test_fetch_task_with_invalid_urn():
 @pytest.mark.asyncio
 async def test_fetch_task_with_valid_and_invalid_urn():
     # given
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
     urns = ["urn:nl:aivt:tr:iama:1.0", "invalid"]
 
     # when
@@ -107,8 +102,7 @@ async def test_fetch_task_with_valid_and_invalid_urn():
 @pytest.mark.asyncio
 async def test_fetch_tasks_invalid_response(httpx_mock: HTTPXMock):
     # given
-    client = TaskRegistryAPIClient()
-    repository = TaskRegistryRepository(client)
+    repository = TaskRegistryRepository(task_registry_api_client)
     urn = "urn:nl:aivt:tr:td:1.0"
 
     httpx_mock.add_response(