@yourgpt/llm-sdk 2.1.2 → 2.1.4-alpha.0

package/dist/providers/openai/index.mjs

@@ -271,8 +271,49 @@ function generateId(prefix = "id") {
 function generateMessageId() {
   return generateId("msg");
 }
+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
@@ -297,9 +338,44 @@ function parameterToJsonSchema(param) {
         )
       ])
     );
+    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",
@@ -314,7 +390,8 @@ function formatTools(actions) {
             parameterToJsonSchema(param)
           ])
         ) : {},
-        required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : []
+        required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : [],
+        additionalProperties: false
       }
     }
   }));
@@ -411,7 +488,152 @@ var OpenAIAdapter = class {
     }
     return this.client;
   }
+  shouldUseResponsesApi(request) {
+    return request.providerToolOptions?.openai?.nativeToolSearch?.enabled === true && request.providerToolOptions.openai.nativeToolSearch.useResponsesApi !== false && Array.isArray(request.toolDefinitions) && request.toolDefinitions.length > 0;
+  }
+  buildResponsesInput(request) {
+    const sourceMessages = request.rawMessages && request.rawMessages.length > 0 ? request.rawMessages : formatMessagesForOpenAI2(request.messages, void 0);
+    const input = [];
+    for (const message of sourceMessages) {
+      if (message.role === "system") {
+        continue;
+      }
+      if (message.role === "assistant") {
+        const content = typeof message.content === "string" ? message.content : Array.isArray(message.content) ? message.content : message.content ? JSON.stringify(message.content) : "";
+        if (content) {
+          input.push({
+            type: "message",
+            role: "assistant",
+            content
+          });
+        }
+        const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
+        for (const toolCall of toolCalls) {
+          input.push({
+            type: "function_call",
+            call_id: toolCall.id,
+            name: toolCall.function?.name,
+            arguments: toolCall.function?.arguments ?? "{}"
+          });
+        }
+        continue;
+      }
+      if (message.role === "tool") {
+        input.push({
+          type: "function_call_output",
+          call_id: message.tool_call_id,
+          output: typeof message.content === "string" ? message.content : JSON.stringify(message.content ?? null)
+        });
+        continue;
+      }
+      input.push({
+        type: "message",
+        role: message.role === "developer" ? "developer" : "user",
+        content: typeof message.content === "string" ? message.content : Array.isArray(message.content) ? message.content : JSON.stringify(message.content ?? "")
+      });
+    }
+    return input;
+  }
+  buildResponsesTools(tools) {
+    const nativeTools = tools.filter((tool) => tool.available !== false).map((tool) => ({
+      type: "function",
+      name: tool.name,
+      description: tool.description,
+      parameters: normalizeObjectJsonSchema(
+        tool.inputSchema ?? {
+          type: "object",
+          properties: {},
+          required: []
+        }
+      ),
+      strict: true,
+      defer_loading: tool.deferLoading === true
+    }));
+    return [{ type: "tool_search" }, ...nativeTools];
+  }
+  parseResponsesResult(response) {
+    const content = typeof response?.output_text === "string" ? response.output_text : "";
+    const toolCalls = Array.isArray(response?.output) ? response.output.filter((item) => item?.type === "function_call").map((item) => ({
+      id: item.call_id ?? item.id ?? generateToolCallId(),
+      name: item.name,
+      args: (() => {
+        try {
+          return JSON.parse(item.arguments ?? "{}");
+        } catch {
+          return {};
+        }
+      })()
+    })) : [];
+    return {
+      content,
+      toolCalls,
+      usage: response?.usage ? {
+        promptTokens: response.usage.input_tokens ?? 0,
+        completionTokens: response.usage.output_tokens ?? 0,
+        totalTokens: response.usage.total_tokens ?? (response.usage.input_tokens ?? 0) + (response.usage.output_tokens ?? 0)
+      } : void 0,
+      rawResponse: response
+    };
+  }
+  async completeWithResponses(request) {
+    const client = await this.getClient();
+    const openaiToolOptions = request.providerToolOptions?.openai;
+    const payload = {
+      model: request.config?.model || this.model,
+      instructions: request.systemPrompt,
+      input: this.buildResponsesInput(request),
+      tools: this.buildResponsesTools(request.toolDefinitions ?? []),
+      tool_choice: openaiToolOptions?.toolChoice === "required" ? "required" : openaiToolOptions?.toolChoice === "auto" ? "auto" : void 0,
+      parallel_tool_calls: openaiToolOptions?.parallelToolCalls,
+      temperature: request.config?.temperature ?? this.config.temperature,
+      max_output_tokens: request.config?.maxTokens ?? this.config.maxTokens,
+      stream: false
+    };
+    logProviderPayload("openai", "request payload", payload, request.debug);
+    const response = await client.responses.create(payload);
+    logProviderPayload("openai", "response payload", response, request.debug);
+    return this.parseResponsesResult(response);
+  }
   async *stream(request) {
+    if (this.shouldUseResponsesApi(request)) {
+      const messageId2 = generateMessageId();
+      yield { type: "message:start", id: messageId2 };
+      try {
+        const result = await this.completeWithResponses(request);
+        if (result.content) {
+          yield { type: "message:delta", content: result.content };
+        }
+        for (const toolCall of result.toolCalls) {
+          yield {
+            type: "action:start",
+            id: toolCall.id,
+            name: toolCall.name
+          };
+          yield {
+            type: "action:args",
+            id: toolCall.id,
+            args: JSON.stringify(toolCall.args)
+          };
+        }
+        yield { type: "message:end" };
+        yield {
+          type: "done",
+          usage: result.usage ? {
+            prompt_tokens: result.usage.promptTokens,
+            completion_tokens: result.usage.completionTokens,
+            total_tokens: result.usage.totalTokens
+          } : void 0
+        };
+        return;
+      } catch (error) {
+        yield {
+          type: "error",
+          message: error instanceof Error ? error.message : "Unknown error",
+          code: "OPENAI_RESPONSES_ERROR"
+        };
+        return;
+      }
+    }
     const client = await this.getClient();
     let messages;
     if (request.rawMessages && request.rawMessages.length > 0) {
@@ -476,20 +698,32 @@ var OpenAIAdapter = class {
     const messageId = generateMessageId();
     yield { type: "message:start", id: messageId };
     try {
-      const stream = await client.chat.completions.create({
+      const openaiToolOptions = request.providerToolOptions?.openai;
+      const toolChoice = openaiToolOptions?.toolChoice && typeof openaiToolOptions.toolChoice === "object" ? {
+        type: "function",
+        function: {
+          name: openaiToolOptions.toolChoice.name
+        }
+      } : openaiToolOptions?.toolChoice;
+      const payload = {
         model: request.config?.model || this.model,
         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,
         stream: true,
         stream_options: { include_usage: true }
-      });
+      };
+      logProviderPayload("openai", "request payload", payload, request.debug);
+      const stream = await client.chat.completions.create(payload);
       let currentToolCall = null;
       const collectedCitations = [];
       let citationIndex = 0;
       let usage;
       for await (const chunk of stream) {
+        logProviderPayload("openai", "stream chunk", chunk, request.debug);
         if (request.signal?.aborted) {
           break;
         }
@@ -571,6 +805,70 @@ var OpenAIAdapter = class {
       };
     }
   }
+  async complete(request) {
+    if (this.shouldUseResponsesApi(request)) {
+      return this.completeWithResponses(request);
+    }
+    const client = await this.getClient();
+    let messages;
+    if (request.rawMessages && request.rawMessages.length > 0) {
+      messages = request.rawMessages;
+      if (request.systemPrompt && !messages.some((message2) => message2.role === "system")) {
+        messages = [
+          { role: "system", content: request.systemPrompt },
+          ...messages
+        ];
+      }
+    } else {
+      messages = formatMessagesForOpenAI2(
+        request.messages,
+        request.systemPrompt
+      );
+    }
+    const tools = request.actions?.length ? formatTools(request.actions) : [];
+    const openaiToolOptions = request.providerToolOptions?.openai;
+    const toolChoice = openaiToolOptions?.toolChoice && typeof openaiToolOptions.toolChoice === "object" ? {
+      type: "function",
+      function: {
+        name: openaiToolOptions.toolChoice.name
+      }
+    } : openaiToolOptions?.toolChoice;
+    const payload = {
+      model: request.config?.model || this.model,
+      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,
+      stream: false
+    };
+    logProviderPayload("openai", "request payload", payload, request.debug);
+    const response = await client.chat.completions.create(payload);
+    logProviderPayload("openai", "response payload", response, request.debug);
+    const choice = response.choices?.[0];
+    const message = choice?.message;
+    return {
+      content: message?.content ?? "",
+      toolCalls: message?.tool_calls?.map((toolCall) => ({
+        id: toolCall.id ?? generateToolCallId(),
+        name: toolCall.function?.name ?? "",
+        args: (() => {
+          try {
+            return JSON.parse(toolCall.function?.arguments ?? "{}");
+          } catch {
+            return {};
+          }
+        })()
+      })) ?? [],
+      usage: response.usage ? {
+        promptTokens: response.usage.prompt_tokens,
+        completionTokens: response.usage.completion_tokens,
+        totalTokens: response.usage.total_tokens
+      } : void 0,
+      rawResponse: response
+    };
+  }
 };
 function extractDomain(url) {
   try {