openai[minor]: Update OpenAI with Azure Specific Code #5323
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| import { | ||
| type ClientOptions, | ||
| AzureOpenAI as AzureOpenAIClient, | ||
| OpenAI as OpenAIClient, | ||
| } from "openai"; | ||
| import { OpenAIEmbeddings, OpenAIEmbeddingsParams } from "../embeddings.js"; | ||
| import { | ||
| AzureOpenAIInput, | ||
| OpenAICoreRequestOptions, | ||
| LegacyOpenAIInput, | ||
| } from "../types.js"; | ||
| import { getEndpoint, OpenAIEndpointConfig } from "../utils/azure.js"; | ||
| import { wrapOpenAIClientError } from "../utils/openai.js"; | ||
|
|
||
| export class AzureOpenAIEmbeddings extends OpenAIEmbeddings { | ||
| constructor( | ||
| fields?: Partial<OpenAIEmbeddingsParams> & | ||
| Partial<AzureOpenAIInput> & { | ||
| verbose?: boolean; | ||
| /** | ||
| * The OpenAI API key to use. | ||
| * Alias for `apiKey`. | ||
| */ | ||
| openAIApiKey?: string; | ||
sarangan12 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /** The OpenAI API key to use. */ | ||
| apiKey?: string; | ||
| configuration?: ClientOptions; | ||
| deploymentName?: string; | ||
| openAIApiVersion?: string; | ||
| }, | ||
| configuration?: ClientOptions & LegacyOpenAIInput | ||
| ) { | ||
| const newFields = fields ? { ...fields } : fields; | ||
| if (newFields) { | ||
sarangan12 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| newFields.azureOpenAIApiDeploymentName = newFields.deploymentName; | ||
| newFields.azureOpenAIApiKey = newFields.openAIApiKey; | ||
| newFields.azureOpenAIApiVersion = newFields.openAIApiVersion; | ||
| } | ||
|
|
||
| super(newFields, configuration); | ||
| } | ||
|
|
||
| protected async embeddingWithRetry( | ||
| request: OpenAIClient.EmbeddingCreateParams | ||
| ) { | ||
| if (!this.client) { | ||
| const openAIEndpointConfig: OpenAIEndpointConfig = { | ||
| azureOpenAIApiDeploymentName: this.azureOpenAIApiDeploymentName, | ||
| azureOpenAIApiInstanceName: this.azureOpenAIApiInstanceName, | ||
| azureOpenAIApiKey: this.azureOpenAIApiKey, | ||
| azureOpenAIBasePath: this.azureOpenAIBasePath, | ||
| baseURL: this.clientConfig.baseURL, | ||
| }; | ||
|
|
||
| const endpoint = getEndpoint(openAIEndpointConfig); | ||
|
|
||
| const params = { | ||
| ...this.clientConfig, | ||
| baseURL: endpoint, | ||
| timeout: this.timeout, | ||
| maxRetries: 0, | ||
| }; | ||
|
|
||
| if (!this.azureADTokenProvider) { | ||
| params.apiKey = openAIEndpointConfig.azureOpenAIApiKey; | ||
| } | ||
|
|
||
| if (!params.baseURL) { | ||
| delete params.baseURL; | ||
| } | ||
|
|
||
| this.client = new AzureOpenAIClient({ | ||
| apiVersion: this.azureOpenAIApiVersion, | ||
| azureADTokenProvider: this.azureADTokenProvider, | ||
| deployment: this.azureOpenAIApiDeploymentName, | ||
| ...params, | ||
| }); | ||
| } | ||
| const requestOptions: OpenAICoreRequestOptions = {}; | ||
| if (this.azureOpenAIApiKey) { | ||
| requestOptions.headers = { | ||
| "api-key": this.azureOpenAIApiKey, | ||
| ...requestOptions.headers, | ||
| }; | ||
| requestOptions.query = { | ||
| "api-version": this.azureOpenAIApiVersion, | ||
| ...requestOptions.query, | ||
| }; | ||
| } | ||
| return this.caller.call(async () => { | ||
| try { | ||
| const res = await this.client.embeddings.create( | ||
| request, | ||
| requestOptions | ||
| ); | ||
| return res; | ||
| } catch (e) { | ||
| const error = wrapOpenAIClientError(e); | ||
| throw error; | ||
| } | ||
| }); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey there! 👋 I noticed that the package.json file has an update to the "openai" dependency version and a new dev dependency "@azure/identity" added. This is just a heads up for the maintainers to review the changes in dependencies. Keep up the great work! 🚀