Fix tests

langchain-ai · Jan 22, 2025 · 2515692 · 2515692
1 parent 1ef3eb1
commit 2515692
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 82 deletions.
diff --git a/libs/langchain-openai/src/llms.ts b/libs/langchain-openai/src/llms.ts
@@ -157,7 +157,6 @@ export class OpenAI<CallOptions extends OpenAICallOptions = OpenAICallOptions>
       getEnvironmentVariable("OPENAI_ORGANIZATION");
 
     this.model = fields?.model ?? fields?.modelName ?? this.model;
-    console.log(this.model);
     if (
       (this.model?.startsWith("gpt-3.5-turbo") ||
         this.model?.startsWith("gpt-4") ||

diff --git a/libs/langchain-openai/src/tests/azure/chat_models.int.test.ts b/libs/langchain-openai/src/tests/azure/chat_models.int.test.ts
@@ -28,24 +28,6 @@ import { AzureChatOpenAI } from "../../azure/chat_models.js";
 // Save the original value of the 'LANGCHAIN_CALLBACKS_BACKGROUND' environment variable
 const originalBackground = process.env.LANGCHAIN_CALLBACKS_BACKGROUND;
 
-beforeAll(() => {
-  if (!process.env.AZURE_OPENAI_API_KEY) {
-    process.env.AZURE_OPENAI_API_KEY = process.env.TEST_AZURE_OPENAI_API_KEY;
-  }
-  if (!process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME) {
-    process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME =
-      process.env.TEST_AZURE_OPENAI_API_DEPLOYMENT_NAME;
-  }
-  if (!process.env.AZURE_OPENAI_BASE_PATH) {
-    process.env.AZURE_OPENAI_BASE_PATH =
-      process.env.TEST_AZURE_OPENAI_BASE_PATH;
-  }
-  if (!process.env.AZURE_OPENAI_API_VERSION) {
-    process.env.AZURE_OPENAI_API_VERSION =
-      process.env.TEST_AZURE_OPENAI_API_VERSION;
-  }
-});
-
 test("Test Azure ChatOpenAI call method", async () => {
   const chat = new AzureChatOpenAI({
     modelName: "gpt-3.5-turbo",

diff --git a/libs/langchain-openai/src/tests/azure/chat_models.standard.int.test.ts b/libs/langchain-openai/src/tests/azure/chat_models.standard.int.test.ts
@@ -1,36 +1,12 @@
 /* eslint-disable no-process-env */
-import { test, expect, beforeAll, afterAll } from "@jest/globals";
+import { test, expect, afterAll } from "@jest/globals";
 import { ChatModelIntegrationTests } from "@langchain/standard-tests";
 import { AIMessageChunk } from "@langchain/core/messages";
 import { AzureChatOpenAI } from "../../azure/chat_models.js";
 import { ChatOpenAICallOptions } from "../../chat_models.js";
 
 let openAIAPIKey: string | undefined;
 
-beforeAll(() => {
-  if (process.env.OPENAI_API_KEY) {
-    openAIAPIKey = process.env.OPENAI_API_KEY;
-    process.env.OPENAI_API_KEY = "";
-  }
-
-  if (!process.env.AZURE_OPENAI_API_KEY) {
-    process.env.AZURE_OPENAI_API_KEY = process.env.TEST_AZURE_OPENAI_API_KEY;
-  }
-  if (!process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME) {
-    process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME =
-      process.env.TEST_AZURE_OPENAI_API_DEPLOYMENT_NAME ??
-      process.env.AZURE_OPENAI_CHAT_DEPLOYMENT_NAME;
-  }
-  if (!process.env.AZURE_OPENAI_BASE_PATH) {
-    process.env.AZURE_OPENAI_BASE_PATH =
-      process.env.TEST_AZURE_OPENAI_BASE_PATH;
-  }
-  if (!process.env.AZURE_OPENAI_API_VERSION) {
-    process.env.AZURE_OPENAI_API_VERSION =
-      process.env.TEST_AZURE_OPENAI_API_VERSION;
-  }
-});
-
 afterAll(() => {
   if (openAIAPIKey) {
     process.env.OPENAI_API_KEY = openAIAPIKey;

diff --git a/libs/langchain-openai/src/tests/azure/embeddings.int.test.ts b/libs/langchain-openai/src/tests/azure/embeddings.int.test.ts
@@ -2,24 +2,6 @@
 import { test, expect } from "@jest/globals";
 import { AzureOpenAIEmbeddings as OpenAIEmbeddings } from "../../azure/embeddings.js";
 
-beforeAll(() => {
-  if (!process.env.AZURE_OPENAI_API_KEY) {
-    process.env.AZURE_OPENAI_API_KEY = process.env.TEST_AZURE_OPENAI_API_KEY;
-  }
-  if (!process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME) {
-    process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME =
-      process.env.TEST_AZURE_OPENAI_API_DEPLOYMENT_NAME;
-  }
-  if (!process.env.AZURE_OPENAI_BASE_PATH) {
-    process.env.AZURE_OPENAI_BASE_PATH =
-      process.env.TEST_AZURE_OPENAI_BASE_PATH;
-  }
-  if (!process.env.AZURE_OPENAI_API_VERSION) {
-    process.env.AZURE_OPENAI_API_VERSION =
-      process.env.TEST_AZURE_OPENAI_API_VERSION;
-  }
-});
-
 test("Test AzureOpenAIEmbeddings.embedQuery", async () => {
   const embeddings = new OpenAIEmbeddings();
   const res = await embeddings.embedQuery("Hello world");

diff --git a/libs/langchain-openai/src/tests/azure/llms.int.test.ts b/libs/langchain-openai/src/tests/azure/llms.int.test.ts
@@ -15,24 +15,6 @@ import { AzureOpenAI } from "../../azure/llms.js";
 // Save the original value of the 'LANGCHAIN_CALLBACKS_BACKGROUND' environment variable
 const originalBackground = process.env.LANGCHAIN_CALLBACKS_BACKGROUND;
 
-beforeAll(() => {
-  if (!process.env.AZURE_OPENAI_API_KEY) {
-    process.env.AZURE_OPENAI_API_KEY = process.env.TEST_AZURE_OPENAI_API_KEY;
-  }
-  if (!process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME) {
-    process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME =
-      process.env.TEST_AZURE_OPENAI_API_DEPLOYMENT_NAME;
-  }
-  if (!process.env.AZURE_OPENAI_BASE_PATH) {
-    process.env.AZURE_OPENAI_BASE_PATH =
-      process.env.TEST_AZURE_OPENAI_BASE_PATH;
-  }
-  if (!process.env.AZURE_OPENAI_API_VERSION) {
-    process.env.AZURE_OPENAI_API_VERSION =
-      process.env.TEST_AZURE_OPENAI_API_VERSION;
-  }
-});
-
 test("Test Azure OpenAI invoke", async () => {
   const model = new AzureOpenAI({
     maxTokens: 5,
@@ -262,7 +244,7 @@ test("Test Azure OpenAI in streaming mode with multiple prompts", async () => {
 
   const model = new AzureOpenAI({
     maxTokens: 5,
-    modelName: "gpt-3.5-turbo",
+    modelName: "gpt-3.5-turbo-instruct",
     streaming: true,
     n: 1,
     callbacks: CallbackManager.fromHandlers({

diff --git a/libs/langchain-openai/src/tests/llms.int.test.ts b/libs/langchain-openai/src/tests/llms.int.test.ts
@@ -239,7 +239,7 @@ test("Test OpenAIChat in streaming mode with multiple prompts", async () => {
 
   const model = new OpenAI({
     maxTokens: 5,
-    modelName: "gpt-3.5-turbo",
+    modelName: "gpt-3.5-turbo-instruct",
     streaming: true,
     n: 1,
     callbacks: CallbackManager.fromHandlers({