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

Author: blink1073

.pre-commit-config.yaml

@@ -105,6 +105,12 @@ repos:
     # - test/test_client.py:188: te ==> the, be, we, to
     args: ["-L", "fle,fo,infinit,isnt,nin,te,aks"]
 
+- repo: https://github.com/astral-sh/uv-pre-commit
+  # uv version.
+  rev: 0.8.17
+  hooks:
+    - id: uv-lock
+
 - repo: local
   hooks:
   - id: executable-shell

CONTRIBUTING.md

@@ -514,3 +514,11 @@ To profile a test script and generate a flame graph, follow these steps:
    (Note: on macOS you will need to run this command using `sudo` to allow `py-spy` to attach to the Python process.)
 4. If you need to include native code (for example the C extensions), profiling should be done on a Linux system, as macOS and Windows do not support the `--native` option of `py-spy`.
    Creating an ubuntu Evergreen spawn host and using `scp` to copy the flamegraph `.svg` file back to your local machine is the best way to do this.
+
+## Dependabot updates
+
+Dependabot will raise PRs at most once per week, grouped by GitHub Actions updates and Python requirement
+file updates.  We have a pre-commit hook that will update the `uv.lock` file when requirements change.
+To update the lock file on a failing PR, you can use a method like `gh pr checkout <pr number>`, then run
+`just lint uv-lock` to update the lock file, and then push the changes.  If a typing dependency has changed,
+also run `just typing` and handle any new findings.

bson/__init__.py

@@ -1327,7 +1327,7 @@ def decode_iter(
         elements = data[position : position + obj_size]
         position += obj_size
 
-        yield _bson_to_dict(elements, opts)  # type:ignore[misc]
+        yield _bson_to_dict(elements, opts)
 
 
 @overload
@@ -1373,7 +1373,7 @@ def decode_file_iter(
             raise InvalidBSON("cut off in middle of objsize")
         obj_size = _UNPACK_INT_FROM(size_data, 0)[0] - 4
         elements = size_data + file_obj.read(max(0, obj_size))
-        yield _bson_to_dict(elements, opts)  # type:ignore[arg-type, misc]
+        yield _bson_to_dict(elements, opts)  # type:ignore[misc]
 
 
 def is_valid(bson: bytes) -> bool:

doc/changelog.rst

@@ -1,6 +1,28 @@
 Changelog
 =========
 
+Changes in Version 4.15.1 (2025/09/16)
+--------------------------------------
+
+Version 4.15.1 is a bug fix release.
+
+- Fixed a bug in :meth:`~pymongo.synchronous.encryption.ClientEncryption.encrypt`
+  and :meth:`~pymongo.asynchronous.encryption.AsyncClientEncryption.encrypt`
+  that would cause a ``TypeError`` when using ``pymongocrypt<1.16`` by passing
+  an unsupported ``type_opts`` parameter even if Queryable Encryption text
+  queries beta was not used.
+
+- Fixed a bug in ``AsyncMongoClient`` that caused a ``ServerSelectionTimeoutError``
+  when used with ``uvicorn``, ``FastAPI``, or ``uvloop``.
+
+Issues Resolved
+...............
+
+See the `PyMongo 4.15.1 release notes in JIRA`_ for the list of resolved issues
+in this release.
+
+.. _PyMongo 4.15.1 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=46486
+
 Changes in Version 4.15.0 (2025/09/10)
 --------------------------------------
 
@@ -13,17 +35,20 @@ PyMongo 4.15 brings a number of changes including:
   :attr:`~pymongo.encryption.QueryType.SUBSTRINGPREVIEW`,
   as part of the experimental Queryable Encryption text queries beta.
   ``pymongocrypt>=1.16`` is required for text query support.
-- Added :class:`bson.decimal128.DecimalEncoder` and :class:`bson.decimal128.DecimalDecoder`
-  to support encoding and decoding of BSON Decimal128 values to decimal.Decimal values using the TypeRegistry API.
+- Added :class:`bson.decimal128.DecimalEncoder` and
+  :class:`bson.decimal128.DecimalDecoder`
+  to support encoding and decoding of BSON Decimal128 values to
+  decimal.Decimal values using the TypeRegistry API.
 - Added support for Windows ``arm64`` wheels.
 
 Changes in Version 4.14.1 (2025/08/19)
 --------------------------------------
 
 Version 4.14.1 is a bug fix release.
 
- - Fixed a bug in ``MongoClient.append_metadata()`` and ``AsyncMongoClient.append_metadata()``
-   that allowed duplicate ``DriverInfo.name`` to be appended to the metadata.
+- Fixed a bug in ``MongoClient.append_metadata()`` and
+  ``AsyncMongoClient.append_metadata()``
+  that allowed duplicate ``DriverInfo.name`` to be appended to the metadata.
 
 Issues Resolved
 ...............

justfile

@@ -50,12 +50,12 @@ typing-pyright: && resync
     {{typing_run}} pyright -p strict_pyrightconfig.json test/test_typing_strict.py
 
 [group('lint')]
-lint: && resync
-    uv run pre-commit run --all-files
+lint *args="": && resync
+    uv run pre-commit run --all-files {{args}}
 
 [group('lint')]
-lint-manual: && resync
-    uv run pre-commit run --all-files --hook-stage manual
+lint-manual *args="": && resync
+    uv run pre-commit run --all-files --hook-stage manual {{args}}
 
 [group('test')]
 test *args="-v --durations=5 --maxfail=10": && resync

pymongo/asynchronous/srv_resolver.py

@@ -107,7 +107,7 @@ async def get_options(self) -> Optional[str]:
             # No TXT records
             return None
         except Exception as exc:
-            raise ConfigurationError(str(exc)) from None
+            raise ConfigurationError(str(exc)) from exc
         if len(results) > 1:
             raise ConfigurationError("Only one TXT record is supported")
         return (b"&".join([b"".join(res.strings) for res in results])).decode("utf-8")  # type: ignore[attr-defined]
@@ -122,7 +122,7 @@ async def _resolve_uri(self, encapsulate_errors: bool) -> resolver.Answer:
                 # Raise the original error.
                 raise
             # Else, raise all errors as ConfigurationError.
-            raise ConfigurationError(str(exc)) from None
+            raise ConfigurationError(str(exc)) from exc
         return results
 
     async def _get_srv_response_and_hosts(
@@ -145,8 +145,8 @@ async def _get_srv_response_and_hosts(
                 )
             try:
                 nlist = srv_host.split(".")[1:][-self.__slen :]
-            except Exception:
-                raise ConfigurationError(f"Invalid SRV host: {node[0]}") from None
+            except Exception as exc:
+                raise ConfigurationError(f"Invalid SRV host: {node[0]}") from exc
             if self.__plist != nlist:
                 raise ConfigurationError(f"Invalid SRV host: {node[0]}")
         if self.__srv_max_hosts:

pymongo/synchronous/srv_resolver.py

@@ -107,7 +107,7 @@ def get_options(self) -> Optional[str]:
             # No TXT records
             return None
         except Exception as exc:
-            raise ConfigurationError(str(exc)) from None
+            raise ConfigurationError(str(exc)) from exc
         if len(results) > 1:
             raise ConfigurationError("Only one TXT record is supported")
         return (b"&".join([b"".join(res.strings) for res in results])).decode("utf-8")  # type: ignore[attr-defined]
@@ -122,7 +122,7 @@ def _resolve_uri(self, encapsulate_errors: bool) -> resolver.Answer:
                 # Raise the original error.
                 raise
             # Else, raise all errors as ConfigurationError.
-            raise ConfigurationError(str(exc)) from None
+            raise ConfigurationError(str(exc)) from exc
         return results
 
     def _get_srv_response_and_hosts(
@@ -145,8 +145,8 @@ def _get_srv_response_and_hosts(
                 )
             try:
                 nlist = srv_host.split(".")[1:][-self.__slen :]
-            except Exception:
-                raise ConfigurationError(f"Invalid SRV host: {node[0]}") from None
+            except Exception as exc:
+                raise ConfigurationError(f"Invalid SRV host: {node[0]}") from exc
             if self.__plist != nlist:
                 raise ConfigurationError(f"Invalid SRV host: {node[0]}")
         if self.__srv_max_hosts:

test/asynchronous/test_srv_polling.py

@@ -225,7 +225,7 @@ def response_callback(*args):
 
             await self.run_scenario(response_callback, False)
 
-    @flaky(reason="PYTHON-5500")
+    @flaky(reason="PYTHON-5500", max_runs=3)
     async def test_dns_failures_logging(self):
         from dns import exception
 

test/lambda/build_internal.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -ex
 
 cd /src
-PYTHON=/opt/python/cp39-cp39/bin/python
+PYTHON=/opt/python/cp310-cp310/bin/python
 $PYTHON -m pip install -v -e .

test/lambda/template.yaml

@@ -23,7 +23,7 @@ Resources:
         Variables:
           MONGODB_URI: !Ref MongoDbUri
       Handler: app.lambda_handler
-      Runtime: python3.9
+      Runtime: python3.10
       Architectures:
         - x86_64
       Events: