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

package/dist/providers/google/index.mjs

@@ -1,3 +1,232 @@
+// 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 parameterToJsonSchema(param) {
+  const schema = {
+    type: param.type
+  };
+  if (param.description) {
+    schema.description = param.description;
+  }
+  if (param.enum) {
+    schema.enum = param.enum;
+  }
+  if (param.type === "array" && param.items) {
+    schema.items = parameterToJsonSchema(
+      param.items
+    );
+  }
+  if (param.type === "object" && param.properties) {
+    schema.properties = Object.fromEntries(
+      Object.entries(param.properties).map(([key, prop]) => [
+        key,
+        parameterToJsonSchema(
+          prop
+        )
+      ])
+    );
+    schema.additionalProperties = false;
+  }
+  return schema;
+}
+function normalizeObjectJsonSchema(schema) {
+  if (!schema || typeof schema !== "object") {
+    return {
+      type: "object",
+      properties: {},
+      required: [],
+      additionalProperties: false
+    };
+  }
+  const normalized = { ...schema };
+  const type = normalized.type;
+  if (type === "object") {
+    const properties = normalized.properties && typeof normalized.properties === "object" && !Array.isArray(normalized.properties) ? normalized.properties : {};
+    normalized.properties = Object.fromEntries(
+      Object.entries(properties).map(([key, value]) => [
+        key,
+        normalizeObjectJsonSchema(value)
+      ])
+    );
+    const propertyKeys = Object.keys(properties);
+    const required = Array.isArray(normalized.required) ? normalized.required.filter(
+      (value) => typeof value === "string"
+    ) : [];
+    normalized.required = Array.from(/* @__PURE__ */ new Set([...required, ...propertyKeys]));
+    if (normalized.additionalProperties === void 0) {
+      normalized.additionalProperties = false;
+    }
+  } else if (type === "array" && normalized.items && typeof normalized.items === "object") {
+    normalized.items = normalizeObjectJsonSchema(
+      normalized.items
+    );
+  }
+  return normalized;
+}
+function isOpenAIReasoningModel(modelId) {
+  if (!modelId) return false;
+  return /^(o1|o3|o4|gpt-5)/i.test(modelId);
+}
+function buildOpenAITokenParams(modelId, maxTokens, temperature) {
+  if (isOpenAIReasoningModel(modelId)) {
+    return { max_completion_tokens: maxTokens };
+  }
+  return { max_tokens: maxTokens, temperature };
+}
+function toOpenAIResponseFormat(rf) {
+  if (!rf) return void 0;
+  if (rf.type === "json_object") return { type: "json_object" };
+  return {
+    type: "json_schema",
+    json_schema: {
+      name: rf.json_schema.name,
+      schema: normalizeObjectJsonSchema(rf.json_schema.schema),
+      strict: rf.json_schema.strict ?? true
+    }
+  };
+}
+function toOpenAIResponsesTextFormat(rf) {
+  if (!rf || rf.type !== "json_schema") return void 0;
+  return {
+    type: "json_schema",
+    name: rf.json_schema.name,
+    schema: normalizeObjectJsonSchema(rf.json_schema.schema),
+    strict: rf.json_schema.strict ?? true
+  };
+}
+function formatTools(actions) {
+  return actions.map((action) => ({
+    type: "function",
+    function: {
+      name: action.name,
+      description: action.description,
+      parameters: {
+        type: "object",
+        properties: action.parameters ? Object.fromEntries(
+          Object.entries(action.parameters).map(([key, param]) => [
+            key,
+            parameterToJsonSchema(param)
+          ])
+        ) : {},
+        required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : [],
+        additionalProperties: false
+      }
+    }
+  }));
+}
+function hasImageAttachments(message) {
+  const attachments = message.metadata?.attachments;
+  return attachments?.some((a) => a.type === "image") ?? false;
+}
+function attachmentToOpenAIImage(attachment) {
+  if (attachment.type !== "image") return null;
+  let imageUrl;
+  if (attachment.url) {
+    imageUrl = attachment.url;
+  } else if (attachment.data) {
+    imageUrl = attachment.data.startsWith("data:") ? attachment.data : `data:${attachment.mimeType || "image/png"};base64,${attachment.data}`;
+  } else {
+    return null;
+  }
+  return {
+    type: "image_url",
+    image_url: {
+      url: imageUrl,
+      detail: "auto"
+    }
+  };
+}
+function messageToOpenAIContent(message) {
+  const attachments = message.metadata?.attachments;
+  const content = message.content ?? "";
+  if (!hasImageAttachments(message)) {
+    return content;
+  }
+  const blocks = [];
+  if (content) {
+    blocks.push({ type: "text", text: content });
+  }
+  if (attachments) {
+    for (const attachment of attachments) {
+      const imageBlock = attachmentToOpenAIImage(attachment);
+      if (imageBlock) {
+        blocks.push(imageBlock);
+      }
+    }
+  }
+  return blocks;
+}
+function formatMessagesForOpenAI(messages, systemPrompt) {
+  const formatted = [];
+  if (systemPrompt) {
+    formatted.push({ role: "system", content: systemPrompt });
+  }
+  for (const msg of messages) {
+    if (msg.role === "system") {
+      formatted.push({ role: "system", content: msg.content ?? "" });
+    } else if (msg.role === "user") {
+      formatted.push({
+        role: "user",
+        content: messageToOpenAIContent(msg)
+      });
+    } else if (msg.role === "assistant") {
+      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
+      const assistantMsg = {
+        role: "assistant",
+        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
+        content: hasToolCalls ? msg.content || null : msg.content
+      };
+      if (hasToolCalls) {
+        assistantMsg.tool_calls = msg.tool_calls;
+      }
+      formatted.push(assistantMsg);
+    } else if (msg.role === "tool" && msg.tool_call_id) {
+      formatted.push({
+        role: "tool",
+        content: msg.content ?? "",
+        tool_call_id: msg.tool_call_id
+      });
+    }
+  }
+  return formatted;
+}
+
 // src/providers/google/provider.ts
 var GOOGLE_MODELS = {
   // Gemini 2.5 (Experimental)
@@ -117,7 +346,8 @@ function google(modelId, options = {}) {
         messages,
         tools: params.tools,
         temperature: params.temperature,
-        max_tokens: params.maxTokens
+        max_tokens: params.maxTokens,
+        response_format: toOpenAIResponseFormat(params.responseFormat)
       });
       const choice = response.choices[0];
       const message = choice.message;
@@ -149,6 +379,7 @@ function google(modelId, options = {}) {
         tools: params.tools,
         temperature: params.temperature,
         max_tokens: params.maxTokens,
+        response_format: toOpenAIResponseFormat(params.responseFormat),
         stream: true
       });
       let currentToolCall = null;
@@ -294,204 +525,6 @@ function generateToolCallId() {
   return generateId("call");
 }
 
-// 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 parameterToJsonSchema(param) {
-  const schema = {
-    type: param.type
-  };
-  if (param.description) {
-    schema.description = param.description;
-  }
-  if (param.enum) {
-    schema.enum = param.enum;
-  }
-  if (param.type === "array" && param.items) {
-    schema.items = parameterToJsonSchema(
-      param.items
-    );
-  }
-  if (param.type === "object" && param.properties) {
-    schema.properties = Object.fromEntries(
-      Object.entries(param.properties).map(([key, prop]) => [
-        key,
-        parameterToJsonSchema(
-          prop
-        )
-      ])
-    );
-    schema.additionalProperties = false;
-  }
-  return schema;
-}
-function normalizeObjectJsonSchema(schema) {
-  if (!schema || typeof schema !== "object") {
-    return {
-      type: "object",
-      properties: {},
-      required: [],
-      additionalProperties: false
-    };
-  }
-  const normalized = { ...schema };
-  const type = normalized.type;
-  if (type === "object") {
-    const properties = normalized.properties && typeof normalized.properties === "object" && !Array.isArray(normalized.properties) ? normalized.properties : {};
-    normalized.properties = Object.fromEntries(
-      Object.entries(properties).map(([key, value]) => [
-        key,
-        normalizeObjectJsonSchema(value)
-      ])
-    );
-    const propertyKeys = Object.keys(properties);
-    const required = Array.isArray(normalized.required) ? normalized.required.filter(
-      (value) => typeof value === "string"
-    ) : [];
-    normalized.required = Array.from(/* @__PURE__ */ new Set([...required, ...propertyKeys]));
-    if (normalized.additionalProperties === void 0) {
-      normalized.additionalProperties = false;
-    }
-  } else if (type === "array" && normalized.items && typeof normalized.items === "object") {
-    normalized.items = normalizeObjectJsonSchema(
-      normalized.items
-    );
-  }
-  return normalized;
-}
-function formatTools(actions) {
-  return actions.map((action) => ({
-    type: "function",
-    function: {
-      name: action.name,
-      description: action.description,
-      parameters: {
-        type: "object",
-        properties: action.parameters ? Object.fromEntries(
-          Object.entries(action.parameters).map(([key, param]) => [
-            key,
-            parameterToJsonSchema(param)
-          ])
-        ) : {},
-        required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : [],
-        additionalProperties: false
-      }
-    }
-  }));
-}
-function hasImageAttachments(message) {
-  const attachments = message.metadata?.attachments;
-  return attachments?.some((a) => a.type === "image") ?? false;
-}
-function attachmentToOpenAIImage(attachment) {
-  if (attachment.type !== "image") return null;
-  let imageUrl;
-  if (attachment.url) {
-    imageUrl = attachment.url;
-  } else if (attachment.data) {
-    imageUrl = attachment.data.startsWith("data:") ? attachment.data : `data:${attachment.mimeType || "image/png"};base64,${attachment.data}`;
-  } else {
-    return null;
-  }
-  return {
-    type: "image_url",
-    image_url: {
-      url: imageUrl,
-      detail: "auto"
-    }
-  };
-}
-function messageToOpenAIContent(message) {
-  const attachments = message.metadata?.attachments;
-  const content = message.content ?? "";
-  if (!hasImageAttachments(message)) {
-    return content;
-  }
-  const blocks = [];
-  if (content) {
-    blocks.push({ type: "text", text: content });
-  }
-  if (attachments) {
-    for (const attachment of attachments) {
-      const imageBlock = attachmentToOpenAIImage(attachment);
-      if (imageBlock) {
-        blocks.push(imageBlock);
-      }
-    }
-  }
-  return blocks;
-}
-function formatMessagesForOpenAI(messages, systemPrompt) {
-  const formatted = [];
-  if (systemPrompt) {
-    formatted.push({ role: "system", content: systemPrompt });
-  }
-  for (const msg of messages) {
-    if (msg.role === "system") {
-      formatted.push({ role: "system", content: msg.content ?? "" });
-    } else if (msg.role === "user") {
-      formatted.push({
-        role: "user",
-        content: messageToOpenAIContent(msg)
-      });
-    } else if (msg.role === "assistant") {
-      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
-      const assistantMsg = {
-        role: "assistant",
-        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
-        content: hasToolCalls ? msg.content || null : msg.content
-      };
-      if (hasToolCalls) {
-        assistantMsg.tool_calls = msg.tool_calls;
-      }
-      formatted.push(assistantMsg);
-    } else if (msg.role === "tool" && msg.tool_call_id) {
-      formatted.push({
-        role: "tool",
-        content: msg.content ?? "",
-        tool_call_id: msg.tool_call_id
-      });
-    }
-  }
-  return formatted;
-}
-
 // src/adapters/openai.ts
 var OpenAIAdapter = class _OpenAIAdapter {
   constructor(config) {
@@ -606,6 +639,9 @@ var OpenAIAdapter = class _OpenAIAdapter {
   async completeWithResponses(request) {
     const client = await this.getClient();
     const openaiToolOptions = request.providerToolOptions?.openai;
+    const responsesTextFormat = toOpenAIResponsesTextFormat(
+      request.config?.responseFormat
+    );
     const payload = {
       model: request.config?.model || this.model,
       instructions: request.systemPrompt,
@@ -615,6 +651,7 @@ var OpenAIAdapter = class _OpenAIAdapter {
       parallel_tool_calls: openaiToolOptions?.parallelToolCalls,
       temperature: request.config?.temperature ?? this.config.temperature,
       max_output_tokens: request.config?.maxTokens ?? this.config.maxTokens,
+      ...responsesTextFormat ? { text: { format: responsesTextFormat } } : {},
       stream: false
     };
     logProviderPayload("openai", "request payload", payload, request.debug);
@@ -736,14 +773,19 @@ var OpenAIAdapter = class _OpenAIAdapter {
           name: openaiToolOptions.toolChoice.name
         }
       } : openaiToolOptions?.toolChoice;
+      const modelIdForPayload = request.config?.model || this.model;
       const payload = {
-        model: request.config?.model || this.model,
+        model: modelIdForPayload,
         messages,
         tools: tools.length > 0 ? tools : void 0,
         tool_choice: tools.length > 0 ? toolChoice : void 0,
         parallel_tool_calls: tools.length > 0 ? openaiToolOptions?.parallelToolCalls : void 0,
-        temperature: request.config?.temperature ?? this.config.temperature,
-        max_tokens: request.config?.maxTokens ?? this.config.maxTokens,
+        ...buildOpenAITokenParams(
+          modelIdForPayload,
+          request.config?.maxTokens ?? this.config.maxTokens,
+          request.config?.temperature ?? this.config.temperature
+        ),
+        response_format: toOpenAIResponseFormat(request.config?.responseFormat),
         stream: true,
         stream_options: { include_usage: true }
       };
@@ -885,14 +927,19 @@ var OpenAIAdapter = class _OpenAIAdapter {
         name: openaiToolOptions.toolChoice.name
       }
     } : openaiToolOptions?.toolChoice;
+    const modelIdForCompletePayload = request.config?.model || this.model;
     const payload = {
-      model: request.config?.model || this.model,
+      model: modelIdForCompletePayload,
       messages,
       tools: tools.length > 0 ? tools : void 0,
       tool_choice: tools.length > 0 ? toolChoice : void 0,
       parallel_tool_calls: tools.length > 0 ? openaiToolOptions?.parallelToolCalls : void 0,
-      temperature: request.config?.temperature ?? this.config.temperature,
-      max_tokens: request.config?.maxTokens ?? this.config.maxTokens,
+      ...buildOpenAITokenParams(
+        modelIdForCompletePayload,
+        request.config?.maxTokens ?? this.config.maxTokens,
+        request.config?.temperature ?? this.config.temperature
+      ),
+      response_format: toOpenAIResponseFormat(request.config?.responseFormat),
       stream: false
     };
     logProviderPayload("openai", "request payload", payload, request.debug);

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

@@ -1,8 +1,8 @@
-import { c as OllamaProviderConfig, A as AIProvider } from '../../types-DRqxMIjF.mjs';
-export { d as OllamaModelOptions } from '../../types-DRqxMIjF.mjs';
-import '../../base-D-U61JaB.mjs';
-import '../../types-CR8mi9I0.mjs';
+import { c as OllamaProviderConfig, A as AIProvider } from '../../types-BSSiJW2o.mjs';
+export { d as OllamaModelOptions } from '../../types-BSSiJW2o.mjs';
+import '../../types-BkQCSiIt.mjs';
 import 'zod';
+import '../../base-tNgbBaSo.mjs';
 
 /**
  * Ollama Provider

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

@@ -1,8 +1,8 @@
-import { c as OllamaProviderConfig, A as AIProvider } from '../../types-BctsnC3g.js';
-export { d as OllamaModelOptions } from '../../types-BctsnC3g.js';
-import '../../base-iGi9Va6Z.js';
-import '../../types-CR8mi9I0.js';
+import { c as OllamaProviderConfig, A as AIProvider } from '../../types-BQ31QIsA.js';
+export { d as OllamaModelOptions } from '../../types-BQ31QIsA.js';
+import '../../types-BkQCSiIt.js';
 import 'zod';
+import '../../base-C58Dsr9p.js';
 
 /**
  * Ollama Provider

package/dist/providers/ollama/index.js

@@ -78,6 +78,11 @@ function parameterToJsonSchema(param) {
   }
   return schema;
 }
+function toOllamaFormat(rf) {
+  if (!rf) return void 0;
+  if (rf.type === "json_object") return "json";
+  return rf.json_schema.schema;
+}
 function formatTools(actions) {
   return actions.map((action) => ({
     type: "function",
@@ -240,12 +245,14 @@ var OllamaAdapter = class {
       if (this.config.options) {
         Object.assign(ollamaOptions, this.config.options);
       }
+      const ollamaFormat = toOllamaFormat(request.config?.responseFormat);
       const payload = {
         model: request.config?.model || this.model,
         messages,
         tools,
         stream: true,
-        options: ollamaOptions
+        options: ollamaOptions,
+        ...ollamaFormat !== void 0 ? { format: ollamaFormat } : {}
       };
       logProviderPayload("ollama", "request payload", payload, request.debug);
       const response = await fetch(`${this.baseUrl}/api/chat`, {
@@ -496,7 +503,8 @@ function createOllama(config = {}) {
       supportsVideo: false,
       maxTokens: model.maxTokens,
       supportedImageTypes: model.vision ? ["image/png", "image/jpeg", "image/gif"] : [],
-      supportsJsonMode: false,
+      // Ollama 0.5+ supports `format: "json"` and JSON-schema constrained output.
+      supportsJsonMode: true,
       supportsSystemMessages: true
     };
   };

package/dist/providers/ollama/index.mjs

@@ -76,6 +76,11 @@ function parameterToJsonSchema(param) {
   }
   return schema;
 }
+function toOllamaFormat(rf) {
+  if (!rf) return void 0;
+  if (rf.type === "json_object") return "json";
+  return rf.json_schema.schema;
+}
 function formatTools(actions) {
   return actions.map((action) => ({
     type: "function",
@@ -238,12 +243,14 @@ var OllamaAdapter = class {
       if (this.config.options) {
         Object.assign(ollamaOptions, this.config.options);
       }
+      const ollamaFormat = toOllamaFormat(request.config?.responseFormat);
       const payload = {
         model: request.config?.model || this.model,
         messages,
         tools,
         stream: true,
-        options: ollamaOptions
+        options: ollamaOptions,
+        ...ollamaFormat !== void 0 ? { format: ollamaFormat } : {}
       };
       logProviderPayload("ollama", "request payload", payload, request.debug);
       const response = await fetch(`${this.baseUrl}/api/chat`, {
@@ -494,7 +501,8 @@ function createOllama(config = {}) {
       supportsVideo: false,
       maxTokens: model.maxTokens,
       supportedImageTypes: model.vision ? ["image/png", "image/jpeg", "image/gif"] : [],
-      supportsJsonMode: false,
+      // Ollama 0.5+ supports `format: "json"` and JSON-schema constrained output.
+      supportsJsonMode: true,
       supportsSystemMessages: true
     };
   };

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

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

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

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