chore(openai,anthropic): Expose OpenAI and Anthropic payload formatte…

…rs (#6872)
langchain-ai · Sep 24, 2024 · 78066be · 78066be
1 parent 1250232
commit 78066be
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/libs/langchain-anthropic/src/chat_models.ts b/libs/langchain-anthropic/src/chat_models.ts
@@ -33,7 +33,7 @@ import type {
 import { isLangChainTool } from "@langchain/core/utils/function_calling";
 import { AnthropicToolsOutputParser } from "./output_parsers.js";
 import { extractToolCallChunk, handleToolChoice } from "./utils/tools.js";
-import { _formatMessagesForAnthropic } from "./utils/message_inputs.js";
+import { _convertMessagesToAnthropicPayload } from "./utils/message_inputs.js";
 import {
   _makeMessageChunkFromAnthropicEvent,
   anthropicResponseToChatMessages,
@@ -782,7 +782,7 @@ export class ChatAnthropicMessages<
     runManager?: CallbackManagerForLLMRun
   ): AsyncGenerator<ChatGenerationChunk> {
     const params = this.invocationParams(options);
-    const formattedMessages = _formatMessagesForAnthropic(messages);
+    const formattedMessages = _convertMessagesToAnthropicPayload(messages);
     const coerceContentToString = !_toolsInParams({
       ...params,
       ...formattedMessages,
@@ -852,7 +852,7 @@ export class ChatAnthropicMessages<
       {
         ...params,
         stream: false,
-        ..._formatMessagesForAnthropic(messages),
+        ..._convertMessagesToAnthropicPayload(messages),
       },
       requestOptions
     );

diff --git a/libs/langchain-anthropic/src/index.ts b/libs/langchain-anthropic/src/index.ts
@@ -1 +1,2 @@
 export * from "./chat_models.js";
+export { _convertMessagesToAnthropicPayload } from "./utils/message_inputs.js";
diff --git a/libs/langchain-anthropic/src/tests/chat_models.test.ts b/libs/langchain-anthropic/src/tests/chat_models.test.ts
@@ -3,7 +3,7 @@ import { AIMessage, HumanMessage, ToolMessage } from "@langchain/core/messages";
 import { z } from "zod";
 import { OutputParserException } from "@langchain/core/output_parsers";
 import { ChatAnthropic } from "../chat_models.js";
-import { _formatMessagesForAnthropic } from "../utils/message_inputs.js";
+import { _convertMessagesToAnthropicPayload } from "../index.js";
 
 test("withStructuredOutput with output validation", async () => {
   const model = new ChatAnthropic({
@@ -143,7 +143,7 @@ test("Can properly format anthropic messages when given two tool results", async
     }),
   ];
 
-  const formattedMessages = _formatMessagesForAnthropic(messageHistory);
+  const formattedMessages = _convertMessagesToAnthropicPayload(messageHistory);
 
   expect(formattedMessages).toEqual({
     messages: [

diff --git a/libs/langchain-anthropic/src/utils/message_inputs.ts b/libs/langchain-anthropic/src/utils/message_inputs.ts
@@ -185,10 +185,11 @@ function _formatContent(content: MessageContent) {
 
 /**
  * Formats messages as a prompt for the model.
+ * Used in LangSmith, export is important here.
  * @param messages The base messages to format as a prompt.
  * @returns The formatted prompt.
  */
-export function _formatMessagesForAnthropic(
+export function _convertMessagesToAnthropicPayload(
   messages: BaseMessage[]
 ): AnthropicMessageCreateParams {
   const mergedMessages = _mergeMessages(messages);

diff --git a/libs/langchain-openai/src/chat_models.ts b/libs/langchain-openai/src/chat_models.ts
@@ -250,7 +250,8 @@ function _convertDeltaToMessageChunk(
   }
 }
 
-function convertMessagesToOpenAIParams(messages: BaseMessage[]) {
+// Used in LangSmith, export is important here
+export function _convertMessagesToOpenAIParams(messages: BaseMessage[]) {
   // TODO: Function messages do not support array content, fix cast
   return messages.map((message) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1200,7 +1201,7 @@ export class ChatOpenAI<
       return;
     }
     const messagesMapped: OpenAICompletionParam[] =
-      convertMessagesToOpenAIParams(messages);
+      _convertMessagesToOpenAIParams(messages);
     const params = {
       ...this.invocationParams(options, {
         streaming: true,
@@ -1329,7 +1330,7 @@ export class ChatOpenAI<
     const tokenUsage: TokenUsage = {};
     const params = this.invocationParams(options);
     const messagesMapped: OpenAICompletionParam[] =
-      convertMessagesToOpenAIParams(messages);
+      _convertMessagesToOpenAIParams(messages);
 
     if (params.stream) {
       const stream = this._streamResponseChunks(messages, options, runManager);