Adding Oracle Database Vector Store Connector

.vscode/settings.json

@@ -21,5 +21,6 @@
     },
   },
   "java.debug.settings.onBuildFailureProceed": true,
-  "java.compile.nullAnalysis.mode": "disabled"
+  "java.compile.nullAnalysis.mode": "disabled",
+  "java.configuration.updateBuildConfiguration": "interactive"
 }

agents/semantickernel-agents-core/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.microsoft.semantic-kernel</groupId>
@@ -18,6 +19,18 @@
             <groupId>com.microsoft.semantic-kernel</groupId>
             <artifactId>semantickernel-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-builders</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-ai-services</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-exceptions</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

aiservices/google/pom.xml

@@ -34,6 +34,22 @@
             <groupId>com.microsoft.semantic-kernel</groupId>
             <artifactId>semantickernel-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-builders</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-ai-services</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-exceptions</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-localization</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

aiservices/huggingface/pom.xml

@@ -31,6 +31,14 @@
             <groupId>com.microsoft.semantic-kernel</groupId>
             <artifactId>semantickernel-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-exceptions</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-ai-services</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>

aiservices/openai/pom.xml

@@ -19,6 +19,30 @@
             <groupId>com.microsoft.semantic-kernel</groupId>
             <artifactId>semantickernel-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-data</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-exceptions</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-ai-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-builders</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-textembedding-services</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-ai-openai</artifactId>

api-test/integration-tests/pom.xml

@@ -61,6 +61,21 @@
             <artifactId>semantickernel-data-jdbc</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-data-mysql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-data-hsqldb</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-data-sqlite</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.microsoft.semantic-kernel</groupId>
             <artifactId>semantickernel-data-redis</artifactId>

data/semantickernel-data-azureaisearch/pom.xml

@@ -21,6 +21,14 @@
             <groupId>com.microsoft.semantic-kernel</groupId>
             <artifactId>semantickernel-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-data</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-exceptions</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.azure</groupId>

data/semantickernel-data-hsqldb/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.microsoft.semantic-kernel</groupId>
+        <artifactId>semantickernel-parent</artifactId>
+        <version>1.4.4-RC2-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>com.microsoft.semantic-kernel</groupId>
+    <artifactId>semantickernel-data-hsqldb</artifactId>
+    <name>Semantic Kernel HLSQLDB connector</name>
+    <description>Provides a HLSQLDB connector for the Semantic Kernel</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-data-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-exceptions</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-data</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-builders</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+        </dependency>
+    </dependencies>
+</project>

data/semantickernel-data-jdbc/pom.xml

@@ -15,9 +15,19 @@
     <dependencies>
         <dependency>
             <groupId>com.microsoft.semantic-kernel</groupId>
-            <artifactId>semantickernel-api</artifactId>
+            <artifactId>semantickernel-api-data</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-exceptions</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.semantic-kernel</groupId>
+            <artifactId>semantickernel-api-builders</artifactId>
+            <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -63,5 +73,10 @@
             <artifactId>sqlite-jdbc</artifactId>
             <version>3.47.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc11</artifactId>
+            <version>23.7.0.25.01</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -106,7 +106,7 @@ public JDBCVectorStoreQueryProvider(
         @SuppressFBWarnings("EI_EXPOSE_REP2") @Nonnull DataSource dataSource,
         @Nonnull String collectionsTable,
         @Nonnull String prefixForCollectionTables,
-        @Nonnull HashMap<Class<?>, String> supportedKeyTypes,
+        @Nonnull Map<Class<?>, String> supportedKeyTypes,
         @Nonnull Map<Class<?>, String> supportedDataTypes,
         @Nonnull Map<Class<?>, String> supportedVectorTypes) {
         this.dataSource = dataSource;
@@ -220,7 +220,7 @@ public Map<Class<?>, String> getSupportedVectorTypes() {
     @Override
     public void prepareVectorStore() {
         String createCollectionsTable = formatQuery(
-            "CREATE TABLE IF NOT EXISTS %s (collectionId VARCHAR(255) PRIMARY KEY);",
+            "CREATE TABLE IF NOT EXISTS %s (collectionId VARCHAR(255) PRIMARY KEY)",
             validateSQLidentifier(collectionsTable));
 
         try (Connection connection = dataSource.getConnection();
@@ -701,6 +701,16 @@ public String getAnyTagEqualToFilter(AnyTagEqualToFilterClause filterClause) {
         return String.format("%s LIKE ?", fieldName);
     }
 
+    @Override
+    public <Record> VectorStoreRecordMapper<Record, ResultSet> getVectorStoreRecordMapper(
+        Class<Record> recordClass,
+        VectorStoreRecordDefinition recordDefinition) {
+        return JDBCVectorStoreRecordMapper.<Record>builder()
+            .withRecordClass(recordClass)
+            .withVectorStoreRecordDefinition(recordDefinition)
+            .build();
+    }
+
     /**
      * The builder for {@link JDBCVectorStoreQueryProvider}.
      */
@@ -755,4 +765,5 @@ public JDBCVectorStoreQueryProvider build() {
                 prefixForCollectionTables);
         }
     }
+
 }

data/semantickernel-data-jdbc/src/main/java/com/microsoft/semantickernel/data/jdbc/JDBCVectorStoreRecordCollection.java

@@ -2,9 +2,6 @@
 package com.microsoft.semantickernel.data.jdbc;
 
 import com.microsoft.semantickernel.builders.SemanticKernelBuilder;
-import com.microsoft.semantickernel.data.jdbc.mysql.MySQLVectorStoreQueryProvider;
-import com.microsoft.semantickernel.data.jdbc.postgres.PostgreSQLVectorStoreQueryProvider;
-import com.microsoft.semantickernel.data.jdbc.postgres.PostgreSQLVectorStoreRecordMapper;
 import com.microsoft.semantickernel.data.vectorsearch.VectorSearchResults;
 import com.microsoft.semantickernel.data.vectorstorage.VectorStoreRecordCollection;
 import com.microsoft.semantickernel.data.vectorstorage.VectorStoreRecordMapper;
@@ -37,10 +34,10 @@ public class JDBCVectorStoreRecordCollection<Record>
     implements SQLVectorStoreRecordCollection<String, Record> {
 
     private final String collectionName;
-    private final VectorStoreRecordDefinition recordDefinition;
-    private final VectorStoreRecordMapper<Record, ResultSet> vectorStoreRecordMapper;
+    protected final VectorStoreRecordDefinition recordDefinition;
+    protected final VectorStoreRecordMapper<Record, ResultSet> vectorStoreRecordMapper;
     private final JDBCVectorStoreRecordCollectionOptions<Record> options;
-    private final SQLVectorStoreQueryProvider queryProvider;
+    protected final SQLVectorStoreQueryProvider queryProvider;
 
     /**
      * Creates a new instance of the {@link JDBCVectorStoreRecordCollection}.
@@ -73,25 +70,9 @@ public JDBCVectorStoreRecordCollection(
 
         // If mapper is not provided, set a default one
         if (options.getVectorStoreRecordMapper() == null) {
-            // Default mapper for PostgreSQL
-            if (this.queryProvider instanceof PostgreSQLVectorStoreQueryProvider) {
-                vectorStoreRecordMapper = PostgreSQLVectorStoreRecordMapper.<Record>builder()
-                    .withRecordClass(options.getRecordClass())
-                    .withVectorStoreRecordDefinition(recordDefinition)
-                    .build();
-                // Default mapper for MySQL
-            } else if (this.queryProvider instanceof MySQLVectorStoreQueryProvider) {
-                vectorStoreRecordMapper = JDBCVectorStoreRecordMapper.<Record>builder()
-                    .withRecordClass(options.getRecordClass())
-                    .withVectorStoreRecordDefinition(recordDefinition)
-                    .build();
-                // Default mapper for other databases
-            } else {
-                vectorStoreRecordMapper = JDBCVectorStoreRecordMapper.<Record>builder()
-                    .withRecordClass(options.getRecordClass())
-                    .withVectorStoreRecordDefinition(recordDefinition)
-                    .build();
-            }
+            vectorStoreRecordMapper = options.getQueryProvider()
+                .getVectorStoreRecordMapper(options.getRecordClass(),
+                    recordDefinition);
         } else {
             vectorStoreRecordMapper = options.getVectorStoreRecordMapper();
         }
@@ -214,7 +195,7 @@ protected String getKeyFromRecord(Record data) {
             Field keyField = data.getClass()
                 .getDeclaredField(recordDefinition.getKeyField().getName());
             keyField.setAccessible(true);
-            return (String) keyField.get(data);
+            return keyField.get(data).toString();
         } catch (NoSuchFieldException | IllegalAccessException e) {
             throw new SKException("Failed to get key from record", e);
         }

data/semantickernel-data-jdbc/src/main/java/com/microsoft/semantickernel/data/jdbc/SQLVectorStoreQueryProvider.java

@@ -151,6 +151,18 @@ <Record> VectorSearchResults<Record> search(String collectionName,
         VectorStoreRecordDefinition recordDefinition,
         VectorStoreRecordMapper<Record, ResultSet> mapper);
 
+    /**
+     * Gets the record mapper for the given record class and definition.
+     * 
+     * @param <Record>         the record type
+     * @param recordClass      the record class
+     * @param recordDefinition the record definition
+     * @return the record mapper that maps JDBC result sets to the given record.
+     */
+    <Record> VectorStoreRecordMapper<Record, ResultSet> getVectorStoreRecordMapper(
+        final Class<Record> recordClass,
+        final VectorStoreRecordDefinition recordDefinition);
+
     /**
      * The builder for the JDBC vector store query provider.
      */