@spendgraph/tools 0.3.1 → 0.3.3

package/dist/builtin/http/http.js

@@ -6,7 +6,7 @@ export function httpRequest(opts) {
     if (!opts.allow?.length) {
         throw new Error("httpRequest needs an allow list of hosts; there is no safe default.");
     }
-    const doFetch = opts.fetch ?? globalThis.fetch;
+    const doFetch = opts.fetch ?? globalThis.fetch.bind(globalThis);
     const maxChars = opts.maxChars ?? DEFAULT_MAX_CHARS;
     return tool({
         name: "http_request",

package/dist/builtin/web-search/web-search.d.ts

@@ -18,8 +18,18 @@ export interface WebSearchOptions {
     maxChars?: number;
     /** Longest source list handed back. Default 20. */
     maxResults?: number;
+    /**
+     * Tries for a rate limit or a bad minute on Perplexity's side. Default 3.
+     *
+     * A wave of sub-questions searches in parallel, so two calls landing together
+     * is ordinary and a 429 on the second is not a failure worth surfacing — it
+     * is a wait. `retry-after` is honoured where the server sends one.
+     */
+    attempts?: number;
     /** Injected for tests. */
     fetch?: typeof fetch;
+    /** Injected for tests. */
+    sleep?: (ms: number) => Promise<void>;
 }
 /**
  * The live web, through Perplexity's Sonar models.

package/dist/builtin/web-search/web-search.js

@@ -12,6 +12,16 @@ const DEEP_TIMEOUT_MS = 300_000;
 const DEFAULT_MAX_CHARS = 20_000;
 const DEFAULT_MAX_RESULTS = 20;
 const ERROR_DETAIL_CHARS = 500;
+const BACKOFF_BASE_MS = 500;
+const MAX_BACKOFF_MS = 8_000;
+function retryAfterMs(res) {
+    const raw = res.headers.get("retry-after");
+    if (!raw)
+        return null;
+    const seconds = Number(raw);
+    return Number.isFinite(seconds) && seconds >= 0 ? seconds * 1000 : null;
+}
+const isWorthRetrying = (status) => status === 429 || status >= 500;
 function describe(maxDepth, domains) {
     return ("Searches the live web and returns an answer with the sources it rests on. Use it for " +
         "anything that turns on current facts — prices, releases, who holds a post, what " +
@@ -26,8 +36,10 @@ export function webSearch(opts) {
     if (!opts.apiKey?.trim()) {
         throw new Error("webSearch needs a Perplexity apiKey; it will not read one from the process.");
     }
-    const doFetch = opts.fetch ?? globalThis.fetch;
+    const doFetch = opts.fetch ?? globalThis.fetch.bind(globalThis);
     const maxDepth = opts.maxDepth ?? "pro";
+    const attempts = Math.max(1, opts.attempts ?? 3);
+    const pause = opts.sleep ?? ((ms) => new Promise((done) => setTimeout(done, ms)));
     return tool({
         name: "web_search",
         description: describe(maxDepth, opts.domains),
@@ -61,25 +73,31 @@ export function webSearch(opts) {
             }
             const model = MODELS[depth];
             const fallback = depth === "deep" ? DEEP_TIMEOUT_MS : DEFAULT_TIMEOUT_MS;
-            const res = await doFetch(ENDPOINT, {
-                method: "POST",
-                signal: AbortSignal.timeout(opts.timeoutMs ?? fallback),
-                headers: {
-                    authorization: `Bearer ${opts.apiKey}`,
-                    "content-type": "application/json",
-                },
-                body: JSON.stringify({
-                    model,
-                    messages: [{ role: "user", content: query }],
-                    ...(recency ? { search_recency_filter: recency } : {}),
-                    ...(opts.domains?.length ? { search_domain_filter: opts.domains } : {}),
-                }),
-            });
-            if (!res.ok) {
+            for (let attempt = 1;; attempt++) {
+                const res = await doFetch(ENDPOINT, {
+                    method: "POST",
+                    signal: AbortSignal.timeout(opts.timeoutMs ?? fallback),
+                    headers: {
+                        authorization: `Bearer ${opts.apiKey}`,
+                        "content-type": "application/json",
+                    },
+                    body: JSON.stringify({
+                        model,
+                        messages: [{ role: "user", content: query }],
+                        ...(recency ? { search_recency_filter: recency } : {}),
+                        ...(opts.domains?.length ? { search_domain_filter: opts.domains } : {}),
+                    }),
+                });
+                if (res.ok) {
+                    return readReply(await res.json(), model, opts.maxChars ?? DEFAULT_MAX_CHARS, opts.maxResults ?? DEFAULT_MAX_RESULTS);
+                }
                 const detail = (await res.text()).slice(0, ERROR_DETAIL_CHARS);
-                throw new Error(`Perplexity returned ${res.status} for ${model}: ${detail}`);
+                if (!isWorthRetrying(res.status) || attempt === attempts) {
+                    throw new Error(`Perplexity returned ${res.status} for ${model}: ${detail}`);
+                }
+                const wait = retryAfterMs(res) ?? BACKOFF_BASE_MS * 2 ** (attempt - 1);
+                await pause(Math.min(MAX_BACKOFF_MS, wait));
             }
-            return readReply(await res.json(), model, opts.maxChars ?? DEFAULT_MAX_CHARS, opts.maxResults ?? DEFAULT_MAX_RESULTS);
         },
     });
 }

package/dist/builtin/write-document/http.js

@@ -36,7 +36,7 @@ function deadlineSignal(timeoutMs, caller) {
     };
 }
 export function createRequest(config = {}) {
-    const doFetch = config.fetch ?? globalThis.fetch;
+    const doFetch = config.fetch ?? globalThis.fetch.bind(globalThis);
     const base = (config.baseUrl ?? MOA_BASE_URL).replace(/\/+$/, "");
     return async function request(path, opts = {}) {
         const timeoutMs = opts.timeoutMs ?? config.timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spendgraph/tools",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Declare a tool once, offer the right few, and record what was called.",
   "license": "MIT",
   "repository": {
@@ -49,10 +49,10 @@
   },
   "dependencies": {
     "@locusgraph/client": "^0.8.1",
-    "@spendgraph/sdk": "^0.3.1"
+    "@spendgraph/sdk": "^0.3.3"
   },
   "devDependencies": {
-    "@spendgraph/prompt": "^0.3.1",
+    "@spendgraph/prompt": "^0.3.3",
     "typescript": "^5"
   },
   "engines": {