fmt: formatting changes

This commit is contained in:
Deepak Mallubhotla 2024-05-21 15:54:55 -05:00
parent c881da2837
commit e76c619c8b
Signed by: deepak
GPG Key ID: BEBAEBF28083E022
5 changed files with 28 additions and 17 deletions

View File

@ -42,11 +42,11 @@ def parse_args() -> argparse.Namespace:
confirm_outfile_overwrite_group.add_argument(
"--never-overwrite-outfile",
action="store_true",
help="If a duplicate outfile is detected, skip confirmation and automatically exit early"
help="If a duplicate outfile is detected, skip confirmation and automatically exit early",
)
confirm_outfile_overwrite_group.add_argument(
"--force-overwrite-outfile",
action="store_true",
help="Skips checking for duplicate outfiles and overwrites"
help="Skips checking for duplicate outfiles and overwrites",
)
return parser.parse_args()

View File

@ -34,9 +34,13 @@ def build_model_dict(
calculation_dict[calculation_key] = {
"_model_key_dict": model_result.parsed_model_keys,
"_calculation_key_dict": out.data,
"num_finished_runs": int(model_result.result_dict["num_finished_runs"]),
"num_finished_runs": int(
model_result.result_dict["num_finished_runs"]
),
"num_runs": int(model_result.result_dict["num_runs"]),
"estimated_likelihood": float(model_result.result_dict["estimated_likelihood"]),
"estimated_likelihood": float(
model_result.result_dict["estimated_likelihood"]
),
}
else:
raise ValueError(
@ -46,7 +50,6 @@ def build_model_dict(
return model_dict
def coalesced_dict(
uncoalesced_model_dict: typing.Dict[
typing.Tuple, typing.Dict[typing.Tuple, typing.Dict["str", typing.Any]]
@ -77,7 +80,6 @@ def coalesced_dict(
_logger.error(f"We shouldn't be here! Double key for {model_key=}")
raise ValueError()
# second pass do probability calculation
prior = 1 / num_keys
@ -114,7 +116,9 @@ def write_coalesced_dict(
_logger.info(f"Detected model field names {model_field_names}")
collected_fieldnames = list(model_field_names)
collected_fieldnames.extend(["calculations_coalesced", "num_finished_runs", "num_runs", "prob"])
collected_fieldnames.extend(
["calculations_coalesced", "num_finished_runs", "num_runs", "prob"]
)
with open(coalesced_output_filename, "w", newline="") as coalesced_output_file:
writer = csv.DictWriter(coalesced_output_file, fieldnames=collected_fieldnames)
writer.writeheader()

View File

@ -45,20 +45,25 @@ def main(args: argparse.Namespace):
if "outfile" in args and args.outfile:
if os.path.exists(args.outfile):
if args.never_overwrite_outfile:
_logger.warning(f"Filename {args.outfile} already exists, and never want overwrite, so aborting.")
_logger.warning(
f"Filename {args.outfile} already exists, and never want overwrite, so aborting."
)
return
elif args.force_overwrite_outfile:
_logger.warning(f"Forcing overwrite of {args.outfile}")
else:
# need to confirm
confirm_overwrite = deepdog.cli.util.confirm_prompt(f"Filename {args.outfile} exists, overwrite?")
confirm_overwrite = deepdog.cli.util.confirm_prompt(
f"Filename {args.outfile} exists, overwrite?"
)
if not confirm_overwrite:
_logger.warning(f"Filename {args.outfile} already exists and do not want overwrite, aborting.")
_logger.warning(
f"Filename {args.outfile} already exists and do not want overwrite, aborting."
)
return
else:
_logger.warning(f"Overwriting file {args.outfile}")
indexifier = None
if args.indexify_json:
with open(args.indexify_json, "r") as indexify_json_file:
@ -73,7 +78,9 @@ def main(args: argparse.Namespace):
indexifier = deepdog.indexify.Indexifier(indexify_data)
results_dir = pathlib.Path(args.results_directory)
out_files = [f for f in results_dir.iterdir() if f.name.endswith("subsetsim.csv")]
out_files = [
f for f in results_dir.iterdir() if f.name.endswith("subsetsim.csv")
]
_logger.info(
f"Reading {len(out_files)} subsetsim.csv files in directory {args.results_directory}"
)

View File

@ -1,3 +1,3 @@
from deepdog.cli.util.confirm import confirm_prompt
__all__ = ["confirm_prompt"]
__all__ = ["confirm_prompt"]

View File

@ -8,12 +8,12 @@ _RESPONSE_MAP = {
"n": False,
"nope": False,
"true": True,
"false": False
"false": False,
}
def confirm_prompt(question: str) -> bool:
""" Prompt with the question and returns yes or no based on response.
"""
"""Prompt with the question and returns yes or no based on response."""
prompt = question + " [y/n]: "
while True:
@ -22,4 +22,4 @@ def confirm_prompt(question: str) -> bool:
if choice in _RESPONSE_MAP:
return _RESPONSE_MAP[choice]
else:
print(f"Respond with \"yes\" or \"no\"")
print(f'Respond with "yes" or "no"')