PYTHON-5745 Add _topology_id property to MongoClient

Author: blink1073

pymongo/asynchronous/command_runner.py

@@ -245,7 +245,7 @@ async def run_bulk_write_command(
     :param max_doc_size: The largest document size in the batch, passed to ``conn.send_message``.
     :param unacknowledged: When ``True``, send only and fake an ``{"ok": 1}`` reply.
     """
-    topology_id = client._topology_settings._topology_id if client is not None else None
+    topology_id = client._topology_id if client is not None else None
     return await _run_command(
         bwc.conn,  # type: ignore[arg-type]
         cmd,
@@ -305,7 +305,7 @@ async def run_cursor_command(
         reply's own ``unpack_response`` is used.
     :param cursor_id: The cursor id passed to ``unpack_res``.
     """
-    topology_id = client._topology_settings._topology_id if client is not None else None
+    topology_id = client._topology_id if client is not None else None
     return await _run_command(
         conn,
         cmd,
@@ -389,7 +389,7 @@ async def run_command(
     if collation is not None:
         spec["collation"] = collation
 
-    topology_id = client._topology_settings._topology_id if client is not None else None
+    topology_id = client._topology_id if client is not None else None
     speculative_hello = _is_speculative_authenticate(name, spec)
 
     if compression_ctx and name.lower() in _NO_COMPRESSION:

pymongo/asynchronous/mongo_client.py

@@ -1248,6 +1248,10 @@ def topology_description(self) -> TopologyDescription:
             )
         return self._topology.description
 
+    @property
+    def _topology_id(self) -> Optional[ObjectId]:
+        return self._topology_settings._topology_id
+
     @property
     def nodes(self) -> frozenset[_Address]:
         """Set of all currently connected servers.
@@ -3012,7 +3016,7 @@ async def _write(self) -> T:
                     _debug_log(
                         _COMMAND_LOGGER,
                         message=f"Retrying write attempt number {self._attempt_number}",
-                        clientId=self._client._topology_settings._topology_id,
+                        clientId=self._client._topology_id,
                         commandName=self._operation,
                         operationId=self._operation_id,
                     )

pymongo/synchronous/command_runner.py

@@ -245,7 +245,7 @@ def run_bulk_write_command(
     :param max_doc_size: The largest document size in the batch, passed to ``conn.send_message``.
     :param unacknowledged: When ``True``, send only and fake an ``{"ok": 1}`` reply.
     """
-    topology_id = client._topology_settings._topology_id if client is not None else None
+    topology_id = client._topology_id if client is not None else None
     return _run_command(
         bwc.conn,  # type: ignore[arg-type]
         cmd,
@@ -305,7 +305,7 @@ def run_cursor_command(
         reply's own ``unpack_response`` is used.
     :param cursor_id: The cursor id passed to ``unpack_res``.
     """
-    topology_id = client._topology_settings._topology_id if client is not None else None
+    topology_id = client._topology_id if client is not None else None
     return _run_command(
         conn,
         cmd,
@@ -389,7 +389,7 @@ def run_command(
     if collation is not None:
         spec["collation"] = collation
 
-    topology_id = client._topology_settings._topology_id if client is not None else None
+    topology_id = client._topology_id if client is not None else None
     speculative_hello = _is_speculative_authenticate(name, spec)
 
     if compression_ctx and name.lower() in _NO_COMPRESSION:

pymongo/synchronous/mongo_client.py

@@ -1249,6 +1249,10 @@ def topology_description(self) -> TopologyDescription:
             )
         return self._topology.description
 
+    @property
+    def _topology_id(self) -> Optional[ObjectId]:
+        return self._topology_settings._topology_id
+
     @property
     def nodes(self) -> frozenset[_Address]:
         """Set of all currently connected servers.
@@ -3003,7 +3007,7 @@ def _write(self) -> T:
                     _debug_log(
                         _COMMAND_LOGGER,
                         message=f"Retrying write attempt number {self._attempt_number}",
-                        clientId=self._client._topology_settings._topology_id,
+                        clientId=self._client._topology_id,
                         commandName=self._operation,
                         operationId=self._operation_id,
                     )