mirror of
https://github.com/leonvanzyl/autocoder.git
synced 2026-03-17 02:43:09 +00:00
fix: handle rate_limit_event crash in chat sessions
The Claude CLI sends `rate_limit_event` messages that the SDK's `parse_message()` doesn't recognize, raising `MessageParseError` and crashing all three chat session types (spec, assistant, expand). Changes: - Bump claude-agent-sdk minimum from 0.1.0 to 0.1.39 - Add `check_rate_limit_error()` helper in chat_constants.py that detects rate limits from both MessageParseError data payloads and error message text patterns - Wrap `receive_response()` loops in all three `_query_claude()` methods with retry-on-rate-limit logic (up to 3 retries with backoff) - Gracefully log and skip non-rate-limit MessageParseError instead of crashing the session - Add `rate_limited` message type to frontend TypeScript types and handle it in useSpecChat, useAssistantChat, useExpandChat hooks to show "Rate limited. Retrying in Xs..." system messages Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -22,7 +22,13 @@ from claude_agent_sdk import ClaudeAgentOptions, ClaudeSDKClient
|
||||
from dotenv import load_dotenv
|
||||
|
||||
from ..schemas import ImageAttachment
|
||||
from .chat_constants import ROOT_DIR, make_multimodal_message
|
||||
from .chat_constants import (
|
||||
MAX_CHAT_RATE_LIMIT_RETRIES,
|
||||
ROOT_DIR,
|
||||
calculate_rate_limit_backoff,
|
||||
check_rate_limit_error,
|
||||
make_multimodal_message,
|
||||
)
|
||||
|
||||
# Load environment variables from .env file if present
|
||||
load_dotenv()
|
||||
@@ -298,24 +304,67 @@ class ExpandChatSession:
|
||||
else:
|
||||
await self.client.query(message)
|
||||
|
||||
# Stream the response
|
||||
async for msg in self.client.receive_response():
|
||||
msg_type = type(msg).__name__
|
||||
# Stream the response (with rate-limit retry)
|
||||
for _attempt in range(MAX_CHAT_RATE_LIMIT_RETRIES + 1):
|
||||
try:
|
||||
async for msg in self.client.receive_response():
|
||||
msg_type = type(msg).__name__
|
||||
|
||||
if msg_type == "AssistantMessage" and hasattr(msg, "content"):
|
||||
for block in msg.content:
|
||||
block_type = type(block).__name__
|
||||
if msg_type == "AssistantMessage" and hasattr(msg, "content"):
|
||||
for block in msg.content:
|
||||
block_type = type(block).__name__
|
||||
|
||||
if block_type == "TextBlock" and hasattr(block, "text"):
|
||||
text = block.text
|
||||
if text:
|
||||
yield {"type": "text", "content": text}
|
||||
if block_type == "TextBlock" and hasattr(block, "text"):
|
||||
text = block.text
|
||||
if text:
|
||||
yield {"type": "text", "content": text}
|
||||
|
||||
self.messages.append({
|
||||
"role": "assistant",
|
||||
"content": text,
|
||||
"timestamp": datetime.now().isoformat()
|
||||
self.messages.append({
|
||||
"role": "assistant",
|
||||
"content": text,
|
||||
"timestamp": datetime.now().isoformat()
|
||||
})
|
||||
# Completed successfully — break out of retry loop
|
||||
break
|
||||
except Exception as exc:
|
||||
is_rate_limit, retry_secs = check_rate_limit_error(exc)
|
||||
if is_rate_limit and _attempt < MAX_CHAT_RATE_LIMIT_RETRIES:
|
||||
delay = retry_secs if retry_secs else calculate_rate_limit_backoff(_attempt)
|
||||
logger.warning(f"Rate limited (attempt {_attempt + 1}/{MAX_CHAT_RATE_LIMIT_RETRIES}), retrying in {delay}s")
|
||||
yield {
|
||||
"type": "rate_limited",
|
||||
"retry_in": delay,
|
||||
"attempt": _attempt + 1,
|
||||
"max_attempts": MAX_CHAT_RATE_LIMIT_RETRIES,
|
||||
}
|
||||
await asyncio.sleep(delay)
|
||||
# Re-send the query before retrying receive_response
|
||||
if attachments and len(attachments) > 0:
|
||||
content_blocks_retry: list[dict[str, Any]] = []
|
||||
if message:
|
||||
content_blocks_retry.append({"type": "text", "text": message})
|
||||
for att in attachments:
|
||||
content_blocks_retry.append({
|
||||
"type": "image",
|
||||
"source": {
|
||||
"type": "base64",
|
||||
"media_type": att.mimeType,
|
||||
"data": att.base64Data,
|
||||
}
|
||||
})
|
||||
await self.client.query(make_multimodal_message(content_blocks_retry))
|
||||
else:
|
||||
await self.client.query(message)
|
||||
continue
|
||||
if is_rate_limit:
|
||||
logger.error("Rate limit retries exhausted for expand chat")
|
||||
yield {"type": "error", "content": "Rate limited. Please try again later."}
|
||||
return
|
||||
# Non-rate-limit MessageParseError: log and break (don't crash)
|
||||
if type(exc).__name__ == "MessageParseError":
|
||||
logger.warning(f"Ignoring unrecognized message from Claude CLI: {exc}")
|
||||
break
|
||||
raise
|
||||
|
||||
def get_features_created(self) -> int:
|
||||
"""Get the total number of features created in this session."""
|
||||
|
||||
Reference in New Issue
Block a user