resolve merge conflicts

Author: daniel-sanche

packages/google-cloud-bigtable/google/cloud/bigtable/data/_async/_read_rows.py

@@ -15,35 +15,15 @@
 
 from __future__ import annotations
 
-<<<<<<< HEAD
 import time
 from typing import TYPE_CHECKING, Sequence
 
-from google.api_core import retry as retries
 from grpc import StatusCode
-=======
-from typing import Sequence, TYPE_CHECKING
-
-from google.cloud.bigtable_v2.types import ReadRowsRequest as ReadRowsRequestPB
-from google.cloud.bigtable_v2.types import ReadRowsResponse as ReadRowsResponsePB
-from google.cloud.bigtable_v2.types import RowSet as RowSetPB
-from google.cloud.bigtable_v2.types import RowRange as RowRangePB
-
-from google.cloud.bigtable.data.row import Row, Cell
-from google.cloud.bigtable.data.read_rows_query import ReadRowsQuery
-from google.cloud.bigtable.data.exceptions import InvalidChunk
-from google.cloud.bigtable.data.exceptions import _RowSetComplete
-from google.cloud.bigtable.data.exceptions import _ResetRow
-from google.cloud.bigtable.data._helpers import _attempt_timeout_generator
-from google.cloud.bigtable.data._helpers import _retry_exception_factory
-from google.cloud.bigtable.data._helpers import _rst_stream_aware_predicate
-
-from google.api_core.retry import exponential_sleep_generator
->>>>>>> 3426dbfbca1 (feat: Added rst_stream exception handling for ReadRows. (#1298))
 
 from google.cloud.bigtable.data._cross_sync import CrossSync
 from google.cloud.bigtable.data._helpers import (
     _attempt_timeout_generator,
+    _rst_stream_aware_predicate,
 )
 from google.cloud.bigtable.data._metrics.tracked_retry import tracked_retry
 from google.cloud.bigtable.data.exceptions import (

packages/google-cloud-bigtable/google/cloud/bigtable/data/_helpers.py

@@ -17,24 +17,22 @@
 
 from __future__ import annotations
 
-<<<<<<< HEAD
-=======
-from typing import Callable, Sequence, List, Tuple, TYPE_CHECKING, Union
-import time
->>>>>>> 3426dbfbca1 (feat: Added rst_stream exception handling for ReadRows. (#1298))
 import enum
 import time
 from collections import namedtuple
-from typing import TYPE_CHECKING, List, Sequence, Tuple, Union
+from typing import (
+    TYPE_CHECKING,
+    Callable,
+    List,
+    Sequence,
+    Tuple,
+    Union,
+)
 
 from google.api_core import exceptions as core_exceptions
-<<<<<<< HEAD
+from google.api_core import retry as retries
 from google.api_core.retry import RetryFailureReason, exponential_sleep_generator
 
-=======
-from google.api_core import retry as retries
-from google.api_core.retry import RetryFailureReason
->>>>>>> 3426dbfbca1 (feat: Added rst_stream exception handling for ReadRows. (#1298))
 from google.cloud.bigtable.data.exceptions import RetryExceptionGroup
 from google.cloud.bigtable.data.read_rows_query import ReadRowsQuery
 
@@ -162,12 +160,14 @@ def _rst_stream_aware_predicate(
     """
     # predicate to check for retryable error types
     if_exception_type = retries.if_exception_type(*exception_types)
+
     # special case: treat InternalServerError with rst_stream error message as ServiceUnavailable
-    rst_check = (
-        lambda e: core_exceptions.ServiceUnavailable in exception_types
-        and isinstance(e, core_exceptions.InternalServerError)
-        and any(m in e.message.lower() for m in _RETRYABLE_INTERNAL_ERROR_MESSAGES)
-    )
+    def rst_check(e):
+        return (
+            core_exceptions.ServiceUnavailable in exception_types
+            and isinstance(e, core_exceptions.InternalServerError)
+            and any(m in e.message.lower() for m in _RETRYABLE_INTERNAL_ERROR_MESSAGES)
+        )
 
     return lambda e: if_exception_type(e) or rst_check(e)
 

packages/google-cloud-bigtable/google/cloud/bigtable/data/_sync_autogen/_read_rows.py

@@ -21,11 +21,13 @@
 import time
 from typing import TYPE_CHECKING, Sequence
 
-from google.api_core import retry as retries
 from grpc import StatusCode
 
 from google.cloud.bigtable.data._cross_sync import CrossSync
-from google.cloud.bigtable.data._helpers import _attempt_timeout_generator
+from google.cloud.bigtable.data._helpers import (
+    _attempt_timeout_generator,
+    _rst_stream_aware_predicate,
+)
 from google.cloud.bigtable.data._metrics.tracked_retry import tracked_retry
 from google.cloud.bigtable.data.exceptions import (
     InvalidChunk,
@@ -37,20 +39,7 @@
 from google.cloud.bigtable_v2.types import ReadRowsRequest as ReadRowsRequestPB
 from google.cloud.bigtable_v2.types import ReadRowsResponse as ReadRowsResponsePB
 from google.cloud.bigtable_v2.types import RowRange as RowRangePB
-<<<<<<< HEAD
 from google.cloud.bigtable_v2.types import RowSet as RowSetPB
-=======
-from google.cloud.bigtable.data.row import Row, Cell
-from google.cloud.bigtable.data.read_rows_query import ReadRowsQuery
-from google.cloud.bigtable.data.exceptions import InvalidChunk
-from google.cloud.bigtable.data.exceptions import _RowSetComplete
-from google.cloud.bigtable.data.exceptions import _ResetRow
-from google.cloud.bigtable.data._helpers import _attempt_timeout_generator
-from google.cloud.bigtable.data._helpers import _retry_exception_factory
-from google.cloud.bigtable.data._helpers import _rst_stream_aware_predicate
-from google.api_core.retry import exponential_sleep_generator
-from google.cloud.bigtable.data._cross_sync import CrossSync
->>>>>>> 3426dbfbca1 (feat: Added rst_stream exception handling for ReadRows. (#1298))
 
 if TYPE_CHECKING:
     from google.cloud.bigtable.data._metrics import ActiveOperationMetric

packages/google-cloud-bigtable/tests/unit/data/_async/test_client.py

@@ -1637,7 +1637,6 @@ async def test_customizable_retryable_errors(
                     predicate_builder_mock.assert_called_once_with(
                         *expected_retryables, *extra_retryables
                     )
-<<<<<<< HEAD
                     # output of if_exception_type should be sent in to retry constructor
                     retry_call_kwargs = retry_fn_mock.call_args_list[0].kwargs
                     # check for predicate passed as kwarg
@@ -1647,12 +1646,6 @@ async def test_customizable_retryable_errors(
                         # check for predicate passed as arg
                         retry_call_args = retry_fn_mock.call_args_list[0].args
                         assert retry_call_args[1] is expected_predicate
-=======
-                    retry_call_args = retry_fn_mock.call_args_list[0].args
-
-                    # output of the predicate builder should be sent in to retry constructor
-                    assert retry_call_args[1] is expected_predicate
->>>>>>> 3426dbfbca1 (feat: Added rst_stream exception handling for ReadRows. (#1298))
 
     @pytest.mark.parametrize(
         "fn_name,fn_args,gapic_fn",