diff --git a/scripts/.env b/scripts/.env index 5e0516c5c..dbeb94515 100644 --- a/scripts/.env +++ b/scripts/.env @@ -2,9 +2,7 @@ # Default values ENV_COMPLETION_MODEL_OPEN_AI="gpt-3.5-turbo" -ENV_PLANNER_MODEL_OPEN_AI="gpt-3.5-turbo" ENV_COMPLETION_MODEL_AZURE_OPEN_AI="gpt-35-turbo" -ENV_PLANNER_MODEL_AZURE_OPEN_AI="gpt-35-turbo" ENV_EMBEDDING_MODEL="text-embedding-ada-002" ENV_ASPNETCORE="Development" ENV_INSTANCE="https://login.microsoftonline.com" diff --git a/scripts/Configure.ps1 b/scripts/Configure.ps1 index 47b1afe4e..94819526c 100644 --- a/scripts/Configure.ps1 +++ b/scripts/Configure.ps1 @@ -3,7 +3,7 @@ Configure user secrets, appsettings.Development.json, and webapp/.env for Chat Copilot. .PARAMETER AIService -The service type used: OpenAI or Azure OpenAI. +The service type used: OpenAI or AzureOpenAI. .PARAMETER APIKey The API key for the AI service. @@ -17,9 +17,6 @@ The chat completion model to use (e.g., gpt-3.5-turbo or gpt-4). .PARAMETER EmbeddingModel The embedding model to use (e.g., text-embedding-ada-002). -.PARAMETER PlannerModel -The chat completion model to use for planning (e.g., gpt-3.5-turbo or gpt-4). - .PARAMETER FrontendClientId The client (application) ID associated with your frontend's AAD app registration. @@ -51,9 +48,6 @@ param( [Parameter(Mandatory = $false)] [string]$EmbeddingModel, - [Parameter(Mandatory = $false)] - [string]$PlannerModel, - [Parameter(Mandatory = $false)] [string] $FrontendClientId, @@ -74,21 +68,17 @@ $varScriptFilePath = Join-Path "$PSScriptRoot" 'Variables.ps1' # Set remaining values from Variables.ps1 if ($AIService -eq $varOpenAI) { if (!$CompletionModel) { + Write-Host "No completion model provided - Defaulting to $varCompletionModelOpenAI" $CompletionModel = $varCompletionModelOpenAI } - if (!$PlannerModel) { - $PlannerModel = $varPlannerModelOpenAI - } # TO DO: Validate model values if set by command line. } elseif ($AIService -eq $varAzureOpenAI) { if (!$CompletionModel) { + Write-Host "No completion model provided - Defaulting to $varCompletionModelAzureOpenAI" $CompletionModel = $varCompletionModelAzureOpenAI } - if (!$PlannerModel) { - $PlannerModel = $varPlannerModelAzureOpenAI - } # TO DO: Validate model values if set by command line. @@ -177,9 +167,6 @@ $appsettingsOverrides = @{ Scopes = $varScopes } }; - Planner = @{ - Model = $PlannerModel - }; KernelMemory = @{ TextGeneratorType = $AIService; DataIngestion = @{ diff --git a/scripts/Variables.ps1 b/scripts/Variables.ps1 index 64e92c020..3d75b5c06 100644 --- a/scripts/Variables.ps1 +++ b/scripts/Variables.ps1 @@ -2,9 +2,7 @@ # Default values $varCompletionModelOpenAI = "gpt-3.5-turbo" -$varPlannerModelOpenAI = "gpt-3.5-turbo" $varCompletionModelAzureOpenAI = "gpt-35-turbo" -$varPlannerModelAzureOpenAI = "gpt-35-turbo" $varEmbeddingModel = "text-embedding-ada-002" $varASPNetCore = "Development" $varInstance = "https://login.microsoftonline.com" diff --git a/scripts/configure.sh b/scripts/configure.sh index f88c23328..7cf2a591b 100755 --- a/scripts/configure.sh +++ b/scripts/configure.sh @@ -37,11 +37,6 @@ while [[ $# -gt 0 ]]; do shift shift ;; - --plannermodel) - PLANNER_MODEL="$2" - shift - shift - ;; -fc | --frontend-clientid) FRONTEND_CLIENT_ID="$2" shift @@ -111,17 +106,11 @@ if [ "$AI_SERVICE" = "$ENV_OPEN_AI" ]; then if [ -z "$COMPLETION_MODEL" ]; then COMPLETION_MODEL="$ENV_COMPLETION_MODEL_OPEN_AI" fi - if [ -z "$PLANNER_MODEL" ]; then - PLANNER_MODEL="$ENV_PLANNER_MODEL_OPEN_AI" - fi # TO DO: Validate model values if set by command line. else # elif [ "$AI_SERVICE" = "$ENV_AZURE_OPEN_AI" ]; then if [ -z "$COMPLETION_MODEL" ]; then COMPLETION_MODEL="$ENV_COMPLETION_MODEL_AZURE_OPEN_AI" fi - if [ -z "$PLANNER_MODEL" ]; then - PLANNER_MODEL="$ENV_PLANNER_MODEL_AZURE_OPEN_AI" - fi # TO DO: Validate model values if set by command line. fi @@ -194,9 +183,6 @@ APPSETTINGS_OVERRIDES="{ \"Scopes\": \"${ENV_SCOPES}\" } }, - \"Planner\": { - \"Model\": \"${PLANNER_MODEL}\" - }, \"KernelMemory\": { \"TextGeneratorType\": \"${AI_SERVICE}\", \"DataIngestion\": {