Skip to content

Commit

Permalink
Merge pull request #312 from tipi-tapi/feature/310
Browse files Browse the repository at this point in the history
ํ”„๋กฌํ”„ํŠธ ์ƒ์„ฑ์„ ์œ„ํ•ด ํ˜ธ์ถœํ•˜๋Š” gpt api์— ํŒŒ๋ผ๋ฏธํ„ฐ ์ถ”๊ฐ€ ๋ฐ ๋ฌธ์ž์—ด ์ฒ˜๋ฆฌ ์ž‘์—…
  • Loading branch information
choihuk authored Mar 29, 2024
2 parents ea36437 + 1ee0532 commit 49cc9ac
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@
public class Message implements TextGeneratorContent {

private final ChatCompletionsRole role;
private final String content;
private String content;

public Message(ChatCompletionsRole role, String content) {
this.role = role;
this.content = content;
}

public void clampContent() {
if (content.lastIndexOf(".") != content.length() - 1) {
content = content.substring(0, content.lastIndexOf(".") + 1);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package tipitapi.drawmytoday.domain.generator.api.gpt.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
Expand All @@ -13,10 +15,13 @@

@Getter
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
public class GptChatCompletionsRequest {

private final String model;
private final List<Message> messages;
private final int maxTokens = 100;
private final float temperature = 0;

public GptChatCompletionsRequest() {
this.model = "gpt-3.5-turbo";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public List<Message> regeneratePrompt(String diaryNote, Prompt prompt) {

String gptContent = prompt.getPromptGeneratorResult().getPromptGeneratorContent();
List<Message> previousGptMessages = parsingGptContent(gptContent);
String gptRegeneratePrompt = this.gptRegeneratePrompt + "\n\n" + diaryNote;
String gptRegeneratePrompt = diaryNote + "\n\n" + this.gptRegeneratePrompt;
GptChatCompletionsRequest newGptChatCompletionsRequest = GptChatCompletionsRequest.createRegenerateMessage(
previousGptMessages, gptRegeneratePrompt);
HttpEntity<GptChatCompletionsRequest> httpEntity = createChatCompletionsRequest(
Expand All @@ -89,8 +89,10 @@ private List<Message> requestGptChatCompletion(
chatCompletionsUrl, httpEntity, GptChatCompletionsResponse.class);

validIsSuccessfulRequest(responseEntity);
Message responseMessage = responseEntity.getBody().getChoices()[0].getMessage();
responseMessage.clampContent();
List<Message> messages = httpEntity.getBody().getMessages();
messages.add(responseEntity.getBody().getChoices()[0].getMessage());
messages.add(responseMessage);
return messages;
} catch (RestClientException e) {
log.warn("GPT chat completions ์š”์ฒญ์— ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค. message: {}", e.getMessage());
Expand Down

0 comments on commit 49cc9ac

Please sign in to comment.