Merge pull request #27 from ebi-ait/task/delete-errors-every-upload

Delete submission errors every attempt to upload

ingest/api/ingestapi.py

@@ -369,6 +369,10 @@ def create_submission_manifest(self, submission_url, data):
     def create_submission_error(self, submission_url, data):
         return self.create_entity(submission_url, data, 'submissionEnvelopeErrors')
 
+    def delete_submission_errors(self, submission_url: str):
+        r = self.session.delete(f'{submission_url}/submissionErrors')
+        r.raise_for_status()
+
     def create_entity(self, submission_url, data, entity_type, uuid=None):
         params = {}
         if uuid:
@@ -495,4 +499,5 @@ def find_staging_job(self, upload_area_uuid, filename):
 
     @staticmethod
     def __get_basic_header():
-        return {'Content-type': 'application/json'}
+        return {'Content-type': 'application/json'}
+

ingest/importer/importer.py

@@ -3,6 +3,7 @@
 
 from requests import HTTPError
 
+from ingest.api.ingestapi import IngestApi
 from ingest.importer.conversion import template_manager
 from ingest.importer.conversion.metadata_entity import MetadataEntity
 from ingest.importer.conversion.template_manager import TemplateManager
@@ -26,7 +27,7 @@ class XlsImporter:
     for more information on the spreadsheet format.
     """
 
-    def __init__(self, ingest_api):
+    def __init__(self, ingest_api: IngestApi):
         self.ingest_api = ingest_api
         self.logger = logging.getLogger(__name__)
         self.submitter = IngestSubmitter(self.ingest_api)
@@ -61,6 +62,7 @@ def import_file(self, file_path, submission_url, is_update=False, project_uuid=N
             template_mgr = None
             spreadsheet_json, template_mgr, errors = self.generate_json(file_path, is_update, project_uuid=project_uuid)
             entity_map = EntityMap.load(spreadsheet_json)
+            self.ingest_api.delete_submission_errors(submission_url)
 
             if errors:
                 self.report_errors(submission_url, errors)