Skip to content

Commit 3cd3344

Browse files
committed
Ensured file paths in recipes are represented canonically
1 parent 09e85cc commit 3cd3344

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/murfey/workflows/clem/lif_to_stack.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ def zocalo_cluster_request(
5555
"recipes": ["clem-lif-to-stack"],
5656
"parameters": {
5757
# Job parameters
58-
"lif_file": str(file),
58+
"lif_file": f"{str(file)!r}",
5959
"root_folder": root_folder,
6060
# Other recipe parameters
61-
"session_dir": str(session_dir),
61+
"session_dir": f"{str(session_dir)!r}",
6262
"session_id": session_id,
6363
"job_name": job_name,
6464
"feedback_queue": feedback_queue,

src/murfey/workflows/clem/tiff_to_stack.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ def zocalo_cluster_request(
3636
)
3737
# Construct the session and job name
3838
session_dir = "/".join(path_parts[:root_index])
39+
job_name = "--".join(
40+
[p.replace(" ", "_") if " " in p else p for p in path_parts][
41+
root_index + 1 :
42+
]
43+
)
3944

4045
# If no metadata file provided, generate path to one
4146
if metadata is None:
@@ -52,14 +57,14 @@ def zocalo_cluster_request(
5257
"recipes": ["clem-tiff-to-stack"],
5358
"parameters": {
5459
# Job parameters
55-
"tiff_list": str([str(file) for file in tiff_list]),
60+
"tiff_list": "null",
5661
"root_folder": root_folder,
57-
"metadata": str(metadata),
58-
"tiff_file": "null",
62+
"metadata": f"{str(metadata)!r}",
63+
"tiff_file": f"{str(tiff_list[0])!r}",
5964
# Other recipe parameters
60-
"session_dir": str(session_dir),
65+
"session_dir": f"{str(session_dir)!r}",
6166
"session_id": session_id,
62-
"job_name": series_name,
67+
"job_name": job_name,
6368
"feedback_queue": feedback_queue,
6469
},
6570
},

0 commit comments

Comments
 (0)