You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by "aIbrahiim (via GitHub)" <gi...@apache.org> on 2026/02/03 14:10:50 UTC
[PR] Fix postcommit python validates container dataflow [beam]
aIbrahiim opened a new pull request, #37490:
URL: https://github.com/apache/beam/pull/37490
Fixes: #33064
Successful run: https://github.com/apache/beam/actions/runs/21631628144
------------------------
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Mention the appropriate issue in your description (for example: `addresses #123`), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment `fixes #<ISSUE NUMBER>` instead.
- [ ] Update `CHANGES.md` with noteworthy changes.
- [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://github.com/apache/beam/blob/master/CONTRIBUTING.md#make-the-reviewers-job-easier).
To check the build health, please visit [https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md](https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md)
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)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Go+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 or the [workflows README](https://github.com/apache/beam/blob/master/.github/workflows/README.md) to see a list of phrases to trigger workflows.
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "damccorm (via GitHub)" <gi...@apache.org>.
damccorm commented on code in PR #37490:
URL: https://github.com/apache/beam/pull/37490#discussion_r2759636681
##########
sdks/python/apache_beam/runners/portability/sdk_container_builder.py:
##########
@@ -262,10 +262,11 @@ def _invoke_docker_build_and_push(self, container_image_name):
build.steps.append(step)
source = cloud_build_types.Source()
- source.storageSource = cloud_build_types.StorageSource()
+ storage_source = cloud_build_types.StorageSource()
gcs_bucket, gcs_object = self._get_gcs_bucket_and_name(gcs_location)
- source.storageSource.bucket = os.path.join(gcs_bucket)
- source.storageSource.object = gcs_object
+ storage_source.bucket = os.path.join(gcs_bucket)
+ storage_source.object_ = gcs_object
+ source.storage_source = storage_source
Review Comment:
Do these changes have any impact? It seems like they're doing the same thing
##########
sdks/python/apache_beam/runners/portability/sdk_container_builder.py:
##########
@@ -325,16 +326,8 @@ def _upload_to_gcs(self, local_file_path, gcs_location):
_LOGGER.info('Completed GCS upload to %s.', gcs_location)
def _get_cloud_build_id_and_log_url(self, metadata):
- id = None
- log_url = None
- for item in metadata.additionalProperties:
- if item.key == 'build':
- for field in item.value.object_value.properties:
- if field.key == 'logUrl':
- log_url = field.value.string_value
- if field.key == 'id':
- id = field.value.string_value
- return id, log_url
+ build = metadata.build
+ return (build.id, build.log_url)
Review Comment:
@jrmccluskey could you please take a look? (unclear to me if this is related to the migration, so feel free to ignore if you don't have extra insight)
##########
sdks/python/apache_beam/runners/portability/sdk_container_builder.py:
##########
@@ -325,16 +326,8 @@ def _upload_to_gcs(self, local_file_path, gcs_location):
_LOGGER.info('Completed GCS upload to %s.', gcs_location)
def _get_cloud_build_id_and_log_url(self, metadata):
- id = None
- log_url = None
- for item in metadata.additionalProperties:
- if item.key == 'build':
- for field in item.value.object_value.properties:
- if field.key == 'logUrl':
- log_url = field.value.string_value
- if field.key == 'id':
- id = field.value.string_value
- return id, log_url
+ build = metadata.build
+ return (build.id, build.log_url)
Review Comment:
Is this always set? If not, we could check if this is set first, and then fall back to the previous logic if not.
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "damccorm (via GitHub)" <gi...@apache.org>.
damccorm commented on code in PR #37490:
URL: https://github.com/apache/beam/pull/37490#discussion_r2760534934
##########
sdks/python/apache_beam/runners/portability/sdk_container_builder.py:
##########
@@ -325,16 +326,8 @@ def _upload_to_gcs(self, local_file_path, gcs_location):
_LOGGER.info('Completed GCS upload to %s.', gcs_location)
def _get_cloud_build_id_and_log_url(self, metadata):
- id = None
- log_url = None
- for item in metadata.additionalProperties:
- if item.key == 'build':
- for field in item.value.object_value.properties:
- if field.key == 'logUrl':
- log_url = field.value.string_value
- if field.key == 'id':
- id = field.value.string_value
- return id, log_url
+ build = metadata.build
+ return (build.id, build.log_url)
Review Comment:
Yeah, I think that would help
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "gemini-code-assist[bot] (via GitHub)" <gi...@apache.org>.
gemini-code-assist[bot] commented on PR #37490:
URL: https://github.com/apache/beam/pull/37490#issuecomment-3841565754
## Summary of Changes
Hello @aIbrahiim, I'm Gemini Code Assist[^1]! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
This pull request addresses issues in the Python SDK's container dataflow validation during post-commit checks. It refines how Cloud Build requests are constructed by correcting attribute assignments for source storage and streamlines the process of extracting build-related information from Cloud Build metadata. These changes ensure more robust and accurate interaction with the Cloud Build API for container image management.
### Highlights
* **Cloud Build Source Object Correction**: Corrected the assignment of the `storageSource` attribute and its `object_` field within the `_invoke_docker_build_and_push` method to properly interact with the Cloud Build API types.
* **Simplified Build Metadata Extraction**: Refactored the `_get_cloud_build_id_and_log_url` method to directly access `build.id` and `build.log_url` from the metadata object, simplifying the code and improving readability.
🧠**New Feature in Public Preview:** You can now enable **Memory** to help **Gemini Code Assist** learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. **Click [here](https://codeassist.google/code-review/login) to enable Memory in your admin console.**
<details>
<summary><b>Changelog</b></summary>
* **sdks/python/apache_beam/runners/portability/sdk_container_builder.py**
* Updated the `_invoke_docker_build_and_push` method to correctly assign the `storage_source` object and its `object_` attribute, resolving a potential API incompatibility or naming conflict.
* Modified the `_get_cloud_build_id_and_log_url` method to directly retrieve `build.id` and `build.log_url` from the `metadata.build` object, removing the need for manual iteration through `additionalProperties`.
</details>
<details>
<summary><b>Activity</b></summary>
* The author, aIbrahiim, has provided a successful run link for the changes: https://github.com/apache/beam/actions/runs/21631628144, indicating that the changes have passed initial testing.
</details>
<details>
<summary><b>Using Gemini Code Assist</b></summary>
<br>
The full guide for Gemini Code Assist can be found on our [documentation page](https://developers.google.com/gemini-code-assist/docs/review-github-code), here are some quick tips.
<b>Invoking Gemini</b>
You can request assistance from Gemini at any point by creating a comment using either `/gemini <command>` or `@gemini-code-assist <command>`. Below is a summary of the supported commands on the current page.
Feature | Command | Description
--- | --- | ---
Code Review | `/gemini review` | Performs a code review for the current pull request in its current state.
Pull Request Summary | `/gemini summary` | Provides a summary of the current pull request in its current state.
Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help | `/gemini help` | Displays a list of available commands.
<b>Customization</b>
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a `.gemini/` folder in the base of the repository. Detailed instructions can be found [here](https://developers.google.com/gemini-code-assist/docs/customize-gemini-behavior-github).
<b>Limitations & Feedback</b>
Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with :thumbsup: and :thumbsdown: on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up [here](https://google.qualtrics.com/jfe/form/SV_2cyuGuTWsEw84yG).
<b>You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the [Gemini Code Assist IDE Extension](https://cloud.google.com/products/gemini/code-assist).</b>
</details>
[^1]: Review the [Privacy Notices](https://policies.google.com/privacy), [Generative AI Prohibited Use Policy](https://policies.google.com/terms/generative-ai/use-policy), [Terms of Service](https://policies.google.com/terms), and learn how to configure Gemini Code Assist in GitHub [here](https://developers.google.com/gemini-code-assist/docs/customize-gemini-behavior-github). Gemini can make mistakes, so double check it and [use code with caution](https://support.google.com/legal/answer/13505487).
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "damccorm (via GitHub)" <gi...@apache.org>.
damccorm commented on code in PR #37490:
URL: https://github.com/apache/beam/pull/37490#discussion_r2760536907
##########
sdks/python/apache_beam/runners/portability/sdk_container_builder.py:
##########
@@ -262,10 +262,11 @@ def _invoke_docker_build_and_push(self, container_image_name):
build.steps.append(step)
source = cloud_build_types.Source()
- source.storageSource = cloud_build_types.StorageSource()
+ storage_source = cloud_build_types.StorageSource()
gcs_bucket, gcs_object = self._get_gcs_bucket_and_name(gcs_location)
- source.storageSource.bucket = os.path.join(gcs_bucket)
- source.storageSource.object = gcs_object
+ storage_source.bucket = os.path.join(gcs_bucket)
+ storage_source.object_ = gcs_object
+ source.storage_source = storage_source
Review Comment:
Oh I see - I didn't notice the case shift. Got it, that works, thanks
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "aIbrahiim (via GitHub)" <gi...@apache.org>.
aIbrahiim commented on code in PR #37490:
URL: https://github.com/apache/beam/pull/37490#discussion_r2759693322
##########
sdks/python/apache_beam/runners/portability/sdk_container_builder.py:
##########
@@ -262,10 +262,11 @@ def _invoke_docker_build_and_push(self, container_image_name):
build.steps.append(step)
source = cloud_build_types.Source()
- source.storageSource = cloud_build_types.StorageSource()
+ storage_source = cloud_build_types.StorageSource()
gcs_bucket, gcs_object = self._get_gcs_bucket_and_name(gcs_location)
- source.storageSource.bucket = os.path.join(gcs_bucket)
- source.storageSource.object = gcs_object
+ storage_source.bucket = os.path.join(gcs_bucket)
+ storage_source.object_ = gcs_object
+ source.storage_source = storage_source
Review Comment:
I made this change after looking up the library as the library API changed in google cloud build 3.35+. and the library now uses snake_case (storage_source, object_) instead of camelCase (storageSource, object) while the old code raises AttributeError Unknown field for Source storageSource when running with 3.35+ so had to assign to source.storage_source and storage_source.object_; and the dependency is already google-cloud-build>=3.35.0, so i thought this aligns the code with the current api
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "damccorm (via GitHub)" <gi...@apache.org>.
damccorm commented on PR #37490:
URL: https://github.com/apache/beam/pull/37490#issuecomment-3843735004
Waiting on precommit checks to finish before merging
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #37490:
URL: https://github.com/apache/beam/pull/37490#issuecomment-3841972198
Assigning reviewers:
R: @damccorm for label python.
Note: If you would like to opt out of this review, comment `assign to next reviewer`.
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "aIbrahiim (via GitHub)" <gi...@apache.org>.
aIbrahiim commented on PR #37490:
URL: https://github.com/apache/beam/pull/37490#issuecomment-3844090895
> Waiting on precommit checks to finish before merging
I think precommit failed because of CI timing @damccorm
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "aIbrahiim (via GitHub)" <gi...@apache.org>.
aIbrahiim commented on code in PR #37490:
URL: https://github.com/apache/beam/pull/37490#discussion_r2759698993
##########
sdks/python/apache_beam/runners/portability/sdk_container_builder.py:
##########
@@ -325,16 +326,8 @@ def _upload_to_gcs(self, local_file_path, gcs_location):
_LOGGER.info('Completed GCS upload to %s.', gcs_location)
def _get_cloud_build_id_and_log_url(self, metadata):
- id = None
- log_url = None
- for item in metadata.additionalProperties:
- if item.key == 'build':
- for field in item.value.object_value.properties:
- if field.key == 'logUrl':
- log_url = field.value.string_value
- if field.key == 'id':
- id = field.value.string_value
- return id, log_url
+ build = metadata.build
+ return (build.id, build.log_url)
Review Comment:
would it make sense to check if metadata.build is set and fall back to the previous additionalProperties logic when it’s not so it works with both old and new library versions?
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "Amar3tto (via GitHub)" <gi...@apache.org>.
Amar3tto commented on PR #37490:
URL: https://github.com/apache/beam/pull/37490#issuecomment-3847400249
Checks passed
--
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
Re: [PR] Fix postcommit python validates container dataflow [beam]
Posted by "Amar3tto (via GitHub)" <gi...@apache.org>.
Amar3tto merged PR #37490:
URL: https://github.com/apache/beam/pull/37490
--
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