Merge pull request #155 from conductor-sdk/update-task-api

Added workerid parameter when updating a task from API

Author: gardusig

.github/workflows/pull_request.yml

@@ -35,5 +35,5 @@ jobs:
           --build-arg KEY=${{ secrets.KEY }}
           --build-arg SECRET=${{ secrets.SECRET }}
           --build-arg CONDUCTOR_SERVER_URL=${{ secrets.CONDUCTOR_SERVER_URL }}
-          --target=integration_test          
+          --target=test          
           .

.github/workflows/release.yml

@@ -42,5 +42,5 @@ jobs:
           --build-arg CONDUCTOR_SERVER_URL=${{ secrets.CONDUCTOR_SERVER_URL }}
           --build-arg CONDUCTOR_PYTHON_VERSION=${{ github.ref_name }}
           --build-arg SDK_ORIGIN=remote_sdk
-          --target=integration_test
+          --target=test
           .

Dockerfile

@@ -26,7 +26,7 @@ COPY /tests /package/tests
 FROM python_test_base as unit_test
 RUN python3 -m unittest discover --verbose --start-directory=./tests/unit
 
-FROM python_test_base as integration_test
+FROM python_test_base as test
 ARG KEY
 ARG SECRET
 ARG CONDUCTOR_SERVER_URL

src/conductor/client/automator/task_runner.py

@@ -93,7 +93,7 @@ def __poll_task(self) -> Task:
                 self.metrics_collector.increment_task_poll_error(
                     task_definition_name, type(e)
                 )
-            logger.info(
+            logger.debug(
                 f'Failed to poll task for: {task_definition_name}, reason: {traceback.format_exc()}'
             )
             return None

src/conductor/client/http/api/task_resource_api.py

@@ -4,6 +4,7 @@
 
 # python 2 and python 3 compatibility library
 import six
+import socket
 
 from conductor.client.http.api_client import ApiClient
 
@@ -1481,6 +1482,7 @@ def update_task1(self, body, workflow_id, task_ref_name, status, **kwargs):  # n
         :param str workflow_id: (required)
         :param str task_ref_name: (required)
         :param str status: (required)
+        :param str workerid:
         :return: str
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1505,6 +1507,7 @@ def update_task1_with_http_info(self, body, workflow_id, task_ref_name, status,
         :param str workflow_id: (required)
         :param str task_ref_name: (required)
         :param str status: (required)
+        :param str workerid:
         :return: str
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1553,6 +1556,10 @@ def update_task1_with_http_info(self, body, workflow_id, task_ref_name, status,
             path_params['status'] = params['status']  # noqa: E501
 
         query_params = []
+        
+        if 'workerid' not in params:
+            params['workerid'] = socket.gethostname()
+        query_params.append(('workerid', params['workerid']))  # noqa: E501
 
         header_params = {}
 

tests/integration/workflow/test_workflow_execution.py

@@ -52,7 +52,7 @@ def run_workflow_execution_tests(configuration: Configuration, workflow_executor
             workflow_quantity=10,
             workflow_name=WORKFLOW_NAME,
             workflow_executor=workflow_executor,
-            workflow_completion_timeout=5
+            workflow_completion_timeout=7
         )
         logger.debug('finished workflow execution tests')
         test_workflow_methods(