applied changes suggested in comments

Author: jatinriverlane

pyaqueduct/api.py

@@ -191,7 +191,19 @@ def get_task(
         Returns:
             Task object
         """
-        return Task(client=self._client, task_id=task_id)
+        task = self._client.get_task(
+            task_id=task_id
+        )
+        return Task(
+            client=self._client,
+            uuid=task_id,
+            created_by=task.created_by,
+            received_at=task.received_at,
+            experiment=task.experiment,
+            extension_name=task.extension_name,
+            action_name=task.action_name,
+            parameters=task.parameters,
+        )
 
     @validate_call
     def get_tasks(  # pylint: disable=too-many-arguments, duplicate-code
@@ -224,6 +236,12 @@ def get_tasks(  # pylint: disable=too-many-arguments, duplicate-code
             Task(
                 client=self._client,
                 uuid=task.task_id,
+                created_by=task.created_by,
+                received_at=task.received_at,
+                experiment=task.experiment,
+                extension_name=task.extension_name,
+                action_name=task.action_name,
+                parameters=task.parameters
             )
             for task in tasks
         ]

pyaqueduct/client/client.py

@@ -496,13 +496,13 @@ def execute_extension_action(
         )
         return result
 
-    def get_task(self, task_id: str) -> TaskData:
+    def get_task(self, task_id: UUID) -> TaskData:
         """Get details for a submitted taks
 
         Args:
             task_id: Task identifier
         """
-        task_result = self.fetch_response(get_task_query, variable_values={"taskId": task_id})
+        task_result = self.fetch_response(get_task_query, variable_values={"taskId": str(task_id)})
 
         result = TaskData.from_dict(task_result["task"])  # pylint: disable=unsubscriptable-object
         return result

pyaqueduct/client/task_types.py

@@ -60,7 +60,7 @@ def from_dict(cls, data: dict) -> TaskData:
             Object populated with server response data.
         """
         return cls(
-            task_id=UUID(data["taskId"]),
+            task_id=UUID(data["uuid"]),
             task_status=data["taskStatus"],
             result_code=data["resultCode"],
             extension_name=data["extensionName"],

pyaqueduct/extensions.py

@@ -25,7 +25,6 @@ class ExtensionAction(BaseModel):
     """List of parameters which extension action expects to accept."""
 
     data: ExtensionActionData
-
     extension: Extension = None
     """Extension to which this action belongs."""
 

pyaqueduct/schemas/mutations.py

@@ -164,7 +164,7 @@
                 taskId: $taskId
         }
         ) {
-            taskId
+            uuid
             resultCode
             taskStatus
         }

pyaqueduct/schemas/queries.py

@@ -124,7 +124,7 @@
         task (
             taskId: $taskId
         ) {
-            taskId
+            uuid
             extensionName
             actionName
             receivedAt
@@ -189,7 +189,7 @@
             }
         ) {
             tasksData {
-                taskId
+                uuid
                 extensionName
                 actionName
                 receivedAt

pyaqueduct/task.py

@@ -39,21 +39,25 @@ class Task(BaseModel):
     parameters: List[ParameterData]
     """List of parameters with key and value passed to action"""
 
-    def __init__(self, client: AqueductClient, uuid: str):
+    def __init__( # pylint: disable=too-many-arguments
+        self,
+        client: AqueductClient,
+        uuid: UUID,
+        created_by: str,
+        received_at: datetime,
+        experiment: ExperimentData,
+        extension_name: str,
+        action_name: str,
+        parameters: List[ParameterData]
+    ):
         # Call parent constructor for Pydantic validation
-        task_data = client.get_task(uuid)
-
-        parameters = [
-            param if isinstance(param, ParameterData) else ParameterData.from_dict(param)
-            for param in task_data.parameters
-        ]
         super().__init__(
-            uuid=task_data.task_id,
-            extension_name=task_data.extension_name,
-            action_name=task_data.action_name,
-            created_by=task_data.created_by,
-            received_at=task_data.received_at,
-            experiment=task_data.experiment,
+            uuid=uuid,
+            created_by=created_by,
+            received_at=received_at,
+            experiment=experiment,
+            extension_name=extension_name,
+            action_name=action_name,
             parameters=parameters,
         )
 

tests/unittests/mock.py

@@ -352,7 +352,7 @@ def patched_execute(self, query, variable_values, **kwargs):
                             "resultCode": None,
                             "stdErr": "terminated",
                             "stdOut": None,
-                            "taskId": "7cc868d9-5b3c-4785-bf98-5ed982b1d9ad",
+                            "uuid": "7cc868d9-5b3c-4785-bf98-5ed982b1d9ad",
                             "taskStatus": "REVOKED",
                         },
                         {
@@ -448,7 +448,7 @@ def patched_execute(self, query, variable_values, **kwargs):
                             "resultCode": None,
                             "stdErr": "terminated",
                             "stdOut": None,
-                            "taskId": "2a8d1dc5-12b0-4582-89f5-755a5948093e",
+                            "uuid": "2a8d1dc5-12b0-4582-89f5-755a5948093e",
                             "taskStatus": "REVOKED",
                         },
                         {
@@ -544,7 +544,7 @@ def patched_execute(self, query, variable_values, **kwargs):
                             "resultCode": None,
                             "stdErr": "terminated",
                             "stdOut": None,
-                            "taskId": "1af71a66-6e57-4cc8-9970-9af17f64000a",
+                            "uuid": "1af71a66-6e57-4cc8-9970-9af17f64000a",
                             "taskStatus": "REVOKED",
                         },
                     ]