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

Jump to bottom

openai[patch]: Update default headers azure & Add Token Provider Check #5379

Merged
merged 8 commits into from
May 15, 2024
Merged

openai[patch]: Update default headers azure & Add Token Provider Check #5379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
227d34c
Update Default Headers for Azure OpenAI Requests
sarangan12 May 15, 2024
d968b4c
nit
sarangan12 May 15, 2024
a9c0754
Update user agent string
sarangan12 May 15, 2024
743b4a0
Add Token Provider check
sarangan12 May 15, 2024
921b5d4
Update libs/langchain-openai/src/azure/llms.ts
sarangan12 May 15, 2024
cdecce5
Update libs/langchain-openai/src/azure/embeddings.ts
sarangan12 May 15, 2024
06f6069
Update libs/langchain-openai/src/azure/chat_models.ts
sarangan12 May 15, 2024
61940ce
Format the code
sarangan12 May 15, 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
8 changes: 8 additions & 0 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 @@ -50,6 +50,7 @@ export class AzureChatOpenAI extends ChatOpenAI {
azureOpenAIApiInstanceName: this.azureOpenAIApiInstanceName,
azureOpenAIApiKey: this.azureOpenAIApiKey,
azureOpenAIBasePath: this.azureOpenAIBasePath,
azureADTokenProvider: this.azureADTokenProvider,
baseURL: this.clientConfig.baseURL,
};

Expand All @@ -70,6 +71,13 @@ export class AzureChatOpenAI extends ChatOpenAI {
delete params.baseURL;
}

params.defaultHeaders = {
...params.defaultHeaders,
"User-Agent": params.defaultHeaders?.["User-Agent"]
? `${params.defaultHeaders["User-Agent"]}: langchainjs-azure-openai-v2`
: `langchainjs-azure-openai-v2`,
};

this.client = new AzureOpenAIClient({
apiVersion: this.azureOpenAIApiVersion,
azureADTokenProvider: this.azureADTokenProvider,
Expand Down
8 changes: 8 additions & 0 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 @@ -44,6 +44,7 @@ export class AzureOpenAIEmbeddings extends OpenAIEmbeddings {
azureOpenAIApiInstanceName: this.azureOpenAIApiInstanceName,
azureOpenAIApiKey: this.azureOpenAIApiKey,
azureOpenAIBasePath: this.azureOpenAIBasePath,
azureADTokenProvider: this.azureADTokenProvider,
baseURL: this.clientConfig.baseURL,
};

Expand All @@ -64,6 +65,13 @@ export class AzureOpenAIEmbeddings extends OpenAIEmbeddings {
delete params.baseURL;
}

params.defaultHeaders = {
...params.defaultHeaders,
"User-Agent": params.defaultHeaders?.["User-Agent"]
? `${params.defaultHeaders["User-Agent"]}: langchainjs-azure-openai-v2`
: `langchainjs-azure-openai-v2`,
};

this.client = new AzureOpenAIClient({
apiVersion: this.azureOpenAIApiVersion,
azureADTokenProvider: this.azureADTokenProvider,
Expand Down
8 changes: 8 additions & 0 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 @@ -46,6 +46,7 @@ export class AzureOpenAI extends OpenAI {
azureOpenAIApiInstanceName: this.azureOpenAIApiInstanceName,
azureOpenAIApiKey: this.azureOpenAIApiKey,
azureOpenAIBasePath: this.azureOpenAIBasePath,
azureADTokenProvider: this.azureADTokenProvider,
baseURL: this.clientConfig.baseURL,
};

Expand All @@ -66,6 +67,13 @@ export class AzureOpenAI extends OpenAI {
delete params.baseURL;
}

params.defaultHeaders = {
...params.defaultHeaders,
"User-Agent": params.defaultHeaders?.["User-Agent"]
? `${params.defaultHeaders["User-Agent"]}: langchainjs-azure-openai-v2`
: `langchainjs-azure-openai-v2`,
};

this.client = new AzureOpenAIClient({
apiVersion: this.azureOpenAIApiVersion,
azureADTokenProvider: this.azureADTokenProvider,
Expand Down
4 changes: 3 additions & 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 @@ -2,6 +2,7 @@ export interface OpenAIEndpointConfig {
azureOpenAIApiDeploymentName?: string;
azureOpenAIApiInstanceName?: string;
azureOpenAIApiKey?: string;
azureADTokenProvider?: () => Promise<string>;
azureOpenAIBasePath?: string;
baseURL?: string | null;
}
Expand Down Expand Up @@ -35,6 +36,7 @@ export function getEndpoint(config: OpenAIEndpointConfig) {
azureOpenAIApiKey,
azureOpenAIBasePath,
baseURL,
azureADTokenProvider,
} = config;

if (
Expand All @@ -45,7 +47,7 @@ export function getEndpoint(config: OpenAIEndpointConfig) {
return `${azureOpenAIBasePath}/${azureOpenAIApiDeploymentName}`;
}

if (azureOpenAIApiKey) {
if (azureOpenAIApiKey || azureADTokenProvider) {
if (!azureOpenAIApiInstanceName) {
throw new Error(
"azureOpenAIApiInstanceName is required when using azureOpenAIApiKey"
Expand Down
Loading