Merge 'main' into 'add-sk-chat'

Author: Milder Hernandez Cagua

README.md

@@ -1,3 +1,20 @@
+---
+page_type: sample
+languages:
+- java
+products:
+- azure-openai
+- azure-active-directory
+- azure-cognitive-search
+- azure-app-service
+- semantic-kernel
+- azure-sdks
+- github
+- azure-devops-pipelines
+- document-intelligence
+- azure-monitor
+---
+
 # ChatGPT + Enterprise data with Azure OpenAI and Cognitive Search - Java Version
 
 This repo is the Java version of the well known [ChatGPT + Enterprise data code sample](https://github.com/Azure-Samples/azure-search-openai-demo) originally written in python.

app/backend/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.microsoft.openai.samples.rag</groupId>
 	<artifactId>search-demo-java</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<name>openai-search-demo-java</name>
 	<description>This sample demonstrates a few approaches for creating ChatGPT-like experiences over your own data using the Retrieval Augmented Generation pattern</description>
 	<properties>

app/backend/src/main/java/com/microsoft/openai/samples/rag/Application.java

@@ -1,3 +1,4 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.openai.samples.rag;
 
 import org.slf4j.Logger;
@@ -14,7 +15,9 @@ public class Application {
     private static final Logger LOG = LoggerFactory.getLogger(Application.class);
 
     public static void main(String[] args) {
-        LOG.info("Application profile from system property is [{}]", System.getProperty("spring.profiles.active"));
+        LOG.info(
+                "Application profile from system property is [{}]",
+                System.getProperty("spring.profiles.active"));
         new SpringApplication(Application.class).run(args);
     }
 }

app/backend/src/main/java/com/microsoft/openai/samples/rag/approaches/ContentSource.java

@@ -1,45 +1,45 @@
-package com.microsoft.openai.samples.rag.approaches;
-
-public class ContentSource {
-
-    private String sourceName;
-    private String sourceContent;
-    private final boolean noNewLine;
-
-    public ContentSource(String sourceName, String sourceContent, Boolean noNewLine) {
-        this.noNewLine = noNewLine;
-        this.sourceName = sourceName;
-        buildContent(sourceContent);
-    }
-
-    public ContentSource(String sourceName, String sourceContent) {
-        this(sourceName, sourceContent, true);
-    }
-
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-
-    public String getSourceContent() {
-        return sourceContent;
-    }
-
-    public void setSourceContent(String sourceContent) {
-        this.sourceContent = sourceContent;
-    }
-
-    public boolean isNoNewLine() {
-        return noNewLine;
-    }
-
-    private void buildContent(String sourceContent) {
-        if (this.noNewLine) {
-            this.sourceContent = sourceContent.replace("\n", "");
-        }
-    }
-
-}
+// Copyright (c) Microsoft. All rights reserved.
+package com.microsoft.openai.samples.rag.approaches;
+
+public class ContentSource {
+
+    private String sourceName;
+    private String sourceContent;
+    private final boolean noNewLine;
+
+    public ContentSource(String sourceName, String sourceContent, Boolean noNewLine) {
+        this.noNewLine = noNewLine;
+        this.sourceName = sourceName;
+        buildContent(sourceContent);
+    }
+
+    public ContentSource(String sourceName, String sourceContent) {
+        this(sourceName, sourceContent, true);
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
+    public String getSourceContent() {
+        return sourceContent;
+    }
+
+    public void setSourceContent(String sourceContent) {
+        this.sourceContent = sourceContent;
+    }
+
+    public boolean isNoNewLine() {
+        return noNewLine;
+    }
+
+    private void buildContent(String sourceContent) {
+        if (this.noNewLine) {
+            this.sourceContent = sourceContent.replace("\n", "");
+        }
+    }
+}

app/backend/src/main/java/com/microsoft/openai/samples/rag/approaches/PromptTemplate.java

@@ -1,9 +1,9 @@
-package com.microsoft.openai.samples.rag.approaches;
-
-public interface PromptTemplate {
-
-    String getPrompt();
-
-    void setVariables();
-
-}
+// Copyright (c) Microsoft. All rights reserved.
+package com.microsoft.openai.samples.rag.approaches;
+
+public interface PromptTemplate {
+
+    String getPrompt();
+
+    void setVariables();
+}

app/backend/src/main/java/com/microsoft/openai/samples/rag/approaches/RAGApproach.java

@@ -1,12 +1,11 @@
-package com.microsoft.openai.samples.rag.approaches;
-
-import com.microsoft.openai.samples.rag.common.ChatGPTConversation;
-import reactor.core.publisher.Flux;
-
-import java.io.OutputStream;
-
-public interface RAGApproach<I, O> {
-
-    O run(I questionOrConversation, RAGOptions options);
-    void runStreaming(I questionOrConversation, RAGOptions options, OutputStream outputStream);
-}
+// Copyright (c) Microsoft. All rights reserved.
+package com.microsoft.openai.samples.rag.approaches;
+
+import java.io.OutputStream;
+
+public interface RAGApproach<I, O> {
+
+    O run(I questionOrConversation, RAGOptions options);
+
+    void runStreaming(I questionOrConversation, RAGOptions options, OutputStream outputStream);
+}

app/backend/src/main/java/com/microsoft/openai/samples/rag/approaches/RAGApproachFactory.java

@@ -1,7 +1,7 @@
+// Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.openai.samples.rag.approaches;
 
 public interface RAGApproachFactory<I, O> {
 
     RAGApproach<I, O> createApproach(String approachName, RAGType ragType, RAGOptions options);
-
 }