You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by GitBox <gi...@apache.org> on 2022/07/01 21:39:21 UTC
[GitHub] [beam] TheNeuralBit opened a new pull request, #22133: Add `schema_options` and `field_options` on RowTypeConstraint
TheNeuralBit opened a new pull request, #22133:
URL: https://github.com/apache/beam/pull/22133
Fixes #22083. This PR adds a Python-native representation for [Beam schema options](https://cwiki.apache.org/confluence/display/BEAM/%5BBIP-1%5D+Beam+Schema+Options).
GitHub Actions Tests Status (on master branch)
------------------------------------------------------------------------------------------------
[](https://github.com/apache/beam/actions?query=workflow%3A%22Build+python+source+distribution+and+wheels%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Python+Tests%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Java+Tests%22+branch%3Amaster+event%3Aschedule)
See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] codecov[bot] commented on pull request #22133: Add `schema_options` and `field_options` on RowTypeConstraint
Posted by GitBox <gi...@apache.org>.
codecov[bot] commented on PR #22133:
URL: https://github.com/apache/beam/pull/22133#issuecomment-1172757132
# [Codecov](https://codecov.io/gh/apache/beam/pull/22133?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#22133](https://codecov.io/gh/apache/beam/pull/22133?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (997f7c4) into [master](https://codecov.io/gh/apache/beam/commit/d032431670de614b48a0e1951cc459e800331073?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (d032431) will **decrease** coverage by `0.00%`.
> The diff coverage is `69.56%`.
```diff
@@ Coverage Diff @@
## master #22133 +/- ##
==========================================
- Coverage 74.19% 74.19% -0.01%
==========================================
Files 702 702
Lines 92791 92890 +99
==========================================
+ Hits 68848 68919 +71
- Misses 22675 22703 +28
Partials 1268 1268
```
| Flag | Coverage Δ | |
|---|---|---|
| python | `83.56% <69.56%> (-0.02%)` | :arrow_down: |
Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more.
| [Impacted Files](https://codecov.io/gh/apache/beam/pull/22133?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [sdks/python/apache\_beam/typehints/schemas.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vdHlwZWhpbnRzL3NjaGVtYXMucHk=) | `88.95% <63.15%> (-5.60%)` | :arrow_down: |
| [sdks/python/apache\_beam/typehints/row\_type.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vdHlwZWhpbnRzL3Jvd190eXBlLnB5) | `96.55% <100.00%> (+7.07%)` | :arrow_up: |
| [.../python/apache\_beam/testing/test\_stream\_service.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vdGVzdGluZy90ZXN0X3N0cmVhbV9zZXJ2aWNlLnB5) | `88.09% <0.00%> (-4.77%)` | :arrow_down: |
| [...python/apache\_beam/runners/worker/worker\_status.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vcnVubmVycy93b3JrZXIvd29ya2VyX3N0YXR1cy5weQ==) | `77.53% <0.00%> (-2.18%)` | :arrow_down: |
| [...che\_beam/runners/interactive/interactive\_runner.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vcnVubmVycy9pbnRlcmFjdGl2ZS9pbnRlcmFjdGl2ZV9ydW5uZXIucHk=) | `90.06% <0.00%> (-1.33%)` | :arrow_down: |
| [...ks/python/apache\_beam/runners/worker/sdk\_worker.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vcnVubmVycy93b3JrZXIvc2RrX3dvcmtlci5weQ==) | `88.46% <0.00%> (-0.48%)` | :arrow_down: |
| [...hon/apache\_beam/runners/worker/bundle\_processor.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vcnVubmVycy93b3JrZXIvYnVuZGxlX3Byb2Nlc3Nvci5weQ==) | `93.30% <0.00%> (-0.25%)` | :arrow_down: |
| [.../python/apache\_beam/typehints/trivial\_inference.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vdHlwZWhpbnRzL3RyaXZpYWxfaW5mZXJlbmNlLnB5) | `96.41% <0.00%> (ø)` | |
| [...eam/runners/interactive/interactive\_environment.py](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vcnVubmVycy9pbnRlcmFjdGl2ZS9pbnRlcmFjdGl2ZV9lbnZpcm9ubWVudC5weQ==) | `92.02% <0.00%> (+0.30%)` | :arrow_up: |
| ... and [2 more](https://codecov.io/gh/apache/beam/pull/22133/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/beam/pull/22133?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/beam/pull/22133?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [d032431...997f7c4](https://codecov.io/gh/apache/beam/pull/22133?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] TheNeuralBit commented on pull request #22133: Add `schema_options` and `field_options` on RowTypeConstraint
Posted by GitBox <gi...@apache.org>.
TheNeuralBit commented on PR #22133:
URL: https://github.com/apache/beam/pull/22133#issuecomment-1172800737
Run Python PreCommit
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] y1chi commented on a diff in pull request #22133: Add `schema_options` and `field_options` on RowTypeConstraint
Posted by GitBox <gi...@apache.org>.
y1chi commented on code in PR #22133:
URL: https://github.com/apache/beam/pull/22133#discussion_r915342721
##########
sdks/python/apache_beam/typehints/schemas.py:
##########
@@ -260,6 +270,86 @@ def typing_to_runner_api(self, type_: type) -> schema_pb2.FieldType:
representation=self.typing_to_runner_api(
logical_type.representation_type())))
+ def option_from_runner_api(
+ self, option_proto: schema_pb2.Option) -> Tuple[str, Any]:
+ if not option_proto.HasField('type'):
+ return option_proto.name, None
+
+ fieldtype_proto = option_proto.type
+ if not fieldtype_proto.WhichOneof("type_info") == "atomic_type":
+ raise ValueError(
+ "Encounterd option with unsupported type. Only "
+ f"atomic_type options are supported: {option_proto}")
+
+ if fieldtype_proto.atomic_type == schema_pb2.BYTE:
+ value = np.int8(option_proto.value.atomic_value.byte)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT16:
+ value = np.int16(option_proto.value.atomic_value.int16)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT32:
+ value = np.int32(option_proto.value.atomic_value.int32)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT64:
+ value = np.int64(option_proto.value.atomic_value.int64)
+ elif fieldtype_proto.atomic_type == schema_pb2.FLOAT:
+ value = np.float32(option_proto.value.atomic_value.float)
+ elif fieldtype_proto.atomic_type == schema_pb2.DOUBLE:
+ value = np.float64(option_proto.value.atomic_value.double)
+ elif fieldtype_proto.atomic_type == schema_pb2.STRING:
+ value = option_proto.value.atomic_value.string
+ elif fieldtype_proto.atomic_type == schema_pb2.BOOLEAN:
+ value = option_proto.value.atomic_value.boolean
+ elif fieldtype_proto.atomic_type == schema_pb2.BYTES:
+ value = option_proto.value.atomic_value.bytes
+ else:
+ raise ValueError(
+ "Unrecognized atomic_type ({fieldtype_proto.atomic_type}) "
Review Comment:
f""?
##########
sdks/python/apache_beam/typehints/schemas.py:
##########
@@ -260,6 +270,86 @@ def typing_to_runner_api(self, type_: type) -> schema_pb2.FieldType:
representation=self.typing_to_runner_api(
logical_type.representation_type())))
+ def option_from_runner_api(
+ self, option_proto: schema_pb2.Option) -> Tuple[str, Any]:
+ if not option_proto.HasField('type'):
+ return option_proto.name, None
+
+ fieldtype_proto = option_proto.type
+ if not fieldtype_proto.WhichOneof("type_info") == "atomic_type":
Review Comment:
use `!=`?
##########
sdks/python/apache_beam/typehints/schemas.py:
##########
@@ -260,6 +270,86 @@ def typing_to_runner_api(self, type_: type) -> schema_pb2.FieldType:
representation=self.typing_to_runner_api(
logical_type.representation_type())))
+ def option_from_runner_api(
+ self, option_proto: schema_pb2.Option) -> Tuple[str, Any]:
+ if not option_proto.HasField('type'):
+ return option_proto.name, None
+
+ fieldtype_proto = option_proto.type
+ if not fieldtype_proto.WhichOneof("type_info") == "atomic_type":
+ raise ValueError(
+ "Encounterd option with unsupported type. Only "
+ f"atomic_type options are supported: {option_proto}")
+
+ if fieldtype_proto.atomic_type == schema_pb2.BYTE:
+ value = np.int8(option_proto.value.atomic_value.byte)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT16:
+ value = np.int16(option_proto.value.atomic_value.int16)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT32:
+ value = np.int32(option_proto.value.atomic_value.int32)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT64:
+ value = np.int64(option_proto.value.atomic_value.int64)
+ elif fieldtype_proto.atomic_type == schema_pb2.FLOAT:
+ value = np.float32(option_proto.value.atomic_value.float)
+ elif fieldtype_proto.atomic_type == schema_pb2.DOUBLE:
+ value = np.float64(option_proto.value.atomic_value.double)
+ elif fieldtype_proto.atomic_type == schema_pb2.STRING:
+ value = option_proto.value.atomic_value.string
+ elif fieldtype_proto.atomic_type == schema_pb2.BOOLEAN:
+ value = option_proto.value.atomic_value.boolean
+ elif fieldtype_proto.atomic_type == schema_pb2.BYTES:
+ value = option_proto.value.atomic_value.bytes
+ else:
+ raise ValueError(
+ "Unrecognized atomic_type ({fieldtype_proto.atomic_type}) "
+ "when decoding option {option_proto!r}")
+
+ return option_proto.name, value
+
+ def option_to_runner_api(self, option: Tuple[str, Any]) -> schema_pb2.Option:
+ name, value = option
+
+ if value is None:
+ # a value of None indicates the option is just a flag.
+ # Don't set type, value
+ return schema_pb2.Option(name=name)
+
+ fieldtype_proto = self.typing_to_runner_api(type(value))
+ if not fieldtype_proto.WhichOneof("type_info") == "atomic_type":
Review Comment:
use `!=` ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] github-actions[bot] commented on pull request #22133: Add `schema_options` and `field_options` on RowTypeConstraint
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #22133:
URL: https://github.com/apache/beam/pull/22133#issuecomment-1172794197
Assigning reviewers. If you would like to opt out of this review, comment `assign to next reviewer`:
R: @y1chi for label python.
Available commands:
- `stop reviewer notifications` - opt out of the automated review tooling
- `remind me after tests pass` - tag the comment author after tests pass
- `waiting on author` - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)
The PR bot will only process comments in the main thread (not review comments).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] TheNeuralBit commented on pull request #22133: Add `schema_options` and `field_options` on RowTypeConstraint
Posted by GitBox <gi...@apache.org>.
TheNeuralBit commented on PR #22133:
URL: https://github.com/apache/beam/pull/22133#issuecomment-1176839690
@y1chi do you have time to review this? I know the diff is large, but most of it is rote. A lot of it is `switch` statements to handle the supported option types (in implementation and in test), and refactoring tests to be parameterized.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] TheNeuralBit merged pull request #22133: Add `schema_options` and `field_options` on RowTypeConstraint
Posted by GitBox <gi...@apache.org>.
TheNeuralBit merged PR #22133:
URL: https://github.com/apache/beam/pull/22133
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] TheNeuralBit commented on a diff in pull request #22133: Add `schema_options` and `field_options` on RowTypeConstraint
Posted by GitBox <gi...@apache.org>.
TheNeuralBit commented on code in PR #22133:
URL: https://github.com/apache/beam/pull/22133#discussion_r916068112
##########
sdks/python/apache_beam/typehints/schemas.py:
##########
@@ -260,6 +270,86 @@ def typing_to_runner_api(self, type_: type) -> schema_pb2.FieldType:
representation=self.typing_to_runner_api(
logical_type.representation_type())))
+ def option_from_runner_api(
+ self, option_proto: schema_pb2.Option) -> Tuple[str, Any]:
+ if not option_proto.HasField('type'):
+ return option_proto.name, None
+
+ fieldtype_proto = option_proto.type
+ if not fieldtype_proto.WhichOneof("type_info") == "atomic_type":
+ raise ValueError(
+ "Encounterd option with unsupported type. Only "
+ f"atomic_type options are supported: {option_proto}")
+
+ if fieldtype_proto.atomic_type == schema_pb2.BYTE:
+ value = np.int8(option_proto.value.atomic_value.byte)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT16:
+ value = np.int16(option_proto.value.atomic_value.int16)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT32:
+ value = np.int32(option_proto.value.atomic_value.int32)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT64:
+ value = np.int64(option_proto.value.atomic_value.int64)
+ elif fieldtype_proto.atomic_type == schema_pb2.FLOAT:
+ value = np.float32(option_proto.value.atomic_value.float)
+ elif fieldtype_proto.atomic_type == schema_pb2.DOUBLE:
+ value = np.float64(option_proto.value.atomic_value.double)
+ elif fieldtype_proto.atomic_type == schema_pb2.STRING:
+ value = option_proto.value.atomic_value.string
+ elif fieldtype_proto.atomic_type == schema_pb2.BOOLEAN:
+ value = option_proto.value.atomic_value.boolean
+ elif fieldtype_proto.atomic_type == schema_pb2.BYTES:
+ value = option_proto.value.atomic_value.bytes
+ else:
+ raise ValueError(
+ "Unrecognized atomic_type ({fieldtype_proto.atomic_type}) "
Review Comment:
Thanks! done
##########
sdks/python/apache_beam/typehints/schemas.py:
##########
@@ -260,6 +270,86 @@ def typing_to_runner_api(self, type_: type) -> schema_pb2.FieldType:
representation=self.typing_to_runner_api(
logical_type.representation_type())))
+ def option_from_runner_api(
+ self, option_proto: schema_pb2.Option) -> Tuple[str, Any]:
+ if not option_proto.HasField('type'):
+ return option_proto.name, None
+
+ fieldtype_proto = option_proto.type
+ if not fieldtype_proto.WhichOneof("type_info") == "atomic_type":
Review Comment:
done
##########
sdks/python/apache_beam/typehints/schemas.py:
##########
@@ -260,6 +270,86 @@ def typing_to_runner_api(self, type_: type) -> schema_pb2.FieldType:
representation=self.typing_to_runner_api(
logical_type.representation_type())))
+ def option_from_runner_api(
+ self, option_proto: schema_pb2.Option) -> Tuple[str, Any]:
+ if not option_proto.HasField('type'):
+ return option_proto.name, None
+
+ fieldtype_proto = option_proto.type
+ if not fieldtype_proto.WhichOneof("type_info") == "atomic_type":
+ raise ValueError(
+ "Encounterd option with unsupported type. Only "
+ f"atomic_type options are supported: {option_proto}")
+
+ if fieldtype_proto.atomic_type == schema_pb2.BYTE:
+ value = np.int8(option_proto.value.atomic_value.byte)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT16:
+ value = np.int16(option_proto.value.atomic_value.int16)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT32:
+ value = np.int32(option_proto.value.atomic_value.int32)
+ elif fieldtype_proto.atomic_type == schema_pb2.INT64:
+ value = np.int64(option_proto.value.atomic_value.int64)
+ elif fieldtype_proto.atomic_type == schema_pb2.FLOAT:
+ value = np.float32(option_proto.value.atomic_value.float)
+ elif fieldtype_proto.atomic_type == schema_pb2.DOUBLE:
+ value = np.float64(option_proto.value.atomic_value.double)
+ elif fieldtype_proto.atomic_type == schema_pb2.STRING:
+ value = option_proto.value.atomic_value.string
+ elif fieldtype_proto.atomic_type == schema_pb2.BOOLEAN:
+ value = option_proto.value.atomic_value.boolean
+ elif fieldtype_proto.atomic_type == schema_pb2.BYTES:
+ value = option_proto.value.atomic_value.bytes
+ else:
+ raise ValueError(
+ "Unrecognized atomic_type ({fieldtype_proto.atomic_type}) "
+ "when decoding option {option_proto!r}")
+
+ return option_proto.name, value
+
+ def option_to_runner_api(self, option: Tuple[str, Any]) -> schema_pb2.Option:
+ name, value = option
+
+ if value is None:
+ # a value of None indicates the option is just a flag.
+ # Don't set type, value
+ return schema_pb2.Option(name=name)
+
+ fieldtype_proto = self.typing_to_runner_api(type(value))
+ if not fieldtype_proto.WhichOneof("type_info") == "atomic_type":
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org