diff --git a/README.md b/README.md index a82185411..854ead427 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ You will need the following items to run the sample: | AI Service | Requirement | | ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Azure OpenAI | - [Access](https://aka.ms/oai/access)
- [Resource](https://learn.microsoft.com/azure/ai-services/openai/how-to/create-resource?pivots=web-portal#create-a-resource)
- [Deployed models](https://learn.microsoft.com/azure/ai-services/openai/how-to/create-resource?pivots=web-portal#deploy-a-model) (`gpt-35-turbo` and `text-embedding-ada-002`)
- [Endpoint](https://learn.microsoft.com/azure/ai-services/openai/tutorials/embeddings?tabs=command-line#retrieve-key-and-endpoint)
- [API key](https://learn.microsoft.com/azure/ai-services/openai/tutorials/embeddings?tabs=command-line#retrieve-key-and-endpoint) | +| Azure OpenAI | - [Access](https://aka.ms/oai/access)
- [Resource](https://learn.microsoft.com/azure/ai-services/openai/how-to/create-resource?pivots=web-portal#create-a-resource)
- [Deployed models](https://learn.microsoft.com/azure/ai-services/openai/how-to/create-resource?pivots=web-portal#deploy-a-model) (`gpt-4o` and `text-embedding-ada-002`)
- [Endpoint](https://learn.microsoft.com/azure/ai-services/openai/tutorials/embeddings?tabs=command-line#retrieve-key-and-endpoint)
- [API key](https://learn.microsoft.com/azure/ai-services/openai/tutorials/embeddings?tabs=command-line#retrieve-key-and-endpoint) | | OpenAI | - [Account](https://platform.openai.com/docs/overview)
- [API key](https://platform.openai.com/api-keys) | # Instructions @@ -66,7 +66,7 @@ You will need the following items to run the sample: - `API_KEY`: The `API key` for Azure OpenAI or for OpenAI. - `AZURE_OPENAI_ENDPOINT`: The Azure OpenAI resource `Endpoint` address. This is only required when using Azure OpenAI, omit `-Endpoint` if using OpenAI. - - > **IMPORTANT:** For `AzureOpenAI`, if you deployed models `gpt-35-turbo` and `text-embedding-ada-002` with custom names (instead of the default names), also use the parameters: + - > **IMPORTANT:** For `AzureOpenAI`, if you deployed models `gpt-4o` and `text-embedding-ada-002` with custom names (instead of the default names), also use the parameters: ```powershell -CompletionModel {DEPLOYMENT_NAME} -EmbeddingModel {DEPLOYMENT_NAME} @@ -142,7 +142,7 @@ You will need the following items to run the sample: - `AZURE_OPENAI_ENDPOINT`: The Azure OpenAI resource `Endpoint` address. - `API_KEY`: The `API key` for Azure OpenAI. - **IMPORTANT:** If you deployed models `gpt-35-turbo` and `text-embedding-ada-002` + **IMPORTANT:** If you deployed models `gpt-4o` and `text-embedding-ada-002` with custom names (instead of the default names), you need to specify the deployment names with three additional parameters: diff --git a/memorypipeline/appsettings.json b/memorypipeline/appsettings.json index f28436ab9..8484c4434 100644 --- a/memorypipeline/appsettings.json +++ b/memorypipeline/appsettings.json @@ -141,7 +141,7 @@ // - Auth is the authentication type: "APIKey" or "AzureIdentity". // - APIKey is the key generated to access the service. // - Endpoint is the service endpoint url. - // - Deployment is a completion model (e.g., gpt-35-turbo, gpt-4). + // - Deployment is a completion model (e.g., gpt-4, gpt-4o). // - APIType is the type of completion model: "ChatCompletion" or "TextCompletion". // - MaxRetries is the maximum number of retries for a failed request. // @@ -149,7 +149,7 @@ "Auth": "ApiKey", //"APIKey": "", // dotnet user-secrets set "SemanticMemory:Services:AzureOpenAIText:APIKey" "MY_AZUREOPENAI_KEY" "Endpoint": "", - "Deployment": "gpt-35-turbo", + "Deployment": "gpt-4o", "APIType": "ChatCompletion", "MaxRetries": 10 }, @@ -158,7 +158,7 @@ // - Auth is the authentication type: "APIKey" or "AzureIdentity". // - APIKey is the key generated to access the service. // - Endpoint is the service endpoint url. - // - Deployment is a embedding model (e.g., gpt-35-turbo, gpt-4). + // - Deployment is an embedding model (e.g., text-embedding-ada-002). // "AzureOpenAIEmbedding": { "Auth": "ApiKey", @@ -168,7 +168,7 @@ }, // // AI completion and embedding configuration for OpenAI services. - // - TextModel is a completion model (e.g., gpt-35-turbo, gpt-4). + // - TextModel is a completion model (e.g., gpt-4, gpt-4o). // - EmbeddingModelSet is an embedding model (e.g., "text-embedding-ada-002"). // - APIKey is the key generated to access the service. // - OrgId is the optional OpenAI organization id/key. diff --git a/scripts/.env b/scripts/.env index dbeb94515..dcac41131 100644 --- a/scripts/.env +++ b/scripts/.env @@ -1,8 +1,8 @@ # Default environment file to be read by scripts # Default values -ENV_COMPLETION_MODEL_OPEN_AI="gpt-3.5-turbo" -ENV_COMPLETION_MODEL_AZURE_OPEN_AI="gpt-35-turbo" +ENV_COMPLETION_MODEL_OPEN_AI="gpt-4o" +ENV_COMPLETION_MODEL_AZURE_OPEN_AI="gpt-4o" ENV_EMBEDDING_MODEL="text-embedding-ada-002" ENV_ASPNETCORE="Development" ENV_INSTANCE="https://login.microsoftonline.com" diff --git a/scripts/Variables.ps1 b/scripts/Variables.ps1 index 3d75b5c06..b4ff44529 100644 --- a/scripts/Variables.ps1 +++ b/scripts/Variables.ps1 @@ -1,8 +1,8 @@ # Default environment file to be read by scripts # Default values -$varCompletionModelOpenAI = "gpt-3.5-turbo" -$varCompletionModelAzureOpenAI = "gpt-35-turbo" +$varCompletionModelOpenAI = "gpt-4o" +$varCompletionModelAzureOpenAI = "gpt-4o" $varEmbeddingModel = "text-embedding-ada-002" $varASPNetCore = "Development" $varInstance = "https://login.microsoftonline.com" diff --git a/scripts/deploy/main.bicep b/scripts/deploy/main.bicep index 119f05cab..cc7991e7c 100644 --- a/scripts/deploy/main.bicep +++ b/scripts/deploy/main.bicep @@ -32,7 +32,7 @@ param webSearcherPackageUri string = 'https://aka.ms/copilotchat/websearcher/lat param aiService string = 'AzureOpenAI' @description('Model to use for chat completions') -param completionModel string = 'gpt-35-turbo' +param completionModel string = 'gpt-4o' @description('Model to use for text embeddings') param embeddingModel string = 'text-embedding-ada-002' diff --git a/scripts/deploy/main.json b/scripts/deploy/main.json index 6af068690..92141d4fb 100644 --- a/scripts/deploy/main.json +++ b/scripts/deploy/main.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.28.1.47646", - "templateHash": "7267170677416144946" + "templateHash": "18195377528136882013" } }, "parameters": { @@ -67,7 +67,7 @@ }, "completionModel": { "type": "string", - "defaultValue": "gpt-35-turbo", + "defaultValue": "gpt-4o", "metadata": { "description": "Model to use for chat completions" } diff --git a/webapi/appsettings.json b/webapi/appsettings.json index a21af1195..e1a4577a0 100644 --- a/webapi/appsettings.json +++ b/webapi/appsettings.json @@ -309,7 +309,7 @@ // - Auth is the authentication type: "APIKey" or "AzureIdentity". // - APIKey is the key generated to access the service. // - Endpoint is the service endpoint url. - // - Deployment is a embedding model (e.g., gpt-35-turbo, gpt-4). + // - Deployment is an embedding model (e.g., text-embedding-ada-002). // "AzureOpenAIEmbedding": { "Auth": "ApiKey",