Fixed tests

src/palace/manager/celery/tasks/marc.py

@@ -3,7 +3,6 @@
 from tempfile import TemporaryFile
 from typing import Any
 
-import pyinstrument
 from celery import shared_task
 from pydantic import TypeAdapter
 
@@ -124,7 +123,7 @@ def marc_export_collection(
             )
             return
 
-        with ExitStack() as stack, task.session() as session, pyinstrument.profile():
+        with ExitStack() as stack, task.transaction() as session:
             files = {
                 library: stack.enter_context(TemporaryFile())
                 for library in libraries_info
@@ -192,7 +191,11 @@ def marc_export_collection(
 
             # Upload part to s3, if there is anything to upload
             for library, tmp_file in files.items():
-                uploads[library].upload_part(tmp_file)
+                upload = uploads[library]
+                if not upload.upload_part(tmp_file):
+                    task.log.warning(
+                        f"No data to upload to s3 '{upload.context.s3_key}'."
+                    )
 
             if no_more_works:
                 # Task is complete. Finalize the s3 uploads and create MarcFile records in DB.
@@ -208,6 +211,12 @@ def marc_export_collection(
                             key=upload.context.s3_key,
                             since=library.last_updated if delta else None,
                         )
+                        task.log.info(f"Completed upload for '{upload.context.s3_key}'")
+                    else:
+                        task.log.warning(
+                            f"No upload for '{upload.context.s3_key}', "
+                            f"because there were no records."
+                        )
 
                 task.log.info(
                     f"Finished generating MARC records for collection '{collection_name}' ({collection_id}) "

src/palace/manager/marc/uploader.py

@@ -16,7 +16,7 @@
 class UploadContext(BaseModel):
     upload_uuid: uuid.UUID
     s3_key: str
-    upload_id: str
+    upload_id: str | None = None
     parts: list[MultipartS3UploadPart] = []
 
 
@@ -51,11 +51,9 @@ def __init__(
                 upload_uuid,
                 since_time,
             )
-            upload_id = self.storage_service.multipart_create(
-                s3_key, content_type=Representation.MARC_MEDIA_TYPE
-            )
             context = UploadContext(
-                upload_uuid=upload_uuid, s3_key=s3_key, upload_id=upload_id
+                upload_uuid=upload_uuid,
+                s3_key=s3_key,
             )
         self.context = context
 
@@ -114,17 +112,34 @@ def __exit__(
         self._in_context_manager = False
         return False
 
+    def begin_upload(self) -> str:
+        upload_id = self.storage_service.multipart_create(
+            self.context.s3_key, content_type=Representation.MARC_MEDIA_TYPE
+        )
+        self.context.upload_id = upload_id
+        return upload_id
+
     def upload_part(self, data: IO[bytes] | bytes) -> bool:
         if self._finalized:
             raise MarcUploadException("Upload is already finalized.")
 
-        length = len(data) if isinstance(data, bytes) else data.tell()
+        if isinstance(data, bytes):
+            length = len(data)
+        else:
+            length = data.tell()
+            data.seek(0)
+
         if length == 0:
             return False
 
+        if self.context.upload_id is None:
+            upload_id = self.begin_upload()
+        else:
+            upload_id = self.context.upload_id
+
         part_number = len(self.context.parts) + 1
         upload_part = self.storage_service.multipart_upload(
-            self.context.s3_key, self.context.upload_id, part_number, data
+            self.context.s3_key, upload_id, part_number, data
         )
         self.context.parts.append(upload_part)
         return True
@@ -133,7 +148,7 @@ def complete(self) -> bool:
         if self._finalized:
             raise MarcUploadException("Upload is already finalized.")
 
-        if not self.context.parts:
+        if self.context.upload_id is None or not self.context.parts:
             self.abort()
             return False
 
@@ -147,6 +162,10 @@ def abort(self) -> None:
         if self._finalized:
             return
 
+        if self.context.upload_id is None:
+            self._finalized = True
+            return
+
         self.storage_service.multipart_abort(
             self.context.s3_key, self.context.upload_id
         )

tests/fixtures/marc.py

@@ -42,8 +42,6 @@ def __init__(
         self.collection2.libraries = [self.library1]
         self.collection3.libraries = [self.library2]
 
-        self.test_marc_file_key = "test-file-1.mrc"
-
     def integration(self) -> IntegrationConfiguration:
         return self._db.integration_configuration(
             MarcExporter, Goals.CATALOG_GOAL, name="MARC Exporter"
@@ -54,13 +52,13 @@ def work(self, collection: Collection | None = None) -> Work:
         edition = self._db.edition()
         self._db.licensepool(edition, collection=collection)
         work = self._db.work(presentation_edition=edition)
-        work.last_update_time = utc_now()
+        work.last_update_time = utc_now() - datetime.timedelta(days=1)
         return work
 
     def works(self, collection: Collection | None = None) -> list[Work]:
         return [self.work(collection) for _ in range(5)]
 
-    def configure_export(self, *, marc_file: bool = True) -> None:
+    def configure_export(self) -> None:
         marc_integration = self.integration()
         self._db.integration_library_configuration(
             marc_integration,
@@ -77,12 +75,6 @@ def configure_export(self, *, marc_file: bool = True) -> None:
         self.collection2.export_marc_records = True
         self.collection3.export_marc_records = True
 
-        if marc_file:
-            self.marc_file(
-                key=self.test_marc_file_key,
-                created=utc_now() - datetime.timedelta(days=7),
-            )
-
     def enabled_libraries(
         self, collection: Collection | None = None
     ) -> Sequence[LibraryInfo]:

tests/fixtures/s3.py

@@ -81,7 +81,6 @@ def __init__(
         if isinstance(content, bytes):
             self.content = content
         else:
-            content.seek(0)
             self.content = content.read()