Skip to content

EPD-2096: add retry to run_test_suite #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josorio-autoblocks merged 1 commit into from
Jul 15, 2025
Merged

EPD-2096: add retry to run_test_suite #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 53 additions & 2 deletions autoblocks/_impl/testing/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
from typing import Union
from typing import overload

import httpx
from tenacity import retry
from tenacity import retry_if_exception_type
from tenacity import stop_after_attempt
from tenacity import wait_random_exponential

from autoblocks._impl import global_state
from autoblocks._impl.context_vars import EvaluatorRunContext
from autoblocks._impl.context_vars import TestCaseRunContext
Expand Down Expand Up @@ -52,6 +58,32 @@
DEFAULT_MAX_TEST_CASE_CONCURRENCY = 10


def create_retry_decorator(retry_count: int) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
"""Create retry decorator following existing tenacity pattern."""
if retry_count <= 0:
# No retry - return identity decorator
def no_retry_decorator(func: Callable[..., Any]) -> Callable[..., Any]:
return func

return no_retry_decorator

# Use same pattern as existing code in api.py
return retry(
stop=stop_after_attempt(retry_count + 1), # +1 because first attempt isn't a retry
wait=wait_random_exponential(multiplier=1, max=30),
retry=retry_if_exception_type(
(
httpx.TimeoutException,
httpx.ConnectError,
httpx.ReadTimeout,
httpx.WriteTimeout,
httpx.PoolTimeout,
)
),
Comment thread
josorio-autoblocks marked this conversation as resolved.
reraise=True,
)


def tests_and_hashes_overrides_map() -> Optional[dict[str, list[str]]]:
"""
AUTOBLOCKS_OVERRIDES_TESTS_AND_HASHES is a JSON string that maps test suite IDs to a list of test case hashes.
Expand Down Expand Up @@ -225,6 +257,7 @@ async def run_test_case(
evaluators: Sequence[BaseTestEvaluator],
fn: Union[Callable[[TestCaseType], Any], Callable[[TestCaseType], Awaitable[Any]]],
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]],
retry_count: int = 0,
) -> None:
reset_token = test_case_run_context_var.set(
TestCaseRunContext(
Expand All @@ -233,14 +266,23 @@ async def run_test_case(
test_case_hash=test_case_ctx.hash(),
),
)
try:
output, hook_results, test_case_result_id = await run_test_case_unsafe(

# Create retry decorator
retry_decorator = create_retry_decorator(retry_count)

# Wrap the unsafe function with retry logic
@retry_decorator
async def _retry_wrapper() -> Tuple[Any, Any, str]:
return await run_test_case_unsafe(
test_id=test_id,
run_id=run_id,
test_case_ctx=test_case_ctx,
fn=fn,
before_evaluators_hook=before_evaluators_hook,
)

try:
output, hook_results, test_case_result_id = await _retry_wrapper()
except Exception as err:
await send_error(
test_id=test_id,
Expand Down Expand Up @@ -363,6 +405,7 @@ async def run_test_suite_for_grid_combo(
grid_search_run_group_id: Optional[str],
grid_search_params_combo: Optional[GridSearchParamsCombo],
human_review_job: Optional[CreateHumanReviewJob],
retry_count: int = 0,
) -> None:
try:
# Determine message with priority: unified overrides > legacy env var
Expand Down Expand Up @@ -402,6 +445,7 @@ async def run_test_suite_for_grid_combo(
evaluators=evaluators,
fn=fn,
before_evaluators_hook=before_evaluators_hook,
retry_count=retry_count,
)
for test_case_ctx in yield_test_case_contexts_from_test_cases(test_cases)
],
Expand Down Expand Up @@ -457,6 +501,7 @@ async def async_run_test_suite(
caller_filepath: Optional[str],
grid_search_params: Optional[GridSearchParams],
human_review_job: Optional[CreateHumanReviewJob],
retry_count: int = 0,
) -> None:
# Handle alignment mode
align_test_id = AutoblocksEnvVar.ALIGN_TEST_EXTERNAL_ID.get()
Expand Down Expand Up @@ -532,6 +577,7 @@ async def async_run_test_suite(
grid_search_run_group_id=None,
grid_search_params_combo=None,
human_review_job=human_review_job,
retry_count=retry_count,
)
except Exception as err:
await send_error(
Expand Down Expand Up @@ -575,6 +621,7 @@ async def async_run_test_suite(
grid_search_run_group_id=grid_search_run_group_id,
grid_search_params_combo=grid_params_combo,
human_review_job=human_review_job,
retry_count=retry_count,
)
for grid_params_combo in yield_grid_search_param_combos(grid_search_params)
],
Expand All @@ -600,6 +647,7 @@ def run_test_suite(
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]] = None,
grid_search_params: Optional[GridSearchParams] = None,
human_review_job: Optional[CreateHumanReviewJob] = None,
retry_count: int = 0,
) -> None: ...


Expand All @@ -614,6 +662,7 @@ def run_test_suite(
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]] = None,
grid_search_params: Optional[GridSearchParams] = None,
human_review_job: Optional[CreateHumanReviewJob] = None,
retry_count: int = 0,
) -> None: ...


Expand All @@ -627,6 +676,7 @@ def run_test_suite(
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]] = None,
grid_search_params: Optional[GridSearchParams] = None,
human_review_job: Optional[CreateHumanReviewJob] = None,
retry_count: int = 0,
) -> None:
if not is_cli_running():
log.info(f"Running test suite '{id}'")
Expand All @@ -649,6 +699,7 @@ def run_test_suite(
caller_filepath=caller_filepath,
grid_search_params=grid_search_params,
human_review_job=human_review_job,
retry_count=retry_count,
),
global_state.event_loop(),
).result()
Expand Down
56 changes: 53 additions & 3 deletions autoblocks/_impl/testing/v2/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@
from typing import Union
from typing import overload

import httpx
from opentelemetry import trace
from opentelemetry.baggage import set_baggage
from opentelemetry.context import attach
from opentelemetry.context import detach
from opentelemetry.context import get_current
from tenacity import retry
from tenacity import retry_if_exception_type
from tenacity import stop_after_attempt
from tenacity import wait_random_exponential

from autoblocks._impl import global_state
from autoblocks._impl.context_vars import EvaluatorRunContext
Expand Down Expand Up @@ -56,6 +61,32 @@
DEFAULT_MAX_TEST_CASE_CONCURRENCY = 10


def create_retry_decorator(retry_count: int) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
"""Create retry decorator following existing tenacity pattern."""
if retry_count <= 0:
# No retry - return identity decorator
def no_retry_decorator(func: Callable[..., Any]) -> Callable[..., Any]:
return func

return no_retry_decorator

# Use same pattern as existing code in api.py
return retry(
stop=stop_after_attempt(retry_count + 1), # +1 because first attempt isn't a retry
wait=wait_random_exponential(multiplier=1, max=30),
retry=retry_if_exception_type(
(
httpx.TimeoutException,
httpx.ConnectError,
httpx.ReadTimeout,
httpx.WriteTimeout,
httpx.PoolTimeout,
)
),
reraise=True,
)


def tests_and_hashes_overrides_map() -> Optional[dict[str, list[str]]]:
"""
AUTOBLOCKS_OVERRIDES_TESTS_AND_HASHES is a JSON string that maps test suite IDs to a list of test case hashes.
Expand Down Expand Up @@ -244,6 +275,7 @@ async def run_test_case(
fn: Union[Callable[[TestCaseType], Any], Callable[[TestCaseType], Awaitable[Any]]],
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]],
test_case_idx: int,
retry_count: int = 0,
) -> None:
reset_token = test_case_run_context_var.set(
TestCaseRunContext(
Expand All @@ -252,16 +284,25 @@ async def run_test_case(
test_case_hash=test_case_ctx.hash(),
),
)
try:
log.info(f"Running test case {test_case_idx} for test suite {test_id}")
await run_test_case_unsafe(

# Create retry decorator
retry_decorator = create_retry_decorator(retry_count)

# Wrap the unsafe function with retry logic
@retry_decorator
async def _retry_wrapper() -> None:
return await run_test_case_unsafe(
test_id=test_id,
app_slug=app_slug,
test_case_ctx=test_case_ctx,
fn=fn,
before_evaluators_hook=before_evaluators_hook,
evaluators=evaluators,
)

try:
log.info(f"Running test case {test_case_idx} for test suite {test_id}")
await _retry_wrapper()
except Exception as err:
log.error(f"Error running test case '{test_case_ctx.hash()}'", exc_info=err)
return
Expand Down Expand Up @@ -355,6 +396,7 @@ async def run_test_suite_for_grid_combo(
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]],
grid_search_params_combo: Optional[GridSearchParamsCombo],
human_review_job: Optional[CreateHumanReviewJob],
retry_count: int = 0,
) -> None:
run_id = cuid_generator()
start_timestamp = now_rfc3339()
Expand Down Expand Up @@ -383,6 +425,7 @@ async def run_test_suite_for_grid_combo(
fn=fn,
before_evaluators_hook=before_evaluators_hook,
test_case_idx=test_case_idx,
retry_count=retry_count,
)
for test_case_idx, test_case_ctx in enumerate(yield_test_case_contexts_from_test_cases(test_cases))
],
Expand Down Expand Up @@ -422,6 +465,7 @@ async def async_run_test_suite(
max_test_case_concurrency: int,
grid_search_params: Optional[GridSearchParams],
human_review_job: Optional[CreateHumanReviewJob],
retry_count: int = 0,
) -> None:

# This will be set if the user passed filters to the CLI
Expand Down Expand Up @@ -475,6 +519,7 @@ async def async_run_test_suite(
before_evaluators_hook=before_evaluators_hook,
grid_search_params_combo=None,
human_review_job=human_review_job,
retry_count=retry_count,
)
except Exception as err:
log.error(f"Error running test suite '{test_id}'", exc_info=err)
Expand All @@ -492,6 +537,7 @@ async def async_run_test_suite(
before_evaluators_hook=before_evaluators_hook,
grid_search_params_combo=grid_params_combo,
human_review_job=human_review_job,
retry_count=retry_count,
)
for grid_params_combo in yield_grid_search_param_combos(grid_search_params)
],
Expand All @@ -512,6 +558,7 @@ def run_test_suite(
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]] = None,
grid_search_params: Optional[GridSearchParams] = None,
human_review_job: Optional[CreateHumanReviewJob] = None,
retry_count: int = 0,
) -> None: ...


Expand All @@ -527,6 +574,7 @@ def run_test_suite(
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]] = None,
grid_search_params: Optional[GridSearchParams] = None,
human_review_job: Optional[CreateHumanReviewJob] = None,
retry_count: int = 0,
) -> None: ...


Expand All @@ -541,6 +589,7 @@ def run_test_suite(
before_evaluators_hook: Optional[Callable[[TestCaseType, Any], Any]] = None,
grid_search_params: Optional[GridSearchParams] = None,
human_review_job: Optional[CreateHumanReviewJob] = None,
retry_count: int = 0,
Comment thread
josorio-autoblocks marked this conversation as resolved.
) -> None:
if not global_state.is_auto_tracer_initialized():
log.error(
Expand All @@ -561,6 +610,7 @@ def run_test_suite(
max_test_case_concurrency=max_test_case_concurrency,
grid_search_params=grid_search_params,
human_review_job=human_review_job,
retry_count=retry_count,
),
global_state.event_loop(),
).result()
Expand Down
Loading