Remove try except block which just logs as we get logging anyway when exception happens.

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/IngestionPolicy_getIngestionOperationAndParameterDictEbulk.py

@@ -10,37 +10,36 @@ reference_separator = portal.getIngestionReferenceDictionary()["reference_separa
 reference_end_single = portal.getIngestionReferenceDictionary()["single_end_suffix"]
 none_extension = portal.getIngestionReferenceDictionary()["none_extension"]
 
-try:
-  # remove supplier, eof, size and hash from reference
-  reference = reference_separator.join(reference.split(reference_separator)[1:-3])
-
-  data_ingestion_reference = reference
-  eof = movement_dict.get('eof', reference_end_single) if movement_dict.get('eof', reference_end_single) != "" else reference_end_single
-  resource_reference = movement_dict.get('resource_reference', None)
-  supplier = movement_dict.get('supplier', None)
-  extension = movement_dict.get('extension', None)
-  dataset_reference = movement_dict.get('dataset_reference', None)
-  data_ingestion_id =  '%s_%s_%s_%s' %(supplier, dataset_reference, now_string, eof)
-  size = movement_dict.get('size', None) if movement_dict.get('size', None) != "" else None
-  hash_value = movement_dict.get('hash', None) if movement_dict.get('hash', None) != "" else None
-
-  # search for applicable data ingestion
-  data_ingestion = portal_catalog.getResultValue(
+# remove supplier, eof, size and hash from reference
+reference = reference_separator.join(reference.split(reference_separator)[1:-3])
+
+data_ingestion_reference = reference
+eof = movement_dict.get('eof', reference_end_single) if movement_dict.get('eof', reference_end_single) != "" else reference_end_single
+resource_reference = movement_dict.get('resource_reference', None)
+supplier = movement_dict.get('supplier', None)
+extension = movement_dict.get('extension', None)
+dataset_reference = movement_dict.get('dataset_reference', None)
+data_ingestion_id =  '%s_%s_%s_%s' %(supplier, dataset_reference, now_string, eof)
+size = movement_dict.get('size', None) if movement_dict.get('size', None) != "" else None
+hash_value = movement_dict.get('hash', None) if movement_dict.get('hash', None) != "" else None
+
+# search for applicable data ingestion
+data_ingestion = portal_catalog.getResultValue(
   portal_type = 'Data Ingestion',
   reference = data_ingestion_reference)
 
-  if data_ingestion is not None:
+if data_ingestion is not None:
   if data_ingestion.getSimulationState() != 'started':
     if eof == reference_end_single: # if not split (one single ingestion), invalidate old ingestion
       portal.ERP5Site_invalidateIngestionObjects(data_ingestion_reference)
 
-  specialise_value_list = [x.getObject() for x in portal_catalog.searchResults(
+specialise_value_list = [x.getObject() for x in portal_catalog.searchResults(
   portal_type = 'Data Supply',
   reference = 'embulk',
   validation_state = 'validated')]
 
-  # create a new data ingestion
-  data_ingestion = portal.data_ingestion_module.newContent(
+# create a new data ingestion
+data_ingestion = portal.data_ingestion_module.newContent(
     id = data_ingestion_id,
     portal_type = "Data Ingestion",
     title = movement_dict.get('filename', data_ingestion_reference),
@@ -48,7 +47,7 @@ try:
     start_date = now,
     specialise_value_list = specialise_value_list)
 
-  property_list = ["title",
+property_list = ["title",
                  "source",
                  "source_section",
                  "source_project",
@@ -57,14 +56,14 @@ try:
                  "destination_project",
                  "specialise"]
 
-  composed = data_ingestion.asComposedDocument()
-  data_ingestion.edit(**{p: composed.getProperty(p) for p in property_list})
+composed = data_ingestion.asComposedDocument()
+data_ingestion.edit(**{p: composed.getProperty(p) for p in property_list})
 
-  # create ingestion lines from specialise lines and assign input line
-  # and operation line
-  input_line = None
-  operation_line = None
-  for supply_line in composed.objectValues(portal_type = 'Data Supply Line'):
+# create ingestion lines from specialise lines and assign input line
+# and operation line
+input_line = None
+operation_line = None
+for supply_line in composed.objectValues(portal_type = 'Data Supply Line'):
   current_line = data_ingestion.newContent(
     portal_type = "Data Ingestion Line",
     title = supply_line.getTitle(),
@@ -82,22 +81,22 @@ try:
     # we set quantity=0 for the empty line
     current_line.setQuantity(0)
 
-  # copy device and configuration from operation line to input line
-  input_line.setAggregateSet(
+# copy device and configuration from operation line to input line
+input_line.setAggregateSet(
   input_line.getAggregateList() + operation_line.getAggregateList())
 
-  if hash_value is None or eof != reference_end_single: # do not set hash if split, calculate when append
+if hash_value is None or eof != reference_end_single: # do not set hash if split, calculate when append
   hash_value = ""
-  data_stream = portal.data_stream_module.newContent(
+data_stream = portal.data_stream_module.newContent(
   portal_type = "Data Stream",
   id = data_ingestion_id,
   version = hash_value,
   title = "%s%s" % (data_ingestion.getTitle(), "."+extension if extension != none_extension else ""),
   reference = data_ingestion_reference)
 
-  input_line.setDefaultAggregateValue(data_stream)
+input_line.setDefaultAggregateValue(data_stream)
 
-  if dataset_reference is not None:
+if dataset_reference is not None:
   data_set = portal.data_set_module.get(dataset_reference)
   try:
     if data_set is None:
@@ -118,15 +117,12 @@ try:
     data_set.validate()
   input_line.setDefaultAggregateValue(data_set)
 
-  data_ingestion.start()
+data_ingestion.start()
 
-  data_operation = operation_line.getResourceValue()
-  data_stream = input_line.getAggregateDataStreamValue()
+data_operation = operation_line.getResourceValue()
+data_stream = input_line.getAggregateDataStreamValue()
 
-  if eof == reference_end_single:
+if eof == reference_end_single:
   data_stream.validate()
 
-  return data_operation, {'data_stream': data_stream}
-except Exception as e:
-  context.logEntry(''.join(["[ERROR] Error during ingestion policy operation: ", str(e)]))
-  raise e
+return data_operation, {'data_stream': data_stream}