sws-api-client 0.0.7.dev0__tar.gz → 0.0.9.dev0__tar.gz

{sws_api_client-0.0.7.dev0/sws_api_client.egg-info → sws_api_client-0.0.9.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sws_api_client
-Version: 0.0.7.dev0
+Version: 0.0.9.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.7.dev0 → sws_api_client-0.0.9.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.7-dev"
+VERSION = "0.0.9-dev"
 
 # Setting up
 setup(

{sws_api_client-0.0.7.dev0 → sws_api_client-0.0.9.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
 
@@ -108,24 +112,29 @@ class TaskManager:
         return TaskResponse(
             task_id=task['taskId'],
             info=TaskInfo(
-                detail_status=task['info'].get('detailStatus'),
-                ended_on=task['info'].get('endedOn'),
-                description=task['info'].get('description'),
-                updated_on=task['info'].get('updatedOn'),
-                created_on=task['info'].get('createdOn'),
-                service_user=task['info'].get('serviceUser'),
-                tags=task['info'].get('tags'),
-                output=task['info'].get('output'),
-                input=json.loads(task['info'].get('input', '{}')),  # Default to an empty dictionary if 'input' is missing
-                task_type=task['info'].get('taskType'),
-                context=task['info'].get('context'),
-                progress=task['info'].get('progress'),
-                user=task['info'].get('user'),
-                outcome=task['info'].get('outcome'),
-                status=task['info'].get('status'),
-                group=task['info'].get('group')
+                detail_status=task.get('info').get('detailStatus'),
+                ended_on=task.get('info').get('endedOn'),
+                description=task.get('info').get('description'),
+                updated_on=task.get('info').get('updatedOn'),
+                created_on=task.get('info').get('createdOn'),
+                service_user=task.get('info').get('serviceUser'),
+                tags=task.get('info').get('tags'),
+                output=task.get('info').get('output'),
+                input=json.loads(task.get('info').get('input', '{}')),  # Default to an empty dictionary if 'input' is missing
+                task_type=task.get('info').get('taskType'),
+                context=task.get('info').get('context'),
+                progress=task.get('info').get('progress'),
+                user=task.get('info').get('user'),
+                outcome=task.get('info').get('outcome'),
+                status=task.get('info').get('status'),
+                group=task.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]:
@@ -156,18 +165,23 @@ class TaskManager:
         Returns:
             str: The final outcome of the task.
         """
+        not_created_counter = 0
         while True:
             task_response = self.get_task(task_id)
 
-            if not task_response:
+            if not task_response and not_created_counter > 5:
                 raise ValueError(f"Task with ID {task_id} not found.")
-
-            task_status = task_response.info.detail_status
-            print(f"Task {task_id} status: {task_status}")
-            if task_status == 'ENDED':
-                return task_response
-
-            time.sleep(poll_interval)
+            elif not task_response:
+                not_created_counter += 1
+            else:
+                not_created_counter = 0
+            
+                task_status = task_response.info.detail_status
+                print(f"Task {task_id} status: {task_status}")
+                if task_status == 'ENDED':
+                    return task_response
+
+                time.sleep(poll_interval)
 
     def wait_completion_by_ids(self, task_ids: List[str], poll_interval: int = 10) -> List[TaskResponse]:
         """
@@ -187,4 +201,5 @@ class TaskManager:
             if len(completed_tasks) == len(task_ids):
                 return completed_tasks
 
-            time.sleep(poll_interval)
+            time.sleep(poll_interval)
+    

{sws_api_client-0.0.7.dev0 → sws_api_client-0.0.9.dev0/sws_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sws_api_client
-Version: 0.0.7.dev0
+Version: 0.0.9.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)