Add cwd option to add_process #469
Merged
Conversation
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
kzscisoft
reviewed
Jul 31, 2024
simvue/executor.py
Outdated
| @@ -203,10 +208,20 @@ def callback_function(status_code: int, std_out: str, std_err: str) -> None: | |||
| ) | |||
|
|
|||
| if script: | |||
| self._runner.save_file(file_path=script, category="code") | |||
| if cwd: | |||
There was a problem hiding this comment.
Can simplify this to:
self._runner.save_file(
file_path=os.path.join(cwd or os.getcwd(), script), category="code"
)There was a problem hiding this comment.
My issue with this would be what if they've provided the absolute path to the script? Will it not then duplicate the start of the path and fail to find the file?
There was a problem hiding this comment.
Well the issue then is that someone could provide both cwd and the path to their script as an absolute path.
I don't really agree with script being a string this creates ambiguity:
cwdshould be directory to run process in.scriptshould be a path to the script to execute.
The two are not related as you might want to run a script from another directory in the current directory. I think the solution here is unstable
kzscisoft
approved these changes
Aug 2, 2024
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.
For the FDS connector to be able to support executing a simulation in a different working directory to the place where the connector is called, need to be able to specify a working directory for the process to use (since FDS always puts results into the working directory). Added this as an option to the
add_processmethod, which then just passes thecwdparameter through to the subprocess.This now assumes that the path to the
scriptorinput_fileare relative to thecwdparameter, so have updated the file upload inadd_processto join together these paths before trying to find the file ifcwdis specified. Also had to loosen the typing forscriptandinput_fileto accept a string or Path, since the path provided for either of these may not exist ifcwdis specified.Added a test which checks this functionality