@@ -1219,7 +1219,7 @@ async def complete_async_iterator_value(
12191219 field_group : FieldGroup ,
12201220 info : GraphQLResolveInfo ,
12211221 path : Path ,
1222- iterator : AsyncIterator [Any ],
1222+ async_iterator : AsyncIterator [Any ],
12231223 async_payload_record : AsyncPayloadRecord | None ,
12241224 ) -> list [Any ]:
12251225 """Complete an async iterator.
@@ -1244,7 +1244,7 @@ async def complete_async_iterator_value(
12441244 shield (
12451245 self .execute_stream_async_iterator (
12461246 index ,
1247- iterator ,
1247+ async_iterator ,
12481248 field_group ,
12491249 info ,
12501250 item_type ,
@@ -1260,7 +1260,7 @@ async def complete_async_iterator_value(
12601260 item_path = path .add_key (index , None )
12611261 try :
12621262 try :
1263- value = await anext (iterator )
1263+ value = await anext (async_iterator )
12641264 except StopAsyncIteration :
12651265 break
12661266 except Exception as raw_error :
@@ -1315,10 +1315,10 @@ def complete_list_value(
13151315 item_type = return_type .of_type
13161316
13171317 if isinstance (result , AsyncIterable ):
1318- iterator = result .__aiter__ ()
1318+ async_iterator = result .__aiter__ ()
13191319
13201320 return self .complete_async_iterator_value (
1321- item_type , field_group , info , path , iterator , async_payload_record
1321+ item_type , field_group , info , path , async_iterator , async_payload_record
13221322 )
13231323
13241324 if not is_iterable (result ):
@@ -1861,18 +1861,18 @@ async def await_completed_items() -> list[Any] | None:
18611861
18621862 async def execute_stream_async_iterator_item (
18631863 self ,
1864- iterator : AsyncIterator [Any ],
1864+ async_iterator : AsyncIterator [Any ],
18651865 field_group : FieldGroup ,
18661866 info : GraphQLResolveInfo ,
18671867 item_type : GraphQLOutputType ,
18681868 async_payload_record : StreamRecord ,
18691869 item_path : Path ,
18701870 ) -> Any :
18711871 """Execute stream iterator item."""
1872- if iterator in self ._canceled_iterators :
1872+ if async_iterator in self ._canceled_iterators :
18731873 raise StopAsyncIteration
18741874 try :
1875- item = await anext (iterator )
1875+ item = await anext (async_iterator )
18761876 completed_item = self .complete_value (
18771877 item_type , field_group , info , item_path , item , async_payload_record
18781878 )
@@ -1884,7 +1884,7 @@ async def execute_stream_async_iterator_item(
18841884 )
18851885
18861886 except StopAsyncIteration as raw_error :
1887- async_payload_record .set_is_completed_iterator ()
1887+ async_payload_record .set_is_completed_async_iterator ()
18881888 raise StopAsyncIteration from raw_error
18891889
18901890 except Exception as raw_error :
@@ -1896,7 +1896,7 @@ async def execute_stream_async_iterator_item(
18961896 async def execute_stream_async_iterator (
18971897 self ,
18981898 initial_index : int ,
1899- iterator : AsyncIterator [Any ],
1899+ async_iterator : AsyncIterator [Any ],
19001900 field_group : FieldGroup ,
19011901 info : GraphQLResolveInfo ,
19021902 item_type : GraphQLOutputType ,
@@ -1911,12 +1911,12 @@ async def execute_stream_async_iterator(
19111911 while True :
19121912 item_path = Path (path , index , None )
19131913 async_payload_record = StreamRecord (
1914- label , item_path , iterator , previous_async_payload_record , self
1914+ label , item_path , async_iterator , previous_async_payload_record , self
19151915 )
19161916
19171917 try :
19181918 data = await self .execute_stream_async_iterator_item (
1919- iterator ,
1919+ async_iterator ,
19201920 field_group ,
19211921 info ,
19221922 item_type ,
@@ -1933,12 +1933,12 @@ async def execute_stream_async_iterator(
19331933 async_payload_record .errors .append (error )
19341934 self .filter_subsequent_payloads (path , async_payload_record )
19351935 async_payload_record .add_items (None )
1936- if iterator : # pragma: no cover else
1936+ if async_iterator : # pragma: no cover else
19371937 with suppress (Exception ):
1938- await iterator .aclose () # type: ignore
1938+ await async_iterator .aclose () # type: ignore
19391939 # running generators cannot be closed since Python 3.8,
19401940 # so we need to remember that this iterator is already canceled
1941- self ._canceled_iterators .add (iterator )
1941+ self ._canceled_iterators .add (async_iterator )
19421942 break
19431943
19441944 async_payload_record .add_items ([data ])
@@ -1961,8 +1961,8 @@ def filter_subsequent_payloads(
19611961 # async_record points to a path unaffected by this payload
19621962 continue
19631963 # async_record path points to nulled error field
1964- if isinstance (async_record , StreamRecord ) and async_record .iterator :
1965- self ._canceled_iterators .add (async_record .iterator )
1964+ if isinstance (async_record , StreamRecord ) and async_record .async_iterator :
1965+ self ._canceled_iterators .add (async_record .async_iterator )
19661966 del self .subsequent_payloads [async_record ]
19671967
19681968 def get_completed_incremental_results (self ) -> list [IncrementalResult ]:
@@ -1977,7 +1977,7 @@ def get_completed_incremental_results(self) -> list[IncrementalResult]:
19771977 del self .subsequent_payloads [async_payload_record ]
19781978 if isinstance (async_payload_record , StreamRecord ):
19791979 items = async_payload_record .items
1980- if async_payload_record .is_completed_iterator :
1980+ if async_payload_record .is_completed_async_iterator :
19811981 # async iterable resolver finished but there may be pending payload
19821982 continue # pragma: no cover
19831983 incremental_result = IncrementalStreamResult (
@@ -2667,8 +2667,8 @@ class StreamRecord:
26672667 path : list [str | int ]
26682668 items : list [str ] | None
26692669 parent_context : AsyncPayloadRecord | None
2670- iterator : AsyncIterator [Any ] | None
2671- is_completed_iterator : bool
2670+ async_iterator : AsyncIterator [Any ] | None
2671+ is_completed_async_iterator : bool
26722672 completed : Event
26732673 _context : ExecutionContext
26742674 _items : AwaitableOrValue [list [Any ] | None ]
@@ -2678,21 +2678,21 @@ def __init__(
26782678 self ,
26792679 label : str | None ,
26802680 path : Path | None ,
2681- iterator : AsyncIterator [Any ] | None ,
2681+ async_iterator : AsyncIterator [Any ] | None ,
26822682 parent_context : AsyncPayloadRecord | None ,
26832683 context : ExecutionContext ,
26842684 ) -> None :
26852685 self .label = label
26862686 self .path = path .as_list () if path else []
26872687 self .parent_context = parent_context
2688- self .iterator = iterator
2688+ self .async_iterator = async_iterator
26892689 self .errors = []
26902690 self ._context = context
26912691 context .subsequent_payloads [self ] = None
26922692 self .items = self ._items = None
26932693 self .completed = Event ()
26942694 self ._items_added = Event ()
2695- self .is_completed_iterator = False
2695+ self .is_completed_async_iterator = False
26962696
26972697 def __repr__ (self ) -> str :
26982698 name = self .__class__ .__name__
@@ -2729,9 +2729,9 @@ def add_items(self, items: AwaitableOrValue[list[Any] | None]) -> None:
27292729 self ._items = items
27302730 self ._items_added .set ()
27312731
2732- def set_is_completed_iterator (self ) -> None :
2732+ def set_is_completed_async_iterator (self ) -> None :
27332733 """Mark as completed."""
2734- self .is_completed_iterator = True
2734+ self .is_completed_async_iterator = True
27352735 self ._items_added .set ()
27362736
27372737
0 commit comments