chore(datashare-python): fix DatashareTaskClient.get_task_result

Author: ClemDoum

datashare-python/datashare_python/task_client.py

@@ -21,6 +21,8 @@
 
 logger = logging.getLogger(__name__)
 
+ApiKey = str
+UserAndApiKey = tuple[User, ApiKey]
 # TODO: move this one to icij_common
 
 
@@ -100,11 +102,11 @@ def _raise_for_status(res: ClientResponse) -> None:
 
 
 class DatashareTaskClient(AiohttpClient):
-    def __init__(self, datashare_url: str, api_key: str | None = None) -> None:
-        self._api_key = api_key
+    def __init__(self, datashare_url: str, auth: UserAndApiKey | None = None) -> None:
+        self._user, self._api_key = auth if auth else (None, None)
         headers = None
-        if api_key is not None:
-            headers = {"Authorization": f"Bearer {api_key}"}
+        if self._api_key is not None:
+            headers = {"Authorization": f"Bearer {self._api_key}"}
         super().__init__(datashare_url, headers=headers)
 
     async def __aenter__(self) -> Self:

datashare-python/tests/test_task_client.py

@@ -13,13 +13,15 @@
     TaskError,
     TaskResult,
     TaskState,
+    User,
 )
 from datashare_python.task_client import AiohttpClient, DatashareTaskClient
 
 
 async def test_task_client_create_task(monkeypatch: MonkeyPatch) -> None:
     # Given
     datashare_url = "http://some-url"
+    user = User(id="user")
     api_key = "some-api-key"
     task_name = "hello"
     task_id = f"{task_name}-{uuid.uuid4()}"
@@ -40,7 +42,14 @@ async def _put_and_assert(
             "id": task_id,
             "state": "CREATED",
             "name": "hello",
-            "args": {"greeted": "world"},
+            "args": {
+                "greeted": "world",
+                "user": {
+                    "@type": "org.icij.datashare.user.User",
+                    "details": {},
+                    "id": "user",
+                },
+            },
         }
         assert data is None
         json_data = kwargs.pop("json")
@@ -53,7 +62,7 @@ async def _put_and_assert(
 
     monkeypatch.setattr(AiohttpClient, "_put", _put_and_assert)
 
-    task_client = DatashareTaskClient(datashare_url, api_key=api_key)
+    task_client = DatashareTaskClient(datashare_url, auth=(user, api_key))
     async with task_client:
         # When
         t_id = await task_client.create_task(task_name, args, id_=task_id, group=group)