@yourgpt/llm-sdk 2.5.0 → 2.5.1-beta.0

package/dist/index.mjs

@@ -133,6 +133,11 @@ function formatToolsForGoogle(tools) {
 // src/core/generate-text.ts
 async function generateText(params) {
   const { model, tools, maxSteps = 1, signal } = params;
+  if (params.responseFormat && model.capabilities.supportsJsonMode === false) {
+    console.warn(
+      `[llm-sdk] ${model.provider}/${model.modelId} does not support structured output (responseFormat); the request will be sent but the provider may ignore it.`
+    );
+  }
   let messages = buildMessages(params);
   const steps = [];
   const allToolCalls = [];
@@ -147,6 +152,7 @@ async function generateText(params) {
       tools: formattedTools,
       temperature: params.temperature,
       maxTokens: params.maxTokens,
+      responseFormat: params.responseFormat,
       signal
     });
     const stepToolResults = [];
@@ -264,6 +270,11 @@ function sumUsage(steps) {
 // src/core/stream-text.ts
 async function streamText(params) {
   const { model, tools, maxSteps = 1, signal } = params;
+  if (params.responseFormat && model.capabilities.supportsJsonMode === false) {
+    console.warn(
+      `[llm-sdk] ${model.provider}/${model.modelId} does not support structured output (responseFormat); the request will be sent but the provider may ignore it.`
+    );
+  }
   let fullText = "";
   let finalUsage = {
     promptTokens: 0,
@@ -289,6 +300,7 @@ async function streamText(params) {
           tools: formattedTools,
           temperature: params.temperature,
           maxTokens: params.maxTokens,
+          responseFormat: params.responseFormat,
           signal
         })) {
           switch (chunk.type) {

package/dist/providers/anthropic/index.d.mts

@@ -1,7 +1,7 @@
-import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
-import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-DRqxMIjF.mjs';
+import { L as LanguageModel } from '../../types-BkQCSiIt.mjs';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-BSSiJW2o.mjs';
 import 'zod';
-import '../../base-D-U61JaB.mjs';
+import '../../base-tNgbBaSo.mjs';
 
 /**
  * Anthropic Provider - Modern Pattern

package/dist/providers/anthropic/index.d.ts

@@ -1,7 +1,7 @@
-import { L as LanguageModel } from '../../types-CR8mi9I0.js';
-import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-BctsnC3g.js';
+import { L as LanguageModel } from '../../types-BkQCSiIt.js';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-BQ31QIsA.js';
 import 'zod';
-import '../../base-iGi9Va6Z.js';
+import '../../base-C58Dsr9p.js';
 
 /**
  * Anthropic Provider - Modern Pattern

package/dist/providers/anthropic/index.js

@@ -1,5 +1,243 @@
 'use strict';
 
+// src/adapters/base.ts
+function stringifyForDebug(value) {
+  return JSON.stringify(
+    value,
+    (_key, currentValue) => {
+      if (typeof currentValue === "bigint") {
+        return currentValue.toString();
+      }
+      if (currentValue instanceof Error) {
+        return {
+          name: currentValue.name,
+          message: currentValue.message,
+          stack: currentValue.stack
+        };
+      }
+      return currentValue;
+    },
+    2
+  );
+}
+function logProviderPayload(provider, label, payload, enabled) {
+  if (!enabled) {
+    return;
+  }
+  if (label.toLowerCase().includes("stream ")) {
+    return;
+  }
+  try {
+    console.log(
+      `[llm-sdk:${provider}] ${label}
+${stringifyForDebug(payload)}`
+    );
+  } catch (error) {
+    console.log(
+      `[llm-sdk:${provider}] ${label} (failed to stringify payload)`,
+      error
+    );
+  }
+}
+function stripSchemaKeys(schema, keysToDrop, options = {}) {
+  if (Array.isArray(schema)) {
+    return schema.map((item) => stripSchemaKeys(item, keysToDrop, options));
+  }
+  if (!schema || typeof schema !== "object") return schema;
+  const out = {};
+  for (const [key, value] of Object.entries(
+    schema
+  )) {
+    if (keysToDrop.has(key)) continue;
+    const renamed = options.renameKeys?.[key] ?? key;
+    out[renamed] = stripSchemaKeys(value, keysToDrop, options);
+  }
+  if (options.forceAdditionalPropertiesFalse && out.type === "object") {
+    out.additionalProperties = false;
+  }
+  return out;
+}
+var ANTHROPIC_UNSUPPORTED_KEYS = /* @__PURE__ */ new Set([
+  "minimum",
+  "maximum",
+  "exclusiveMinimum",
+  "exclusiveMaximum",
+  "multipleOf",
+  "minLength",
+  "maxLength",
+  "minItems",
+  "maxItems",
+  "minProperties",
+  "maxProperties",
+  "pattern",
+  "$schema"
+]);
+function toAnthropicOutputConfig(rf) {
+  if (!rf || rf.type !== "json_schema") return void 0;
+  const schema = stripSchemaKeys(
+    rf.json_schema.schema,
+    ANTHROPIC_UNSUPPORTED_KEYS,
+    {
+      forceAdditionalPropertiesFalse: true,
+      renameKeys: { oneOf: "anyOf" }
+    }
+  );
+  return {
+    format: {
+      type: "json_schema",
+      schema
+    }
+  };
+}
+function hasMediaAttachments(message) {
+  const attachments = message.metadata?.attachments;
+  return attachments?.some(
+    (a) => a.type === "image" || a.type === "file" && a.mimeType === "application/pdf"
+  ) ?? false;
+}
+function attachmentToAnthropicImage(attachment) {
+  if (attachment.type !== "image") return null;
+  if (attachment.url) {
+    return {
+      type: "image",
+      source: {
+        type: "url",
+        url: attachment.url
+      }
+    };
+  }
+  if (!attachment.data) return null;
+  let base64Data = attachment.data;
+  if (base64Data.startsWith("data:")) {
+    const commaIndex = base64Data.indexOf(",");
+    if (commaIndex !== -1) {
+      base64Data = base64Data.slice(commaIndex + 1);
+    }
+  }
+  return {
+    type: "image",
+    source: {
+      type: "base64",
+      media_type: attachment.mimeType || "image/png",
+      data: base64Data
+    }
+  };
+}
+function attachmentToAnthropicDocument(attachment) {
+  if (attachment.type !== "file" || attachment.mimeType !== "application/pdf") {
+    return null;
+  }
+  if (attachment.url) {
+    return {
+      type: "document",
+      source: {
+        type: "url",
+        url: attachment.url
+      }
+    };
+  }
+  if (!attachment.data) return null;
+  let base64Data = attachment.data;
+  if (base64Data.startsWith("data:")) {
+    const commaIndex = base64Data.indexOf(",");
+    if (commaIndex !== -1) {
+      base64Data = base64Data.slice(commaIndex + 1);
+    }
+  }
+  return {
+    type: "document",
+    source: {
+      type: "base64",
+      media_type: "application/pdf",
+      data: base64Data
+    }
+  };
+}
+function messageToAnthropicContent(message) {
+  const attachments = message.metadata?.attachments;
+  const content = message.content ?? "";
+  if (!hasMediaAttachments(message)) {
+    return content;
+  }
+  const blocks = [];
+  if (attachments) {
+    for (const attachment of attachments) {
+      const imageBlock = attachmentToAnthropicImage(attachment);
+      if (imageBlock) {
+        blocks.push(imageBlock);
+        continue;
+      }
+      const docBlock = attachmentToAnthropicDocument(attachment);
+      if (docBlock) {
+        blocks.push(docBlock);
+      }
+    }
+  }
+  if (content) {
+    blocks.push({ type: "text", text: content });
+  }
+  return blocks;
+}
+function formatMessagesForAnthropic(messages, systemPrompt) {
+  const formatted = [];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (msg.role === "system") continue;
+    if (msg.role === "assistant") {
+      const content = [];
+      if (msg.content) {
+        content.push({ type: "text", text: msg.content });
+      }
+      if (msg.tool_calls && msg.tool_calls.length > 0) {
+        for (const tc of msg.tool_calls) {
+          content.push({
+            type: "tool_use",
+            id: tc.id,
+            name: tc.function.name,
+            input: JSON.parse(tc.function.arguments)
+          });
+        }
+      }
+      formatted.push({
+        role: "assistant",
+        content: content.length === 1 && content[0].type === "text" ? content[0].text : content
+      });
+    } else if (msg.role === "tool" && msg.tool_call_id) {
+      const toolResults = [
+        {
+          type: "tool_result",
+          tool_use_id: msg.tool_call_id,
+          content: msg.content ?? ""
+        }
+      ];
+      while (i + 1 < messages.length && messages[i + 1].role === "tool") {
+        i++;
+        const nextTool = messages[i];
+        if (nextTool.tool_call_id) {
+          toolResults.push({
+            type: "tool_result",
+            tool_use_id: nextTool.tool_call_id,
+            content: nextTool.content ?? ""
+          });
+        }
+      }
+      formatted.push({
+        role: "user",
+        content: toolResults
+      });
+    } else if (msg.role === "user") {
+      formatted.push({
+        role: "user",
+        content: messageToAnthropicContent(msg)
+      });
+    }
+  }
+  return {
+    system: "",
+    messages: formatted
+  };
+}
+
 // src/providers/anthropic/provider.ts
 var ANTHROPIC_MODELS = {
   // Claude 4 series
@@ -8,6 +246,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: true,
     pdf: true,
+    jsonMode: true,
     maxTokens: 2e5
   },
   "claude-opus-4-20250514": {
@@ -15,6 +254,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: true,
     pdf: true,
+    jsonMode: true,
     maxTokens: 2e5
   },
   // Claude 3.7 series
@@ -23,6 +263,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: true,
     pdf: true,
+    jsonMode: true,
     maxTokens: 2e5
   },
   "claude-3-7-sonnet-latest": {
@@ -30,6 +271,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: true,
     pdf: true,
+    jsonMode: true,
     maxTokens: 2e5
   },
   // Claude 3.5 series
@@ -38,6 +280,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: false,
     pdf: true,
+    jsonMode: true,
     maxTokens: 2e5
   },
   "claude-3-5-sonnet-latest": {
@@ -45,6 +288,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: false,
     pdf: true,
+    jsonMode: true,
     maxTokens: 2e5
   },
   "claude-3-5-haiku-20241022": {
@@ -52,6 +296,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: false,
     pdf: false,
+    jsonMode: true,
     maxTokens: 2e5
   },
   "claude-3-5-haiku-latest": {
@@ -59,6 +304,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: false,
     pdf: false,
+    jsonMode: true,
     maxTokens: 2e5
   },
   // Claude 3 series
@@ -67,6 +313,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: false,
     pdf: false,
+    jsonMode: false,
     maxTokens: 2e5
   },
   "claude-3-sonnet-20240229": {
@@ -74,6 +321,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: false,
     pdf: false,
+    jsonMode: false,
     maxTokens: 2e5
   },
   "claude-3-haiku-20240307": {
@@ -81,6 +329,7 @@ var ANTHROPIC_MODELS = {
     tools: true,
     thinking: false,
     pdf: false,
+    jsonMode: false,
     maxTokens: 2e5
   }
 };
@@ -105,7 +354,7 @@ function anthropic(modelId, options = {}) {
       supportsVision: modelConfig.vision,
       supportsTools: modelConfig.tools,
       supportsStreaming: true,
-      supportsJsonMode: false,
+      supportsJsonMode: modelConfig.jsonMode,
       supportsThinking: modelConfig.thinking,
       supportsPDF: modelConfig.pdf,
       maxTokens: modelConfig.maxTokens,
@@ -113,7 +362,7 @@ function anthropic(modelId, options = {}) {
     },
     async doGenerate(params) {
       const client2 = await getClient();
-      const { system, messages } = formatMessagesForAnthropic(params.messages);
+      const { system, messages } = formatMessagesForAnthropic2(params.messages);
       const requestOptions = {
         model: modelId,
         max_tokens: params.maxTokens ?? 4096,
@@ -130,6 +379,10 @@ function anthropic(modelId, options = {}) {
           budget_tokens: options.thinking.budgetTokens ?? 1e4
         };
       }
+      const outputConfig = toAnthropicOutputConfig(params.responseFormat);
+      if (outputConfig) {
+        requestOptions.output_config = outputConfig;
+      }
       const response = await client2.messages.create(requestOptions);
       let text = "";
       const toolCalls = [];
@@ -158,7 +411,7 @@ function anthropic(modelId, options = {}) {
     },
     async *doStream(params) {
       const client2 = await getClient();
-      const { system, messages } = formatMessagesForAnthropic(params.messages);
+      const { system, messages } = formatMessagesForAnthropic2(params.messages);
       const requestOptions = {
         model: modelId,
         max_tokens: params.maxTokens ?? 4096,
@@ -175,6 +428,10 @@ function anthropic(modelId, options = {}) {
           budget_tokens: options.thinking.budgetTokens ?? 1e4
         };
       }
+      const outputConfig = toAnthropicOutputConfig(params.responseFormat);
+      if (outputConfig) {
+        requestOptions.output_config = outputConfig;
+      }
       const stream = await client2.messages.stream(requestOptions);
       let currentToolUse = null;
       let inputTokens = 0;
@@ -253,7 +510,7 @@ function mapFinishReason(reason) {
       return "unknown";
   }
 }
-function formatMessagesForAnthropic(messages) {
+function formatMessagesForAnthropic2(messages) {
   let system = "";
   const formatted = [];
   const pendingToolResults = [];
@@ -362,194 +619,6 @@ function generateMessageId() {
   return generateId("msg");
 }
 
-// src/adapters/base.ts
-function stringifyForDebug(value) {
-  return JSON.stringify(
-    value,
-    (_key, currentValue) => {
-      if (typeof currentValue === "bigint") {
-        return currentValue.toString();
-      }
-      if (currentValue instanceof Error) {
-        return {
-          name: currentValue.name,
-          message: currentValue.message,
-          stack: currentValue.stack
-        };
-      }
-      return currentValue;
-    },
-    2
-  );
-}
-function logProviderPayload(provider, label, payload, enabled) {
-  if (!enabled) {
-    return;
-  }
-  if (label.toLowerCase().includes("stream ")) {
-    return;
-  }
-  try {
-    console.log(
-      `[llm-sdk:${provider}] ${label}
-${stringifyForDebug(payload)}`
-    );
-  } catch (error) {
-    console.log(
-      `[llm-sdk:${provider}] ${label} (failed to stringify payload)`,
-      error
-    );
-  }
-}
-function hasMediaAttachments(message) {
-  const attachments = message.metadata?.attachments;
-  return attachments?.some(
-    (a) => a.type === "image" || a.type === "file" && a.mimeType === "application/pdf"
-  ) ?? false;
-}
-function attachmentToAnthropicImage(attachment) {
-  if (attachment.type !== "image") return null;
-  if (attachment.url) {
-    return {
-      type: "image",
-      source: {
-        type: "url",
-        url: attachment.url
-      }
-    };
-  }
-  if (!attachment.data) return null;
-  let base64Data = attachment.data;
-  if (base64Data.startsWith("data:")) {
-    const commaIndex = base64Data.indexOf(",");
-    if (commaIndex !== -1) {
-      base64Data = base64Data.slice(commaIndex + 1);
-    }
-  }
-  return {
-    type: "image",
-    source: {
-      type: "base64",
-      media_type: attachment.mimeType || "image/png",
-      data: base64Data
-    }
-  };
-}
-function attachmentToAnthropicDocument(attachment) {
-  if (attachment.type !== "file" || attachment.mimeType !== "application/pdf") {
-    return null;
-  }
-  if (attachment.url) {
-    return {
-      type: "document",
-      source: {
-        type: "url",
-        url: attachment.url
-      }
-    };
-  }
-  if (!attachment.data) return null;
-  let base64Data = attachment.data;
-  if (base64Data.startsWith("data:")) {
-    const commaIndex = base64Data.indexOf(",");
-    if (commaIndex !== -1) {
-      base64Data = base64Data.slice(commaIndex + 1);
-    }
-  }
-  return {
-    type: "document",
-    source: {
-      type: "base64",
-      media_type: "application/pdf",
-      data: base64Data
-    }
-  };
-}
-function messageToAnthropicContent(message) {
-  const attachments = message.metadata?.attachments;
-  const content = message.content ?? "";
-  if (!hasMediaAttachments(message)) {
-    return content;
-  }
-  const blocks = [];
-  if (attachments) {
-    for (const attachment of attachments) {
-      const imageBlock = attachmentToAnthropicImage(attachment);
-      if (imageBlock) {
-        blocks.push(imageBlock);
-        continue;
-      }
-      const docBlock = attachmentToAnthropicDocument(attachment);
-      if (docBlock) {
-        blocks.push(docBlock);
-      }
-    }
-  }
-  if (content) {
-    blocks.push({ type: "text", text: content });
-  }
-  return blocks;
-}
-function formatMessagesForAnthropic2(messages, systemPrompt) {
-  const formatted = [];
-  for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i];
-    if (msg.role === "system") continue;
-    if (msg.role === "assistant") {
-      const content = [];
-      if (msg.content) {
-        content.push({ type: "text", text: msg.content });
-      }
-      if (msg.tool_calls && msg.tool_calls.length > 0) {
-        for (const tc of msg.tool_calls) {
-          content.push({
-            type: "tool_use",
-            id: tc.id,
-            name: tc.function.name,
-            input: JSON.parse(tc.function.arguments)
-          });
-        }
-      }
-      formatted.push({
-        role: "assistant",
-        content: content.length === 1 && content[0].type === "text" ? content[0].text : content
-      });
-    } else if (msg.role === "tool" && msg.tool_call_id) {
-      const toolResults = [
-        {
-          type: "tool_result",
-          tool_use_id: msg.tool_call_id,
-          content: msg.content ?? ""
-        }
-      ];
-      while (i + 1 < messages.length && messages[i + 1].role === "tool") {
-        i++;
-        const nextTool = messages[i];
-        if (nextTool.tool_call_id) {
-          toolResults.push({
-            type: "tool_result",
-            tool_use_id: nextTool.tool_call_id,
-            content: nextTool.content ?? ""
-          });
-        }
-      }
-      formatted.push({
-        role: "user",
-        content: toolResults
-      });
-    } else if (msg.role === "user") {
-      formatted.push({
-        role: "user",
-        content: messageToAnthropicContent(msg)
-      });
-    }
-  }
-  return {
-    system: "",
-    messages: formatted
-  };
-}
-
 // src/adapters/anthropic.ts
 var AnthropicAdapter = class {
   constructor(config) {
@@ -772,12 +841,14 @@ var AnthropicAdapter = class {
    * Build common request options for both streaming and non-streaming
    */
   buildRequestOptions(request) {
-    const systemMessage = request.systemPrompt || "";
+    const responseFormat = request.config?.responseFormat;
+    const jsonObjectSuffix = responseFormat?.type === "json_object" ? "\n\nRespond with a single JSON object and no other text." : "";
+    const systemMessage = (request.systemPrompt || "") + jsonObjectSuffix;
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
       messages = this.convertToAnthropicMessages(request.rawMessages);
     } else {
-      const formatted = formatMessagesForAnthropic2(request.messages);
+      const formatted = formatMessagesForAnthropic(request.messages);
       messages = formatted.messages;
     }
     const anthropicNativeSearch = request.providerToolOptions?.anthropic?.nativeToolSearch;
@@ -853,6 +924,10 @@ var AnthropicAdapter = class {
     if (serverToolConfiguration) {
       options.server_tool_configuration = serverToolConfiguration;
     }
+    const outputConfig = toAnthropicOutputConfig(responseFormat);
+    if (outputConfig) {
+      options.output_config = outputConfig;
+    }
     if (this.config.thinking?.type === "enabled") {
       options.thinking = {
         type: "enabled",
@@ -1181,7 +1256,8 @@ function createAnthropic(config = {}) {
         "image/gif",
         "image/webp"
       ],
-      supportsJsonMode: false,
+      // Native `output_config.format` — GA on Claude 3.5 and newer.
+      supportsJsonMode: true,
       supportsSystemMessages: true
     };
   };