Always enable integrated vectorization at query time

Author: jelledruyts

src/Azure.AISearch.WebApp/Models/SearchRequest.cs

@@ -10,7 +10,7 @@ public class SearchRequest
     public QuerySyntax QuerySyntax { get; set; } = QuerySyntax.Simple;
     public DataSourceType DataSource { get; set; } = DataSourceType.None;
     public string? OpenAIGptDeployment { get; set; }
-    public bool UseIntegratedVectorization { get; set; }
+    public bool UseIntegratedVectorization { get; set; } = true;
     public int? VectorNearestNeighborsCount { get; set; } = Constants.Defaults.VectorNearestNeighborsCount;
     public bool LimitToDataSource { get; set; } = true; // "Limit responses to your data content"
     public string? SystemRoleInformation { get; set; } // Give the model instructions about how it should behave and any context it should reference when generating a response. You can describe the assistant’s personality, tell it what it should and shouldn’t answer, and tell it how to format responses. There’s no token limit for this section, but it will be included with every API call, so it counts against the overall token limit.

src/Azure.AISearch.WebApp/Services/AzureCognitiveSearchConfigurationService.cs

@@ -397,7 +397,8 @@ private async Task CreateChunksIndex(AppSettingsOverride? settingsOverride, stri
 
     private SearchIndex GetChunksSearchIndex(string chunkIndexName, AppSettingsOverride? settingsOverride)
     {
-        var chunksSearchIndex = new SearchIndex(chunkIndexName)
+        ArgumentNullException.ThrowIfNull(this.settings.OpenAIEndpoint);
+        return new SearchIndex(chunkIndexName)
         {
             Fields =
             {
@@ -434,6 +435,9 @@ private SearchIndex GetChunksSearchIndex(string chunkIndexName, AppSettingsOverr
                 Profiles =
                 {
                     new VectorSearchProfile(Constants.ConfigurationNames.VectorSearchProfileNameDefault, Constants.ConfigurationNames.VectorSearchAlgorithNameDefault)
+                    {
+                        Vectorizer = Constants.ConfigurationNames.VectorSearchVectorizerNameDefault
+                    }
                 },
                 Algorithms =
                 {
@@ -447,28 +451,21 @@ private SearchIndex GetChunksSearchIndex(string chunkIndexName, AppSettingsOverr
                             Metric = Constants.Defaults.HnswParametersMetric
                         }
                     }
+                },
+                Vectorizers =
+                {
+                    new AzureOpenAIVectorizer(Constants.ConfigurationNames.VectorSearchVectorizerNameDefault)
+                    {
+                        AzureOpenAIParameters = new AzureOpenAIParameters
+                        {
+                            ResourceUri = new Uri(this.settings.OpenAIEndpoint),
+                            DeploymentId = this.settings.OpenAIEmbeddingDeployment,
+                            ApiKey = this.settings.OpenAIApiKey
+                        }
+                    }
                 }
             }
         };
-
-        var searchIndexerSkillType = GetSearchIndexerSkillType(settingsOverride);
-        if (string.Equals(searchIndexerSkillType, Constants.SearchIndexerSkillTypes.Integrated, StringComparison.InvariantCultureIgnoreCase))
-        {
-            // For integrated vectorization, use the OpenAI vectorizer to generate the embeddings for the search query itself.
-            ArgumentNullException.ThrowIfNull(this.settings.OpenAIEndpoint);
-            chunksSearchIndex.VectorSearch.Vectorizers.Add(new AzureOpenAIVectorizer(Constants.ConfigurationNames.VectorSearchVectorizerNameDefault)
-            {
-                AzureOpenAIParameters = new AzureOpenAIParameters
-                {
-                    ResourceUri = new Uri(this.settings.OpenAIEndpoint),
-                    DeploymentId = this.settings.OpenAIEmbeddingDeployment,
-                    ApiKey = this.settings.OpenAIApiKey
-                }
-            });
-            chunksSearchIndex.VectorSearch.Profiles[0].Vectorizer = Constants.ConfigurationNames.VectorSearchVectorizerNameDefault;
-        }
-
-        return chunksSearchIndex;
     }
 
     private TimeSpan GetIndexingSchedule(AppSettingsOverride? settingsOverride)