Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions cecli/coders/base_coder.py
Original file line number Diff line number Diff line change
Expand Up @@ -2860,6 +2860,8 @@ async def format_in_executor():
should_retry = ex_info.retry
if ex_info.name == "ServiceUnavailableError":
should_retry = should_retry or retry_config["retry_on_unavailable"]
if ex_info.name == "PermissionDeniedError":
should_retry = should_retry or retry_config["retry_on_forbidden"]

if should_retry:
retry_delay *= retry_config["retry_backoff_factor"]
Expand Down
9 changes: 9 additions & 0 deletions cecli/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class ModelSettings:
retries: Optional[dict] = None
retry_backoff_factor: float = 1.5
retry_on_unavailable: bool = True
retry_on_forbidden: bool = False
retry_timeout: float = 30
request_timeout: int = request_timeout
debug: bool = False
Expand Down Expand Up @@ -1454,6 +1455,7 @@ async def send_completion(

retry_config = parse_retry_config(self.retries)
self.retry_on_unavailable = retry_config["retry_on_unavailable"]
self.retry_on_forbidden = retry_config["retry_on_forbidden"]
self.retry_backoff_factor = retry_config["retry_backoff_factor"]
self.retry_timeout = retry_config["retry_timeout"]

Expand Down Expand Up @@ -1486,6 +1488,8 @@ async def send_completion(
should_retry = ex_info.retry
if ex_info.name == "ServiceUnavailableError":
should_retry = should_retry or self.retry_on_unavailable
elif ex_info.name == "PermissionDeniedError":
should_retry = should_retry or self.retry_on_forbidden

custom_retry_delay = self._extract_retry_delay(err)
if custom_retry_delay is not None:
Expand Down Expand Up @@ -1550,6 +1554,7 @@ async def simple_send_with_retries(
retry_backoff_factor = retry_config["retry_backoff_factor"]
retry_timeout = retry_config["retry_timeout"]
retry_on_unavailable = retry_config["retry_on_unavailable"]
retry_on_forbidden = retry_config["retry_on_forbidden"]

if self.verbose:
dump(messages)
Expand Down Expand Up @@ -1603,6 +1608,8 @@ async def simple_send_with_retries(
should_retry = ex_info.retry
if ex_info.name == "ServiceUnavailableError":
should_retry = should_retry or retry_on_unavailable
elif ex_info.name == "PermissionDeniedError":
should_retry = should_retry or retry_on_forbidden

custom_retry_delay = self._extract_retry_delay(err)
if custom_retry_delay is not None:
Expand Down Expand Up @@ -1796,6 +1803,7 @@ def parse_retry_config(retries_input):
retry_timeout: 30
retry_backoff_factor: 1.5
retry_on_unavailable: True
retry_on_forbidden: False
retry_on_empty: False
"""
config = dict()
Expand All @@ -1821,6 +1829,7 @@ def _get(key, default):
"retry_timeout": float(_get("retry_timeout", 30)),
"retry_backoff_factor": float(_get("retry_backoff_factor", 1.5)),
"retry_on_unavailable": bool(_get("retry_on_unavailable", True)),
"retry_on_forbidden": bool(_get("retry_on_forbidden", False)),
"retry_on_empty": bool(_get("retry_on_empty", False)),
}

Expand Down
Loading
Loading