Add suggestions

Author: Milder Hernandez Cagua

api-test/integration-tests/pom.xml

@@ -144,31 +144,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.45.0</version> <!-- Use the latest version -->
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <images>
-                        <image>
-                            <name>pgvector:latest</name>
-                            <build>
-                                <dockerFile>${project.basedir}/api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/jdbc/pgvector/Dockerfile</dockerFile>
-                            </build>
-                        </image>
-                    </images>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

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

@@ -25,26 +25,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class JDBCVectorStoreDefaultQueryProvider
     implements JDBCVectorStoreQueryProvider {
-    /**
-     * Map of supported key types to their SQL types.
-     * Can be modified by subclasses.
-     */
-    protected Map<Class<?>, String> supportedKeyTypes;
 
-    /**
-     * Map of supported data types to their SQL types.
-     * Can be modified by subclasses.
-     */
-    protected Map<Class<?>, String> supportedDataTypes;
-
-    /**
-     * Map of supported vector types to their SQL types.
-     * Can be modified by subclasses.
-     */
-    protected Map<Class<?>, String> supportedVectorTypes;
+    private Map<Class<?>, String> supportedKeyTypes;
+    private Map<Class<?>, String> supportedDataTypes;
+    private Map<Class<?>, String> supportedVectorTypes;
     private final DataSource dataSource;
     private final String collectionsTable;
     private final String prefixForCollectionTables;
@@ -95,14 +83,9 @@ public static Builder builder() {
      * @return the formatted wildcard string
      */
     protected String getWildcardString(int wildcards) {
-        StringBuilder wildcardString = new StringBuilder();
-        for (int i = 0; i < wildcards; ++i) {
-            wildcardString.append("?");
-            if (i < wildcards - 1) {
-                wildcardString.append(", ");
-            }
-        }
-        return wildcardString.toString();
+        return Stream.generate(() -> "?")
+            .limit(wildcards)
+            .collect(Collectors.joining(", "));
     }
 
     /**
@@ -133,6 +116,36 @@ protected String getCollectionTableName(String collectionName) {
         return validateSQLidentifier(prefixForCollectionTables + collectionName);
     }
 
+    /**
+     * Gets the supported key types and their corresponding SQL types.
+     *
+     * @return the supported key types
+     */
+    @Override
+    public Map<Class<?>, String> getSupportedKeyTypes() {
+        return new HashMap<>(this.supportedKeyTypes);
+    }
+
+    /**
+     * Gets the supported data types and their corresponding SQL types.
+     *
+     * @return the supported data types
+     */
+    @Override
+    public Map<Class<?>, String> getSupportedDataTypes() {
+        return new HashMap<>(this.supportedDataTypes);
+    }
+
+    /**
+     * Gets the supported vector types and their corresponding SQL types.
+     *
+     * @return the supported vector types
+     */
+    @Override
+    public Map<Class<?>, String> getSupportedVectorTypes() {
+        return new HashMap<>(this.supportedVectorTypes);
+    }
+
     /**
      * Prepares the vector store.
      * Executes any necessary setup steps for the vector store.
@@ -165,11 +178,12 @@ public void validateSupportedTypes(Class<?> recordClass,
         VectorStoreRecordDefinition recordDefinition) {
         VectorStoreRecordDefinition.validateSupportedTypes(
             Collections.singletonList(recordDefinition.getKeyDeclaredField(recordClass)),
-            supportedKeyTypes.keySet());
+            getSupportedKeyTypes().keySet());
         VectorStoreRecordDefinition.validateSupportedTypes(
-            recordDefinition.getDataDeclaredFields(recordClass), supportedDataTypes.keySet());
+            recordDefinition.getDataDeclaredFields(recordClass), getSupportedDataTypes().keySet());
         VectorStoreRecordDefinition.validateSupportedTypes(
-            recordDefinition.getVectorDeclaredFields(recordClass), supportedVectorTypes.keySet());
+            recordDefinition.getVectorDeclaredFields(recordClass),
+            getSupportedVectorTypes().keySet());
     }
 
     /**
@@ -213,8 +227,8 @@ public void createCollection(String collectionName, Class<?> recordClass,
         String createStorageTable = "CREATE TABLE IF NOT EXISTS "
             + getCollectionTableName(collectionName)
             + " (" + keyDeclaredField.getName() + " VARCHAR(255) PRIMARY KEY, "
-            + getColumnNamesAndTypes(dataDeclaredFields, supportedDataTypes) + ", "
-            + getColumnNamesAndTypes(vectorDeclaredFields, supportedVectorTypes) + ");";
+            + getColumnNamesAndTypes(dataDeclaredFields, getSupportedDataTypes()) + ", "
+            + getColumnNamesAndTypes(vectorDeclaredFields, getSupportedVectorTypes()) + ");";
 
         String insertCollectionQuery = "INSERT INTO " + validateSQLidentifier(collectionsTable)
             + " (collectionId) VALUES (?)";

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

@@ -10,6 +10,7 @@
 
 import java.sql.ResultSet;
 import java.util.List;
+import java.util.Map;
 
 /**
  * The JDBC vector store query provider.
@@ -26,6 +27,27 @@ public interface JDBCVectorStoreQueryProvider {
      */
     String DEFAULT_PREFIX_FOR_COLLECTION_TABLES = "SKCollection_";
 
+    /**
+     * Gets the supported key types and their corresponding SQL types.
+     *
+     * @return the supported key types
+     */
+    Map<Class<?>, String> getSupportedKeyTypes();
+
+    /**
+     * Gets the supported data types and their corresponding SQL types.
+     *
+     * @return the supported data types
+     */
+    Map<Class<?>, String> getSupportedDataTypes();
+
+    /**
+     * Gets the supported vector types and their corresponding SQL types.
+     *
+     * @return the supported vector types
+     */
+    Map<Class<?>, String> getSupportedVectorTypes();
+
     /**
      * Prepares the vector store.
      * Executes any necessary setup steps for the vector store.

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

@@ -25,9 +25,15 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class PostgreSQLVectorStoreQueryProvider extends
     JDBCVectorStoreDefaultQueryProvider implements JDBCVectorStoreQueryProvider {
+
+    private Map<Class<?>, String> supportedKeyTypes;
+    private Map<Class<?>, String> supportedDataTypes;
+    private Map<Class<?>, String> supportedVectorTypes;
+
     private final DataSource dataSource;
     private final String collectionsTable;
     private final String prefixForCollectionTables;
@@ -63,6 +69,36 @@ private PostgreSQLVectorStoreQueryProvider(DataSource dataSource, String collect
         supportedVectorTypes.put(Collection.class, "VECTOR(%d)");
     }
 
+    /**
+     * Gets the supported key types and their corresponding SQL types.
+     *
+     * @return the supported key types
+     */
+    @Override
+    public Map<Class<?>, String> getSupportedKeyTypes() {
+        return new HashMap<>(this.supportedKeyTypes);
+    }
+
+    /**
+     * Gets the supported data types and their corresponding SQL types.
+     *
+     * @return the supported data types
+     */
+    @Override
+    public Map<Class<?>, String> getSupportedDataTypes() {
+        return new HashMap<>(this.supportedDataTypes);
+    }
+
+    /**
+     * Gets the supported vector types and their corresponding SQL types.
+     *
+     * @return the supported vector types
+     */
+    @Override
+    public Map<Class<?>, String> getSupportedVectorTypes() {
+        return new HashMap<>(this.supportedVectorTypes);
+    }
+
     /**
      * Creates a new builder.
      * @return the builder
@@ -103,7 +139,7 @@ private String getColumnNamesAndTypesForVectorFields(List<VectorStoreRecordVecto
                 }
 
                 if (declaredField.getType().equals(String.class)) {
-                    columnNames.append(field.getName())
+                    columnNames.append(field.getName()).append(" ")
                         .append(supportedVectorTypes.get(String.class));
                 } else {
                     // Get the vector type and dimensions