Merge branch 'master' into PYTHON-5164

Author: ShaneHarvey

doc/changelog.rst

@@ -1,7 +1,26 @@
 Changelog
 =========
 
-Changes in Version 4.11.0 (YYYY/MM/DD)
+Changes in Version 4.11.2 (YYYY/MM/DD)
+--------------------------------------
+
+Version 4.11.2 is a bug fix release.
+
+- Fixed a bug where :meth:`~pymongo.database.Database.command` would fail when attempting to run the bulkWrite command.
+
+Issues Resolved
+...............
+
+See the `PyMongo 4.11.2 release notes in JIRA`_ for the list of resolved issues in this release.
+
+.. _PyMongo 4.11.2 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=42506
+
+Changes in Version 4.11.1 (2025/02/10)
+--------------------------------------
+
+- Fixed support for prebuilt ``ppc64le`` and ``s390x`` wheels.
+
+Changes in Version 4.11.0 (2025/01/28)
 --------------------------------------
 
 .. warning:: PyMongo 4.11 drops support for Python 3.8 and PyPy 3.9: Python 3.9+ or PyPy 3.10+ is now required.

gridfs/asynchronous/grid_file.py

@@ -1301,11 +1301,8 @@ async def write(self, data: Any) -> None:
             raise ValueError("cannot write to a closed file")
 
         try:
-            if isinstance(data, AsyncGridOut):
-                read = data.read
-            else:
-                # file-like
-                read = data.read
+            # file-like
+            read = data.read
         except AttributeError:
             # string
             if not isinstance(data, (str, bytes)):
@@ -1317,7 +1314,7 @@ async def write(self, data: Any) -> None:
                     raise TypeError(
                         "must specify an encoding for file in order to write str"
                     ) from None
-            read = io.BytesIO(data).read  # type: ignore[assignment]
+            read = io.BytesIO(data).read
 
         if inspect.iscoroutinefunction(read):
             await self._write_async(read)
@@ -1331,15 +1328,15 @@ async def write(self, data: Any) -> None:
                     except BaseException:
                         await self.abort()
                         raise
-                    self._buffer.write(to_write)  # type: ignore
-                    if len(to_write) < space:  # type: ignore
+                    self._buffer.write(to_write)
+                    if len(to_write) < space:
                         return  # EOF or incomplete
                 await self._flush_buffer()
             to_write = read(self.chunk_size)
-            while to_write and len(to_write) == self.chunk_size:  # type: ignore
+            while to_write and len(to_write) == self.chunk_size:
                 await self._flush_data(to_write)
                 to_write = read(self.chunk_size)
-            self._buffer.write(to_write)  # type: ignore
+            self._buffer.write(to_write)
 
     async def _write_async(self, read: Any) -> None:
         if self._buffer.tell() > 0:

gridfs/synchronous/grid_file.py

@@ -1291,11 +1291,8 @@ def write(self, data: Any) -> None:
             raise ValueError("cannot write to a closed file")
 
         try:
-            if isinstance(data, GridOut):
-                read = data.read
-            else:
-                # file-like
-                read = data.read
+            # file-like
+            read = data.read
         except AttributeError:
             # string
             if not isinstance(data, (str, bytes)):
@@ -1307,7 +1304,7 @@ def write(self, data: Any) -> None:
                     raise TypeError(
                         "must specify an encoding for file in order to write str"
                     ) from None
-            read = io.BytesIO(data).read  # type: ignore[assignment]
+            read = io.BytesIO(data).read
 
         if inspect.iscoroutinefunction(read):
             self._write_async(read)
@@ -1321,15 +1318,15 @@ def write(self, data: Any) -> None:
                     except BaseException:
                         self.abort()
                         raise
-                    self._buffer.write(to_write)  # type: ignore
-                    if len(to_write) < space:  # type: ignore
+                    self._buffer.write(to_write)
+                    if len(to_write) < space:
                         return  # EOF or incomplete
                 self._flush_buffer()
             to_write = read(self.chunk_size)
-            while to_write and len(to_write) == self.chunk_size:  # type: ignore
+            while to_write and len(to_write) == self.chunk_size:
                 self._flush_data(to_write)
                 to_write = read(self.chunk_size)
-            self._buffer.write(to_write)  # type: ignore
+            self._buffer.write(to_write)
 
     def _write_async(self, read: Any) -> None:
         if self._buffer.tell() > 0:

pymongo/message.py

@@ -105,7 +105,7 @@
     "insert": "documents",
     "update": "updates",
     "delete": "deletes",
-    "bulkWrite": "bulkWrite",
+    "bulkWrite": "ops",
 }
 
 _UNICODE_REPLACE_CODEC_OPTIONS: CodecOptions[Mapping[str, Any]] = CodecOptions(

test/asynchronous/test_database.py

@@ -430,6 +430,21 @@ async def test_command_with_regex(self):
         for doc in result["cursor"]["firstBatch"]:
             self.assertTrue(isinstance(doc["r"], Regex))
 
+    async def test_command_bulkWrite(self):
+        # Ensure bulk write commands can be run directly via db.command().
+        if async_client_context.version.at_least(8, 0):
+            await self.client.admin.command(
+                {
+                    "bulkWrite": 1,
+                    "nsInfo": [{"ns": self.db.test.full_name}],
+                    "ops": [{"insert": 0, "document": {}}],
+                }
+            )
+        await self.db.command({"insert": "test", "documents": [{}]})
+        await self.db.command({"update": "test", "updates": [{"q": {}, "u": {"$set": {"x": 1}}}]})
+        await self.db.command({"delete": "test", "deletes": [{"q": {}, "limit": 1}]})
+        await self.db.test.drop()
+
     async def test_cursor_command(self):
         db = self.client.pymongo_test
         await db.test.drop()

test/test_database.py

@@ -425,6 +425,21 @@ def test_command_with_regex(self):
         for doc in result["cursor"]["firstBatch"]:
             self.assertTrue(isinstance(doc["r"], Regex))
 
+    def test_command_bulkWrite(self):
+        # Ensure bulk write commands can be run directly via db.command().
+        if client_context.version.at_least(8, 0):
+            self.client.admin.command(
+                {
+                    "bulkWrite": 1,
+                    "nsInfo": [{"ns": self.db.test.full_name}],
+                    "ops": [{"insert": 0, "document": {}}],
+                }
+            )
+        self.db.command({"insert": "test", "documents": [{}]})
+        self.db.command({"update": "test", "updates": [{"q": {}, "u": {"$set": {"x": 1}}}]})
+        self.db.command({"delete": "test", "deletes": [{"q": {}, "limit": 1}]})
+        self.db.test.drop()
+
     def test_cursor_command(self):
         db = self.client.pymongo_test
         db.test.drop()