@agentskit/adapters 0.17.4 → 0.18.0

package/dist/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var core = require('@agentskit/core');
+var net = require('@agentskit/net');
 
 // src/stream-errors.ts
 function isAbortError(err) {
@@ -238,27 +239,75 @@ function generic(config) {
     }
   };
 }
-
-// src/stream-lines.ts
-async function* readSSELines(stream) {
-  const reader = stream.getReader();
-  const decoder = new TextDecoder();
-  let buffer = "";
+var DEFAULT_RETRY = {
+  maxAttempts: 3,
+  baseDelayMs: 500,
+  maxDelayMs: 8e3,
+  jitter: true,
+  retryOn: ({ error, response }) => {
+    if (response) return [408, 429, 500, 502, 503, 504].includes(response.status);
+    if (isAbortError(error)) return false;
+    return true;
+  }
+};
+var RetryableResponse = class extends Error {
+  constructor(response, retryAfterMs) {
+    super(`HTTP ${response.status}`);
+    this.response = response;
+    this.retryAfterMs = retryAfterMs;
+  }
+};
+async function fetchWithRetry(doFetch, signal, retryOpt = {}) {
+  const opts = { ...DEFAULT_RETRY, ...retryOpt };
+  const maxAttempts = Math.floor(opts.maxAttempts);
+  if (!Number.isFinite(maxAttempts) || maxAttempts < 1) {
+    throw new core.AdapterError({
+      code: core.ErrorCodes.AK_CONFIG_INVALID,
+      message: "Retry maxAttempts must be finite and at least 1 after flooring"
+    });
+  }
+  if (signal.aborted) throw new DOMException("Aborted", "AbortError");
   try {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      buffer += decoder.decode(value, { stream: true });
-      const lines = buffer.split("\n");
-      buffer = lines.pop() ?? "";
-      for (const line of lines) {
-        if (!line.startsWith("data: ")) continue;
-        const data = line.slice(6).trim();
-        if (data) yield data;
+    return await net.retry(async ({ attempt }) => {
+      let response;
+      try {
+        response = await doFetch(signal);
+      } catch (error) {
+        if (signal.aborted) throw new DOMException("Aborted", "AbortError");
+        throw error;
       }
-    }
-  } finally {
-    reader.releaseLock();
+      if (response.ok || attempt >= maxAttempts || !opts.retryOn({ response, attempt })) return response;
+      const retryAfter = net.parseRetryAfter(response.headers.get("retry-after"));
+      await cancelBody(response.body);
+      throw new RetryableResponse(
+        response,
+        retryAfter === void 0 ? void 0 : Math.min(retryAfter, opts.maxDelayMs)
+      );
+    }, {
+      retries: maxAttempts - 1,
+      minDelayMs: opts.baseDelayMs,
+      maxDelayMs: opts.maxDelayMs,
+      jitter: opts.jitter ? "full" : "none",
+      shouldRetry: (error, attempt) => {
+        if (error instanceof RetryableResponse) return true;
+        if (isAbortError(error)) return false;
+        return opts.retryOn({ error, attempt });
+      },
+      delayFor: (error) => error instanceof RetryableResponse ? error.retryAfterMs : void 0,
+      onRetry: ({ error, attempt, delayMs }) => {
+        retryOpt.onRetry?.({
+          attempt,
+          delayMs,
+          reason: error instanceof Error ? error.message : String(error)
+        });
+      },
+      sleep: retryOpt.sleep ? (ms, retrySignal) => abortableSleep(ms, retrySignal ?? signal, retryOpt.sleep) : net.sleep,
+      signal
+    });
+  } catch (error) {
+    if (signal.aborted) throw new DOMException("Aborted", "AbortError");
+    if (error instanceof RetryableResponse) return error.response;
+    throw error;
   }
 }
 async function* readNDJSONLines(stream) {
@@ -268,8 +317,12 @@ async function* readNDJSONLines(stream) {
   try {
     while (true) {
       const { done, value } = await reader.read();
-      if (done) break;
-      buffer += decoder.decode(value, { stream: true });
+      buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
+      if (done) {
+        const trimmed = buffer.trim();
+        if (trimmed) yield trimmed;
+        break;
+      }
       const lines = buffer.split("\n");
       buffer = lines.pop() ?? "";
       for (const line of lines) {
@@ -281,8 +334,6 @@ async function* readNDJSONLines(stream) {
     reader.releaseLock();
   }
 }
-
-// src/openai-stream.ts
 var SUCCESS_FINISH_REASONS = /* @__PURE__ */ new Set(["stop", "tool_calls", "function_call"]);
 async function* parseOpenAIStream(stream) {
   const pendingToolCalls = /* @__PURE__ */ new Map();
@@ -314,7 +365,7 @@ async function* parseOpenAIStream(stream) {
     pendingToolCalls.clear();
     return true;
   };
-  for await (const data of readSSELines(stream)) {
+  for await (const { data } of net.parseSSE(stream)) {
     if (data === "[DONE]") {
       if (finishReason !== void 0 && !SUCCESS_FINISH_REASONS.has(finishReason)) {
         pendingToolCalls.clear();
@@ -436,7 +487,7 @@ async function* parseAnthropicStream(stream) {
     };
     return true;
   };
-  for await (const data of readSSELines(stream)) {
+  for await (const { data } of net.parseSSE(stream)) {
     if (data === "[DONE]") continue;
     try {
       const event = JSON.parse(data);
@@ -517,7 +568,7 @@ var GEMINI_SUCCESS_FINISH = /* @__PURE__ */ new Set([
 ]);
 async function* parseGeminiStream(stream) {
   let finishReason;
-  for await (const data of readSSELines(stream)) {
+  for await (const { data } of net.parseSSE(stream)) {
     try {
       const event = JSON.parse(data);
       if (event.usageMetadata) {
@@ -634,70 +685,6 @@ async function* parseOllamaStream(stream) {
   }
   yield { type: "done" };
 }
-var DEFAULT_RETRY = {
-  maxAttempts: 3,
-  baseDelayMs: 500,
-  maxDelayMs: 8e3,
-  jitter: true,
-  retryOn: ({ error, response }) => {
-    if (response) {
-      return [408, 429, 500, 502, 503, 504].includes(response.status);
-    }
-    if (isAbortError(error)) return false;
-    return true;
-  }
-};
-function defaultSleep(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
-}
-function computeDelay(attempt, opts) {
-  const exp = Math.min(opts.maxDelayMs, opts.baseDelayMs * Math.pow(2, attempt - 1));
-  if (!opts.jitter) return exp;
-  return Math.floor(Math.random() * exp);
-}
-function parseRetryAfter(value, maxDelayMs) {
-  if (!value) return void 0;
-  const n = Number(value);
-  if (Number.isFinite(n) && n >= 0) return Math.min(n * 1e3, maxDelayMs);
-  const date = Date.parse(value);
-  if (!Number.isNaN(date)) return Math.min(maxDelayMs, Math.max(0, date - Date.now()));
-  return void 0;
-}
-async function fetchWithRetry(doFetch, signal, retryOpt = {}) {
-  const opts = {
-    ...DEFAULT_RETRY,
-    ...retryOpt
-  };
-  const sleep = retryOpt.sleep ?? defaultSleep;
-  let lastError;
-  for (let attempt = 1; attempt <= opts.maxAttempts; attempt++) {
-    if (signal.aborted) throw new DOMException("Aborted", "AbortError");
-    try {
-      const response = await doFetch(signal);
-      if (response.ok) return response;
-      if (attempt >= opts.maxAttempts || !opts.retryOn({ response, attempt })) {
-        return response;
-      }
-      const retryAfterMs = parseRetryAfter(response.headers.get("retry-after"), opts.maxDelayMs);
-      const delay = retryAfterMs ?? computeDelay(attempt, opts);
-      retryOpt.onRetry?.({ attempt, delayMs: delay, reason: `HTTP ${response.status}` });
-      await cancelBody(response.body);
-      await abortableSleep(delay, signal, sleep);
-    } catch (err) {
-      lastError = err;
-      if (isAbortError(err)) throw err;
-      if (attempt >= opts.maxAttempts || !opts.retryOn({ error: err, attempt })) throw err;
-      const delay = computeDelay(attempt, opts);
-      retryOpt.onRetry?.({
-        attempt,
-        delayMs: delay,
-        reason: err instanceof Error ? err.message : String(err)
-      });
-      await abortableSleep(delay, signal, sleep);
-    }
-  }
-  throw lastError ?? new Error("fetchWithRetry: exhausted attempts");
-}
 function chunkText(text, targetSize = 32) {
   if (text.length <= targetSize) return [text];
   const out = [];
@@ -714,14 +701,14 @@ function chunkText(text, targetSize = 32) {
   return out;
 }
 function simulateStream(doFetch, extractText, errorLabel, options = {}) {
-  const { chunkSize = 32, delayMs = 8, retry } = options;
+  const { chunkSize = 32, delayMs = 8, retry: retry2 } = options;
   let abortController = new AbortController();
   return {
     stream: async function* () {
       const controller = abortController;
       if (!controller) return;
       try {
-        const response = await fetchWithRetry(doFetch, controller.signal, retry ?? {});
+        const response = await fetchWithRetry(doFetch, controller.signal, retry2 ?? {});
         if (!response.ok) {
           await cancelBody(response.body);
           yield adapterErrorChunk(`${errorLabel} error: ${response.status}`);
@@ -741,7 +728,7 @@ function simulateStream(doFetch, extractText, errorLabel, options = {}) {
         for (const chunk of chunks) {
           if (abortController === null || controller.signal.aborted) return;
           if (delayMs > 0) {
-            await abortableSleep(delayMs, controller.signal, defaultSleep);
+            await abortableSleep(delayMs, controller.signal, net.sleep);
           }
           yield { type: "text", content: chunk };
         }
@@ -760,14 +747,14 @@ function simulateStream(doFetch, extractText, errorLabel, options = {}) {
 }
 
 // src/stream-source.ts
-function createStreamSource(doFetch, parse, errorLabel, retry) {
+function createStreamSource(doFetch, parse, errorLabel, retry2) {
   let abortController = new AbortController();
   return {
     stream: async function* () {
       const controller = abortController;
       if (!controller) return;
       try {
-        const response = await fetchWithRetry(doFetch, controller.signal, retry ?? {});
+        const response = await fetchWithRetry(doFetch, controller.signal, retry2 ?? {});
         if (!response.ok) {
           await cancelBody(response.body);
           yield adapterErrorChunk(`${errorLabel} error: ${response.status}`);
@@ -929,7 +916,7 @@ function toGeminiContents(messages) {
 
 // src/anthropic.ts
 function anthropic(config) {
-  const { apiKey, model, baseUrl = "https://api.anthropic.com", maxTokens = 4096, retry } = config;
+  const { apiKey, model, baseUrl = "https://api.anthropic.com", maxTokens = 4096, retry: retry2 } = config;
   return {
     capabilities: {
       streaming: true,
@@ -964,7 +951,7 @@ function anthropic(config) {
         }),
         parseAnthropicStream,
         "Anthropic API",
-        retry
+        retry2
       );
     }
   };
@@ -972,7 +959,7 @@ function anthropic(config) {
 
 // src/openai.ts
 function openai(config) {
-  const { apiKey, model, baseUrl = "https://api.openai.com", retry } = config;
+  const { apiKey, model, baseUrl = "https://api.openai.com", retry: retry2 } = config;
   const apiRoot = baseUrl.replace(/\/v1\/?$/, "");
   const isCanonicalOpenAI = (() => {
     try {
@@ -1022,7 +1009,7 @@ function openai(config) {
         }),
         parseOpenAIStream,
         "OpenAI API",
-        retry
+        retry2
       );
     }
   };
@@ -1030,7 +1017,7 @@ function openai(config) {
 
 // src/gemini.ts
 function gemini(config) {
-  const { apiKey, model, baseUrl = "https://generativelanguage.googleapis.com", retry } = config;
+  const { apiKey, model, baseUrl = "https://generativelanguage.googleapis.com", retry: retry2 } = config;
   return {
     capabilities: {
       streaming: true,
@@ -1066,7 +1053,7 @@ function gemini(config) {
         ),
         parseGeminiStream,
         "Gemini API",
-        retry
+        retry2
       );
     }
   };
@@ -1087,7 +1074,7 @@ var grok = createOpenAICompatibleAdapter("https://api.x.ai");
 
 // src/ollama.ts
 function ollama(config) {
-  const { model, baseUrl = "http://localhost:11434", retry } = config;
+  const { model, baseUrl = "http://localhost:11434", retry: retry2 } = config;
   return {
     capabilities: {
       streaming: true,
@@ -1113,7 +1100,7 @@ function ollama(config) {
         }),
         parseOllamaStream,
         "Ollama API",
-        retry
+        retry2
       );
     }
   };
@@ -1207,8 +1194,6 @@ function langgraph(config) {
     mode: "events"
   });
 }
-
-// src/vercel-ai.ts
 var UI_STREAM_HEADER = "x-vercel-ai-ui-message-stream";
 async function* parseVercelTextStream(stream) {
   const reader = stream.getReader();
@@ -1226,7 +1211,7 @@ async function* parseVercelTextStream(stream) {
   yield { type: "done" };
 }
 async function* parseVercelUiMessageStreamV1(stream) {
-  for await (const data of readSSELines(stream)) {
+  for await (const { data } of net.parseSSE(stream)) {
     if (data === "[DONE]") {
       yield { type: "done" };
       return;
@@ -1268,7 +1253,7 @@ async function* parseVercelStream(stream, response) {
   yield* parseVercelTextStream(stream);
 }
 function vercelAI(config) {
-  const { api, headers = {}, retry } = config;
+  const { api, headers = {}, retry: retry2 } = config;
   return {
     capabilities: {
       // Vercel AI routes can do any of these — whether they do depends on
@@ -1289,7 +1274,7 @@ function vercelAI(config) {
         }),
         parseVercelStream,
         "API",
-        retry
+        retry2
       );
     }
   };
@@ -1382,7 +1367,7 @@ var cerebrasAdapter = cerebras;
 // src/azure-openai.ts
 var DEFAULT_API_VERSION = "2024-10-21";
 function azureOpenAI(config) {
-  const { apiKey, endpoint, deployment, apiVersion = DEFAULT_API_VERSION, retry } = config;
+  const { apiKey, endpoint, deployment, apiVersion = DEFAULT_API_VERSION, retry: retry2 } = config;
   const includeUsage = config.includeUsage ?? true;
   const url = `${endpoint.replace(/\/$/, "")}/openai/deployments/${encodeURIComponent(deployment)}/chat/completions?api-version=${encodeURIComponent(apiVersion)}`;
   return {
@@ -1419,7 +1404,7 @@ function azureOpenAI(config) {
         }),
         parseOpenAIStream,
         "Azure OpenAI API",
-        retry
+        retry2
       );
     }
   };
@@ -1572,7 +1557,7 @@ var qwen = bail;
 
 // src/vertex.ts
 function vertex(config) {
-  const { project, region, model, accessToken, publisher = "google", retry } = config;
+  const { project, region, model, accessToken, publisher = "google", retry: retry2 } = config;
   const url = `https://${region}-aiplatform.googleapis.com/v1/projects/${project}/locations/${region}/publishers/${publisher}/models/${model}:streamGenerateContent?alt=sse`;
   return {
     capabilities: {
@@ -1610,7 +1595,7 @@ function vertex(config) {
         },
         parseGeminiStream,
         "Vertex AI",
-        retry
+        retry2
       );
     }
   };