Skip to content

Resolve generated kick_off.py paths relative to script directory #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RogerJanusiak merged 1 commit into from
May 14, 2026
+21 −8
Merged

Resolve generated kick_off.py paths relative to script directory #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions servicex_local/science_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,16 @@ def write_kickoff_script(generated_files_dir: Path) -> None:
if os.path.exists(x509up_path):
os.chmod(x509up_path, 0o600)

with open("/generated/transformer_capabilities.json") as f:
script_dir = os.path.dirname(os.path.abspath(__file__))
with open(os.path.join(script_dir, "transformer_capabilities.json")) as f:
info = json.load(f)

file_to_run = info["command"]
if file_to_run.startswith("/generated/"):
file_to_run = os.path.join(script_dir, file_to_run.removeprefix("/generated/"))
elif not os.path.isabs(file_to_run):
file_to_run = os.path.join(script_dir, file_to_run)

arg1 = sys.argv[1]
arg2 = sys.argv[2]
arg3 = sys.argv[3]
Expand Down Expand Up @@ -231,7 +238,6 @@ def transform(
assert (
generated_files_dir.exists()
), f"Missing generate files directory: {generated_files_dir}!"
wsl_generated_files_dir = self._convert_to_wsl_path(generated_files_dir)

for input_file in input_files:
# Check if input_file is a root:// or http:// path
Expand Down Expand Up @@ -260,16 +266,21 @@ def transform(
os.chmod(x509up_path, 0o600)
os.system("ls -l " + x509up_path)

with open("{wsl_generated_files_dir}/transformer_capabilities.json") as f:
script_dir = os.path.dirname(os.path.abspath(__file__))
with open(os.path.join(script_dir, "transformer_capabilities.json")) as f:
info = json.load(f)

file_to_run = info["command"]
# Strip off the default /generated from the file name.
file_to_run = file_to_run.replace("/generated", "")
if file_to_run.startswith("/generated/"):
file_to_run = os.path.join(script_dir, file_to_run.removeprefix("/generated/"))
elif not os.path.isabs(file_to_run):
file_to_run = os.path.join(script_dir, file_to_run)

if info["language"] == "python":
ret_code = os.system("python3 {wsl_generated_files_dir}/" + file_to_run + " {wsl_input_file} "
ret_code = os.system("python3 " + file_to_run + " {wsl_input_file} "
+ "{wsl_output_directory}/{input_path_name} {output_format}")
elif info["language"] == "bash":
ret_code = os.system("bash {wsl_generated_files_dir}/" + file_to_run
ret_code = os.system("bash " + file_to_run
+ " {wsl_input_file} {wsl_output_directory}/{input_path_name} {output_format}")
else:
raise ValueError("Unsupported language: " + info["language"])
Expand All @@ -286,10 +297,12 @@ def transform(
cd $tmp_dir
pwd

script_dir="$(cd "$(dirname "${{BASH_SOURCE[0]}}")" && pwd)"

# source /etc/profile.d/startup-atlas.sh
setupATLAS
asetup AnalysisBase,{self._release},here
python {wsl_generated_files_dir}/kick_off.py
python "$script_dir/kick_off.py"
r=$?
exit $r
"""
Expand Down
Loading