Retry transient failures on each Replicate catalog page. (#662) #663
Mergedtombeckenhammerged 1 commit into
main fromrefs/pull/663/headmerged by tombeckenham View on GitHubtombeckenham linked this to fix #662
- src/server/providers/adapters/replicate.ts line 542@@ -531,7 +538,5 @@531538 if (!isSafeModelsUrl(url)) {532539 throw new Error(`replicate: unexpected catalog page url ${url}`)533540 }534- const body = (await fetchJson(url, {535- headers,536- signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),537- })) as ReplicateModelPage541+ // One transient 502 on any page used to sink the whole poll (#662).542+ const body: ReplicateModelPage = await fetchWithRetry(src/server/providers/fal.ts line 246@@ -257,20 +246 @@257- body,258- )259- }260- const retryAfter = Number(response.headers.get('retry-after'))261- if (Number.isFinite(retryAfter) && retryAfter > 0) {262- retryAfterMs = retryAfter * 1000263- }264- } catch (error) {265- if (error instanceof FalFetchError) throw error266- // Network-level failure (or a truncated body mid-json()) — retryable.267- lastFailure = error instanceof Error ? error.message : String(error)268- }269- if (attempt < attempts) {270- const backoff = Math.min(1000 * Math.pow(2, attempt), MAX_BACKOFF_MS)271- const waitMs = Math.min(retryAfterMs ?? backoff, MAX_BACKOFF_MS)272- await new Promise((resolve) => setTimeout(resolve, waitMs))273- }274- }275- throw new Error(276- `fal models fetch failed after ${String(attempts)} attempts: ${lastFailure}`,246+ await response.text(),src/server/providers/types.ts line 904@@ -854,0 +884,21 @@884+ let lastFailure = 'unknown failure'885+ for (let attempt = 1; attempt <= attempts; attempt++) {886+ let retryAfterMs: number | null = null887+ const request = init()888+ let response: Response | null = null889+ try {890+ response = await fetchResponse(url, request)891+ if (response.ok) {892+ const ok = response893+ return await withFetchTimeout(url, request.signal, () => read(ok))894+ }895+ } catch (error) {896+ // Network failure, timeout, or a truncated body: retryable.897+ lastFailure = error instanceof Error ? error.message : String(error)898+ response = null899+ }900+ if (response) {901+ if (!RETRYABLE_STATUSES.has(response.status)) {902+ throw await reject(response)903+ }904+ await response.body?.cancel()src/server/providers/types.ts line 906@@ -854,0 +886,21 @@886+ let retryAfterMs: number | null = null887+ const request = init()888+ let response: Response | null = null889+ try {890+ response = await fetchResponse(url, request)891+ if (response.ok) {892+ const ok = response893+ return await withFetchTimeout(url, request.signal, () => read(ok))894+ }895+ } catch (error) {896+ // Network failure, timeout, or a truncated body: retryable.897+ lastFailure = error instanceof Error ? error.message : String(error)898+ response = null899+ }900+ if (response) {901+ if (!RETRYABLE_STATUSES.has(response.status)) {902+ throw await reject(response)903+ }904+ await response.body?.cancel()905+ lastFailure = `${String(response.status)} ${response.statusText}`906+ const retryAfter = Number(response.headers.get('retry-after'))
tombeckenham merged this8769929
tombeckenham closed this
Sign in to join this conversation.
⚠️ No Changeset found#
Latest commit: a8f4cd19f232c9ff8df51b9dd517848fd7951416
Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.
This PR includes no changesets
When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types
Click here to learn what changesets are, and how to add one.
Click here if you're a maintainer who wants to add a changeset to this PR