@jaypie/llm 1.2.27 → 1.2.29

package/dist/cjs/operate/adapters/XaiAdapter.d.ts

@@ -1,11 +1,14 @@
+import { ClassifiedError } from "../types.js";
 import { OpenAiAdapter } from "./OpenAiAdapter.js";
 /**
  * XaiAdapter extends OpenAiAdapter since xAI (Grok) uses an OpenAI-compatible API.
- * Only the name and default model are overridden; all request building, response parsing,
- * error classification, tool handling, and streaming are inherited.
+ * Name, default model, and transient-ingest-error detection are overridden;
+ * all request building, response parsing, tool handling, and streaming are
+ * inherited.
  */
 export declare class XaiAdapter extends OpenAiAdapter {
     readonly name: "xai";
     readonly defaultModel: "grok-4.20-0309-reasoning";
+    classifyError(error: unknown): ClassifiedError;
 }
 export declare const xaiAdapter: XaiAdapter;

package/dist/esm/index.js

@@ -1760,8 +1760,6 @@ class GeminiAdapter extends BaseProviderAdapter {
             contents: geminiRequest.contents,
             config: geminiRequest.config,
         });
-        // Track current function call being built
-        let currentFunctionCall = null;
         // Track usage for final chunk
         let inputTokens = 0;
         let outputTokens = 0;
@@ -1782,7 +1780,7 @@ class GeminiAdapter extends BaseProviderAdapter {
                     // Handle function calls
                     if (part.functionCall) {
                         const functionCall = part.functionCall;
-                        currentFunctionCall = {
+                        const currentFunctionCall = {
                             id: functionCall.id || this.generateCallId(),
                             name: functionCall.name || "",
                             arguments: functionCall.args || {},
@@ -1802,7 +1800,6 @@ class GeminiAdapter extends BaseProviderAdapter {
                                 metadata,
                             },
                         };
-                        currentFunctionCall = null;
                     }
                 }
             }
@@ -3341,10 +3338,29 @@ class OpenRouterAdapter extends BaseProviderAdapter {
 // Export singleton instance
 const openRouterAdapter = new OpenRouterAdapter();
 
+/**
+ * Error-message substrings that indicate a transient xAI media-ingest flake.
+ * The xAI ingest service enters a bad state after ~12 consecutive file-bearing
+ * calls and rejects subsequent requests with HTTP 400. The condition is
+ * self-clearing, so these errors should be retried with backoff rather than
+ * surfaced as unrecoverable.
+ *
+ * See: github.com/finlaysonstudio/jaypie issue #301
+ */
+const TRANSIENT_INGEST_MESSAGE_PATTERNS = [
+    "failed to ingest inline file bytes",
+];
+function isTransientIngestError(error) {
+    if (!(error instanceof BadRequestError))
+        return false;
+    const message = (error.message ?? "").toLowerCase();
+    return TRANSIENT_INGEST_MESSAGE_PATTERNS.some((pattern) => message.includes(pattern));
+}
 /**
  * XaiAdapter extends OpenAiAdapter since xAI (Grok) uses an OpenAI-compatible API.
- * Only the name and default model are overridden; all request building, response parsing,
- * error classification, tool handling, and streaming are inherited.
+ * Name, default model, and transient-ingest-error detection are overridden;
+ * all request building, response parsing, tool handling, and streaming are
+ * inherited.
  */
 class XaiAdapter extends OpenAiAdapter {
     constructor() {
@@ -3354,6 +3370,16 @@ class XaiAdapter extends OpenAiAdapter {
         // @ts-expect-error Narrowing override: xAI default model differs from parent's literal
         this.defaultModel = PROVIDER.XAI.MODEL.DEFAULT;
     }
+    classifyError(error) {
+        if (isTransientIngestError(error)) {
+            return {
+                error,
+                category: ErrorCategory.Retryable,
+                shouldRetry: true,
+            };
+        }
+        return super.classifyError(error);
+    }
 }
 // Export singleton instance
 const xaiAdapter = new XaiAdapter();
@@ -5392,14 +5418,13 @@ function formatUserMessage$2(message, { data, placeholders: placeholders$1 } = {
 function prepareMessages$2(message, { data, placeholders } = {}) {
     const logger = getLogger$3();
     const messages = [];
-    let systemInstruction;
     // Note: Gemini handles system prompts differently via systemInstruction config
     // This function is kept for compatibility but system prompts should be passed
     // via the systemInstruction parameter in generateContent
     const userMessage = formatUserMessage$2(message, { data, placeholders });
     messages.push(userMessage);
     logger.trace(`User message: ${userMessage.content?.length} characters`);
-    return { messages, systemInstruction };
+    return { messages, systemInstruction: undefined };
 }
 
 class GeminiProvider {
@@ -6422,8 +6447,10 @@ const weather = {
         }
         catch (error) {
             if (error instanceof Error) {
+                // eslint-disable-next-line preserve-caught-error -- package targets ES2020; Error `cause` option requires ES2022
                 throw new Error(`Weather API error: ${error.message}`);
             }
+            // eslint-disable-next-line preserve-caught-error -- package targets ES2020; Error `cause` option requires ES2022
             throw new Error("Unknown error occurred while fetching weather data");
         }
     },