From 4bbe0dfa39a89086189b600f2397ad0d1f7c3a0d Mon Sep 17 00:00:00 2001 From: Benjamin Pritchard Date: Wed, 8 Jan 2025 10:23:08 -0500 Subject: [PATCH] enable user-friendly strings --- qcfractalcompute/qcfractalcompute/config.py | 2 +- qcfractalcompute/qcfractalcompute/test_manager_config.py | 8 ++++++++ qcfractalcompute/qcfractalcompute/testing_helpers.py | 9 ++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/qcfractalcompute/qcfractalcompute/config.py b/qcfractalcompute/qcfractalcompute/config.py index 870d9b122..11b27633b 100644 --- a/qcfractalcompute/qcfractalcompute/config.py +++ b/qcfractalcompute/qcfractalcompute/config.py @@ -226,7 +226,7 @@ def _check_logfile(cls, v, values): def _check_run_dir(cls, v, values): return _make_abs_path(v, values["base_folder"], "parsl_run_dir") - @validator("update_frequency", pre=True) + @validator("update_frequency", "max_idle_time", pre=True) def _convert_durations(cls, v): return duration_to_seconds(v) diff --git a/qcfractalcompute/qcfractalcompute/test_manager_config.py b/qcfractalcompute/qcfractalcompute/test_manager_config.py index 8efba9838..79a0496a6 100644 --- a/qcfractalcompute/qcfractalcompute/test_manager_config.py +++ b/qcfractalcompute/qcfractalcompute/test_manager_config.py @@ -56,17 +56,25 @@ def test_manager_config_durations(tmp_path): base_config = copy.deepcopy(_base_config) base_config["update_frequency"] = "900" + base_config["max_idle_time"] = "3600" manager_config = FractalComputeConfig(base_folder=base_folder, **base_config) assert manager_config.update_frequency == 900 + assert manager_config.max_idle_time == 3600 base_config["update_frequency"] = 900 + base_config["max_idle_time"] = 3600 manager_config = FractalComputeConfig(base_folder=base_folder, **base_config) assert manager_config.update_frequency == 900 + assert manager_config.max_idle_time == 3600 base_config["update_frequency"] = "3d4h80m09s" + base_config["max_idle_time"] = "1d8h99m77s" manager_config = FractalComputeConfig(base_folder=base_folder, **base_config) assert manager_config.update_frequency == 278409 + assert manager_config.max_idle_time == 121217 base_config["update_frequency"] = "3:04:80:9" + base_config["max_idle_time"] = "1:8:99:77" manager_config = FractalComputeConfig(base_folder=base_folder, **base_config) assert manager_config.update_frequency == 278409 + assert manager_config.max_idle_time == 121217 diff --git a/qcfractalcompute/qcfractalcompute/testing_helpers.py b/qcfractalcompute/qcfractalcompute/testing_helpers.py index 5159a6e54..64ddf241d 100644 --- a/qcfractalcompute/qcfractalcompute/testing_helpers.py +++ b/qcfractalcompute/qcfractalcompute/testing_helpers.py @@ -23,10 +23,7 @@ failed_op = FailedOperation( input_data=None, - error={ - 'error_type': 'internal_error', - 'error_message': 'This is a test error message' - }, + error={"error_type": "internal_error", "error_message": "This is a test error message"}, ) @@ -108,7 +105,9 @@ def _mock_app(result: Optional[AllResultTypes]) -> AppTaskResult: if result is None: return AppTaskResult(success=False, walltime=2.0, result_compressed=compress_result(failed_op.dict())) else: - return AppTaskResult(success=result.success, walltime=2.0, result_compressed=compress_result(result.dict())) + return AppTaskResult( + success=result.success, walltime=2.0, result_compressed=compress_result(result.dict()) + ) for task in tasks: self._record_id_map[task.id] = task.record_id