From 50b471475d46c5ef072f63a852b9e5b9844f2eca Mon Sep 17 00:00:00 2001 From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com> Date: Mon, 23 Sep 2024 19:09:36 -0400 Subject: [PATCH] Change raise_on_error to raise_on_failure --- src/controlflow/run.py | 16 ++++++++-------- src/controlflow/tasks/task.py | 10 ++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/controlflow/run.py b/src/controlflow/run.py index 1f01a35..0d38eb9 100644 --- a/src/controlflow/run.py +++ b/src/controlflow/run.py @@ -23,7 +23,7 @@ def run_tasks( flow: Flow = None, agent: Agent = None, turn_strategy: TurnStrategy = None, - raise_on_error: bool = True, + raise_on_failure: bool = True, max_llm_calls: int = None, max_agent_turns: int = None, handlers: list[Handler] = None, @@ -47,7 +47,7 @@ def run_tasks( max_agent_turns=max_agent_turns, ) - if raise_on_error and any(t.is_failed() for t in tasks): + if raise_on_failure and any(t.is_failed() for t in tasks): errors = [f"- {t.friendly_name()}: {t.result}" for t in tasks if t.is_failed()] if errors: raise ValueError( @@ -64,7 +64,7 @@ async def run_tasks_async( flow: Flow = None, agent: Agent = None, turn_strategy: TurnStrategy = None, - raise_on_error: bool = True, + raise_on_failure: bool = True, max_llm_calls: int = None, max_agent_turns: int = None, handlers: list[Handler] = None, @@ -85,7 +85,7 @@ async def run_tasks_async( max_agent_turns=max_agent_turns, ) - if raise_on_error and any(t.is_failed() for t in tasks): + if raise_on_failure and any(t.is_failed() for t in tasks): errors = [f"- {t.friendly_name()}: {t.result}" for t in tasks if t.is_failed()] if errors: raise ValueError( @@ -102,14 +102,14 @@ def run( turn_strategy: TurnStrategy = None, max_llm_calls: int = None, max_agent_turns: int = None, - raise_on_error: bool = True, + raise_on_failure: bool = True, handlers: list[Handler] = None, **task_kwargs, ) -> Any: task = Task(objective=objective, **task_kwargs) results = run_tasks( tasks=[task], - raise_on_error=raise_on_error, + raise_on_failure=raise_on_failure, turn_strategy=turn_strategy, max_llm_calls=max_llm_calls, max_agent_turns=max_agent_turns, @@ -126,7 +126,7 @@ async def run_async( turn_strategy: TurnStrategy = None, max_llm_calls: int = None, max_agent_turns: int = None, - raise_on_error: bool = True, + raise_on_failure: bool = True, handlers: list[Handler] = None, **task_kwargs, ) -> Any: @@ -138,7 +138,7 @@ async def run_async( turn_strategy=turn_strategy, max_llm_calls=max_llm_calls, max_agent_turns=max_agent_turns, - raise_on_error=raise_on_error, + raise_on_failure=raise_on_failure, handlers=handlers, ) return results[0] diff --git a/src/controlflow/tasks/task.py b/src/controlflow/tasks/task.py index 2c18902..34c1b7e 100644 --- a/src/controlflow/tasks/task.py +++ b/src/controlflow/tasks/task.py @@ -360,6 +360,7 @@ def run( max_llm_calls: int = None, max_agent_turns: int = None, handlers: list["Handler"] = None, + raise_on_failure: bool = True, ) -> T: """ Run the task @@ -372,13 +373,13 @@ def run( turn_strategy=turn_strategy, max_llm_calls=max_llm_calls, max_agent_turns=max_agent_turns, - raise_on_error=False, + raise_on_failure=False, handlers=handlers, ) if self.is_successful(): return self.result - elif self.is_failed(): + elif raise_on_failure and self.is_failed(): raise ValueError(f"{self.friendly_name()} failed: {self.result}") @prefect_task(task_run_name=get_task_run_name) @@ -390,6 +391,7 @@ async def run_async( max_llm_calls: int = None, max_agent_turns: int = None, handlers: list["Handler"] = None, + raise_on_failure: bool = True, ) -> T: """ Run the task @@ -402,13 +404,13 @@ async def run_async( turn_strategy=turn_strategy, max_llm_calls=max_llm_calls, max_agent_turns=max_agent_turns, - raise_on_error=False, + raise_on_failure=False, handlers=handlers, ) if self.is_successful(): return self.result - elif self.is_failed(): + elif raise_on_failure and self.is_failed(): raise ValueError(f"{self.friendly_name()} failed: {self.result}") @contextmanager