Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openai[patch]: fix #5520 #5521

Merged
merged 4 commits into from
May 27, 2024
Merged

openai[patch]: fix #5520 #5521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74ecce6
langchain-openai[patch]: fix #5520
jeasonnow May 23, 2024
d60fbca
fix: don't rewrite config if they are already set in embedding and ch…
May 26, 2024
820908f
Merge branch 'main' of https://github.com/hwchase17/langchainjs into …
jacoblee93 May 26, 2024
3cf5904
Format
jacoblee93 May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions libs/langchain-openai/src/azure/chat_models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,13 @@ export class AzureChatOpenAI extends ChatOpenAI {
) {
const newFields = fields ? { ...fields } : fields;
if (newFields) {
newFields.azureOpenAIApiDeploymentName = newFields.deploymentName;
newFields.azureOpenAIApiKey = newFields.openAIApiKey;
newFields.azureOpenAIApiVersion = newFields.openAIApiVersion;
// don't rewrite the fields if they are already set
newFields.azureOpenAIApiDeploymentName =
newFields.azureOpenAIApiDeploymentName ?? newFields.deploymentName;
newFields.azureOpenAIApiKey =
newFields.azureOpenAIApiKey ?? newFields.openAIApiKey;
newFields.azureOpenAIApiVersion =
newFields.azureOpenAIApiVersion ?? newFields.openAIApiVersion;
}

super(newFields);
Expand Down
10 changes: 7 additions & 3 deletions libs/langchain-openai/src/azure/embeddings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@ export class AzureOpenAIEmbeddings extends OpenAIEmbeddings {
) {
const newFields = { ...fields };
if (Object.entries(newFields).length) {
newFields.azureOpenAIApiDeploymentName = newFields.deploymentName;
newFields.azureOpenAIApiKey = newFields.apiKey;
newFields.azureOpenAIApiVersion = newFields.openAIApiVersion;
// don't rewrite the fields if they are already set
newFields.azureOpenAIApiDeploymentName =
newFields.azureOpenAIApiDeploymentName ?? newFields.deploymentName;
newFields.azureOpenAIApiKey =
newFields.azureOpenAIApiKey ?? newFields.apiKey;
newFields.azureOpenAIApiVersion =
newFields.azureOpenAIApiVersion ?? newFields.openAIApiVersion;
}

super(newFields, configuration);
Expand Down
10 changes: 7 additions & 3 deletions libs/langchain-openai/src/azure/llms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,13 @@ export class AzureOpenAI extends OpenAI {
) {
const newFields = fields ? { ...fields } : fields;
if (newFields) {
newFields.azureOpenAIApiDeploymentName = newFields.deploymentName;
newFields.azureOpenAIApiKey = newFields.openAIApiKey;
newFields.azureOpenAIApiVersion = newFields.openAIApiVersion;
// don't rewrite the fields if they are already set
newFields.azureOpenAIApiDeploymentName =
newFields.azureOpenAIApiDeploymentName ?? newFields.deploymentName;
newFields.azureOpenAIApiKey =
newFields.azureOpenAIApiKey ?? newFields.openAIApiKey;
newFields.azureOpenAIApiVersion =
newFields.azureOpenAIApiVersion ?? newFields.openAIApiVersion;
}

super(newFields);
Expand Down
2 changes: 1 addition & 1 deletion libs/langchain-openai/src/utils/azure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export function getEndpoint(config: OpenAIEndpointConfig) {
} = config;

if (
azureOpenAIApiKey &&
(azureOpenAIApiKey || azureADTokenProvider) &&
azureOpenAIBasePath &&
azureOpenAIApiDeploymentName
) {
Expand Down
Loading