Address review

Author: NoahStapp

doc/changelog.rst

@@ -9,6 +9,8 @@ PyMongo 4.12 brings a number of changes including:
 - Support for configuring DEK cache lifetime via the ``key_expiration_ms`` argument to
   :class:`~pymongo.encryption_options.AutoEncryptionOpts`.
 - Support for $lookup in CSFLE and QE supported on MongoDB 8.1+.
+- Added :meth:`gridfs.asynchronous.grid_file.AsyncGridFSBucket.delete_by_name` and :meth:`gridfs.grid_file.GridFSBucket.delete_by_name`
+  for more performant deletion of a file with multiple revisions.
 
 Issues Resolved
 ...............

gridfs/asynchronous/grid_file.py

@@ -857,7 +857,7 @@ async def delete_by_name(
         """
         _disallow_transactions(session)
         files = self._files.find({"filename": filename}, {"_id": 1}, session=session)
-        file_ids = [file_id["_id"] async for file_id in files]
+        file_ids = [file["_id"] async for file in files]
         res = await self._files.delete_many({"_id": {"$in": file_ids}}, session=session)
         await self._chunks.delete_many({"files_id": {"$in": file_ids}}, session=session)
         if not res.deleted_count:

gridfs/synchronous/grid_file.py

@@ -851,7 +851,7 @@ def delete_by_name(self, filename: str, session: Optional[ClientSession] = None)
         """
         _disallow_transactions(session)
         files = self._files.find({"filename": filename}, {"_id": 1}, session=session)
-        file_ids = [file_id["_id"] for file_id in files]
+        file_ids = [file["_id"] for file in files]
         res = self._files.delete_many({"_id": {"$in": file_ids}}, session=session)
         self._chunks.delete_many({"files_id": {"$in": file_ids}}, session=session)
         if not res.deleted_count:

test/asynchronous/test_session.py

@@ -45,7 +45,7 @@
 
 from bson import DBRef
 from gridfs.asynchronous.grid_file import AsyncGridFS, AsyncGridFSBucket
-from pymongo import ASCENDING, AsyncMongoClient, monitoring
+from pymongo import ASCENDING, AsyncMongoClient, _csot, monitoring
 from pymongo.asynchronous.command_cursor import AsyncCommandCursor
 from pymongo.asynchronous.cursor import AsyncCursor
 from pymongo.asynchronous.helpers import anext
@@ -458,6 +458,7 @@ async def test_cursor(self):
                     f"{name} sent wrong lsid with {event.command_name}",
                 )
 
+    @_csot.apply
     async def test_gridfs(self):
         client = self.client
         fs = AsyncGridFS(client.pymongo_test)
@@ -500,6 +501,7 @@ async def find_list(session=None):
             (fs.delete, [1], {}),
         )
 
+    @_csot.apply
     async def test_gridfs_bucket(self):
         client = self.client
         bucket = AsyncGridFSBucket(client.pymongo_test)
@@ -546,6 +548,7 @@ async def find(session=None):
             (bucket.delete, [2], {}),
         )
 
+    @_csot.apply
     async def test_gridfsbucket_cursor(self):
         client = self.client
         bucket = AsyncGridFSBucket(client.pymongo_test)

test/asynchronous/test_transactions.py

@@ -32,7 +32,7 @@
 
 from bson import encode
 from bson.raw_bson import RawBSONDocument
-from pymongo import WriteConcern
+from pymongo import WriteConcern, _csot
 from pymongo.asynchronous import client_session
 from pymongo.asynchronous.client_session import TransactionOptions
 from pymongo.asynchronous.command_cursor import AsyncCommandCursor
@@ -240,6 +240,7 @@ async def create_and_insert(session):
             self.assertEqual(ctx.exception.code, 48)  # NamespaceExists
 
     @async_client_context.require_transactions
+    @_csot.apply
     async def test_gridfs_does_not_support_transactions(self):
         client = async_client_context.client
         db = client.pymongo_test

test/test_session.py

@@ -45,7 +45,7 @@
 
 from bson import DBRef
 from gridfs.synchronous.grid_file import GridFS, GridFSBucket
-from pymongo import ASCENDING, MongoClient, monitoring
+from pymongo import ASCENDING, MongoClient, _csot, monitoring
 from pymongo.common import _MAX_END_SESSIONS
 from pymongo.errors import ConfigurationError, InvalidOperation, OperationFailure
 from pymongo.operations import IndexModel, InsertOne, UpdateOne
@@ -458,6 +458,7 @@ def test_cursor(self):
                     f"{name} sent wrong lsid with {event.command_name}",
                 )
 
+    @_csot.apply
     def test_gridfs(self):
         client = self.client
         fs = GridFS(client.pymongo_test)
@@ -500,6 +501,7 @@ def find_list(session=None):
             (fs.delete, [1], {}),
         )
 
+    @_csot.apply
     def test_gridfs_bucket(self):
         client = self.client
         bucket = GridFSBucket(client.pymongo_test)
@@ -546,6 +548,7 @@ def find(session=None):
             (bucket.delete, [2], {}),
         )
 
+    @_csot.apply
     def test_gridfsbucket_cursor(self):
         client = self.client
         bucket = GridFSBucket(client.pymongo_test)

test/test_transactions.py

@@ -32,7 +32,7 @@
 
 from bson import encode
 from bson.raw_bson import RawBSONDocument
-from pymongo import WriteConcern
+from pymongo import WriteConcern, _csot
 from pymongo.errors import (
     CollectionInvalid,
     ConfigurationError,
@@ -232,6 +232,7 @@ def create_and_insert(session):
             self.assertEqual(ctx.exception.code, 48)  # NamespaceExists
 
     @client_context.require_transactions
+    @_csot.apply
     def test_gridfs_does_not_support_transactions(self):
         client = client_context.client
         db = client.pymongo_test