Skip to content

Commit

Permalink
always raise exception when camunda request failed (#63)
Browse files Browse the repository at this point in the history 
#47
  • Loading branch information
@Noordsestern
Noordsestern authored Dec 1, 2021
1 parent 516877d commit 606b01f
Showing 1 changed file with 23 additions and 34 deletions.
57 changes: 23 additions & 34 deletions CamundaLibrary/CamundaLibrary.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,7 @@ def get_amount_of_workloads(self, topic: str, **kwargs) -> int:
try:
response: CountResultDto = api_instance.get_external_tasks_count(topic_name=topic, **kwargs)
except ApiException as e:
logger.error(f'Failed to count workload for topic "{topic}":\n{e}')
raise e
raise ApiException(f'Failed to count workload for topic "{topic}":\n{e}')

logger.info(f'Amount of workloads for "{topic}":\t{response.count}')
return response.count
Expand Down Expand Up @@ -219,8 +218,7 @@ def deploy(self, *args):
data=data)
logger.info(f'Response from camunda:\t{response}')
except ApiException as e:
logger.error(f'Failed to upload {filename}:\n{e}')
raise e
raise ApiException(f'Failed to upload {filename}:\n{e}')

return response.to_dict()

Expand Down Expand Up @@ -254,8 +252,7 @@ def deploy_multiple_files(self, *args):
response.raise_for_status()
logger.debug(json)
except HTTPError as e:
logger.error(json)
raise e
raise ApiException(json)

return json

Expand All @@ -279,8 +276,7 @@ def get_deployments(self, deployment_id: str = None, **kwargs):
response: List[DeploymentDto] = api_instance.get_deployments(**kwargs)
logger.info(f'Response from camunda:\t{response}')
except ApiException as e:
logger.error(f'Failed get deployments:\n{e}')
raise e
raise ApiException(f'Failed get deployments:\n{e}')

return [r.to_dict() for r in response]

Expand Down Expand Up @@ -313,14 +309,13 @@ def deliver_message(self, message_name, **kwargs):
response = requests.post(f'{self._shared_resources.camunda_url}/message', json=serialized_message,
headers=headers)
except ApiException as e:
logger.error(f'Failed to deliver message:\n{e}')
raise e
raise ApiException(f'Failed to deliver message:\n{e}')

try:
response.raise_for_status()
except HTTPError as e:
logger.error(response.text)
raise e
logger.error(e)
raise ApiException(response.text)

if correlation_message.result_enabled:
json = response.json()
Expand Down Expand Up @@ -378,7 +373,7 @@ def fetch_workload(self, topic: str, async_response_timeout=None, use_priority=N
api_response = api_instance.fetch_and_lock(fetch_external_tasks_dto=fetch_external_tasks_dto)
logger.info(api_response)
except ApiException as e:
logger.error("Exception when calling ExternalTaskApi->fetch_and_lock: %s\n" % e)
raise ApiException("Exception when calling ExternalTaskApi->fetch_and_lock: %s\n" % e)

work_items: List[LockedExternalTaskDto] = api_response
if work_items:
Expand Down Expand Up @@ -440,7 +435,7 @@ def bpmn_error(self, error_code: str, error_message: str = None, variables: Dict
external_task_bpmn_error=bpmn_error)
self.drop_fetch_response()
except ApiException as e:
logger.error(f"Exception when calling ExternalTaskApi->handle_external_task_bpmn_error: {e}\n")
raise ApiException(f"Exception when calling ExternalTaskApi->handle_external_task_bpmn_error: {e}\n")

@keyword("Notify failure", tags=["task"])
def notify_failure(self, **kwargs):
Expand Down Expand Up @@ -477,7 +472,7 @@ def notify_failure(self, **kwargs):
external_task_failure_dto=external_task_failure_dto)
self.drop_fetch_response()
except ApiException as e:
logger.error("Exception when calling ExternalTaskApi->handle_failure: %s\n" % e)
raise ApiException("Exception when calling ExternalTaskApi->handle_failure: %s\n" % e)

@keyword("Get incidents")
def get_incidents(self, **kwargs):
Expand All @@ -496,8 +491,7 @@ def get_incidents(self, **kwargs):
try:
response: List[IncidentDto] = api_instance.get_incidents(**kwargs)
except ApiException as e:
logger.error(f'Failed to get incidents:\n{e}')
raise e
raise ApiException(f'Failed to get incidents:\n{e}')

return [incident.to_dict() for incident in response]

Expand All @@ -508,7 +502,7 @@ def complete(self, result_set: Dict[str, Any] = None, files: Dict = None):
*Requires `fetch workload` to run before this one, logs warning instead.*
Additonal variables can be provided as dictionary in _result_set_ .
Additional variables can be provided as dictionary in _result_set_ .
Files can be provided as dictionary of filename and patch.
Examples:
Expand Down Expand Up @@ -544,7 +538,7 @@ def complete(self, result_set: Dict[str, Any] = None, files: Dict = None):
complete_external_task_dto=complete_task_dto)
self.drop_fetch_response()
except ApiException as e:
logger.error(f"Exception when calling ExternalTaskApi->complete_external_task_resource: {e}\n")
raise ApiException(f"Exception when calling ExternalTaskApi->complete_external_task_resource: {e}\n")

@keyword("Download file from variable", tags=['task'])
def download_file_from_variable(self, variable_name: str) -> str:
Expand All @@ -559,8 +553,7 @@ def download_file_from_variable(self, variable_name: str) -> str:
id=self.FETCH_RESPONSE.process_instance_id, var_name=variable_name)
logger.debug(response)
except ApiException as e:
logger.error(f"Exception when calling ExternalTaskApi->get_process_instance_variable_binary: {e}\n")
raise e
raise ApiException(f"Exception when calling ExternalTaskApi->get_process_instance_variable_binary: {e}\n")
return response

@keyword("Unlock", tags=['task'])
Expand All @@ -577,7 +570,7 @@ def unlock(self):
api_instance.unlock(self.FETCH_RESPONSE.id)
self.drop_fetch_response()
except ApiException as e:
logger.error(f"Exception when calling ExternalTaskApi->unlock: {e}\n")
raise ApiException(f"Exception when calling ExternalTaskApi->unlock: {e}\n")

@keyword("Start process", tags=['process'])
def start_process(self, process_key: str, variables: Dict = None, files: Dict = None,
Expand Down Expand Up @@ -629,8 +622,7 @@ def start_process(self, process_key: str, variables: Dict = None, files: Dict =
start_process_instance_dto=start_process_instance_dto
)
except ApiException as e:
logger.error(f'Failed to start process {process_key}:\n{e}')
raise e
raise ApiException(f'Failed to start process {process_key}:\n{e}')
logger.info(f'Response:\n{response}')

return response.to_dict()
Expand All @@ -646,8 +638,7 @@ def delete_process_instance(self, process_instance_id):
try:
response = api_instance.delete_process_instance(id=process_instance_id)
except ApiException as e:
logger.error(f'Failed to delete process instance {process_instance_id}:\n{e}')
raise e
raise ApiException(f'Failed to delete process instance {process_instance_id}:\n{e}')

@keyword("Get all active process instances", tags=['process'])
def get_all_active_process_instances(self, process_definition_key):
Expand Down Expand Up @@ -711,8 +702,7 @@ def get_process_instances(self, **kwargs):
try:
response: List[ProcessInstanceDto] = api_instance.get_process_instances(**kwargs)
except ApiException as e:
logger.error(f'Failed to get process instances of process:\n{e}')
raise e
raise ApiException(f'Failed to get process instances of process:\n{e}')

return [process_instance.to_dict() for process_instance in response]

Expand Down Expand Up @@ -745,8 +735,8 @@ def get_process_definitions(self, **kwargs):
try:
response = api_instance.get_process_definitions(**kwargs)
except ApiException as e:
logger.error(f'Failed to get process definitions:\n{e}')
raise e
raise ApiException(f'Failed to get process definitions:\n{e}')

return response

@keyword("Get Activity Instance", tags=['process'])
Expand All @@ -765,8 +755,7 @@ def get_activity_instance(self, id: str):
try:
response: ActivityInstanceDto = api_instance.get_activity_instance_tree(id)
except ApiException as e:
logger.error(f'failed to get activity tree for process instance with id {id}:\n{e}')
raise e
raise ApiException(f'failed to get activity tree for process instance with id {id}:\n{e}')
return response.to_dict()

@keyword("Get Process Instance Variable", tags=['process'])
Expand Down Expand Up @@ -794,7 +783,7 @@ def get_process_instance_variable(self, process_instance_id: str, variable_name:
response = api_instance.get_process_instance_variable(
id=process_instance_id, var_name=variable_name)
except ApiException as e:
logger.error(f'Failed to get variable {variable_name} from '
raise ApiException(f'Failed to get variable {variable_name} from '
f'process instance {process_instance_id}:\n{e}')
return response

Expand All @@ -818,4 +807,4 @@ def evaluate_decision(self, key: str, variables: dict) -> list:
return [CamundaResources.convert_openapi_variables_to_dict(r)
for r in response]
except ApiException as e:
logger.error(f'Failed to evaluate decision {key}:\n{e}')
raise ApiException(f'Failed to evaluate decision {key}:\n{e}')

0 comments on commit 606b01f

Please sign in to comment.