renamed streaming retry function

Author: daniel-sanche

google/api_core/retry.py

@@ -66,7 +66,7 @@ def check_if_exists():
 
 from google.api_core import datetime_helpers
 from google.api_core import exceptions
-from google.api_core.retry_streaming import retry_target_generator
+from google.api_core.retry_streaming import retry_target_stream
 from google.auth import exceptions as auth_exceptions
 
 _LOGGER = logging.getLogger(__name__)
@@ -313,7 +313,7 @@ class Retry(object):
             will be retried. Defaults to False.
             To avoid duplicate values, retryable streams should typically be
             wrapped in additional filter logic before use. For more details, see
-            ``google.api_core.retry_streaming.retry_target_generator``.
+            ``google.api_core.retry_streaming.retry_target_stream``.
         deadline (float): DEPRECATED: use `timeout` instead. For backward
             compatibility, if specified it will override the ``timeout`` parameter.
     """
@@ -361,7 +361,7 @@ def retry_wrapped_func(*args, **kwargs):
             sleep_generator = exponential_sleep_generator(
                 self._initial, self._maximum, multiplier=self._multiplier
             )
-            retry_func = retry_target_generator if self._is_stream else retry_target
+            retry_func = retry_target_stream if self._is_stream else retry_target
             return retry_func(
                 target,
                 self._predicate,

google/api_core/retry_async.py

@@ -61,7 +61,7 @@ async def check_if_exists():
 from google.api_core.retry import exponential_sleep_generator
 from google.api_core.retry import if_exception_type  # noqa: F401
 from google.api_core.retry import if_transient_error
-from google.api_core.retry_streaming_async import retry_target_generator
+from google.api_core.retry_streaming_async import retry_target_stream
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -184,7 +184,7 @@ class AsyncRetry:
             function call itself will be retried. Defaults to False.
             To avoid duplicate values, retryable streams should typically be
             wrapped in additional filter logic before use. For more details, see
-            ``google.api_core.retry_streaming_async.retry_target_generator``.
+            ``google.api_core.retry_streaming_async.retry_target_stream``.
         deadline (float): DEPRECATED use ``timeout`` instead. If set it will
         override ``timeout`` parameter.
     """
@@ -247,7 +247,7 @@ def retry_wrapped_stream(*args, **kwargs):
             sleep_generator = exponential_sleep_generator(
                 self._initial, self._maximum, multiplier=self._multiplier
             )
-            return retry_target_generator(
+            return retry_target_stream(
                 target,
                 self._predicate,
                 sleep_generator,

google/api_core/retry_streaming.py

@@ -20,7 +20,6 @@
     List,
     Tuple,
     Iterable,
-    Iterator,
     Generator,
     TypeVar,
     Any,
@@ -67,7 +66,7 @@ def _build_timeout_error(
         return exc_list[-1], None
 
 
-def retry_target_generator(
+def retry_target_stream(
     target: Callable[[], Union[Iterable[T], Generator[T, Any, None]]],
     predicate: Callable[[Exception], bool],
     sleep_generator: Iterable[float],

google/api_core/retry_streaming_async.py

@@ -42,7 +42,7 @@
 T = TypeVar("T")
 
 
-async def retry_target_generator(
+async def retry_target_stream(
     target: Union[
         Callable[[], AsyncIterable[T]],
         Callable[[], Awaitable[AsyncIterable[T]]],

tests/asyncio/test_retry_async.py

@@ -136,7 +136,7 @@ async def test_retry_target_bad_sleep_generator():
 
 @pytest.mark.asyncio
 async def test_retry_streaming_target_bad_sleep_generator():
-    from google.api_core.retry_streaming_async import retry_target_generator
+    from google.api_core.retry_streaming_async import retry_target_stream
 
     async def target_fn():
         async def inner_gen():
@@ -146,7 +146,7 @@ async def inner_gen():
         return inner_gen()
 
     with pytest.raises(ValueError, match="Sleep generator"):
-        gen = retry_target_generator(target_fn, lambda x: True, [], None)
+        gen = retry_target_stream(target_fn, lambda x: True, [], None)
         await gen.__anext__()
 
 
@@ -828,7 +828,7 @@ async def test_exc_factory_non_retryable_error(self):
         generator should give the option to override exception creation logic
         test when non-retryable error is thrown
         """
-        from google.api_core.retry_streaming_async import retry_target_generator
+        from google.api_core.retry_streaming_async import retry_target_stream
 
         timeout = 6
         sent_errors = [ValueError("test"), ValueError("test2"), BufferError("test3")]
@@ -842,7 +842,7 @@ def factory(*args, **kwargs):
             assert kwargs["timeout_val"] == timeout
             return expected_final_err, expected_source_err
 
-        generator = retry_target_generator(
+        generator = retry_target_stream(
             self._generator_mock,
             retry_async.if_exception_type(ValueError),
             [0] * 3,
@@ -867,7 +867,7 @@ async def test_exc_factory_timeout(self):
         test when timeout is exceeded
         """
         import time
-        from google.api_core.retry_streaming_async import retry_target_generator
+        from google.api_core.retry_streaming_async import retry_target_stream
 
         timeout = 2
         time_now = time.monotonic()
@@ -889,7 +889,7 @@ def factory(*args, **kwargs):
                 assert kwargs["timeout_val"] == timeout
                 return expected_final_err, expected_source_err
 
-            generator = retry_target_generator(
+            generator = retry_target_stream(
                 self._generator_mock,
                 retry_async.if_exception_type(ValueError),
                 [0] * 3,

tests/unit/test_retry.py

@@ -164,7 +164,7 @@ def test_retry_target_bad_sleep_generator():
 
 
 def test_retry_streaming_target_bad_sleep_generator():
-    from google.api_core.retry_streaming import retry_target_generator
+    from google.api_core.retry_streaming import retry_target_stream
 
     def target_fn():
         def inner_gen():
@@ -176,7 +176,7 @@ def inner_gen():
     with pytest.raises(
         ValueError, match="Sleep generator stopped yielding sleep values"
     ):
-        gen = retry_target_generator(target_fn, lambda x: True, [], None)
+        gen = retry_target_stream(target_fn, lambda x: True, [], None)
         next(gen)
 
 
@@ -826,7 +826,7 @@ def test_exc_factory_non_retryable_error(self):
         generator should give the option to override exception creation logic
         test when non-retryable error is thrown
         """
-        from google.api_core.retry_streaming import retry_target_generator
+        from google.api_core.retry_streaming import retry_target_stream
 
         timeout = 6
         sent_errors = [ValueError("test"), ValueError("test2"), BufferError("test3")]
@@ -840,7 +840,7 @@ def factory(*args, **kwargs):
             assert kwargs["timeout_val"] == timeout
             return expected_final_err, expected_source_err
 
-        generator = retry_target_generator(
+        generator = retry_target_stream(
             self._generator_mock,
             retry.if_exception_type(ValueError),
             [0] * 3,
@@ -864,7 +864,7 @@ def test_exc_factory_timeout(self):
         test when timeout is exceeded
         """
         import time
-        from google.api_core.retry_streaming import retry_target_generator
+        from google.api_core.retry_streaming import retry_target_stream
 
         timeout = 2
         time_now = time.monotonic()
@@ -886,7 +886,7 @@ def factory(*args, **kwargs):
                 assert kwargs["timeout_val"] == timeout
                 return expected_final_err, expected_source_err
 
-            generator = retry_target_generator(
+            generator = retry_target_stream(
                 self._generator_mock,
                 retry.if_exception_type(ValueError),
                 [0] * 3,