Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion src/providers/azure-openai/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ const AzureOpenAIAPIConfig: ProviderAPIConfig = {
return `https://${resourceName}.openai.azure.com/openai`;
},
headers: async ({ providerOptions, fn }) => {
const { apiKey, azureAuthMode } = providerOptions;
const { apiKey, azureAdToken, azureAuthMode } = providerOptions;
if (azureAdToken) {
return {
Authorization: `Bearer ${azureAdToken?.replace('Bearer ', '')}`,
};
}

if (azureAuthMode === 'entra') {
const { azureEntraTenantId, azureEntraClientId, azureEntraClientSecret } =
Expand Down
14 changes: 7 additions & 7 deletions src/providers/azure-openai/chatComplete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ export const AzureOpenAIChatCompleteConfig: ProviderConfig = {
param: 'n',
default: 1,
},
logprobs: {
param: 'logprobs',
default: false,
},
top_logprobs: {
param: 'top_logprobs',
},
stream: {
param: 'stream',
default: false,
Expand Down Expand Up @@ -111,6 +104,13 @@ export const AzureOpenAIChatCompleteConfig: ProviderConfig = {
stream_options: {
param: 'stream_options',
},
logprobs: {
param: 'logprobs',
default: false,
},
top_logprobs: {
param: 'top_logprobs',
},
web_search_options: {
param: 'web_search_options',
},
Expand Down
7 changes: 3 additions & 4 deletions src/providers/azure-openai/embed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ export const AzureOpenAIEmbedConfig: ProviderConfig = {
user: {
param: 'user',
},
encoding_format: {
param: 'encoding_format',
required: false,
},
dimensions: {
param: 'dimensions',
},
encoding_format: {
param: 'encoding_format',
},
};

interface AzureOpenAIEmbedResponse extends EmbedResponse {}
Expand Down
14 changes: 13 additions & 1 deletion src/providers/azure-openai/getBatchOutput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Context } from 'hono';
import AzureOpenAIAPIConfig from './api';
import { Options } from '../../types/requestBody';
import { RetrieveBatchResponse } from '../types';
import { AZURE_OPEN_AI } from '../../globals';

// Return a ReadableStream containing batches output data
export const AzureOpenAIGetBatchOutputRequestHandler = async ({
Expand Down Expand Up @@ -49,14 +50,25 @@ export const AzureOpenAIGetBatchOutputRequestHandler = async ({
const batchDetails: RetrieveBatchResponse =
await retrieveBatchesResponse.json();

const outputFileId = batchDetails.output_file_id;
const outputFileId =
batchDetails.output_file_id || batchDetails.error_file_id;
if (!outputFileId) {
const errors = batchDetails.errors;
if (errors) {
return new Response(JSON.stringify(errors), {
status: 200,
});
}
return new Response(
JSON.stringify({
error: 'invalid response output format',
provider_response: batchDetails,
provider: AZURE_OPEN_AI,
}),
{
status: 400,
}
);
}
const retrieveFileContentRequestURL = `https://api.portkey.ai/v1/files/${outputFileId}/content`; // construct the entire url instead of the path of sanity sake
const retrieveFileContentURL =
Expand Down
13 changes: 7 additions & 6 deletions src/providers/azure-openai/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
OpenAIDeleteModelResponseTransformer,
OpenAIGetModelResponseTransformer,
OpenAIListInputItemsResponseTransformer,
OpenAIResponseTransform,
} from '../open-ai-base';
import { AZURE_OPEN_AI } from '../../globals';

Expand Down Expand Up @@ -68,12 +69,12 @@ const AzureOpenAIConfig: ProviderConfigs = {
createTranscription: AzureOpenAICreateTranscriptionResponseTransform,
createTranslation: AzureOpenAICreateTranslationResponseTransform,
realtime: {},
uploadFile: AzureOpenAIResponseTransform,
listFiles: AzureOpenAIResponseTransform,
retrieveFile: AzureOpenAIResponseTransform,
deleteFile: AzureOpenAIResponseTransform,
retrieveFileContent: AzureOpenAIResponseTransform,
createFinetune: AzureOpenAIResponseTransform,
uploadFile: OpenAIResponseTransform,
listFiles: OpenAIResponseTransform,
retrieveFile: OpenAIResponseTransform,
deleteFile: OpenAIResponseTransform,
retrieveFileContent: OpenAIResponseTransform,
createFinetune: OpenAIResponseTransform,
retrieveFinetune: AzureOpenAIFinetuneResponseTransform,
createBatch: AzureOpenAIResponseTransform,
retrieveBatch: AzureOpenAIResponseTransform,
Expand Down
3 changes: 0 additions & 3 deletions src/providers/azure-openai/uploadFile.ts

This file was deleted.