sws-api-client 0.0.6.dev0__tar.gz → 0.0.8.dev0__tar.gz

{sws_api_client-0.0.6.dev0/sws_api_client.egg-info → sws_api_client-0.0.8.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sws_api_client
-Version: 0.0.6.dev0
+Version: 0.0.8.dev0
 Summary: A Python client to easily interact with the FAO SWS REST APIs
 Home-page: https://bitbucket.org/cioapps/sws-it-python-api-client/src/main/
 Author: Mansillo, Daniele (CSI)

{sws_api_client-0.0.6.dev0 → sws_api_client-0.0.8.dev0}/setup.py

@@ -7,7 +7,7 @@ here = os.path.abspath(os.path.dirname(__file__))
 with open(os.path.join(here, "README.md"), encoding="utf-8") as fh:
     long_description = "\n" + fh.read()
 
-VERSION = "0.0.6-dev"
+VERSION = "0.0.8-dev"
 
 # Setting up
 setup(

{sws_api_client-0.0.6.dev0 → sws_api_client-0.0.8.dev0}/sws_api_client/tasks.py

@@ -47,6 +47,10 @@ class TaskResponse:
     task_id: str
     info: TaskInfo
 
+@dataclass
+class TaskCreateResponse:
+    task_id: str
+
 class TaskManager:
 
     def __init__(self, sws_client: SwsApiClient, endpoint: str = 'task_manager_api') -> None:
@@ -75,7 +79,7 @@ class TaskManager:
             group: Optional[str] = None,
             parentTaskId: Optional[str] = None,
             user:Optional[str] = None
-        ) -> TaskResponse:
+        ) -> TaskCreateResponse:
         
         path = 'task/create'
 
@@ -100,7 +104,7 @@ class TaskManager:
 
         response = self.sws_client.discoverable.post(self.endpoint, path, data=data)
         if response:
-            return self.get_task_response(response)
+            return self.get_task_create_response(response)
         else:
             return None
 
@@ -126,6 +130,11 @@ class TaskManager:
                 group=task['info'].get('group')
             )
         )
+    
+    def get_task_create_response(self, task: Dict) -> TaskCreateResponse:
+        return TaskCreateResponse(
+            task_id=task['taskId']
+        )
 
 
     def get_task(self, task_id: str) -> Optional[TaskResponse]:
@@ -136,6 +145,14 @@ class TaskManager:
             return self.get_task_response(response)
         else:
             return None
+
+    def get_tasks_by_ids(self, task_ids: List[str]) -> List[TaskResponse]:
+        path = f'/task/by-ids'
+        response = self.sws_client.discoverable.post(self.endpoint, path, data={"ids":task_ids})
+        # the response is an object like this: {id, data?, error?}[]
+        # we need to convert the task object to a TaskResponse object and return a list of TaskResponse objects
+        if response:
+            return [self.get_task_response(obj.get('data')) for obj in response if obj.get('data')]
     
     def wait_completion(self, task_id: str, poll_interval: int = 10) -> TaskResponse:
         """
@@ -159,4 +176,25 @@ class TaskManager:
             if task_status == 'ENDED':
                 return task_response
 
-            time.sleep(poll_interval)
+            time.sleep(poll_interval)
+
+    def wait_completion_by_ids(self, task_ids: List[str], poll_interval: int = 10) -> List[TaskResponse]:
+        """
+        Wait for a list of tasks to reach the 'ENDED' status and return the task outcomes.
+
+        Args:
+            task_ids (List[str]): The IDs of the tasks.
+            poll_interval (int, optional): The interval (in seconds) between status checks. Defaults to 10.
+
+        Returns:
+            List[str]: The final outcomes of the tasks.
+        """
+        completed_tasks = []
+        while True:
+            tasks_response = self.get_tasks_by_ids(task_ids)
+            completed_tasks = [task for task in tasks_response if task.info.detail_status == 'ENDED']
+            if len(completed_tasks) == len(task_ids):
+                return completed_tasks
+
+            time.sleep(poll_interval)
+    

{sws_api_client-0.0.6.dev0 → sws_api_client-0.0.8.dev0/sws_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sws_api_client
-Version: 0.0.6.dev0
+Version: 0.0.8.dev0
 Summary: A Python client to easily interact with the FAO SWS REST APIs
 Home-page: https://bitbucket.org/cioapps/sws-it-python-api-client/src/main/
 Author: Mansillo, Daniele (CSI)