google-api-core 2.24.2__tar.gz → 2.25.0__tar.gz

{google_api_core-2.24.2/google_api_core.egg-info → google_api_core-2.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-api-core
-Version: 2.24.2
+Version: 2.25.0
 Summary: Google API client core library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache 2.0
@@ -30,16 +30,16 @@ Requires-Dist: proto-plus<2.0.0,>=1.25.0; python_version >= "3.13"
 Requires-Dist: google-auth<3.0.0,>=2.14.1
 Requires-Dist: requests<3.0.0,>=2.18.0
 Provides-Extra: async-rest
-Requires-Dist: google-auth[aiohttp]<3.0.dev0,>=2.35.0; extra == "async-rest"
+Requires-Dist: google-auth[aiohttp]<3.0.0,>=2.35.0; extra == "async-rest"
 Provides-Extra: grpc
-Requires-Dist: grpcio<2.0dev,>=1.33.2; extra == "grpc"
-Requires-Dist: grpcio<2.0dev,>=1.49.1; python_version >= "3.11" and extra == "grpc"
-Requires-Dist: grpcio-status<2.0.dev0,>=1.33.2; extra == "grpc"
-Requires-Dist: grpcio-status<2.0.dev0,>=1.49.1; python_version >= "3.11" and extra == "grpc"
+Requires-Dist: grpcio<2.0.0,>=1.33.2; extra == "grpc"
+Requires-Dist: grpcio<2.0.0,>=1.49.1; python_version >= "3.11" and extra == "grpc"
+Requires-Dist: grpcio-status<2.0.0,>=1.33.2; extra == "grpc"
+Requires-Dist: grpcio-status<2.0.0,>=1.49.1; python_version >= "3.11" and extra == "grpc"
 Provides-Extra: grpcgcp
-Requires-Dist: grpcio-gcp<1.0.dev0,>=0.2.2; extra == "grpcgcp"
+Requires-Dist: grpcio-gcp<1.0.0,>=0.2.2; extra == "grpcgcp"
 Provides-Extra: grpcio-gcp
-Requires-Dist: grpcio-gcp<1.0.dev0,>=0.2.2; extra == "grpcio-gcp"
+Requires-Dist: grpcio-gcp<1.0.0,>=0.2.2; extra == "grpcio-gcp"
 
 Core Library for Google Client Libraries
 ========================================

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/bidi.py

@@ -664,7 +664,8 @@ class BackgroundConsumer(object):
                 _LOGGER.debug("waiting for recv.")
                 response = self._bidi_rpc.recv()
                 _LOGGER.debug("recved response.")
-                self._on_response(response)
+                if self._on_response is not None:
+                    self._on_response(response)
 
         except exceptions.GoogleAPICallError as exc:
             _LOGGER.debug(

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/client_info.py

@@ -59,6 +59,7 @@ class ClientInfo(object):
             Recommended format: ``application-or-tool-ID/major.minor.version``.
         rest_version (Optional[str]): A string with labeled versions of the
             dependencies used for REST transport.
+        protobuf_runtime_version (Optional[str]): The protobuf runtime version.
     """
 
     def __init__(
@@ -70,6 +71,7 @@ class ClientInfo(object):
         client_library_version=None,
         user_agent=None,
         rest_version=None,
+        protobuf_runtime_version=None,
     ):
         self.python_version = python_version
         self.grpc_version = grpc_version
@@ -78,6 +80,7 @@ class ClientInfo(object):
         self.client_library_version = client_library_version
         self.user_agent = user_agent
         self.rest_version = rest_version
+        self.protobuf_runtime_version = protobuf_runtime_version
 
     def to_user_agent(self):
         """Returns the user-agent string for this client info."""
@@ -105,4 +108,7 @@ class ClientInfo(object):
         if self.client_library_version is not None:
             ua += "gccl/{client_library_version} "
 
+        if self.protobuf_runtime_version is not None:
+            ua += "pb/{protobuf_runtime_version} "
+
         return ua.format(**self.__dict__).strip()

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/gapic_v1/client_info.py

@@ -47,6 +47,7 @@ class ClientInfo(client_info.ClientInfo):
             Recommended format: ``application-or-tool-ID/major.minor.version``.
         rest_version (Optional[str]): A string with labeled versions of the
             dependencies used for REST transport.
+        protobuf_runtime_version (Optional[str]): The protobuf runtime version.
     """
 
     def to_grpc_metadata(self):

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/retry/retry_base.py

@@ -25,7 +25,7 @@ import random
 import time
 
 from enum import Enum
-from typing import Any, Callable, Optional, TYPE_CHECKING
+from typing import Any, Callable, Optional, Iterator, TYPE_CHECKING
 
 import requests.exceptions
 
@@ -174,7 +174,7 @@ def build_retry_error(
 def _retry_error_helper(
     exc: Exception,
     deadline: float | None,
-    next_sleep: float,
+    sleep_iterator: Iterator[float],
     error_list: list[Exception],
     predicate_fn: Callable[[Exception], bool],
     on_error_fn: Callable[[Exception], None] | None,
@@ -183,7 +183,7 @@ def _retry_error_helper(
         tuple[Exception, Exception | None],
     ],
     original_timeout: float | None,
-):
+) -> float:
     """
     Shared logic for handling an error for all retry implementations
 
@@ -194,13 +194,15 @@ def _retry_error_helper(
     Args:
        - exc: the exception that was raised
        - deadline: the deadline for the retry, calculated as a diff from time.monotonic()
-       - next_sleep: the next sleep interval
+       - sleep_iterator: iterator to draw the next backoff value from
        - error_list: the list of exceptions that have been raised so far
        - predicate_fn: takes `exc` and returns true if the operation should be retried
        - on_error_fn: callback to execute when a retryable error occurs
        - exc_factory_fn: callback used to build the exception to be raised on terminal failure
        - original_timeout_val: the original timeout value for the retry (in seconds),
            to be passed to the exception factory for building an error message
+    Returns:
+        - the sleep value chosen before the next attempt
     """
     error_list.append(exc)
     if not predicate_fn(exc):
@@ -212,6 +214,12 @@ def _retry_error_helper(
         raise final_exc from source_exc
     if on_error_fn is not None:
         on_error_fn(exc)
+    # next_sleep is fetched after the on_error callback, to allow clients
+    # to update sleep_iterator values dynamically in response to errors
+    try:
+        next_sleep = next(sleep_iterator)
+    except StopIteration:
+        raise ValueError("Sleep generator stopped yielding sleep values.") from exc
     if deadline is not None and time.monotonic() + next_sleep > deadline:
         final_exc, source_exc = exc_factory_fn(
             error_list,
@@ -222,6 +230,7 @@ def _retry_error_helper(
     _LOGGER.debug(
         "Retrying due to {}, sleeping {:.1f}s ...".format(error_list[-1], next_sleep)
     )
+    return next_sleep
 
 
 class _BaseRetry(object):

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/retry/retry_streaming.py

@@ -107,8 +107,11 @@ def retry_target_stream(
         time.monotonic() + timeout if timeout is not None else None
     )
     error_list: list[Exception] = []
+    sleep_iter = iter(sleep_generator)
 
-    for sleep in sleep_generator:
+    # continue trying until an attempt completes, or a terminal exception is raised in _retry_error_helper
+    # TODO: support max_attempts argument: https://github.com/googleapis/python-api-core/issues/535
+    while True:
         # Start a new retry loop
         try:
             # Note: in the future, we can add a ResumptionStrategy object
@@ -121,10 +124,10 @@ def retry_target_stream(
         # This function explicitly must deal with broad exceptions.
         except Exception as exc:
             # defer to shared logic for handling errors
-            _retry_error_helper(
+            next_sleep = _retry_error_helper(
                 exc,
                 deadline,
-                sleep,
+                sleep_iter,
                 error_list,
                 predicate,
                 on_error,
@@ -132,9 +135,7 @@ def retry_target_stream(
                 timeout,
             )
             # if exception not raised, sleep before next attempt
-            time.sleep(sleep)
-
-    raise ValueError("Sleep generator stopped yielding sleep values.")
+            time.sleep(next_sleep)
 
 
 class StreamingRetry(_BaseRetry):

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/retry/retry_streaming_async.py

@@ -109,9 +109,12 @@ async def retry_target_stream(
     deadline = time.monotonic() + timeout if timeout else None
     # keep track of retryable exceptions we encounter to pass in to exception_factory
     error_list: list[Exception] = []
+    sleep_iter = iter(sleep_generator)
     target_is_generator: bool | None = None
 
-    for sleep in sleep_generator:
+    # continue trying until an attempt completes, or a terminal exception is raised in _retry_error_helper
+    # TODO: support max_attempts argument: https://github.com/googleapis/python-api-core/issues/535
+    while True:
         # Start a new retry loop
         try:
             # Note: in the future, we can add a ResumptionStrategy object
@@ -174,10 +177,10 @@ async def retry_target_stream(
         # This function explicitly must deal with broad exceptions.
         except Exception as exc:
             # defer to shared logic for handling errors
-            _retry_error_helper(
+            next_sleep = _retry_error_helper(
                 exc,
                 deadline,
-                sleep,
+                sleep_iter,
                 error_list,
                 predicate,
                 on_error,
@@ -185,11 +188,11 @@ async def retry_target_stream(
                 timeout,
             )
             # if exception not raised, sleep before next attempt
-            await asyncio.sleep(sleep)
+            await asyncio.sleep(next_sleep)
+
         finally:
             if target_is_generator and target_iterator is not None:
                 await cast(AsyncGenerator["_Y", None], target_iterator).aclose()
-    raise ValueError("Sleep generator stopped yielding sleep values.")
 
 
 class AsyncStreamingRetry(_BaseRetry):

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/retry/retry_unary.py

@@ -138,8 +138,11 @@ def retry_target(
 
     deadline = time.monotonic() + timeout if timeout is not None else None
     error_list: list[Exception] = []
+    sleep_iter = iter(sleep_generator)
 
-    for sleep in sleep_generator:
+    # continue trying until an attempt completes, or a terminal exception is raised in _retry_error_helper
+    # TODO: support max_attempts argument: https://github.com/googleapis/python-api-core/issues/535
+    while True:
         try:
             result = target()
             if inspect.isawaitable(result):
@@ -150,10 +153,10 @@ def retry_target(
         # This function explicitly must deal with broad exceptions.
         except Exception as exc:
             # defer to shared logic for handling errors
-            _retry_error_helper(
+            next_sleep = _retry_error_helper(
                 exc,
                 deadline,
-                sleep,
+                sleep_iter,
                 error_list,
                 predicate,
                 on_error,
@@ -161,9 +164,7 @@ def retry_target(
                 timeout,
             )
             # if exception not raised, sleep before next attempt
-            time.sleep(sleep)
-
-    raise ValueError("Sleep generator stopped yielding sleep values.")
+            time.sleep(next_sleep)
 
 
 class Retry(_BaseRetry):

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/retry/retry_unary_async.py

@@ -149,18 +149,21 @@ async def retry_target(
 
     deadline = time.monotonic() + timeout if timeout is not None else None
     error_list: list[Exception] = []
+    sleep_iter = iter(sleep_generator)
 
-    for sleep in sleep_generator:
+    # continue trying until an attempt completes, or a terminal exception is raised in _retry_error_helper
+    # TODO: support max_attempts argument: https://github.com/googleapis/python-api-core/issues/535
+    while True:
         try:
             return await target()
         # pylint: disable=broad-except
         # This function explicitly must deal with broad exceptions.
         except Exception as exc:
             # defer to shared logic for handling errors
-            _retry_error_helper(
+            next_sleep = _retry_error_helper(
                 exc,
                 deadline,
-                sleep,
+                sleep_iter,
                 error_list,
                 predicate,
                 on_error,
@@ -168,9 +171,7 @@ async def retry_target(
                 timeout,
             )
             # if exception not raised, sleep before next attempt
-            await asyncio.sleep(sleep)
-
-    raise ValueError("Sleep generator stopped yielding sleep values.")
+            await asyncio.sleep(next_sleep)
 
 
 class AsyncRetry(_BaseRetry):

{google_api_core-2.24.2 → google_api_core-2.25.0}/google/api_core/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "2.24.2"
+__version__ = "2.25.0"

{google_api_core-2.24.2 → google_api_core-2.25.0/google_api_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-api-core
-Version: 2.24.2
+Version: 2.25.0
 Summary: Google API client core library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache 2.0
@@ -30,16 +30,16 @@ Requires-Dist: proto-plus<2.0.0,>=1.25.0; python_version >= "3.13"
 Requires-Dist: google-auth<3.0.0,>=2.14.1
 Requires-Dist: requests<3.0.0,>=2.18.0
 Provides-Extra: async-rest
-Requires-Dist: google-auth[aiohttp]<3.0.dev0,>=2.35.0; extra == "async-rest"
+Requires-Dist: google-auth[aiohttp]<3.0.0,>=2.35.0; extra == "async-rest"
 Provides-Extra: grpc
-Requires-Dist: grpcio<2.0dev,>=1.33.2; extra == "grpc"
-Requires-Dist: grpcio<2.0dev,>=1.49.1; python_version >= "3.11" and extra == "grpc"
-Requires-Dist: grpcio-status<2.0.dev0,>=1.33.2; extra == "grpc"
-Requires-Dist: grpcio-status<2.0.dev0,>=1.49.1; python_version >= "3.11" and extra == "grpc"
+Requires-Dist: grpcio<2.0.0,>=1.33.2; extra == "grpc"
+Requires-Dist: grpcio<2.0.0,>=1.49.1; python_version >= "3.11" and extra == "grpc"
+Requires-Dist: grpcio-status<2.0.0,>=1.33.2; extra == "grpc"
+Requires-Dist: grpcio-status<2.0.0,>=1.49.1; python_version >= "3.11" and extra == "grpc"
 Provides-Extra: grpcgcp
-Requires-Dist: grpcio-gcp<1.0.dev0,>=0.2.2; extra == "grpcgcp"
+Requires-Dist: grpcio-gcp<1.0.0,>=0.2.2; extra == "grpcgcp"
 Provides-Extra: grpcio-gcp
-Requires-Dist: grpcio-gcp<1.0.dev0,>=0.2.2; extra == "grpcio-gcp"
+Requires-Dist: grpcio-gcp<1.0.0,>=0.2.2; extra == "grpcio-gcp"
 
 Core Library for Google Client Libraries
 ========================================

{google_api_core-2.24.2 → google_api_core-2.25.0}/google_api_core.egg-info/requires.txt

@@ -8,18 +8,18 @@ requests<3.0.0,>=2.18.0
 proto-plus<2.0.0,>=1.25.0
 
 [async_rest]
-google-auth[aiohttp]<3.0.dev0,>=2.35.0
+google-auth[aiohttp]<3.0.0,>=2.35.0
 
 [grpc]
-grpcio<2.0dev,>=1.33.2
-grpcio-status<2.0.dev0,>=1.33.2
+grpcio<2.0.0,>=1.33.2
+grpcio-status<2.0.0,>=1.33.2
 
 [grpc:python_version >= "3.11"]
-grpcio<2.0dev,>=1.49.1
-grpcio-status<2.0.dev0,>=1.49.1
+grpcio<2.0.0,>=1.49.1
+grpcio-status<2.0.0,>=1.49.1
 
 [grpcgcp]
-grpcio-gcp<1.0.dev0,>=0.2.2
+grpcio-gcp<1.0.0,>=0.2.2
 
 [grpcio-gcp]
-grpcio-gcp<1.0.dev0,>=0.2.2
+grpcio-gcp<1.0.0,>=0.2.2

{google_api_core-2.24.2 → google_api_core-2.25.0}/pyproject.toml

@@ -58,15 +58,15 @@ Documentation = "https://googleapis.dev/python/google-api-core/latest/"
 Repository = "https://github.com/googleapis/python-api-core"
 
 [project.optional-dependencies]
-async_rest = ["google-auth[aiohttp] >= 2.35.0, < 3.0.dev0"]
+async_rest = ["google-auth[aiohttp] >= 2.35.0, < 3.0.0"]
 grpc = [
-  "grpcio >= 1.33.2, < 2.0dev",
-  "grpcio >= 1.49.1, < 2.0dev; python_version >= '3.11'",
-  "grpcio-status >= 1.33.2, < 2.0.dev0",
-  "grpcio-status >= 1.49.1, < 2.0.dev0; python_version >= '3.11'",
+  "grpcio >= 1.33.2, < 2.0.0",
+  "grpcio >= 1.49.1, < 2.0.0; python_version >= '3.11'",
+  "grpcio-status >= 1.33.2, < 2.0.0",
+  "grpcio-status >= 1.49.1, < 2.0.0; python_version >= '3.11'",
 ]
-grpcgcp = ["grpcio-gcp >= 0.2.2, < 1.0.dev0"]
-grpcio-gcp = ["grpcio-gcp >= 0.2.2, < 1.0.dev0"]
+grpcgcp = ["grpcio-gcp >= 0.2.2, < 1.0.0"]
+grpcio-gcp = ["grpcio-gcp >= 0.2.2, < 1.0.0"]
 
 [tool.setuptools.dynamic]
 version = { attr = "google.api_core.version.__version__" }

{google_api_core-2.24.2 → google_api_core-2.25.0}/tests/asyncio/gapic/test_method_async.py

@@ -81,6 +81,7 @@ async def test_wrap_method_with_custom_client_info():
         api_core_version=3,
         gapic_version=4,
         client_library_version=5,
+        protobuf_runtime_version=6,
     )
     fake_call = grpc_helpers_async.FakeUnaryUnaryCall()
     method = mock.Mock(spec=aio.UnaryUnaryMultiCallable, return_value=fake_call)

{google_api_core-2.24.2 → google_api_core-2.25.0}/tests/asyncio/retry/test_retry_streaming_async.py

@@ -36,7 +36,36 @@ async def test_retry_streaming_target_bad_sleep_generator():
     from google.api_core.retry.retry_streaming_async import retry_target_stream
 
     with pytest.raises(ValueError, match="Sleep generator"):
-        await retry_target_stream(None, None, [], None).__anext__()
+        await retry_target_stream(None, lambda x: True, [], None).__anext__()
+
+
+@mock.patch("asyncio.sleep", autospec=True)
+@pytest.mark.asyncio
+async def test_retry_streaming_target_dynamic_backoff(sleep):
+    """
+    sleep_generator should be iterated after on_error, to support dynamic backoff
+    """
+    from functools import partial
+    from google.api_core.retry.retry_streaming_async import retry_target_stream
+
+    sleep.side_effect = RuntimeError("stop after sleep")
+    # start with empty sleep generator; values are added after exception in push_sleep_value
+    sleep_values = []
+    error_target = partial(TestAsyncStreamingRetry._generator_mock, error_on=0)
+    inserted_sleep = 99
+
+    def push_sleep_value(err):
+        sleep_values.append(inserted_sleep)
+
+    with pytest.raises(RuntimeError):
+        await retry_target_stream(
+            error_target,
+            predicate=lambda x: True,
+            sleep_generator=sleep_values,
+            on_error=push_sleep_value,
+        ).__anext__()
+    assert sleep.call_count == 1
+    sleep.assert_called_once_with(inserted_sleep)
 
 
 class TestAsyncStreamingRetry(Test_BaseRetry):
@@ -66,8 +95,8 @@ class TestAsyncStreamingRetry(Test_BaseRetry):
             str(retry_),
         )
 
+    @staticmethod
     async def _generator_mock(
-        self,
         num=5,
         error_on=None,
         exceptions_seen=None,
@@ -87,7 +116,7 @@ class TestAsyncStreamingRetry(Test_BaseRetry):
             for i in range(num):
                 if sleep_time:
                     await asyncio.sleep(sleep_time)
-                if error_on and i == error_on:
+                if error_on is not None and i == error_on:
                     raise ValueError("generator mock error")
                 yield i
         except (Exception, BaseException, GeneratorExit) as e:

{google_api_core-2.24.2 → google_api_core-2.25.0}/tests/asyncio/retry/test_retry_unary_async.py

@@ -136,9 +136,34 @@ async def test_retry_target_timeout_exceeded(monotonic, sleep, use_deadline_arg)
 @pytest.mark.asyncio
 async def test_retry_target_bad_sleep_generator():
     with pytest.raises(ValueError, match="Sleep generator"):
+        await retry_async.retry_target(mock.sentinel.target, lambda x: True, [], None)
+
+
+@mock.patch("asyncio.sleep", autospec=True)
+@pytest.mark.asyncio
+async def test_retry_target_dynamic_backoff(sleep):
+    """
+    sleep_generator should be iterated after on_error, to support dynamic backoff
+    """
+    sleep.side_effect = RuntimeError("stop after sleep")
+    # start with empty sleep generator; values are added after exception in push_sleep_value
+    sleep_values = []
+    exception = ValueError("trigger retry")
+    error_target = mock.Mock(side_effect=exception)
+    inserted_sleep = 99
+
+    def push_sleep_value(err):
+        sleep_values.append(inserted_sleep)
+
+    with pytest.raises(RuntimeError):
         await retry_async.retry_target(
-            mock.sentinel.target, mock.sentinel.predicate, [], None
+            error_target,
+            predicate=lambda x: True,
+            sleep_generator=sleep_values,
+            on_error=push_sleep_value,
         )
+    assert sleep.call_count == 1
+    sleep.assert_called_once_with(inserted_sleep)
 
 
 class TestAsyncRetry(Test_BaseRetry):

{google_api_core-2.24.2 → google_api_core-2.25.0}/tests/unit/gapic/test_method.py

@@ -76,6 +76,7 @@ def test_wrap_method_with_custom_client_info():
         api_core_version=3,
         gapic_version=4,
         client_library_version=5,
+        protobuf_runtime_version=6,
     )
     method = mock.Mock(spec=["__call__"])
 

{google_api_core-2.24.2 → google_api_core-2.25.0}/tests/unit/retry/test_retry_streaming.py

@@ -33,7 +33,36 @@ def test_retry_streaming_target_bad_sleep_generator():
     with pytest.raises(
         ValueError, match="Sleep generator stopped yielding sleep values"
     ):
-        next(retry_streaming.retry_target_stream(None, None, [], None))
+        next(retry_streaming.retry_target_stream(None, lambda x: True, [], None))
+
+
+@mock.patch("time.sleep", autospec=True)
+def test_retry_streaming_target_dynamic_backoff(sleep):
+    """
+    sleep_generator should be iterated after on_error, to support dynamic backoff
+    """
+    from functools import partial
+
+    sleep.side_effect = RuntimeError("stop after sleep")
+    # start with empty sleep generator; values are added after exception in push_sleep_value
+    sleep_values = []
+    error_target = partial(TestStreamingRetry._generator_mock, error_on=0)
+    inserted_sleep = 99
+
+    def push_sleep_value(err):
+        sleep_values.append(inserted_sleep)
+
+    with pytest.raises(RuntimeError):
+        next(
+            retry_streaming.retry_target_stream(
+                error_target,
+                predicate=lambda x: True,
+                sleep_generator=sleep_values,
+                on_error=push_sleep_value,
+            )
+        )
+    assert sleep.call_count == 1
+    sleep.assert_called_once_with(inserted_sleep)
 
 
 class TestStreamingRetry(Test_BaseRetry):
@@ -63,8 +92,8 @@ class TestStreamingRetry(Test_BaseRetry):
             str(retry_),
         )
 
+    @staticmethod
     def _generator_mock(
-        self,
         num=5,
         error_on=None,
         return_val=None,
@@ -82,7 +111,7 @@ class TestStreamingRetry(Test_BaseRetry):
         """
         try:
             for i in range(num):
-                if error_on and i == error_on:
+                if error_on is not None and i == error_on:
                     raise ValueError("generator mock error")
                 yield i
             return return_val

{google_api_core-2.24.2 → google_api_core-2.25.0}/tests/unit/retry/test_retry_unary.py

@@ -146,7 +146,33 @@ def test_retry_target_timeout_exceeded(monotonic, sleep, use_deadline_arg):
 
 def test_retry_target_bad_sleep_generator():
     with pytest.raises(ValueError, match="Sleep generator"):
-        retry.retry_target(mock.sentinel.target, mock.sentinel.predicate, [], None)
+        retry.retry_target(mock.sentinel.target, lambda x: True, [], None)
+
+
+@mock.patch("time.sleep", autospec=True)
+def test_retry_target_dynamic_backoff(sleep):
+    """
+    sleep_generator should be iterated after on_error, to support dynamic backoff
+    """
+    sleep.side_effect = RuntimeError("stop after sleep")
+    # start with empty sleep generator; values are added after exception in push_sleep_value
+    sleep_values = []
+    exception = ValueError("trigger retry")
+    error_target = mock.Mock(side_effect=exception)
+    inserted_sleep = 99
+
+    def push_sleep_value(err):
+        sleep_values.append(inserted_sleep)
+
+    with pytest.raises(RuntimeError):
+        retry.retry_target(
+            error_target,
+            predicate=lambda x: True,
+            sleep_generator=sleep_values,
+            on_error=push_sleep_value,
+        )
+    assert sleep.call_count == 1
+    sleep.assert_called_once_with(inserted_sleep)
 
 
 class TestRetry(Test_BaseRetry):

{google_api_core-2.24.2 → google_api_core-2.25.0}/tests/unit/test_bidi.py

@@ -16,6 +16,7 @@ import datetime
 import logging
 import queue
 import threading
+import time
 
 try:
     from unittest import mock
@@ -894,3 +895,26 @@ class TestBackgroundConsumer(object):
 
         # calling stop twice should not result in an error.
         consumer.stop()
+
+    def test_stop_error_logs(self, caplog):
+        """
+        Closing the client should result in no internal error logs
+
+        https://github.com/googleapis/python-api-core/issues/788
+        """
+        caplog.set_level(logging.DEBUG)
+        bidi_rpc = mock.create_autospec(bidi.BidiRpc, instance=True)
+        bidi_rpc.is_active = True
+        on_response = mock.Mock(spec=["__call__"])
+
+        consumer = bidi.BackgroundConsumer(bidi_rpc, on_response)
+
+        consumer.start()
+        consumer.stop()
+        # let the background thread run for a while before exiting
+        time.sleep(0.1)
+        bidi_rpc.is_active = False
+        # running thread should not result in error logs
+        error_logs = [r.message for r in caplog.records if r.levelname == "ERROR"]
+        assert not error_logs, f"Found unexpected ERROR logs: {error_logs}"
+        bidi_rpc.is_active = False

{google_api_core-2.24.2 → google_api_core-2.25.0}/tests/unit/test_client_info.py

@@ -46,6 +46,7 @@ def test_constructor_options():
         client_library_version="5",
         user_agent="6",
         rest_version="7",
+        protobuf_runtime_version="8",
     )
 
     assert info.python_version == "1"
@@ -55,11 +56,15 @@ def test_constructor_options():
     assert info.client_library_version == "5"
     assert info.user_agent == "6"
     assert info.rest_version == "7"
+    assert info.protobuf_runtime_version == "8"
 
 
 def test_to_user_agent_minimal():
     info = client_info.ClientInfo(
-        python_version="1", api_core_version="2", grpc_version=None
+        python_version="1",
+        api_core_version="2",
+        grpc_version=None,
+        protobuf_runtime_version=None,
     )
 
     user_agent = info.to_user_agent()
@@ -75,11 +80,12 @@ def test_to_user_agent_full():
         gapic_version="4",
         client_library_version="5",
         user_agent="app-name/1.0",
+        protobuf_runtime_version="6",
     )
 
     user_agent = info.to_user_agent()
 
-    assert user_agent == "app-name/1.0 gl-python/1 grpc/2 gax/3 gapic/4 gccl/5"
+    assert user_agent == "app-name/1.0 gl-python/1 grpc/2 gax/3 gapic/4 gccl/5 pb/6"
 
 
 def test_to_user_agent_rest():