add dest_dir into pythonpath before loading modules #2692
Merged
Conversation
This file contains 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
Signed-off-by: Nelson Chen <[email protected]>
arbaobao
requested review from
wild-endeavor,
kumare3,
eapolinario,
pingsutw,
cosmicBboy,
samhita-alla,
thomasjpfan and
Future-Outlier
as code owners
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2692 +/- ##
============================================
- Coverage 100.00% 74.40% -25.60%
============================================
Files 5 194 +189
Lines 122 19726 +19604
Branches 0 2865 +2865
============================================
+ Hits 122 14677 +14555
- Misses 0 4312 +4312
- Partials 0 737 +737 ☔ View full report in Codecov by Sentry. |
pingsutw
reviewed
Aug 19, 2024
flytekit/bin/entrypoint.py
Outdated
| @@ -376,6 +377,8 @@ def _execute_task( | |||
| dynamic_addl_distro, | |||
| dynamic_dest_dir, | |||
| ) as ctx: | |||
| if all(os.path.realpath(path) != dynamic_dest_dir for path in sys.path): | |||
| sys.path.append(dynamic_dest_dir) | |||
There was a problem hiding this comment.
I think we should add dest_dir to PYTHONPATH instead of dynamic_dest_dir
Signed-off-by: Nelson Chen <[email protected]>
Signed-off-by: Nelson Chen <[email protected]>
|
I think it's better to add |
thomasjpfan
reviewed
Aug 23, 2024
flytekit/bin/entrypoint.py
Outdated
| @@ -549,7 +549,13 @@ def fast_execute_task_cmd(additional_distribution: str, dest_dir: str, task_exec | |||
|
|
|||
| # Use the commandline to run the task execute command rather than calling it directly in python code | |||
| # since the current runtime bytecode references the older user code, rather than the downloaded distribution. | |||
| p = subprocess.Popen(cmd) | |||
| env = os.environ.copy() | |||
| if all(os.path.realpath(path) != dest_dir for path in sys.path) and dest_dir is not None: | |||
There was a problem hiding this comment.
The new process may have a different sys.path that is not connected to the current process.
I think it's okay to just check for dest_dir is not None.
Signed-off-by: Nelson Chen <[email protected]>
pingsutw
previously approved these changes
Aug 25, 2024
Signed-off-by: Nelson Chen <[email protected]>
Closed
2 tasks
thomasjpfan
reviewed
Sep 14, 2024
There was a problem hiding this comment.
@arbaobao Can you sync up your PR with master? I think this is good to go!
|
@thomasjpfan I have synced this PR. |
thomasjpfan
reviewed
Sep 15, 2024
Signed-off-by: Nelson Chen <[email protected]>
Signed-off-by: Nelson Chen <[email protected]>
Signed-off-by: Nelson Chen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Tracking issue
Why are the changes needed?
According to issue#2673, it seems better to add
dest_dirbefore loading the modules.What changes were proposed in this pull request?
This change will add
dest_dirbefore loading the modules.How was this patch tested?
Run workflow with
--destination-dir=/xxx.For example,
pyflyte run --remote --destination-dir=/tmp flytekit-example/hello_world.py hello_world_wfSetup process
Screenshots
Check all the applicable boxes
Related PRs
issue#2673
Docs link