Merge branch 'main' into add-protobuf-runtime-header

Author: parthea

.github/.OwlBot.lock.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:5581906b957284864632cde4e9c51d1cc66b0094990b27e689132fe5cd036046
-# created: 2025-03-04
+  digest: sha256:a7aef70df5f13313ddc027409fc8f3151422ec2a57ac8730fce8fa75c060d5bb
+# created: 2025-04-10T17:00:10.042601326Z

google/api_core/bidi.py

@@ -664,7 +664,8 @@ def _thread_main(self, ready):
                 _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(

owlbot.py

@@ -26,7 +26,6 @@
 excludes = [
     "noxfile.py",  # pytype
     "setup.cfg",  # pytype
-    ".flake8",  # flake8-import-order, layout
     ".coveragerc",  # layout
     "CONTRIBUTING.rst",  # no systests
     ".github/workflows/unittest.yml",  # exclude unittest gh action
@@ -36,18 +35,6 @@
 templated_files = common.py_library(microgenerator=True, cov_level=100)
 s.move(templated_files, excludes=excludes)
 
-# Add pytype support
-s.replace(
-    ".gitignore",
-    """\
-.pytest_cache
-""",
-    """\
-.pytest_cache
-.pytype
-""",
-)
-
 python.configure_previous_major_version_branches()
 
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)

tests/unit/test_bidi.py

@@ -16,6 +16,7 @@
 import logging
 import queue
 import threading
+import time
 
 try:
     from unittest import mock
@@ -894,3 +895,26 @@ def close_side_effect():
 
         # 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