Add error handling for ObjectNotFoundErrror

- add exception handling for clearing upload

Author: MarcelGeo

server/mergin/sync/models.py

@@ -1042,9 +1042,12 @@ def clear(self):
         """Clean up pending upload.
         Uploaded files and table records are removed, and another upload can start.
         """
-        move_to_tmp(self.upload_dir, self.id)
-        db.session.delete(self)
-        db.session.commit()
+        try:
+            move_to_tmp(self.upload_dir, self.id)
+            db.session.delete(self)
+            db.session.commit()
+        except Exception:
+            logging.exception(f"Failed to clear upload.")
 
     def process_chunks(
         self, use_shared_chunk_dir: bool

server/mergin/sync/public_api_v2_controller.py

@@ -13,6 +13,7 @@
 from flask_login import current_user
 from marshmallow import ValidationError
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm.exc import ObjectDeletedError
 
 from mergin.sync.tasks import remove_transaction_chunks
 
@@ -333,7 +334,12 @@ def create_project_version(id):
         )
         project_version_created.send(pv)
         push_finished.send(pv)
-    except (psycopg2.Error, FileNotFoundError, IntegrityError) as err:
+    except (
+        psycopg2.Error,
+        FileNotFoundError,
+        IntegrityError,
+        ObjectDeletedError,
+    ) as err:
         db.session.rollback()
         logging.exception(
             f"Failed to finish push for project: {project.id}, project version: {v_next_version}, "
@@ -346,6 +352,7 @@ def create_project_version(id):
             ).count()
         ):
             move_to_tmp(version_dir)
+        upload.clear()
         return UploadError().response(422)
     # catch exception during pg transaction so we can rollback and prevent PendingRollbackError during upload clean up
     except gevent.timeout.Timeout: