Do not raise KeyError when discarding dict items

Author: Cito

src/graphql/error/located_error.py

@@ -13,6 +13,8 @@
 
 __all__ = ["located_error"]
 
+suppress_attribute_error = suppress(AttributeError)
+
 
 def located_error(
     original_error: Exception,
@@ -45,6 +47,6 @@ def located_error(
     except AttributeError:
         positions = None
 
-    with suppress(AttributeError):
+    with suppress_attribute_error:
         nodes = original_error.nodes or nodes  # type: ignore
     return GraphQLError(message, nodes, source, positions, path, original_error)

src/graphql/execution/execute.py

@@ -119,6 +119,9 @@ async def anext(iterator: AsyncIterator) -> Any:  # noqa: A001
     "Middleware",
 ]
 
+suppress_exceptions = suppress(Exception)
+suppress_timeout_error = suppress(TimeoutError)
+
 
 # Terminology
 #
@@ -971,7 +974,7 @@ async def complete_async_iterator_value(
                 and isinstance(stream.initial_count, int)
                 and index >= stream.initial_count
             ):
-                with suppress(TimeoutError):
+                with suppress_timeout_error:
                     await wait_for(
                         shield(
                             self.execute_stream_async_iterator(
@@ -1709,7 +1712,7 @@ async def execute_stream_async_iterator(
                     incremental_data_record, None
                 )
                 if async_iterator:  # pragma: no cover else
-                    with suppress(Exception):
+                    with suppress_exceptions:
                         await async_iterator.aclose()  # type: ignore
                     # running generators cannot be closed since Python 3.8,
                     # so we need to remember that this iterator is already canceled

src/graphql/execution/incremental_publisher.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from asyncio import Event, ensure_future, gather
+from contextlib import suppress
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -48,6 +49,8 @@
 
 ASYNC_DELAY = 1 / 512  # wait time in seconds for deferring execution
 
+suppress_key_error = suppress(KeyError)
+
 
 class FormattedIncrementalDeferResult(TypedDict, total=False):
     """Formatted incremental deferred execution result"""
@@ -386,7 +389,7 @@ async def subscribe(
             while not is_done:
                 released = self._released
                 for item in released:
-                    if item in pending:
+                    with suppress_key_error:
                         del pending[item]
                 self._released = {}
 
@@ -487,7 +490,8 @@ def filter(
 
             self._delete(child)
             parent = child.parent_context or self._initial_result
-            del parent.children[child]
+            with suppress_key_error:
+                del parent.children[child]
 
             if isinstance(child, StreamItemsRecord):
                 async_iterator = child.async_iterator
@@ -501,10 +505,7 @@ def filter(
 
     def _trigger(self) -> None:
         self._resolve.set()
-        self._reset()
-
-    def _reset(self) -> None:
-        self._resolve.clear()
+        self._resolve = Event()
 
     def _introduce(self, item: IncrementalDataRecord) -> None:
         self._pending[item] = None
@@ -520,8 +521,10 @@ def _push(self, item: IncrementalDataRecord) -> None:
         self._trigger()
 
     def _delete(self, item: IncrementalDataRecord) -> None:
-        del self._released[item]
-        del self._pending[item]
+        with suppress_key_error:
+            del self._released[item]
+        with suppress_key_error:
+            del self._pending[item]
         self._trigger()
 
     def _get_incremental_result(

tests/execution/test_stream.py

@@ -1234,7 +1234,7 @@ def get_friends(_info):
             {
                 "incremental": [
                     {
-                        "items": [None],
+                        "items": None,
                         "path": ["nonNullFriendList", 1],
                         "errors": [
                             {
@@ -1292,7 +1292,7 @@ def get_friends(_info):
                             {
                                 "message": "Oops",
                                 "locations": [{"line": 4, "column": 17}],
-                                "path": ["friendList", 1, "nonNullName"],
+                                "path": ["nonNullFriendList", 1, "nonNullName"],
                             },
                         ],
                     },
@@ -1406,13 +1406,13 @@ async def get_friends(_info):
             {
                 "incremental": [
                     {
-                        "items": [None],
+                        "items": None,
                         "path": ["nonNullFriendList", 1],
                         "errors": [
                             {
                                 "message": "Oops",
                                 "locations": [{"line": 4, "column": 17}],
-                                "path": ["friendList", 1, "nonNullName"],
+                                "path": ["nonNullFriendList", 1, "nonNullName"],
                             },
                         ],
                     },
@@ -1579,8 +1579,9 @@ async def friend_list(_info):
                         "path": ["nestedObject", "nestedFriendList", 0],
                     },
                 ],
-                "hasNext": False,
+                "hasNext": True,
             },
+            {"hasNext": False},
         ]
 
     @pytest.mark.asyncio()