refactor: resolve request defaults once in rerankDocuments

Author: TheGreatAxios

src/request.ts

@@ -3,7 +3,6 @@ import {
   classifyHTTPError,
   classifyNetworkError,
   classifyProtocolMismatch,
-  createDefaultRetryPolicy,
   type BuiltRequest,
   type Dependencies,
 } from "@intx/inference";
@@ -59,29 +58,25 @@ export type RetryAfterExtractor = (headers: Headers) => number | undefined;
 
 export type RunRequestOptions = {
   deps: RequestDependencies;
-  /** Defaults to Interchange's policy: back off retryables, abort the rest. */
-  retryPolicy: RetryPolicy | undefined;
+  retryPolicy: RetryPolicy;
   /**
    * Per-attempt ceiling, enforced alongside any caller `signal` rather than
    * instead of it. A cold local model can take a while to page in.
    */
-  timeoutMs: number | undefined;
+  timeoutMs: number;
   /**
    * Reads `Retry-After` off a failed response. Mirrors `ProviderAdapter`'s
    * member of the same name, so a provider that signals pacing its own way can
-   * override without touching the transport. Defaults to
-   * {@link extractRetryAfterMs}.
+   * override without touching the transport.
    */
-  extractRetryAfterMs: RetryAfterExtractor | undefined;
+  extractRetryAfterMs: RetryAfterExtractor;
   signal: AbortSignal | undefined;
 };
 
 type Attempt =
   | { ok: true; body: unknown }
   | { ok: false; error: InferenceError };
 
-const DEFAULT_TIMEOUT_MS = 30_000;
-
 /**
  * `Retry-After` in seconds or as an HTTP date; undefined when absent.
  *
@@ -199,10 +194,13 @@ export async function runJSONRequest(
   request: BuiltRequest,
   options: RunRequestOptions,
 ): Promise<unknown> {
-  const { deps, signal } = options;
-  const policy = options.retryPolicy ?? createDefaultRetryPolicy();
-  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  const extractRetryAfter = options.extractRetryAfterMs ?? extractRetryAfterMs;
+  const {
+    deps,
+    signal,
+    retryPolicy: policy,
+    timeoutMs,
+    extractRetryAfterMs: extractRetryAfter,
+  } = options;
 
   // Time comes from the harness scheduler, not globals, so a virtual-clock
   // test scheduler drives the retry loop deterministically.

src/rerank.ts

@@ -1,6 +1,7 @@
 import { type } from "arktype";
 import {
   classifyProtocolMismatch,
+  createDefaultRetryPolicy,
   createDefaultScheduler,
   ProtocolMismatchError,
 } from "@intx/inference";
@@ -9,22 +10,24 @@ import type { RetryPolicy } from "@intx/types/runtime";
 import {
   rerankAdapterRegistry,
   type RerankAdapterRegistry,
-  type RerankAPIStyle,
   type RerankDoc,
   type RerankResult,
 } from "./adapters.js";
 import {
+  extractRetryAfterMs,
   RerankRequestError,
   runJSONRequest,
   type RequestDependencies,
 } from "./request.js";
 
+const DEFAULT_TIMEOUT_MS = 30_000;
+
 export const RerankConfigSchema = type({
-  /** Provider root, e.g. `http://localhost:8085` for a TEI server. */
+  /** Provider root, e.g. `http://localhost:8080` for a TEI server. */
   baseURL: "string",
   /**
    * A key into the registry. Left open rather than pinned to
-   * {@link RerankAPIStyle} so a custom registry can name a house format; the
+   * `RerankAPIStyle` so a custom registry can name a house format; the
    * registry rejects an unknown style by name. The built-ins are `tei`,
    * `cohere` (also Jina) and `voyage`.
    */
@@ -76,9 +79,9 @@ export async function rerankDocuments(
       fetch: globalThis.fetch,
       scheduler: createDefaultScheduler(),
     },
-    retryPolicy: options.retryPolicy,
-    timeoutMs: parsed.timeoutMs,
-    extractRetryAfterMs: adapter.extractRetryAfterMs,
+    retryPolicy: options.retryPolicy ?? createDefaultRetryPolicy(),
+    timeoutMs: parsed.timeoutMs ?? DEFAULT_TIMEOUT_MS,
+    extractRetryAfterMs: adapter.extractRetryAfterMs ?? extractRetryAfterMs,
     signal: options.signal,
   });
 
@@ -109,5 +112,3 @@ export async function rerankDocuments(
     })
     .sort((a, b) => b.score - a.score);
 }
-
-export type { RerankAPIStyle, RerankDoc, RerankResult };