Rename GetRecordOptions.isIncludeVectors

Author: Milder Hernandez Cagua

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/azureaisearch/AzureAISearchVectorStoreRecordCollection.java

@@ -15,7 +15,6 @@
 import com.azure.search.documents.models.VectorizableTextQuery;
 import com.azure.search.documents.models.VectorizedQuery;
 import com.microsoft.semantickernel.data.vectorsearch.VectorizableSearch;
-import com.microsoft.semantickernel.data.vectorsearch.VectorSearch;
 import com.microsoft.semantickernel.data.vectorsearch.VectorSearchResult;
 import com.microsoft.semantickernel.data.vectorsearch.VectorizedSearch;
 import com.microsoft.semantickernel.data.vectorstorage.VectorStoreRecordCollection;
@@ -194,7 +193,7 @@ public Mono<Record> getAsync(
         @Nonnull String key, GetRecordOptions options) {
         // If vectors are not requested, only fetch non-vector fields
         List<String> selectedFields = null;
-        if (options == null || !options.includeVectors()) {
+        if (options == null || !options.isIncludeVectors()) {
             selectedFields = Collections.unmodifiableList(nonVectorFields);
         }
 

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/jdbc/JDBCVectorStoreQueryProvider.java

@@ -338,7 +338,7 @@ public <Record> List<Record> getRecords(String collectionName, List<String> keys
         VectorStoreRecordMapper<Record, ResultSet> mapper,
         GetRecordOptions options) {
         List<VectorStoreRecordField> fields;
-        if (options != null && options.includeVectors()) {
+        if (options != null && options.isIncludeVectors()) {
             fields = recordDefinition.getAllFields();
         } else {
             fields = recordDefinition.getNonVectorFields();

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/jdbc/JDBCVectorStoreRecordMapper.java

@@ -19,7 +19,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 
 public class JDBCVectorStoreRecordMapper<Record>
     extends VectorStoreRecordMapper<Record, ResultSet> {
@@ -115,7 +114,7 @@ public JDBCVectorStoreRecordMapper<Record> build() {
                         // Select fields from the record definition.
                         List<VectorStoreRecordField> fields;
                         ResultSetMetaData metaData = resultSet.getMetaData();
-                        if (options != null && options.includeVectors()) {
+                        if (options != null && options.isIncludeVectors()) {
                             fields = vectorStoreRecordDefinition.getAllFields();
                         } else {
                             fields = vectorStoreRecordDefinition.getNonVectorFields();

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/postgres/PostgreSQLVectorStoreRecordMapper.java

@@ -16,11 +16,9 @@
 import org.postgresql.util.PGobject;
 
 import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 
 public class PostgreSQLVectorStoreRecordMapper<Record>
     extends VectorStoreRecordMapper<Record, ResultSet> {
@@ -107,7 +105,7 @@ public PostgreSQLVectorStoreRecordMapper<Record> build() {
 
                         // Select fields from the record definition.
                         List<VectorStoreRecordField> fields;
-                        if (options != null && options.includeVectors()) {
+                        if (options != null && options.isIncludeVectors()) {
                             fields = vectorStoreRecordDefinition.getAllFields();
                         } else {
                             fields = vectorStoreRecordDefinition.getNonVectorFields();

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/redis/RedisHashSetVectorStoreRecordCollection.java

@@ -231,7 +231,7 @@ public Mono<List<Record>> getBatchAsync(List<String> keys,
         keys.forEach(key -> {
             String redisKey = getRedisKey(key, collectionName);
 
-            if (options != null && options.includeVectors()) {
+            if (options != null && options.isIncludeVectors()) {
                 // Returns Map<String, String> with the fields and values
                 responses.add(new AbstractMap.SimpleEntry<>(key, pipeline.hgetAll(redisKey)));
             } else {
@@ -247,7 +247,7 @@ public Mono<List<Record>> getBatchAsync(List<String> keys,
             try {
                 return Mono.just(responses.stream()
                     .map(entry -> {
-                        if (options != null && options.includeVectors()) {
+                        if (options != null && options.isIncludeVectors()) {
                             // Results directly in a Map<String, String>
                             return this.vectorStoreRecordMapper
                                 .mapStorageModeltoRecord(

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/redis/RedisHashSetVectorStoreRecordMapper.java

@@ -19,7 +19,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
@@ -135,7 +134,7 @@ public RedisHashSetVectorStoreRecordMapper<Record> build() {
                             storageModel.getValue().get(field.getEffectiveStorageName()));
                     }
 
-                    if (options != null && options.includeVectors()) {
+                    if (options != null && options.isIncludeVectors()) {
                         for (VectorStoreRecordVectorField field : recordDefinition
                             .getVectorFields()) {
                             String value = storageModel.getValue()

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/redis/RedisJsonVectorStoreRecordCollection.java

@@ -214,7 +214,7 @@ public Mono<Record> getAsync(String key, GetRecordOptions options) {
         return Mono.defer(() -> {
             try {
                 Object value;
-                if (options != null && options.includeVectors()) {
+                if (options != null && options.isIncludeVectors()) {
                     value = client.jsonGet(redisKey);
                 } else {
                     value = client.jsonGet(redisKey, dataFields);
@@ -225,7 +225,7 @@ public Mono<Record> getAsync(String key, GetRecordOptions options) {
                 }
 
                 JsonNode jsonNode;
-                if (options != null && options.includeVectors()) {
+                if (options != null && options.isIncludeVectors()) {
                     jsonNode = objectMapper.valueToTree(value);
                 } else {
                     // Remove the $. prefix from every key in the JSON object
@@ -255,7 +255,7 @@ public Mono<List<Record>> getBatchAsync(List<String> keys,
         keys.forEach(key -> {
             String redisKey = getRedisKey(key, collectionName);
 
-            if (options != null && options.includeVectors()) {
+            if (options != null && options.isIncludeVectors()) {
                 responses.add(new SimpleEntry<>(key, pipeline.jsonGet(redisKey)));
             } else {
                 responses.add(new SimpleEntry<>(key, pipeline.jsonGet(redisKey, dataFields)));
@@ -274,7 +274,7 @@ public Mono<List<Record>> getBatchAsync(List<String> keys,
                         }
 
                         JsonNode jsonNode;
-                        if (options != null && options.includeVectors()) {
+                        if (options != null && options.isIncludeVectors()) {
                             jsonNode = objectMapper.valueToTree(value);
                         } else {
                             jsonNode = removeRedisPathPrefix((JSONObject) value);

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/data/vectorstorage/options/GetRecordOptions.java

@@ -52,7 +52,7 @@ public GetRecordOptions build() {
      *
      * @return whether to include vectors
      */
-    public boolean includeVectors() {
+    public boolean isIncludeVectors() {
         return includeVectors;
     }
 }