-
Notifications
You must be signed in to change notification settings - Fork 4.5k
Support inferring schemas from Python dataclasses #37728
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Abacn
wants to merge
3
commits into
apache:master
Choose a base branch
from
Abacn:dataclass-schema
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+179
−29
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| """Unit tests for the Beam Row typing functionality.""" | ||
|
|
||
| from dataclasses import dataclass | ||
| import typing | ||
| import unittest | ||
|
|
||
| import apache_beam as beam | ||
| from apache_beam.testing.test_pipeline import TestPipeline | ||
| from apache_beam.testing.util import assert_that | ||
| from apache_beam.testing.util import equal_to | ||
| from apache_beam.typehints import row_type | ||
|
|
||
|
|
||
| class RowTypeTest(unittest.TestCase): | ||
| @staticmethod | ||
| def _check_key_type_and_count(x) -> int: | ||
| key_type = type(x[0]) | ||
| if not row_type._user_type_is_generated(key_type): | ||
| raise RuntimeError("Expect type after GBK to be generated user type") | ||
|
|
||
| return len(x[1]) | ||
|
|
||
| def test_group_by_key_namedtuple(self): | ||
| MyNamedTuple = typing.NamedTuple( | ||
| "MyNamedTuple", [("id", int), ("name", str)]) | ||
|
|
||
| beam.coders.typecoders.registry.register_coder( | ||
| MyNamedTuple, beam.coders.RowCoder) | ||
|
|
||
| def generate(num: int): | ||
| for i in range(100): | ||
| yield (MyNamedTuple(i, 'a'), num) | ||
|
|
||
| pipeline = TestPipeline(is_integration_test=False) | ||
|
|
||
| with pipeline as p: | ||
| result = ( | ||
| p | ||
| | 'Create' >> beam.Create([i for i in range(10)]) | ||
| | 'Generate' >> beam.ParDo(generate).with_output_types( | ||
| tuple[MyNamedTuple, int]) | ||
| | 'GBK' >> beam.GroupByKey() | ||
| | 'Count Elements' >> beam.Map(self._check_key_type_and_count)) | ||
| assert_that(result, equal_to([10] * 100)) | ||
|
|
||
| def test_group_by_key_dataclass(self): | ||
| @dataclass | ||
| class MyDataClass: | ||
| id: int | ||
| name: str | ||
|
|
||
| beam.coders.typecoders.registry.register_coder( | ||
| MyDataClass, beam.coders.RowCoder) | ||
|
|
||
| def generate(num: int): | ||
| for i in range(100): | ||
| yield (MyDataClass(i, 'a'), num) | ||
|
|
||
| pipeline = TestPipeline(is_integration_test=False) | ||
|
|
||
| with pipeline as p: | ||
| result = ( | ||
| p | ||
| | 'Create' >> beam.Create([i for i in range(10)]) | ||
| | 'Generate' >> beam.ParDo(generate).with_output_types( | ||
| tuple[MyDataClass, int]) | ||
| | 'GBK' >> beam.GroupByKey() | ||
| | 'Count Elements' >> beam.Map(self._check_key_type_and_count)) | ||
| assert_that(result, equal_to([10] * 100)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think about adding a test that does beam.Create([MyCuteDataclass()]).wit_output_types(beam.Row) -> Reshuffle (the results should be named tuples)?
And also a test that beam.Create([MyCuteDataclass()]).wit_output_types(beam.Row) -> Reshuffle the resulting type is still the original dataclass?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, added unit tests for both named tuple and dataclasses (they are expected to resulting in same generated user type passing through GBK)
Noticing current schemas_test unit tests does not involve pipeline tests. Created a row_type_test to settle these tests