Commit 398d5cc

committed

rename StreamRecord to StreamItemsRecord

Replicates graphql/graphql-js@ce64e56

1 parent a2d1f89 commit 398d5ccCopy full SHA for 398d5cc

File tree

2 files changed

+16

-11

lines changed

src/graphql/execution
- execute.py
tests/execution
- test_stream.py

2 files changed

+16

-11

lines changed

`‎src/graphql/execution/execute.py‎`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ async def anext(iterator: AsyncIterator) -> Any: # noqa: A001`
`106`	`106`	`"subscribe",`
`107`	`107`	`"AsyncPayloadRecord",`
`108`	`108`	`"DeferredFragmentRecord",`
`109`		`- "StreamRecord",`
	`109`	`+ "StreamItemsRecord",`
`110`	`110`	`"ExecutionResult",`
`111`	`111`	`"ExecutionContext",`
`112`	`112`	`"ExperimentalIncrementalExecutionResults",`
`@@ -1772,7 +1772,7 @@ def execute_stream_field(`
`1772`	`1772`	`) -> AsyncPayloadRecord:`
`1773`	`1773`	`"""Execute stream field."""`
`1774`	`1774`	`is_awaitable = self.is_awaitable`
`1775`		`- async_payload_record = StreamRecord(`
	`1775`	`+ async_payload_record = StreamItemsRecord(`
`1776`	`1776`	`label, item_path, None, parent_context, self`
`1777`	`1777`	`)`
`1778`	`1778`	`completed_item: Any`
`@@ -1865,7 +1865,7 @@ async def execute_stream_async_iterator_item(`
`1865`	`1865`	`field_group: FieldGroup,`
`1866`	`1866`	`info: GraphQLResolveInfo,`
`1867`	`1867`	`item_type: GraphQLOutputType,`
`1868`		`- async_payload_record: StreamRecord,`
	`1868`	`+ async_payload_record: StreamItemsRecord,`
`1869`	`1869`	`item_path: Path,`
`1870`	`1870`	`) -> Any:`
`1871`	`1871`	`"""Execute stream iterator item."""`
`@@ -1910,7 +1910,7 @@ async def execute_stream_async_iterator(`
`1910`	`1910`
`1911`	`1911`	`while True:`
`1912`	`1912`	`item_path = Path(path, index, None)`
`1913`		`- async_payload_record = StreamRecord(`
	`1913`	`+ async_payload_record = StreamItemsRecord(`
`1914`	`1914`	`label, item_path, async_iterator, previous_async_payload_record, self`
`1915`	`1915`	`)`
`1916`	`1916`
`@@ -1961,7 +1961,10 @@ 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.async_iterator:`
	`1964`	`+ if (`
	`1965`	`+ isinstance(async_record, StreamItemsRecord)`
	`1966`	`+ and async_record.async_iterator`
	`1967`	`+ ):`
`1965`	`1968`	`self._canceled_iterators.add(async_record.async_iterator)`
`1966`	`1969`	`del self.subsequent_payloads[async_record]`
`1967`	`1970`
`@@ -1975,7 +1978,7 @@ def get_completed_incremental_results(self) -> list[IncrementalResult]:`
`1975`	`1978`	`if not async_payload_record.completed.is_set():`
`1976`	`1979`	`continue`
`1977`	`1980`	`del self.subsequent_payloads[async_payload_record]`
`1978`		`- if isinstance(async_payload_record, StreamRecord):`
	`1981`	`+ if isinstance(async_payload_record, StreamItemsRecord):`
`1979`	`1982`	`items = async_payload_record.items`
`1980`	`1983`	`if async_payload_record.is_completed_async_iterator:`
`1981`	`1984`	`# async iterable resolver finished but there may be pending payload`
`@@ -2659,7 +2662,7 @@ def add_data(self, data: AwaitableOrValue[dict[str, Any] \| None]) -> None:`
`2659`	`2662`	`self._data_added.set()`
`2660`	`2663`
`2661`	`2664`
`2662`		`-class StreamRecord:`
	`2665`	`+class StreamItemsRecord:`
`2663`	`2666`	`"""A record collecting items marked with the stream directive"""`
`2664`	`2667`
`2665`	`2668`	`errors: list[GraphQLError]`
`@@ -2735,4 +2738,4 @@ def set_is_completed_async_iterator(self) -> None:`
`2735`	`2738`	`self._items_added.set()`
`2736`	`2739`
`2737`	`2740`
`2738`		`-AsyncPayloadRecord = Union[DeferredFragmentRecord, StreamRecord]`
	`2741`	`+AsyncPayloadRecord = Union[DeferredFragmentRecord, StreamItemsRecord]`

`‎tests/execution/test_stream.py‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`IncrementalStreamResult,`
`13`	`13`	`experimental_execute_incrementally,`
`14`	`14`	`)`
`15`		`-from graphql.execution.execute import StreamRecord`
	`15`	`+from graphql.execution.execute import StreamItemsRecord`
`16`	`16`	`from graphql.language import DocumentNode, parse`
`17`	`17`	`from graphql.pyutils import Path`
`18`	`18`	`from graphql.type import (`
`@@ -175,9 +175,11 @@ def can_format_and_print_incremental_stream_result():`
`175`	`175`	`def can_print_stream_record():`
`176`	`176`	`context = ExecutionContext.build(schema, parse("{ hero { id } }"))`
`177`	`177`	`assert isinstance(context, ExecutionContext)`
`178`		`- record = StreamRecord(None, None, None, None, context)`
	`178`	`+ record = StreamItemsRecord(None, None, None, None, context)`
`179`	`179`	`assert str(record) == "StreamRecord(path=[])"`
`180`		`- record = StreamRecord("foo", Path(None, "bar", "Bar"), None, record, context)`
	`180`	`+ record = StreamItemsRecord(`
	`181`	`+ "foo", Path(None, "bar", "Bar"), None, record, context`
	`182`	`+ )`
`181`	`183`	`assert (`
`182`	`184`	`str(record) == "StreamRecord(" "path=['bar'], label='foo', parent_context)"`
`183`	`185`	`)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 398d5cc

File tree

2 files changed

2 files changed

`‎src/graphql/execution/execute.py‎`

`‎tests/execution/test_stream.py‎`

0 commit comments