From 7370c23d5528d062868b2e3dd8ff941c639ca1e4 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Tue, 4 Aug 2026 21:59:24 -0700 Subject: [PATCH 1/2] conductor workspace baseline [conductor-workspace:e801d1f5-ed57-3ed6-acb2-673eb0aca4df:baseline] Conductor-Original-Branch: main Conductor-Original-Head: 5323c3deed01d0ad1e8012002f639906d90ad63b From f6a095fb05b1a7a18b195864f5e4063b81f0cf89 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Tue, 4 Aug 2026 22:00:58 -0700 Subject: [PATCH 2/2] code_subtask fix-wait-task-until-key --- .../client/workflow/task/wait_task.py | 2 +- tests/unit/workflow/test_wait_task.py | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 tests/unit/workflow/test_wait_task.py diff --git a/src/conductor/client/workflow/task/wait_task.py b/src/conductor/client/workflow/task/wait_task.py index d32f9fa7d..a6664d547 100644 --- a/src/conductor/client/workflow/task/wait_task.py +++ b/src/conductor/client/workflow/task/wait_task.py @@ -22,7 +22,7 @@ def __init__(self, task_ref_name: str, wait_until: Optional[str] = None, wait_fo raise Exception("both wait_until and wait_for_seconds are provided. ONLY one is allowed") if wait_until: self.input_parameters = { - "wait_until": wait_until + "until": wait_until } if wait_for_seconds: self.input_parameters = { diff --git a/tests/unit/workflow/test_wait_task.py b/tests/unit/workflow/test_wait_task.py new file mode 100644 index 000000000..64de8dc7c --- /dev/null +++ b/tests/unit/workflow/test_wait_task.py @@ -0,0 +1,34 @@ +import unittest + +from conductor.client.workflow.task.wait_task import ( + WaitForDurationTask, + WaitTask, + WaitUntilTask, +) + + +class TestWaitTask(unittest.TestCase): + def test_wait_until_uses_server_recognized_until_key(self): + task = WaitTask("wait_until", wait_until="2026-08-05 12:00 UTC") + + self.assertEqual(task.input_parameters, {"until": "2026-08-05 12:00 UTC"}) + self.assertNotIn("wait_until", task.input_parameters) + + def test_wait_for_seconds_uses_duration_key(self): + task = WaitTask("wait_for_seconds", wait_for_seconds=60) + + self.assertEqual(task.input_parameters, {"duration": "60s"}) + + def test_wait_for_duration_task_uses_duration_key(self): + task = WaitForDurationTask("wait_for_duration", duration_time_seconds=30) + + self.assertEqual(task.input_parameters, {"duration": "30s"}) + + def test_wait_until_task_uses_until_key(self): + task = WaitUntilTask("wait_until_task", date_time="2026-08-05 12:00 UTC") + + self.assertEqual(task.input_parameters, {"until": "2026-08-05 12:00 UTC"}) + + +if __name__ == "__main__": + unittest.main()