john-oliver/update-ui-3 review and improvements. close PR 34

dantelmomsft · dantelmomsft · commit ec2f96e05c58 · 2023-10-16T10:45:03.000+02:00
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/ask/controller/AskController.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/ask/controller/AskController.java
@@ -5,11 +5,11 @@
 import com.microsoft.openai.samples.rag.approaches.RAGOptions;
 import com.microsoft.openai.samples.rag.approaches.RAGResponse;
 import com.microsoft.openai.samples.rag.approaches.RAGType;
-import com.microsoft.openai.samples.rag.chat.controller.ChatAppRequest;
-import com.microsoft.openai.samples.rag.chat.controller.ChatResponse;
-import com.microsoft.openai.samples.rag.chat.controller.ResponseChoice;
-import com.microsoft.openai.samples.rag.chat.controller.ResponseContext;
-import com.microsoft.openai.samples.rag.chat.controller.ResponseMessage;
+import com.microsoft.openai.samples.rag.controller.ChatAppRequest;
+import com.microsoft.openai.samples.rag.controller.ChatResponse;
+import com.microsoft.openai.samples.rag.controller.ResponseChoice;
+import com.microsoft.openai.samples.rag.controller.ResponseContext;
+import com.microsoft.openai.samples.rag.controller.ResponseMessage;
 import com.microsoft.openai.samples.rag.common.ChatGPTMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,34 +60,8 @@ public ResponseEntity<ChatResponse> openAIAsk(@RequestBody ChatAppRequest askReq
 
         RAGApproach<String, RAGResponse> ragApproach = ragApproachFactory.createApproach(askRequest.approach(), RAGType.ASK, ragOptions);
 
-        return ResponseEntity.ok(buildChatResponse(ragApproach.run(question, ragOptions)));
+        return ResponseEntity.ok(ChatResponse.buildChatResponse(ragApproach.run(question, ragOptions)));
     }
 
-    private ChatResponse buildChatResponse(RAGResponse ragResponse) {
-        List<String> dataPoints = Collections.emptyList();
 
-        if (ragResponse.getSources() != null) {
-            dataPoints = ragResponse.getSources().stream()
-                    .map(source -> source.getSourceName() + ": " + source.getSourceContent())
-                    .toList();
-        }
-
-        String thoughts = "Question:<br>" + ragResponse.getQuestion() + "<br><br>Prompt:<br>" + ragResponse.getPrompt().replace("\n", "<br>");
-
-        return new ChatResponse(
-                List.of(
-                        new ResponseChoice(
-                                0,
-                                new ResponseMessage(
-                                        ragResponse.getAnswer(),
-                                        ChatGPTMessage.ChatRole.ASSISTANT.toString()
-                                ),
-                                new ResponseContext(
-                                        thoughts,
-                                        dataPoints
-                                )
-                        )
-                )
-        );
-    }
 }
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/ask/controller/AskRequest.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/ask/controller/AskRequest.java
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/ask/controller/AskResponse.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/ask/controller/AskResponse.java
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/chat/controller/ChatController.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/chat/controller/ChatController.java
@@ -7,6 +7,7 @@
 import com.microsoft.openai.samples.rag.approaches.RAGType;
 import com.microsoft.openai.samples.rag.common.ChatGPTConversation;
 import com.microsoft.openai.samples.rag.common.ChatGPTMessage;
+import com.microsoft.openai.samples.rag.controller.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -58,7 +59,7 @@ public ResponseEntity<ChatResponse> openAIAsk(@RequestBody ChatAppRequest chatRe
 
 
         ChatGPTConversation chatGPTConversation = convertToChatGPT(chatRequest.messages());
-        return ResponseEntity.ok(buildChatResponse(ragApproach.run(chatGPTConversation, ragOptions)));
+        return ResponseEntity.ok(ChatResponse.buildChatResponse(ragApproach.run(chatGPTConversation, ragOptions)));
 
     }
 
@@ -74,27 +75,4 @@ private ChatGPTConversation convertToChatGPT(List<ResponseMessage> chatHistory)
                         .toList());
     }
 
-    private ChatResponse buildChatResponse(RAGResponse ragResponse) {
-        List<String> dataPoints = ragResponse.getSources().stream()
-                .map(source -> source.getSourceName() + ": " + source.getSourceContent())
-                .toList();
-        String thoughts = "Searched for:<br>" + ragResponse.getQuestion() + "<br><br>Chat:<br>" + ragResponse.getPrompt().replace("\n", "<br>");
-
-        return new ChatResponse(
-                List.of(
-                        new ResponseChoice(
-                                0,
-                                new ResponseMessage(
-                                        ragResponse.getAnswer(),
-                                        "ASSISTANT"
-                                ),
-                                new ResponseContext(
-                                        thoughts,
-                                        dataPoints
-                                )
-                        )
-                )
-        );
-    }
-
 }
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/chat/controller/ChatResponse.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/chat/controller/ChatResponse.java
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ChatAppRequest.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ChatAppRequest.java
@@ -1,4 +1,4 @@
-package com.microsoft.openai.samples.rag.chat.controller;
+package com.microsoft.openai.samples.rag.controller;
 
 import java.util.List;
 
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ChatAppRequestContext.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ChatAppRequestContext.java
@@ -1,4 +1,4 @@
-package com.microsoft.openai.samples.rag.chat.controller;
+package com.microsoft.openai.samples.rag.controller;
 
 public record ChatAppRequestContext(ChatAppRequestOverrides overrides) {
 }
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ChatAppRequestOverrides.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ChatAppRequestOverrides.java
@@ -1,4 +1,4 @@
-package com.microsoft.openai.samples.rag.chat.controller;
+package com.microsoft.openai.samples.rag.controller;
 
 import com.microsoft.openai.samples.rag.approaches.RetrievalMode;
 
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ChatResponse.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ChatResponse.java
@@ -0,0 +1,38 @@
+package com.microsoft.openai.samples.rag.controller;
+
+import com.microsoft.openai.samples.rag.approaches.RAGResponse;
+import com.microsoft.openai.samples.rag.common.ChatGPTMessage;
+
+import java.util.Collections;
+import java.util.List;
+
+public record ChatResponse(List<ResponseChoice> choices) {
+
+    public static ChatResponse buildChatResponse(RAGResponse ragResponse) {
+        List<String> dataPoints = Collections.emptyList();
+
+        if (ragResponse.getSources() != null) {
+            dataPoints = ragResponse.getSources().stream()
+                    .map(source -> source.getSourceName() + ": " + source.getSourceContent())
+                    .toList();
+        }
+
+        String thoughts = "Question:<br>" + ragResponse.getQuestion() + "<br><br>Prompt:<br>" + ragResponse.getPrompt().replace("\n", "<br>");
+
+        return new ChatResponse(
+                List.of(
+                        new ResponseChoice(
+                                0,
+                                new ResponseMessage(
+                                        ragResponse.getAnswer(),
+                                        ChatGPTMessage.ChatRole.ASSISTANT.toString()
+                                ),
+                                new ResponseContext(
+                                        thoughts,
+                                        dataPoints
+                                )
+                        )
+                )
+        );
+    }
+}
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/Overrides.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/Overrides.java
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ResponseChoice.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ResponseChoice.java
@@ -1,4 +1,4 @@
-package com.microsoft.openai.samples.rag.chat.controller;
+package com.microsoft.openai.samples.rag.controller;
 
 public record ResponseChoice(int index, ResponseMessage message, ResponseContext context) {
 }
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ResponseContext.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ResponseContext.java
@@ -1,4 +1,4 @@
-package com.microsoft.openai.samples.rag.chat.controller;
+package com.microsoft.openai.samples.rag.controller;
 
 import java.util.List;
 
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ResponseMessage.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/ResponseMessage.java
@@ -1,4 +1,4 @@
-package com.microsoft.openai.samples.rag.chat.controller;
+package com.microsoft.openai.samples.rag.controller;
 
 public record ResponseMessage(String content, String role) {
 }
diff --git a/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/auth/AuthSetup.java b/app/backend/src/main/java/com/microsoft/openai/samples/rag/controller/auth/AuthSetup.java
@@ -1,4 +1,4 @@
-package com.microsoft.openai.samples.rag.config;
+package com.microsoft.openai.samples.rag.controller.auth;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/app/backend/src/test/java/com/microsoft/openai/samples/rag/AskAPITest.java b/app/backend/src/test/java/com/microsoft/openai/samples/rag/AskAPITest.java
@@ -9,27 +9,19 @@
 import com.azure.search.documents.models.SearchOptions;
 import com.azure.search.documents.models.SearchResult;
 import com.azure.search.documents.util.SearchPagedIterable;
-import com.microsoft.openai.samples.rag.ask.controller.AskRequest;
-import com.microsoft.openai.samples.rag.ask.controller.AskResponse;
 import com.microsoft.openai.samples.rag.proxy.CognitiveSearchProxy;
 import com.microsoft.openai.samples.rag.proxy.OpenAIProxy;
 import com.microsoft.openai.samples.rag.test.utils.CognitiveSearchUnitTestUtils;
 import com.microsoft.openai.samples.rag.test.utils.OpenAIUnitTestUtils;
-import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;
 
 import java.net.URI;
 import java.util.*;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.microsoft.openai.samples.rag.chat.controller;`
	`1`	`+package com.microsoft.openai.samples.rag.controller;`
`2`	`2`
`3`	`3`	`import java.util.List;`
`4`	`4`