None case in _get_status

Author: gkevinzheng

google/cloud/bigtable/data/_async/client.py

@@ -1474,7 +1474,6 @@ def mutations_batcher(
             batch_operation_timeout=batch_operation_timeout,
             batch_attempt_timeout=batch_attempt_timeout,
             batch_retryable_errors=batch_retryable_errors,
-            _batch_completed_callback=_batch_completed_callback,
         )
 
     @CrossSync.convert

google/cloud/bigtable/data/_helpers.py

@@ -16,7 +16,7 @@
 """
 from __future__ import annotations
 
-from typing import Callable, Sequence, List, Tuple, TYPE_CHECKING, Union
+from typing import Callable, Sequence, List, Optional, Tuple, TYPE_CHECKING, Union
 import time
 import enum
 from collections import namedtuple
@@ -263,7 +263,7 @@ def _get_statuses_from_mutations_exception_group(
     return statuses
 
 
-def _get_status(exc: Exception) -> status_pb2.Status:
+def _get_status(exc: Optional[Exception]) -> status_pb2.Status:
     """
     Helper function that returns a Status object corresponding to the given exception.
 
@@ -284,7 +284,7 @@ def _get_status(exc: Exception) -> status_pb2.Status:
 
     return status_pb2.Status(
         code=code_pb2.Code.UNKNOWN,
-        message=str(exc),
+        message=str(exc) if exc else "An unknown error has occurred",
     )
 
 

google/cloud/bigtable/data/_sync_autogen/client.py

@@ -1224,7 +1224,6 @@ def mutations_batcher(
             batch_operation_timeout=batch_operation_timeout,
             batch_attempt_timeout=batch_attempt_timeout,
             batch_retryable_errors=batch_retryable_errors,
-            _batch_completed_callback=_batch_completed_callback,
         )
 
     def mutate_row(

tests/unit/data/test__helpers.py

@@ -313,6 +313,22 @@ class TestGetStatusesFromMutationsExceptionGroup:
                 ),
                 status_pb2.Status(code=code_pb2.UNKNOWN, message="Something happened"),
             ),
+            (
+                0,
+                bt_exceptions.RetryExceptionGroup(
+                    excs=[
+                        core_exceptions.ServiceUnavailable("Service Unavailable"),
+                        core_exceptions.ServiceUnavailable("Service Unavailable"),
+                        None,
+                    ]
+                ),
+                status_pb2.Status(code=code_pb2.UNKNOWN, message="An unknown error has occurred"),
+            ),
+            (
+                0,
+                None,
+                status_pb2.Status(code=code_pb2.UNKNOWN, message="An unknown error has occurred"),
+            ),
             (
                 100,
                 RuntimeError("Something happened"),