java-initial-refactoring merge

Author: dantelmomsft

app/backend/pom.xml

@@ -66,28 +66,6 @@
 			<groupId>com.azure</groupId>
 			<artifactId>azure-storage-blob</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>com.microsoft.semantic-kernel</groupId>
-			<artifactId>semantickernel-api</artifactId>
-			<version>${semantic-kernel.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.microsoft.semantic-kernel</groupId>
-			<artifactId>semantickernel-core</artifactId>
-			<scope>runtime</scope>
-			<version>${semantic-kernel.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.microsoft.semantic-kernel</groupId>
-			<artifactId>semantickernel-connectors-ai-openai</artifactId>
-			<version>${semantic-kernel.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.microsoft.semantic-kernel</groupId>
-			<artifactId>semantickernel-planners</artifactId>
-			<version>${semantic-kernel.version}</version>
-		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -56,7 +56,7 @@ public RAGResponse run(String question, RAGOptions options) {
 
         Completions completionsResults = openAIProxy.getCompletions(completionsOptions);
 
-        logger.debug("Completion generated with Prompt Tokens[{}], Completions Tokens[{}], Total Tokens[{}]",
+        logger.info("Completion generated with Prompt Tokens[{}], Completions Tokens[{}], Total Tokens[{}]",
                 completionsResults.getUsage().getPromptTokens(),
                 completionsResults.getUsage().getCompletionTokens(),
                 completionsResults.getUsage().getTotalTokens());

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

@@ -57,7 +57,7 @@ public RAGResponse run(ChatGPTConversation conversation, RAGOptions options) {
         // STEP 3: Generate a contextual and content specific answer using the search results and chat history
         ChatCompletions chatCompletions = openAIProxy.getChatCompletions(chatCompletionsOptions);
 
-        logger.debug("Chat completion generated with Prompt Tokens[{}], Completions Tokens[{}], Total Tokens[{}]",
+        logger.info("Chat completion generated with Prompt Tokens[{}], Completions Tokens[{}], Total Tokens[{}]",
                 chatCompletions.getUsage().getPromptTokens(),
                 chatCompletions.getUsage().getCompletionTokens(),
                 chatCompletions.getUsage().getTotalTokens());

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

@@ -9,6 +9,7 @@
 import com.azure.search.documents.SearchClientBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -21,9 +22,10 @@ public class CognitiveSearchConfiguration {
 
     @Autowired
     TokenCredential tokenCredential;
-    @Profile("dev")
+
     @Bean
-    public SearchClient debugEnabledClient() {
+    @ConditionalOnProperty(name = "openai.tracing.enabled", havingValue = "true")
+    public SearchClient tracingEnabledClient() {
         String endpoint = "https://%s.search.windows.net".formatted(searchServiceName);
 
         var httpLogOptions = new HttpLogOptions();
@@ -41,7 +43,7 @@ public SearchClient debugEnabledClient() {
 
 
     @Bean
-    @Profile("default")
+    @ConditionalOnProperty(name = "openai.tracing.enabled", havingValue = "false")
     public SearchClient productionEnabledClient() {
         String endpoint = "https://%s.search.windows.net".formatted(searchServiceName);
         return new SearchClientBuilder()

app/backend/src/main/resources/application.properties

@@ -8,6 +8,8 @@ openai.tracing.enabled=${AZURE_OPENAI_TRACING_ENABLED:false}
 
 cognitive.search.service=${AZURE_SEARCH_SERVICE:gptkb-hxy5hdyir5eaa}
 cognitive.search.index=${AZURE_SEARCH_INDEX:gptkbindex}
+cognitive.tracing.enabled=${AZURE_SEARCH_TRACING_ENABLED:false}
+
 
 storage-account.service=${AZURE_STORAGE_ACCOUNT:sthxy5hdyir5eaa}
 blob.container.name=${AZURE_STORAGE_CONTAINER:content}

app/start.sh

@@ -43,7 +43,7 @@ echo ""
 
 cd ../backend
 xdg-open http://localhost:8080
-./mvnw spring-boot:run
+./mvnw spring-boot:run -Dspring-boot.run.profiles=dev
 if [ $? -ne 0 ]; then
     echo "Failed to start backend"
     exit $?