Merge branch 'sk-vector-stores'

Azure-Samples · Jan 30, 2025 · e9b5f67 · e9b5f67
2 parents efa673a + db4da61
commit e9b5f67
Show file tree

Hide file tree

Showing 17 changed files with 646 additions and 552 deletions.
diff --git a/README.md b/README.md
diff --git a/app/backend/pom.xml b/app/backend/pom.xml
@@ -17,8 +17,8 @@
 		<java.version>17</java.version>
 
 		<spring-cloud-azure.version>5.14.0</spring-cloud-azure.version>
-		<azure-search.version>11.6.0-beta.8</azure-search.version>
-		<semantic-kernel.version>1.2.2</semantic-kernel.version>
+		<azure-search.version>11.7.2</azure-search.version>
+		<semantic-kernel.version>1.4.2</semantic-kernel.version>
 		<mockito-inline.version>4.5.1</mockito-inline.version>
 		<maven.compiler-plugin.version>3.11.0</maven.compiler-plugin.version>
 
@@ -123,6 +123,10 @@
 			<groupId>com.microsoft.semantic-kernel</groupId>
 			<artifactId>semantickernel-aiservices-openai</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.microsoft.semantic-kernel</groupId>
+			<artifactId>semantickernel-data-azureaisearch</artifactId>
+		</dependency>
 		<!-- Semantic Kernel end -->
 	</dependencies>
 

diff --git a/...in/java/com/microsoft/openai/samples/rag/approaches/RAGApproachFactorySpringBootImpl.java b/...in/java/com/microsoft/openai/samples/rag/approaches/RAGApproachFactorySpringBootImpl.java
@@ -2,8 +2,10 @@
 
 import com.microsoft.openai.samples.rag.ask.approaches.PlainJavaAskApproach;
 import com.microsoft.openai.samples.rag.ask.approaches.semantickernel.JavaSemanticKernelChainsApproach;
+import com.microsoft.openai.samples.rag.ask.approaches.semantickernel.JavaSemanticKernelWithVectorStoreApproach;
 import com.microsoft.openai.samples.rag.chat.approaches.PlainJavaChatApproach;
 import com.microsoft.openai.samples.rag.chat.approaches.semantickernel.JavaSemanticKernelChainsChatApproach;
+import com.microsoft.openai.samples.rag.chat.approaches.semantickernel.JavaSemanticKernelWithVectorStoreChatApproach;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
@@ -13,7 +15,6 @@ public class RAGApproachFactorySpringBootImpl implements RAGApproachFactory, App
 
     private static final String JAVA_OPENAI_SDK = "jos";
     private static final String JAVA_SEMANTIC_KERNEL = "jsk";
-
     private static final String JAVA_SEMANTIC_KERNEL_PLANNER = "jskp";
     private ApplicationContext applicationContext;
 
@@ -29,6 +30,8 @@ public RAGApproach createApproach(String approachName, RAGType ragType, RAGOptio
         if (ragType.equals(RAGType.CHAT)) {
             if (JAVA_OPENAI_SDK.equals(approachName)) {
                 return applicationContext.getBean(PlainJavaChatApproach.class);
+            } else if (JAVA_SEMANTIC_KERNEL.equals(approachName)) {
+                return applicationContext.getBean(JavaSemanticKernelWithVectorStoreChatApproach.class);
             } else if (
                     JAVA_SEMANTIC_KERNEL_PLANNER.equals(approachName) &&
                             ragOptions != null &&
@@ -39,6 +42,8 @@ public RAGApproach createApproach(String approachName, RAGType ragType, RAGOptio
         } else if (ragType.equals(RAGType.ASK)) {
             if (JAVA_OPENAI_SDK.equals(approachName))
                 return applicationContext.getBean(PlainJavaAskApproach.class);
+            else if (JAVA_SEMANTIC_KERNEL.equals(approachName))
+                return applicationContext.getBean(JavaSemanticKernelWithVectorStoreApproach.class);
             else if (JAVA_SEMANTIC_KERNEL_PLANNER.equals(approachName) && ragOptions != null && ragOptions.getSemantickKernelMode() != null && ragOptions.getSemantickKernelMode() == SemanticKernelMode.chains)
                 return applicationContext.getBean(JavaSemanticKernelChainsApproach.class);
         }

diff --git a/...amples/rag/ask/approaches/semantickernel/JavaSemanticKernelWithMemoryApproach.java.ignore b/...amples/rag/ask/approaches/semantickernel/JavaSemanticKernelWithMemoryApproach.java.ignore