@@ -34,8 +34,8 @@ def sanitise_name(name: str) -> str:
3434 return ''.join(l for l in lower_spaceless_name if l in allowed_chars)
3535
3636
37- def retrieve_sanitised_input_file_name (input_file: str) -> Optional[List[str]]:
38- """Retrieves a sanitised version of the input file name ."""
37+ def retrieve_sanitised_sequence_name (input_file: str) -> Optional[List[str]]:
38+ """Retrieves a list of sanitised sequence name from given input file."""
3939 if not os.path.exists(input_file):
4040 raise FileNotFoundError(f"Input file '{input_file}' does not exist.")
4141 try:
@@ -258,31 +258,32 @@ class AF3SlurmClient:
258258 response = self.submit_base_job(
259259 job_config, job_type, script_options, input_file, output_dir)
260260
261- sanitised_input_name_list : Optional[List[str]] = retrieve_sanitised_input_file_name (
261+ sanitised_sequence_name_list : Optional[List[str]] = retrieve_sanitised_sequence_name (
262262 input_file=input_file
263263 )
264264 output_path_list: List[Dict] = []
265265
266- print(
267- f"[INFO] Inference output path for input file: {input_file}")
268- for index, sanitised_input_name in enumerate(sanitised_input_name_list):
266+ for sanitised_sequence_name in sanitised_sequence_name_list:
267+
268+ print(
269+ f"[INFO] Inference output path for sequence: {input_file}")
269270 inference_model_cif_output_path = os.path.join(
270- output_dir, f"{sanitised_input_name }", f"{sanitised_input_name }_model.cif")
271+ output_dir, f"{sanitised_sequence_name }", f"{sanitised_sequence_name }_model.cif")
271272 inference_summary_confidences_output_path = os.path.join(
272- output_dir, f"{sanitised_input_name }", f"{sanitised_input_name }_summary_confidences.json")
273+ output_dir, f"{sanitised_sequence_name }", f"{sanitised_sequence_name }_summary_confidences.json")
273274 inference_confidences_output_path = os.path.join(
274- output_dir, f"{sanitised_input_name }", f"{sanitised_input_name }_confidences.json")
275+ output_dir, f"{sanitised_sequence_name }", f"{sanitised_sequence_name }_confidences.json")
275276 output_path_list.append({
276277 "model_cif": inference_model_cif_output_path,
277278 "summary_confidences": inference_summary_confidences_output_path,
278279 "confidences": inference_confidences_output_path
279280 })
280281 print(
281- f" ├── Model CIF output path {index+1} : {inference_model_cif_output_path}")
282+ f" ├── Model CIF output path : {inference_model_cif_output_path}")
282283 print(
283- f" ├── Confidences output path {index+1} : {inference_confidences_output_path}")
284+ f" ├── Confidences output path : {inference_confidences_output_path}")
284285 print(
285- f" └── Summary confidences output path {index+1} : {inference_summary_confidences_output_path}")
286+ f" └── Summary confidences output path : {inference_summary_confidences_output_path}")
286287 response["output_path_list"] = output_path_list
287288 return response
288289
@@ -326,20 +327,20 @@ class AF3SlurmClient:
326327 response = self.submit_base_job(
327328 job_config, job_type, script_options, input_file, output_dir
328329 )
329- sanitised_input_name_list = retrieve_sanitised_input_file_name (
330+ sanitised_sequence_name_list = retrieve_sanitised_sequence_name (
330331 input_file)
331332 output_path_list: List[Dict] = []
332333
333- print(
334- f"[INFO] Datapipeline output path for input file: {input_file}")
335- for index, sanitised_input_name in enumerate(sanitised_input_name_list):
334+ for sanitised_sequence_name in sanitised_sequence_name_list:
335+ print(
336+ f"[INFO] Datapipeline output path for sequence: {sanitised_sequence_name}")
336337 datapipeline_output_file_path = os.path.join(
337- output_dir, f"{sanitised_input_name }", f"{sanitised_input_name }_data.json")
338+ output_dir, f"{sanitised_sequence_name }", f"{sanitised_sequence_name }_data.json")
338339 output_path_list.append({
339340 "output_path": datapipeline_output_file_path
340341 })
341342 print(
342- f" └── Path {index+1} : {datapipeline_output_file_path}")
343+ f" └── Path: {datapipeline_output_file_path}")
343344
344345 response["output_path_list"] = output_path_list
345346 return response
0 commit comments