[Python] Log dependencies installed in submission environment #28564

riteshghorse · 2023-09-20T17:50:44Z

Saves the submission environment dependencies and stage it. Logs it along with the runtime dependencies.

Fixes #28563

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.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

codecov · 2023-09-20T18:08:09Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 38.47%. Comparing base (0bbf2c3) to head (80d6d18).
Report is 487 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #28564      +/-   ##
==========================================
+ Coverage   38.23%   38.47%   +0.24%     
==========================================
  Files         696      698       +2     
  Lines      101878   102520     +642     
==========================================
+ Hits        38952    39449     +497     
- Misses      61309    61439     +130     
- Partials     1617     1632      +15

Flag	Coverage Δ
go	`54.33% <ø> (+0.39%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

github-actions · 2023-09-20T19:05:43Z

Checks are failing. Will not request review until checks are succeeding. If you'd like to override that behavior, comment assign set of reviewers

riteshghorse · 2023-09-20T20:07:45Z

Run Python_Integration PreCommit

riteshghorse · 2023-09-21T14:56:07Z

Some unit tests are failing because there is additional staging file now which will always be present. Got the solution. I'll update the PR. Defer review until then.

sdks/python/apache_beam/runners/portability/stager.py

github-actions · 2023-09-22T15:34:59Z

Assigning reviewers. If you would like to opt out of this review, comment assign to next reviewer:

R: @jrmccluskey 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).

sdks/python/container/boot.go

jrmccluskey

LGTM mod a logging nit

riteshghorse · 2023-09-27T17:20:41Z

R: @chamikaramj could you comment on the external transform environment. The external_transform environment tests would fail if there is an additional staging file by default.

It complains about no artifact service when it tries to resolve that artifact.

github-actions · 2023-09-27T17:22:33Z

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

sdks/python/apache_beam/runners/portability/stager.py

sdks/python/apache_beam/transforms/environments.py

tvalentyn · 2023-09-27T18:46:01Z

t. The external_transform environment tests would fail if there is an additional staging file by default.

Can we stage job submission dependencies without including them in the runtime environment defintion?

sdks/python/apache_beam/runners/portability/stager.py

riteshghorse · 2023-12-20T18:49:12Z

R: @tvalentyn this is ready for review

Changes to note:

Changed the artifact comparison logic to ignore the type payload field since that has unique hashes
The external transform test failure was because of the ExpansionServiceServicer not having artifact service method. So added that. Confirmed this by running a multi-language pipeline successfully - Job Link
The staging logic stays in stager.py since we ulitmately call create_job_resources from python_sdk_dependencies() which is invoked during environment creation.

sdks/python/apache_beam/runners/dataflow/dataflow_runner_test.py

sdks/python/apache_beam/runners/portability/expansion_service.py

sdks/python/apache_beam/runners/portability/stager.py

sdks/python/apache_beam/transforms/environments.py

riteshghorse · 2024-02-05T18:22:08Z

R: @tvalentyn

Barring the lint failure, all tests pass.

sdks/python/apache_beam/runners/dataflow/dataflow_runner_test.py

sdks/python/apache_beam/transforms/environments_test.py

sdks/python/apache_beam/runners/dataflow/dataflow_runner_test.py

sdks/python/apache_beam/runners/portability/stager.py

tvalentyn

Thank you!

kennknowles · 2024-03-04T16:04:20Z

Is this ready to merge?

tvalentyn · 2024-03-04T16:12:15Z

i left one comment, after that it should be ready to merge.

riteshghorse · 2024-03-07T18:22:03Z

Done, I'll merge once the check passes

…#28564) * log runtime dependencies * log submission env dependencies * rm spare line * update tests for staged files * update equals test to ignore artifacts * handle unit tests, refactor * unit test sub env staging, convert to string * change Log to Printf * change log level to warning * try env * add artifact_service method * correct urn * fix artifact comparison, file reader * add mock for python sdk dependencies and update artifact service method * fix lint * use magic mock instead of mocking entire function * update dataflow runner test * Update sdks/python/apache_beam/runners/dataflow/dataflow_runner_test.py * use debug option to disable * remove tmp directory mock

riteshghorse added 2 commits September 19, 2023 16:30

log runtime dependencies

e441b52

log submission env dependencies

1497427

github-actions bot added python docker labels Sep 20, 2023

rm spare line

b696f6f

update tests for staged files

8cbeb61

Merge branch 'master' of https://github.com/apache/beam into sdeps

a2761c9

update equals test to ignore artifacts

1e68428

tvalentyn marked this pull request as draft September 21, 2023 16:18

tvalentyn reviewed Sep 21, 2023

View reviewed changes

sdks/python/apache_beam/runners/portability/stager.py Outdated Show resolved Hide resolved

sdks/python/apache_beam/runners/portability/stager.py Outdated Show resolved Hide resolved

sdks/python/apache_beam/runners/portability/stager.py Outdated Show resolved Hide resolved

riteshghorse added 2 commits September 22, 2023 00:55

handle unit tests, refactor

284f772

unit test sub env staging, convert to string

8f03251

riteshghorse marked this pull request as ready for review September 22, 2023 14:49

riteshghorse requested a review from tvalentyn September 22, 2023 14:49

github-actions bot added the Next Action: Reviewers label Sep 22, 2023

jrmccluskey reviewed Sep 26, 2023

View reviewed changes

sdks/python/container/boot.go Outdated Show resolved Hide resolved

jrmccluskey approved these changes Sep 26, 2023

View reviewed changes

change Log to Printf

7e6e62a

tvalentyn reviewed Sep 27, 2023

View reviewed changes

sdks/python/apache_beam/runners/portability/stager.py Outdated Show resolved Hide resolved

sdks/python/apache_beam/runners/portability/stager.py Show resolved Hide resolved

sdks/python/apache_beam/transforms/environments.py Outdated Show resolved Hide resolved

Merge branch 'master' of https://github.com/apache/beam into sdeps

c03378f

chamikaramj reviewed Sep 28, 2023

View reviewed changes

sdks/python/apache_beam/runners/portability/stager.py Show resolved Hide resolved

change log level to warning

cc24a1d

fix artifact comparison, file reader

df68c1d

riteshghorse changed the title ~~[Python] Log dependencies at runtime and at submission environment~~ [Python] Log dependencies installed in submission environment Dec 20, 2023

tvalentyn reviewed Dec 21, 2023

View reviewed changes

riteshghorse added 2 commits February 5, 2024 12:06

add mock for python sdk dependencies and update artifact service method

4dfe7e0

fix lint

b7d62bc

tvalentyn reviewed Feb 9, 2024

View reviewed changes

sdks/python/apache_beam/runners/dataflow/dataflow_runner_test.py Outdated Show resolved Hide resolved

sdks/python/apache_beam/transforms/environments_test.py Outdated Show resolved Hide resolved

sdks/python/apache_beam/transforms/environments_test.py Outdated Show resolved Hide resolved

riteshghorse force-pushed the sdeps branch from 4c816b2 to 53ff953 Compare February 9, 2024 15:30

use magic mock instead of mocking entire function

404286b

riteshghorse force-pushed the sdeps branch from 53ff953 to 404286b Compare February 9, 2024 15:52

update dataflow runner test

da2b954

riteshghorse commented Feb 15, 2024

View reviewed changes

sdks/python/apache_beam/runners/dataflow/dataflow_runner_test.py Outdated Show resolved Hide resolved

Update sdks/python/apache_beam/runners/dataflow/dataflow_runner_test.py

eeedc44

riteshghorse requested a review from tvalentyn February 29, 2024 16:23

tvalentyn reviewed Feb 29, 2024

View reviewed changes

sdks/python/apache_beam/runners/portability/stager.py Show resolved Hide resolved

tvalentyn approved these changes Feb 29, 2024

View reviewed changes

This comment was marked as duplicate.

Sign in to view

riteshghorse added 3 commits March 7, 2024 13:16

use debug option to disable

c527114

pull upstream

279e01d

remove tmp directory mock

80d6d18

riteshghorse merged commit 7497495 into apache:master Mar 7, 2024
76 checks passed

riteshghorse deleted the sdeps branch March 7, 2024 21:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Python] Log dependencies installed in submission environment #28564

[Python] Log dependencies installed in submission environment #28564

riteshghorse commented Sep 20, 2023 •

edited

Loading

codecov bot commented Sep 20, 2023 •

edited

Loading

github-actions bot commented Sep 20, 2023

riteshghorse commented Sep 20, 2023

riteshghorse commented Sep 21, 2023

github-actions bot commented Sep 22, 2023

jrmccluskey left a comment

riteshghorse commented Sep 27, 2023 •

edited

Loading

github-actions bot commented Sep 27, 2023

tvalentyn commented Sep 27, 2023

riteshghorse commented Dec 20, 2023 •

edited

Loading

riteshghorse commented Feb 5, 2024

tvalentyn left a comment

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

kennknowles commented Mar 4, 2024

tvalentyn commented Mar 4, 2024

riteshghorse commented Mar 7, 2024

[Python] Log dependencies installed in submission environment #28564

[Python] Log dependencies installed in submission environment #28564

Conversation

riteshghorse commented Sep 20, 2023 • edited Loading

GitHub Actions Tests Status (on master branch)

codecov bot commented Sep 20, 2023 • edited Loading

Codecov Report

github-actions bot commented Sep 20, 2023

riteshghorse commented Sep 20, 2023

riteshghorse commented Sep 21, 2023

github-actions bot commented Sep 22, 2023

jrmccluskey left a comment

Choose a reason for hiding this comment

riteshghorse commented Sep 27, 2023 • edited Loading

github-actions bot commented Sep 27, 2023

tvalentyn commented Sep 27, 2023

riteshghorse commented Dec 20, 2023 • edited Loading

riteshghorse commented Feb 5, 2024

tvalentyn left a comment

Choose a reason for hiding this comment

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

kennknowles commented Mar 4, 2024

tvalentyn commented Mar 4, 2024

riteshghorse commented Mar 7, 2024

riteshghorse commented Sep 20, 2023 •

edited

Loading

codecov bot commented Sep 20, 2023 •

edited

Loading

riteshghorse commented Sep 27, 2023 •

edited

Loading

riteshghorse commented Dec 20, 2023 •

edited

Loading