mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-28 20:05:02 +00:00
fix: add rate limit patterns for 'too many tokens' and 'tokens per day' (#39377)
Merged via squash.
Prepared head SHA: 132a457286
Co-authored-by: gambletan <266203672+gambletan@users.noreply.github.com>
Co-authored-by: altaywtf <9790196+altaywtf@users.noreply.github.com>
Reviewed-by: @altaywtf
This commit is contained in:
@@ -800,6 +800,61 @@ describe("Cron issue regressions", () => {
|
||||
expect(runIsolatedAgentJob).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
it("#38822: one-shot job retries Bedrock too-many-tokens-per-day errors", async () => {
|
||||
const store = makeStorePath();
|
||||
const scheduledAt = Date.parse("2026-03-08T10:00:00.000Z");
|
||||
|
||||
const cronJob = createIsolatedRegressionJob({
|
||||
id: "oneshot-bedrock-too-many-tokens-per-day",
|
||||
name: "reminder",
|
||||
scheduledAt,
|
||||
schedule: { kind: "at", at: new Date(scheduledAt).toISOString() },
|
||||
payload: { kind: "agentTurn", message: "remind me" },
|
||||
state: { nextRunAtMs: scheduledAt },
|
||||
});
|
||||
await writeCronJobs(store.storePath, [cronJob]);
|
||||
|
||||
let now = scheduledAt;
|
||||
const runIsolatedAgentJob = vi
|
||||
.fn()
|
||||
.mockResolvedValueOnce({
|
||||
status: "error",
|
||||
error: "AWS Bedrock: Too many tokens per day. Please try again tomorrow.",
|
||||
})
|
||||
.mockResolvedValueOnce({ status: "ok", summary: "done" });
|
||||
const state = createCronServiceState({
|
||||
cronEnabled: true,
|
||||
storePath: store.storePath,
|
||||
log: noopLogger,
|
||||
nowMs: () => now,
|
||||
enqueueSystemEvent: vi.fn(),
|
||||
requestHeartbeatNow: vi.fn(),
|
||||
runIsolatedAgentJob,
|
||||
cronConfig: {
|
||||
retry: { maxAttempts: 1, backoffMs: [1000], retryOn: ["rate_limit"] },
|
||||
},
|
||||
});
|
||||
|
||||
await onTimer(state);
|
||||
const jobAfterRetry = state.store?.jobs.find(
|
||||
(j) => j.id === "oneshot-bedrock-too-many-tokens-per-day",
|
||||
);
|
||||
expect(jobAfterRetry).toBeDefined();
|
||||
expect(jobAfterRetry!.enabled).toBe(true);
|
||||
expect(jobAfterRetry!.state.lastStatus).toBe("error");
|
||||
expect(jobAfterRetry!.state.nextRunAtMs).toBeGreaterThan(scheduledAt);
|
||||
|
||||
now = (jobAfterRetry!.state.nextRunAtMs ?? now) + 1;
|
||||
await onTimer(state);
|
||||
|
||||
const finishedJob = state.store?.jobs.find(
|
||||
(j) => j.id === "oneshot-bedrock-too-many-tokens-per-day",
|
||||
);
|
||||
expect(finishedJob).toBeDefined();
|
||||
expect(finishedJob!.state.lastStatus).toBe("ok");
|
||||
expect(runIsolatedAgentJob).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
it("#24355: one-shot job disabled immediately on permanent error", async () => {
|
||||
const store = makeStorePath();
|
||||
const scheduledAt = Date.parse("2026-02-06T10:00:00.000Z");
|
||||
|
||||
@@ -119,7 +119,8 @@ function errorBackoffMs(
|
||||
const DEFAULT_MAX_TRANSIENT_RETRIES = 3;
|
||||
|
||||
const TRANSIENT_PATTERNS: Record<string, RegExp> = {
|
||||
rate_limit: /(rate[_ ]limit|too many requests|429|resource has been exhausted|cloudflare)/i,
|
||||
rate_limit:
|
||||
/(rate[_ ]limit|too many requests|429|resource has been exhausted|cloudflare|tokens per day)/i,
|
||||
overloaded:
|
||||
/\b529\b|\boverloaded(?:_error)?\b|high demand|temporar(?:ily|y) overloaded|capacity exceeded/i,
|
||||
network: /(network|econnreset|econnrefused|fetch failed|socket)/i,
|
||||
|
||||
Reference in New Issue
Block a user