|
1 | 1 | package dev.victormartin.oci.genai.backend.backend.controller;
|
2 | 2 |
|
3 |
| -import com.oracle.bmc.model.BmcException; |
4 |
| -import dev.victormartin.oci.genai.backend.backend.InvalidPromptRequest; |
5 |
| -import dev.victormartin.oci.genai.backend.backend.data.InteractionType; |
6 |
| -import dev.victormartin.oci.genai.backend.backend.service.OCIGenAIService; |
7 |
| -import dev.victormartin.oci.genai.backend.backend.dao.Answer; |
8 |
| -import dev.victormartin.oci.genai.backend.backend.dao.Prompt; |
9 |
| -import dev.victormartin.oci.genai.backend.backend.data.Interaction; |
10 |
| -import dev.victormartin.oci.genai.backend.backend.data.InteractionRepository; |
| 3 | +import java.util.Date; |
| 4 | + |
11 | 5 | import org.slf4j.Logger;
|
12 | 6 | import org.slf4j.LoggerFactory;
|
13 | 7 | import org.springframework.beans.factory.annotation.Autowired;
|
|
18 | 12 | import org.springframework.stereotype.Controller;
|
19 | 13 | import org.springframework.web.util.HtmlUtils;
|
20 | 14 |
|
21 |
| -import java.util.Date; |
| 15 | +import com.oracle.bmc.model.BmcException; |
| 16 | + |
| 17 | +import dev.victormartin.oci.genai.backend.backend.InvalidPromptRequest; |
| 18 | +import dev.victormartin.oci.genai.backend.backend.dao.Answer; |
| 19 | +import dev.victormartin.oci.genai.backend.backend.dao.Prompt; |
| 20 | +import dev.victormartin.oci.genai.backend.backend.data.Interaction; |
| 21 | +import dev.victormartin.oci.genai.backend.backend.data.InteractionRepository; |
| 22 | +import dev.victormartin.oci.genai.backend.backend.data.InteractionType; |
| 23 | +import dev.victormartin.oci.genai.backend.backend.service.OCIGenAIService; |
22 | 24 |
|
23 | 25 | @Controller
|
24 | 26 | public class PromptController {
|
25 |
| - Logger logger = LoggerFactory.getLogger(PromptController.class); |
26 | 27 |
|
27 |
| - @Value("${genai.chat_model_id}") |
28 |
| - private String hardcodedChatModelId; |
| 28 | + Logger logger = LoggerFactory.getLogger(PromptController.class); |
| 29 | + |
| 30 | + @Value("${genai.chat_model_id}") |
| 31 | + private String hardcodedChatModelId; |
29 | 32 |
|
30 |
| - @Autowired |
31 |
| - private final InteractionRepository interactionRepository; |
| 33 | + @Autowired |
| 34 | + private final InteractionRepository interactionRepository; |
32 | 35 |
|
33 |
| - @Autowired |
| 36 | + @Autowired |
34 | 37 | OCIGenAIService genAI;
|
35 | 38 |
|
36 |
| - public PromptController(InteractionRepository interactionRepository, OCIGenAIService genAI) { |
37 |
| - this.interactionRepository = interactionRepository; |
38 |
| - this.genAI = genAI; |
39 |
| - } |
| 39 | + public PromptController(InteractionRepository interactionRepository, OCIGenAIService genAI) { |
| 40 | + this.interactionRepository = interactionRepository; |
| 41 | + this.genAI = genAI; |
| 42 | + } |
| 43 | + |
| 44 | + @MessageMapping("/prompt") |
| 45 | + @SendToUser("/queue/answer") |
| 46 | + public Answer handlePrompt(Prompt prompt) { |
| 47 | + String promptEscaped = HtmlUtils.htmlEscape(prompt.content()); |
| 48 | + String activeModel = (prompt.modelId() == null) ? hardcodedChatModelId : prompt.modelId(); |
| 49 | + logger.info("Prompt " + promptEscaped + " received, on model " + activeModel); |
| 50 | + |
| 51 | + Interaction interaction = new Interaction(); |
| 52 | + interaction.setType(InteractionType.CHAT); |
| 53 | + interaction.setConversationId(prompt.conversationId()); |
| 54 | + interaction.setDatetimeRequest(new Date()); |
| 55 | + interaction.setModelId(activeModel); |
| 56 | + interaction.setRequest(promptEscaped); |
| 57 | + Interaction saved = interactionRepository.save(interaction); |
| 58 | + try { |
| 59 | + if (prompt.content().isEmpty()) { |
| 60 | + throw new InvalidPromptRequest(); |
| 61 | + } |
| 62 | + // if (prompt.modelId() == null || |
| 63 | + // !prompt.modelId().startsWith("ocid1.generativeaimodel.")) { throw new |
| 64 | + // InvalidPromptRequest(); } |
| 65 | + saved.setDatetimeResponse(new Date()); |
| 66 | + String responseFromGenAI = genAI.resolvePrompt(promptEscaped, activeModel); |
| 67 | + saved.setResponse(responseFromGenAI); |
| 68 | + interactionRepository.save(saved); |
| 69 | + return new Answer(responseFromGenAI, ""); |
40 | 70 |
|
41 |
| - @MessageMapping("/prompt") |
42 |
| - @SendToUser("/queue/answer") |
43 |
| - public Answer handlePrompt(Prompt prompt) { |
44 |
| - String promptEscaped = HtmlUtils.htmlEscape(prompt.content()); |
45 |
| - logger.info("Prompt " + promptEscaped + " received, on model " + prompt.modelId() + " but using hardcoded one" + |
46 |
| - " " + hardcodedChatModelId); |
47 |
| - Interaction interaction = new Interaction(); |
48 |
| - interaction.setType(InteractionType.CHAT); |
49 |
| - interaction.setConversationId(prompt.conversationId()); |
50 |
| - interaction.setDatetimeRequest(new Date()); |
51 |
| - interaction.setModelId(hardcodedChatModelId); |
52 |
| - interaction.setRequest(promptEscaped); |
53 |
| - Interaction saved = interactionRepository.save(interaction); |
54 |
| - try { |
55 |
| - if (prompt.content().isEmpty()) { |
56 |
| - throw new InvalidPromptRequest(); |
57 |
| - } |
58 |
| - // if (prompt.modelId() == null || |
59 |
| - // !prompt.modelId().startsWith("ocid1.generativeaimodel.")) { throw new |
60 |
| - // InvalidPromptRequest(); } |
61 |
| - String responseFromGenAI = genAI.resolvePrompt(promptEscaped, hardcodedChatModelId); |
62 |
| - saved.setDatetimeResponse(new Date()); |
63 |
| - saved.setResponse(responseFromGenAI); |
64 |
| - interactionRepository.save(saved); |
65 |
| - return new Answer(responseFromGenAI, ""); |
66 |
| - } catch (BmcException exception) { |
67 |
| - logger.error("Message: {}", exception.getMessage()); |
68 |
| - logger.error("Original Message: {}", exception.getOriginalMessage()); |
69 |
| - logger.error("Unmodified Message: {}", exception.getUnmodifiedMessage()); |
70 |
| - logger.error("Service Details: {}", exception.getServiceDetails()); |
71 |
| - logger.error("Status Code: {}", exception.getStatusCode()); |
72 |
| - String unmodifiedMessage = exception.getUnmodifiedMessage(); |
73 |
| - int statusCode = exception.getStatusCode(); |
74 |
| - String errorMessage = statusCode + " " + unmodifiedMessage; |
75 |
| - logger.error(errorMessage); |
76 |
| - saved.setErrorMessage(errorMessage); |
77 |
| - interactionRepository.save(saved); |
78 |
| - return new Answer("", errorMessage); |
79 |
| - } catch (InvalidPromptRequest exception) { |
80 |
| - int statusCode = HttpStatus.BAD_REQUEST.value(); |
81 |
| - String errorMessage = statusCode + " Invalid Prompt "; |
82 |
| - logger.error(errorMessage); |
83 |
| - saved.setErrorMessage(errorMessage); |
84 |
| - interactionRepository.save(saved); |
85 |
| - return new Answer("", errorMessage); |
86 |
| - } |
87 |
| - } |
| 71 | + } catch (BmcException exception) { |
| 72 | + logger.error("Message: {}", exception.getMessage()); |
| 73 | + logger.error("Original Message: {}", exception.getOriginalMessage()); |
| 74 | + logger.error("Unmodified Message: {}", exception.getUnmodifiedMessage()); |
| 75 | + logger.error("Service Details: {}", exception.getServiceDetails()); |
| 76 | + logger.error("Status Code: {}", exception.getStatusCode()); |
| 77 | + String unmodifiedMessage = exception.getUnmodifiedMessage(); |
| 78 | + int statusCode = exception.getStatusCode(); |
| 79 | + String errorMessage = statusCode + " " + unmodifiedMessage; |
| 80 | + logger.error(errorMessage); |
| 81 | + saved.setErrorMessage(errorMessage); |
| 82 | + interactionRepository.save(saved); |
| 83 | + return new Answer("", errorMessage); |
| 84 | + } catch (InvalidPromptRequest exception) { |
| 85 | + int statusCode = HttpStatus.BAD_REQUEST.value(); |
| 86 | + String errorMessage = statusCode + " Invalid Prompt "; |
| 87 | + logger.error(errorMessage); |
| 88 | + saved.setErrorMessage(errorMessage); |
| 89 | + interactionRepository.save(saved); |
| 90 | + return new Answer("", errorMessage); |
| 91 | + } |
| 92 | + } |
88 | 93 |
|
89 | 94 | }
|
0 commit comments