Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

doc/changelog.rst

@@ -8,8 +8,9 @@ PyMongo 4.9 brings a number of improvements including:
 
 - Added support for MongoDB 8.0.
 - A new asynchronous API with full asyncio support.
-- Add support for :attr:`~pymongo.encryption.Algorithm.RANGE` and deprecate
-  :attr:`~pymongo.encryption.Algorithm.RANGEPREVIEW`.
+- Added support for In-Use Encryption range queries with MongoDB 8.0.
+  Added :attr:`~pymongo.encryption.Algorithm.RANGE`.
+  ``sparsity`` and ``trim_factor`` are now optional in :class:`~pymongo.encryption_options.RangeOpts`.
 - pymongocrypt>=1.10 is now required for :ref:`In-Use Encryption` support.
 - Added :meth:`~pymongo.cursor.Cursor.to_list` to :class:`~pymongo.cursor.Cursor`,
   :class:`~pymongo.command_cursor.CommandCursor`,

pymongo/encryption_options.py

@@ -238,8 +238,8 @@ class RangeOpts:
 
     def __init__(
         self,
-        sparsity: int,
-        trim_factor: int,
+        sparsity: Optional[int] = None,
+        trim_factor: Optional[int] = None,
         min: Optional[Any] = None,
         max: Optional[Any] = None,
         precision: Optional[int] = None,
@@ -264,7 +264,7 @@ def __init__(
     def document(self) -> dict[str, Any]:
         doc = {}
         for k, v in [
-            ("sparsity", int64.Int64(self.sparsity)),
+            ("sparsity", int64.Int64(self.sparsity) if self.sparsity else None),
             ("trimFactor", self.trim_factor),
             ("precision", self.precision),
             ("min", self.min),

pymongo/message.py

@@ -1123,6 +1123,8 @@ def _check_doc_size_limits(
         new_message_size = total_ops_length + total_ns_length + op_length + ns_length
         # We have enough data, return this batch.
         if new_message_size > max_doc_sequences_bytes:
+            if idx == 0:
+                _raise_document_too_large(op_type, op_length, max_bson_size + _COMMAND_OVERHEAD)
             break
 
         # Add op and ns documents to this batch.

test/__init__.py

@@ -79,16 +79,6 @@
 
 _IS_SYNC = True
 
-# The default asyncio loop implementation on Windows
-# has issues with sharing sockets across loops (https://github.com/python/cpython/issues/122240)
-# We explicitly use a different loop implementation here to prevent that issue
-if (
-    not _IS_SYNC
-    and sys.platform == "win32"
-    and asyncio.get_event_loop_policy() == asyncio.WindowsProactorEventLoopPolicy
-):
-    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())  # type: ignore[attr-defined]
-
 
 class ClientContext:
     client: MongoClient

test/asynchronous/__init__.py

@@ -79,16 +79,6 @@
 
 _IS_SYNC = False
 
-# The default asyncio loop implementation on Windows
-# has issues with sharing sockets across loops (https://github.com/python/cpython/issues/122240)
-# We explicitly use a different loop implementation here to prevent that issue
-if (
-    not _IS_SYNC
-    and sys.platform == "win32"
-    and asyncio.get_event_loop_policy() == asyncio.WindowsProactorEventLoopPolicy
-):
-    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())  # type: ignore[attr-defined]
-
 
 class AsyncClientContext:
     client: AsyncMongoClient

test/asynchronous/conftest.py

@@ -1,13 +1,27 @@
 from __future__ import annotations
 
+import asyncio
+import sys
 from test import pytest_conf
 from test.asynchronous import async_setup, async_teardown
 
+import pytest
 import pytest_asyncio
 
 _IS_SYNC = False
 
 
+@pytest.fixture(scope="session")
+def event_loop_policy():
+    # The default asyncio loop implementation on Windows
+    # has issues with sharing sockets across loops (https://github.com/python/cpython/issues/122240)
+    # We explicitly use a different loop implementation here to prevent that issue
+    if sys.platform == "win32":
+        return asyncio.WindowsSelectorEventLoopPolicy()  # type: ignore[attr-defined]
+
+    return asyncio.get_event_loop_policy()
+
+
 @pytest_asyncio.fixture(scope="session", autouse=True)
 async def test_setup_and_teardown():
     await async_setup()

test/asynchronous/test_client_bulk_write.py

@@ -512,17 +512,15 @@ async def test_returns_error_if_no_writes_can_be_added_to_ops(self):
         # Document too large.
         b_repeated = "b" * self.max_message_size_bytes
         models = [InsertOne(namespace="db.coll", document={"a": b_repeated})]
-        with self.assertRaises(InvalidOperation) as context:
+        with self.assertRaises(DocumentTooLarge):
             await client.bulk_write(models=models)
-        self.assertIn("cannot do an empty bulk write", context.exception._message)
 
         # Namespace too large.
         c_repeated = "c" * self.max_message_size_bytes
         namespace = f"db.{c_repeated}"
         models = [InsertOne(namespace=namespace, document={"a": "b"})]
-        with self.assertRaises(InvalidOperation) as context:
+        with self.assertRaises(DocumentTooLarge):
             await client.bulk_write(models=models)
-        self.assertIn("cannot do an empty bulk write", context.exception._message)
 
     @async_client_context.require_version_min(8, 0, 0, -24)
     @unittest.skipUnless(_HAVE_PYMONGOCRYPT, "pymongocrypt is not installed")

test/client-side-encryption/spec/legacy/fle2v2-Compact.json

@@ -130,6 +130,9 @@
             "command": {
               "compactStructuredEncryptionData": "default"
             }
+          },
+          "result": {
+            "ok": 1
           }
         }
       ],