@@ -1219,7 +1219,7 @@ async def complete_async_iterator_value(
1219
1219
field_group : FieldGroup ,
1220
1220
info : GraphQLResolveInfo ,
1221
1221
path : Path ,
1222
- iterator : AsyncIterator [Any ],
1222
+ async_iterator : AsyncIterator [Any ],
1223
1223
async_payload_record : AsyncPayloadRecord | None ,
1224
1224
) -> list [Any ]:
1225
1225
"""Complete an async iterator.
@@ -1244,7 +1244,7 @@ async def complete_async_iterator_value(
1244
1244
shield (
1245
1245
self .execute_stream_async_iterator (
1246
1246
index ,
1247
- iterator ,
1247
+ async_iterator ,
1248
1248
field_group ,
1249
1249
info ,
1250
1250
item_type ,
@@ -1260,7 +1260,7 @@ async def complete_async_iterator_value(
1260
1260
item_path = path .add_key (index , None )
1261
1261
try :
1262
1262
try :
1263
- value = await anext (iterator )
1263
+ value = await anext (async_iterator )
1264
1264
except StopAsyncIteration :
1265
1265
break
1266
1266
except Exception as raw_error :
@@ -1315,10 +1315,10 @@ def complete_list_value(
1315
1315
item_type = return_type .of_type
1316
1316
1317
1317
if isinstance (result , AsyncIterable ):
1318
- iterator = result .__aiter__ ()
1318
+ async_iterator = result .__aiter__ ()
1319
1319
1320
1320
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
1322
1322
)
1323
1323
1324
1324
if not is_iterable (result ):
@@ -1861,18 +1861,18 @@ async def await_completed_items() -> list[Any] | None:
1861
1861
1862
1862
async def execute_stream_async_iterator_item (
1863
1863
self ,
1864
- iterator : AsyncIterator [Any ],
1864
+ async_iterator : AsyncIterator [Any ],
1865
1865
field_group : FieldGroup ,
1866
1866
info : GraphQLResolveInfo ,
1867
1867
item_type : GraphQLOutputType ,
1868
1868
async_payload_record : StreamRecord ,
1869
1869
item_path : Path ,
1870
1870
) -> Any :
1871
1871
"""Execute stream iterator item."""
1872
- if iterator in self ._canceled_iterators :
1872
+ if async_iterator in self ._canceled_iterators :
1873
1873
raise StopAsyncIteration
1874
1874
try :
1875
- item = await anext (iterator )
1875
+ item = await anext (async_iterator )
1876
1876
completed_item = self .complete_value (
1877
1877
item_type , field_group , info , item_path , item , async_payload_record
1878
1878
)
@@ -1884,7 +1884,7 @@ async def execute_stream_async_iterator_item(
1884
1884
)
1885
1885
1886
1886
except StopAsyncIteration as raw_error :
1887
- async_payload_record .set_is_completed_iterator ()
1887
+ async_payload_record .set_is_completed_async_iterator ()
1888
1888
raise StopAsyncIteration from raw_error
1889
1889
1890
1890
except Exception as raw_error :
@@ -1896,7 +1896,7 @@ async def execute_stream_async_iterator_item(
1896
1896
async def execute_stream_async_iterator (
1897
1897
self ,
1898
1898
initial_index : int ,
1899
- iterator : AsyncIterator [Any ],
1899
+ async_iterator : AsyncIterator [Any ],
1900
1900
field_group : FieldGroup ,
1901
1901
info : GraphQLResolveInfo ,
1902
1902
item_type : GraphQLOutputType ,
@@ -1911,12 +1911,12 @@ async def execute_stream_async_iterator(
1911
1911
while True :
1912
1912
item_path = Path (path , index , None )
1913
1913
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
1915
1915
)
1916
1916
1917
1917
try :
1918
1918
data = await self .execute_stream_async_iterator_item (
1919
- iterator ,
1919
+ async_iterator ,
1920
1920
field_group ,
1921
1921
info ,
1922
1922
item_type ,
@@ -1933,12 +1933,12 @@ async def execute_stream_async_iterator(
1933
1933
async_payload_record .errors .append (error )
1934
1934
self .filter_subsequent_payloads (path , async_payload_record )
1935
1935
async_payload_record .add_items (None )
1936
- if iterator : # pragma: no cover else
1936
+ if async_iterator : # pragma: no cover else
1937
1937
with suppress (Exception ):
1938
- await iterator .aclose () # type: ignore
1938
+ await async_iterator .aclose () # type: ignore
1939
1939
# running generators cannot be closed since Python 3.8,
1940
1940
# so we need to remember that this iterator is already canceled
1941
- self ._canceled_iterators .add (iterator )
1941
+ self ._canceled_iterators .add (async_iterator )
1942
1942
break
1943
1943
1944
1944
async_payload_record .add_items ([data ])
@@ -1961,8 +1961,8 @@ def filter_subsequent_payloads(
1961
1961
# async_record points to a path unaffected by this payload
1962
1962
continue
1963
1963
# 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 )
1966
1966
del self .subsequent_payloads [async_record ]
1967
1967
1968
1968
def get_completed_incremental_results (self ) -> list [IncrementalResult ]:
@@ -1977,7 +1977,7 @@ def get_completed_incremental_results(self) -> list[IncrementalResult]:
1977
1977
del self .subsequent_payloads [async_payload_record ]
1978
1978
if isinstance (async_payload_record , StreamRecord ):
1979
1979
items = async_payload_record .items
1980
- if async_payload_record .is_completed_iterator :
1980
+ if async_payload_record .is_completed_async_iterator :
1981
1981
# async iterable resolver finished but there may be pending payload
1982
1982
continue # pragma: no cover
1983
1983
incremental_result = IncrementalStreamResult (
@@ -2667,8 +2667,8 @@ class StreamRecord:
2667
2667
path : list [str | int ]
2668
2668
items : list [str ] | None
2669
2669
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
2672
2672
completed : Event
2673
2673
_context : ExecutionContext
2674
2674
_items : AwaitableOrValue [list [Any ] | None ]
@@ -2678,21 +2678,21 @@ def __init__(
2678
2678
self ,
2679
2679
label : str | None ,
2680
2680
path : Path | None ,
2681
- iterator : AsyncIterator [Any ] | None ,
2681
+ async_iterator : AsyncIterator [Any ] | None ,
2682
2682
parent_context : AsyncPayloadRecord | None ,
2683
2683
context : ExecutionContext ,
2684
2684
) -> None :
2685
2685
self .label = label
2686
2686
self .path = path .as_list () if path else []
2687
2687
self .parent_context = parent_context
2688
- self .iterator = iterator
2688
+ self .async_iterator = async_iterator
2689
2689
self .errors = []
2690
2690
self ._context = context
2691
2691
context .subsequent_payloads [self ] = None
2692
2692
self .items = self ._items = None
2693
2693
self .completed = Event ()
2694
2694
self ._items_added = Event ()
2695
- self .is_completed_iterator = False
2695
+ self .is_completed_async_iterator = False
2696
2696
2697
2697
def __repr__ (self ) -> str :
2698
2698
name = self .__class__ .__name__
@@ -2729,9 +2729,9 @@ def add_items(self, items: AwaitableOrValue[list[Any] | None]) -> None:
2729
2729
self ._items = items
2730
2730
self ._items_added .set ()
2731
2731
2732
- def set_is_completed_iterator (self ) -> None :
2732
+ def set_is_completed_async_iterator (self ) -> None :
2733
2733
"""Mark as completed."""
2734
- self .is_completed_iterator = True
2734
+ self .is_completed_async_iterator = True
2735
2735
self ._items_added .set ()
2736
2736
2737
2737
0 commit comments