Fix S3 get missing files

Author: DavidMStraub

gramps_webapi/api/media.py

@@ -122,8 +122,7 @@ def prefix(self) -> Optional[str]:
             return None
         return splitted[1].rstrip("/")
 
-    @property
-    def remote_keys(self) -> Set[str]:
+    def get_remote_keys(self) -> Set[str]:
         """Return the set of all object keys that are known to exist on remote."""
         keys = list_object_keys(self.bucket_name, endpoint_url=self.endpoint_url)
         return set(removeprefix(key, self.prefix or "").lstrip("/") for key in keys)
@@ -158,7 +157,8 @@ def filter_existing_files(self, objects: List[Media]) -> List[Media]:
         """Given a list of media objects, return the ones with existing files."""
         # for S3, we use the bucket-level list of handles to avoid having
         # to do many GETs that are more expensive than one LIST
-        return [obj for obj in objects if obj.checksum in self.remote_keys]
+        remote_keys = self.get_remote_keys()
+        return [obj for obj in objects if obj.checksum in remote_keys]
 
 
 def MediaHandler(base_dir: Optional[str]) -> MediaHandlerBase:

tests/test_s3.py

@@ -49,30 +49,30 @@ def test_mediahandler(bucket):
     handler = MediaHandler(URL)
     assert handler.endpoint_url is None
     assert handler.bucket_name == BUCKET
-    assert handler.remote_keys == set()
+    assert handler.get_remote_keys() == set()
 
 
 def test_upload(bucket):
     handler = MediaHandler(URL)
     img, checksum = get_image(0)
-    assert handler.remote_keys == set()
+    assert handler.get_remote_keys() == set()
     handler.upload_file(img, checksum, "image/jpeg")
-    assert handler.remote_keys == {checksum}
+    assert handler.get_remote_keys() == {checksum}
     img, checksum2 = get_image(1)
     handler.upload_file(img, checksum2, "image/jpeg")
-    assert handler.remote_keys == {checksum, checksum2}
+    assert handler.get_remote_keys() == {checksum, checksum2}
 
 
 def test_upload_prefix(bucket):
     handler = MediaHandler(URL_PREFIX)
     img, checksum = get_image(0)
-    assert handler.remote_keys == set()
+    assert handler.get_remote_keys() == set()
     handler.upload_file(img, checksum, "image/jpeg")
-    assert handler.remote_keys == {checksum}
+    assert handler.get_remote_keys() == {checksum}
     keys = list_object_keys(handler.bucket_name, handler.endpoint_url)
     assert keys == [f"mytree/{checksum}"]
     img, checksum2 = get_image(1)
     handler.upload_file(img, checksum2, "image/jpeg")
-    assert handler.remote_keys == {checksum, checksum2}
+    assert handler.get_remote_keys() == {checksum, checksum2}
     keys = list_object_keys(handler.bucket_name, handler.endpoint_url)
     assert sorted(keys) == sorted([f"mytree/{checksum}", f"mytree/{checksum2}"])