fix: closes tailing streams in bidi classes.

Always put `None` into the request queue when closing a bidi stream.

This ensures that the request queue is always signaled as closed, even if the underlying gRPC call object is not yet available.

Author: pujawadare

google/api_core/bidi.py

@@ -281,13 +281,12 @@ def open(self):
 
     def close(self):
         """Closes the stream."""
-        if self.call is None:
-            return
+        if self.call is not None:
+            self.call.cancel()
 
+        # Put None in request queue to signal termination.
         self._request_queue.put(None)
-        self.call.cancel()
         self._request_generator = None
-        self._initial_request = None
         self._callbacks = []
         # Don't set self.call to None. Keep it around so that send/recv can
         # raise the error.

google/api_core/bidi_async.py

@@ -197,13 +197,12 @@ async def open(self) -> None:
 
     async def close(self) -> None:
         """Closes the stream."""
-        if self.call is None:
-            return
+        if self.call is not None:
+            self.call.cancel()
 
+        # Put None in request queue to signal termination.
         await self._request_queue.put(None)
-        self.call.cancel()
         self._request_generator = None
-        self._initial_request = None
         self._callbacks = []
         # Don't set self.call to None. Keep it around so that send/recv can
         # raise the error.

tests/asyncio/test_bidi_async.py

@@ -252,7 +252,20 @@ async def test_close(self):
         assert bidi_rpc.pending_requests == 1
         assert await bidi_rpc._request_queue.get() is None
         # ensure request and callbacks are cleaned up
-        assert bidi_rpc._initial_request is None
+        assert not bidi_rpc._callbacks
+
+    @pytest.mark.asyncio
+    async def test_close_with_no_rpc(self):
+        bidi_rpc = bidi_async.AsyncBidiRpc(None)
+
+        await bidi_rpc.close()
+
+        assert bidi_rpc.call is None
+        assert bidi_rpc.is_active is False
+        # ensure the request queue was signaled to stop.
+        assert bidi_rpc.pending_requests == 1
+        assert await bidi_rpc._request_queue.get() is None
+        # ensure request and callbacks are cleaned up
         assert not bidi_rpc._callbacks
 
     @pytest.mark.asyncio

tests/unit/test_bidi.py

@@ -298,13 +298,20 @@ def test_close(self):
         assert bidi_rpc.pending_requests == 1
         assert bidi_rpc._request_queue.get() is None
         # ensure request and callbacks are cleaned up
-        assert bidi_rpc._initial_request is None
         assert not bidi_rpc._callbacks
 
-    def test_close_no_rpc(self):
+    def test_close_with_no_rpc(self):
         bidi_rpc = bidi.BidiRpc(None)
         bidi_rpc.close()
 
+        assert bidi_rpc.call is None
+        assert bidi_rpc.is_active is False
+        # ensure the request queue was signaled to stop.
+        assert bidi_rpc.pending_requests == 1
+        assert bidi_rpc._request_queue.get() is None
+        # ensure request and callbacks are cleaned up
+        assert not bidi_rpc._callbacks
+
     def test_send(self):
         rpc, call = make_rpc()
         bidi_rpc = bidi.BidiRpc(rpc)