Merge branch 'mongodb:master' into arm64-runner

Author: finnagin

.evergreen/remove-unimplemented-tests.sh

@@ -3,11 +3,6 @@ PYMONGO=$(dirname "$(cd "$(dirname "$0")" || exit; pwd)")
 
 rm $PYMONGO/test/transactions/legacy/errors-client.json  # PYTHON-1894
 rm $PYMONGO/test/connection_monitoring/wait-queue-fairness.json  # PYTHON-1873
-rm $PYMONGO/test/client-side-encryption/spec/unified/fle2v2-BypassQueryAnalysis.json  # PYTHON-5143
-rm $PYMONGO/test/client-side-encryption/spec/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json  # PYTHON-5143
-rm $PYMONGO/test/client-side-encryption/spec/unified/localSchema.json  # PYTHON-5143
-rm $PYMONGO/test/client-side-encryption/spec/unified/maxWireVersion.json  # PYTHON-5143
-rm $PYMONGO/test/unified-test-format/valid-pass/poc-queryable-encryption.json  # PYTHON-5143
 rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-application-error.json  # PYTHON-4918
 rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-checkout-error.json  # PYTHON-4918
 rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-min-pool-size-error.json  # PYTHON-4918

.evergreen/run-tests.sh

@@ -26,12 +26,9 @@ else
 fi
 
 # List the packages.
-uv sync ${UV_ARGS} --reinstall
+uv sync ${UV_ARGS} --reinstall --quiet
 uv pip list
 
-# Ensure we go back to base environment after the test.
-trap "uv sync" EXIT HUP
-
 # Start the test runner.
 uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
 

.github/workflows/codeql.yml

@@ -38,15 +38,15 @@ jobs:
           build-mode: none
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         ref: ${{ inputs.ref }}
         persist-credentials: false
     - uses: actions/setup-python@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
+      uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -63,6 +63,6 @@ jobs:
         pip install -e .
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
+      uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/dist.yml

@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout pymongo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -109,7 +109,7 @@ jobs:
     name: Make SDist
     runs-on: macos-13
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/test-python.yml

@@ -19,11 +19,11 @@ jobs:
   static:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
         with:
           enable-cache: true
           python-version: "3.9"
@@ -61,11 +61,11 @@ jobs:
 
     name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
         with:
           enable-cache: true
           python-version: ${{ matrix.python-version }}
@@ -80,11 +80,11 @@ jobs:
     runs-on: ubuntu-latest
     name: DocTest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
         with:
           enable-cache: true
           python-version: "3.9"
@@ -105,11 +105,11 @@ jobs:
     name: Docs Checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
         with:
           enable-cache: true
           python-version: "3.9"
@@ -124,11 +124,11 @@ jobs:
     name: Link Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
         with:
           enable-cache: true
           python-version: "3.9"
@@ -146,11 +146,11 @@ jobs:
       matrix:
         python: ["3.9", "3.11"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
         with:
           enable-cache: true
           python-version: "${{matrix.python}}"
@@ -167,7 +167,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Make an sdist"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - uses: actions/setup-python@v5
@@ -225,11 +225,11 @@ jobs:
       runs-on: ubuntu-latest
       name: Test using minimum dependencies and supported Python
       steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v5
           with:
             persist-credentials: false
         - name: Install uv
-          uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
+          uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
           with:
             python-version: '3.9'
         - id: setup-mongodb
@@ -251,11 +251,11 @@ jobs:
       runs-on: ubuntu-latest
       name: Test async's minimum dependencies and Python
       steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v5
           with:
             persist-credentials: false
         - name: Install uv
-          uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
+          uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v5
           with:
             python-version: '3.9'
         - id: setup-mongodb

.github/workflows/zizmor.yml

@@ -14,8 +14,8 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@383d31df2eb66a2f42db98c9654bdc73231f3e3a
+        uses: zizmorcore/zizmor-action@7f2abfff7488a44086dba64ed2f5a9b431508079

bson/decimal128.py

@@ -20,8 +20,11 @@
 
 import decimal
 import struct
+from decimal import Decimal
 from typing import Any, Sequence, Tuple, Type, Union
 
+from bson.codec_options import TypeDecoder, TypeEncoder
+
 _PACK_64 = struct.Struct("<Q").pack
 _UNPACK_64 = struct.Struct("<Q").unpack
 
@@ -58,6 +61,42 @@
 _VALUE_OPTIONS = Union[decimal.Decimal, float, str, Tuple[int, Sequence[int], int]]
 
 
+class DecimalEncoder(TypeEncoder):
+    """Converts Python :class:`decimal.Decimal` to BSON :class:`Decimal128`.
+
+    For example::
+        opts = CodecOptions(type_registry=TypeRegistry([DecimalEncoder()]))
+        bson.encode({"d": decimal.Decimal('1.0')}, codec_options=opts)
+
+    .. versionadded:: 4.15
+    """
+
+    @property
+    def python_type(self) -> Type[Decimal]:
+        return Decimal
+
+    def transform_python(self, value: Any) -> Decimal128:
+        return Decimal128(value)
+
+
+class DecimalDecoder(TypeDecoder):
+    """Converts BSON :class:`Decimal128` to Python :class:`decimal.Decimal`.
+
+    For example::
+        opts = CodecOptions(type_registry=TypeRegistry([DecimalDecoder()]))
+        bson.decode(data, codec_options=opts)
+
+    .. versionadded:: 4.15
+    """
+
+    @property
+    def bson_type(self) -> Type[Decimal128]:
+        return Decimal128
+
+    def transform_bson(self, value: Any) -> decimal.Decimal:
+        return value.to_decimal()
+
+
 def create_decimal128_context() -> decimal.Context:
     """Returns an instance of :class:`decimal.Context` appropriate
     for working with IEEE-754 128-bit decimal floating point values.

doc/changelog.rst

@@ -1,5 +1,12 @@
 Changelog
 =========
+Changes in Version 4.15.0 (XXXX/XX/XX)
+--------------------------------------
+PyMongo 4.15 brings a number of changes including:
+
+- 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.
+
 Changes in Version 4.14.1 (2025/08/19)
 --------------------------------------
 

justfile

@@ -2,7 +2,7 @@
 set shell := ["bash", "-c"]
 
 # Commonly used command segments.
-uv_run := "uv run --isolated --frozen "
+uv_run := "uv run --frozen "
 typing_run := uv_run + "--group typing --extra aws --extra encryption --extra ocsp --extra snappy --extra test --extra zstd"
 docs_run := uv_run + "--extra docs"
 doc_build := "./doc/_build"
@@ -13,51 +13,55 @@ mypy_args := "--install-types --non-interactive"
 default:
   @just --list
 
+[private]
+resync:
+ @uv sync --quiet --frozen
+
 install:
    bash .evergreen/scripts/setup-dev-env.sh
 
 [group('docs')]
-docs:
+docs: && resync
     {{docs_run}} sphinx-build -W -b html doc {{doc_build}}/html
 
 [group('docs')]
-docs-serve:
+docs-serve: && resync
     {{docs_run}} sphinx-autobuild -W -b html doc --watch ./pymongo --watch ./bson --watch ./gridfs {{doc_build}}/serve
 
 [group('docs')]
-docs-linkcheck:
+docs-linkcheck: && resync
     {{docs_run}} sphinx-build -E -b linkcheck doc {{doc_build}}/linkcheck
 
 [group('typing')]
-typing:
+typing: && resync
     just typing-mypy
     just typing-pyright
 
 [group('typing')]
-typing-mypy:
+typing-mypy: && resync
     {{typing_run}} mypy {{mypy_args}} bson gridfs tools pymongo
     {{typing_run}} mypy {{mypy_args}} --config-file mypy_test.ini test
     {{typing_run}} mypy {{mypy_args}} test/test_typing.py test/test_typing_strict.py
 
 [group('typing')]
-typing-pyright:
+typing-pyright: && resync
     {{typing_run}} pyright test/test_typing.py test/test_typing_strict.py
     {{typing_run}} pyright -p strict_pyrightconfig.json test/test_typing_strict.py
 
 [group('lint')]
-lint:
+lint: && resync
     {{uv_run}} pre-commit run --all-files
 
 [group('lint')]
-lint-manual:
+lint-manual: && resync
     {{uv_run}} pre-commit run --all-files --hook-stage manual
 
 [group('test')]
-test *args="-v --durations=5 --maxfail=10":
+test *args="-v --durations=5 --maxfail=10": && resync
     {{uv_run}} --extra test pytest {{args}}
 
 [group('test')]
-run-tests *args:
+run-tests *args: && resync
     bash ./.evergreen/run-tests.sh {{args}}
 
 [group('test')]

pymongo/asynchronous/client_session.py

@@ -167,7 +167,6 @@
     WTimeoutError,
 )
 from pymongo.helpers_shared import _RETRYABLE_ERROR_CODES
-from pymongo.operations import _Op
 from pymongo.read_concern import ReadConcern
 from pymongo.read_preferences import ReadPreference, _ServerMode
 from pymongo.server_type import SERVER_TYPE
@@ -868,7 +867,7 @@ async def func(
             return await self._finish_transaction(conn, command_name)
 
         return await self._client._retry_internal(
-            func, self, None, retryable=True, operation=_Op.ABORT
+            func, self, None, retryable=True, operation=command_name
         )
 
     async def _finish_transaction(self, conn: AsyncConnection, command_name: str) -> dict[str, Any]: