Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ jacocoTestCoverageVerification {

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation('org.springframework.boot:spring-boot-starter-webflux')
implementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1'

implementation 'org.springframework.boot:spring-boot-starter-security'

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.ureca.ufit.domain.chatbot.controller;

import java.util.concurrent.CompletableFuture;

import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand All @@ -20,6 +18,7 @@
import com.ureca.ufit.global.dto.CursorPageResponse;

import lombok.RequiredArgsConstructor;
import reactor.core.publisher.Mono;

@RestController
@RequiredArgsConstructor
Expand Down Expand Up @@ -52,13 +51,25 @@ public ResponseEntity<CreateChatBotReviewResponse> createChatBotReview(CreateCha
}

@Override
public ResponseEntity<CompletableFuture<CreateChatBotMessageResponse>> createChatBotMessage(
public ResponseEntity<CreateChatBotMessageResponse> createChatBotMessage(
CustomUserDetails userDetails,
CreateChatBotMessageRequest request) {

Long userId = (userDetails != null) ? userDetails.userId() : nonUserId;

CreateChatBotMessageResponse response = chatBotMessageService.createChatBotMessage(request,
userId);
return ResponseEntity.status(HttpStatus.CREATED).body(response);
}

@Override
public ResponseEntity<Mono<CreateChatBotMessageResponse>> createChatBotMessageWithWebClient(
CustomUserDetails userDetails,
CreateChatBotMessageRequest request) {

Long userId = (userDetails != null) ? userDetails.userId() : nonUserId;

CompletableFuture<CreateChatBotMessageResponse> response = chatBotMessageService.createChatBotMessage(request,
Mono<CreateChatBotMessageResponse> response = chatBotMessageService.createChatBotMessageWithWebClient(request,
userId);
return ResponseEntity.status(HttpStatus.CREATED).body(response);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.ureca.ufit.domain.chatbot.controller;

import java.util.concurrent.CompletableFuture;

import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -31,6 +29,7 @@
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import reactor.core.publisher.Mono;

@Tag(name = "ChatBot API", description = "챗봇 관련 API")
@RequestMapping("/api/chats")
Expand Down Expand Up @@ -109,7 +108,22 @@ public ResponseEntity<CreateChatBotReviewResponse> createChatBotReview(
content = @Content(schema = @Schema(implementation = CreateChatBotMessageResponse.class))
))
@PostMapping("/message")
public ResponseEntity<CompletableFuture<CreateChatBotMessageResponse>> createChatBotMessage(
public ResponseEntity<CreateChatBotMessageResponse> createChatBotMessage(
@Parameter(hidden = true)
@AuthenticationPrincipal CustomUserDetails userDetails,
@RequestBody @Valid CreateChatBotMessageRequest request
);

@Operation(
summary = "챗봇 메시지 저장 API(WebClient)",
description = "사용자 메시지를 저장하고, AI 답변을 반환한다."
)
@ApiResponses(@ApiResponse(
responseCode = "201", description = "메시지 저장 & 답변 완료",
content = @Content(schema = @Schema(implementation = CreateChatBotMessageResponse.class))
))
@PostMapping("/message/webclient")
public ResponseEntity<Mono<CreateChatBotMessageResponse>> createChatBotMessageWithWebClient(
@Parameter(hidden = true)
@AuthenticationPrincipal CustomUserDetails userDetails,
@RequestBody @Valid CreateChatBotMessageRequest request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
import static com.ureca.ufit.global.profanity.BanwordFilterPolicy.*;

import java.util.Set;
import java.util.concurrent.CompletableFuture;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.reactive.function.client.WebClient;

import com.ureca.ufit.domain.chatbot.dto.ChatMessageMapper;
import com.ureca.ufit.domain.chatbot.dto.request.CreateAIAnswerRequest;
Expand All @@ -26,6 +25,7 @@
import com.ureca.ufit.global.profanity.ProfanityService;

import lombok.RequiredArgsConstructor;
import reactor.core.publisher.Mono;

@Service
@RequiredArgsConstructor
Expand All @@ -37,6 +37,7 @@ public class ChatBotMessageService {
private final ChatBotMessageRepository chatBotMessageRepository;
private final ChatRoomRepository chatRoomRepository;
private final RestTemplate restTemplate;
private final WebClient webClient;

public CursorPageResponse<ChatMessageDto> getChatMessages(Long chatRoomId, Pageable pageable,
String lastMessageId) {
Expand All @@ -45,8 +46,7 @@ public CursorPageResponse<ChatMessageDto> getChatMessages(Long chatRoomId, Pagea
return chatBotMessageRepository.findMessagesPage(findChatRoom, pageable, lastMessageId);
}

@Async
public CompletableFuture<CreateChatBotMessageResponse> createChatBotMessage(CreateChatBotMessageRequest request,
public CreateChatBotMessageResponse createChatBotMessage(CreateChatBotMessageRequest request,
Long userId) {

Set<BanwordFilterPolicy> policies = Set.of(NUMBERS, WHITESPACES);
Expand All @@ -60,13 +60,35 @@ public CompletableFuture<CreateChatBotMessageResponse> createChatBotMessage(Crea
CreateAIAnswerRequest createAIAnswerRequest = ChatMessageMapper.toCreateAIAnswerRequest(request, userId);

try {
CreateChatBotMessageResponse response = restTemplate.postForObject(
return restTemplate.postForObject(
fastApiUrl,
createAIAnswerRequest,
CreateChatBotMessageResponse.class
);
return CompletableFuture.completedFuture(response);
} catch (Exception e) {
throw new RestApiException(ChatBotErrorCode.LLM_TIMEOUT);
}
}

public Mono<CreateChatBotMessageResponse> createChatBotMessageWithWebClient(CreateChatBotMessageRequest request,
Long userId) {

Set<BanwordFilterPolicy> policies = Set.of(NUMBERS, WHITESPACES);

if (profanityService.containsBannedWord(request.content(), policies)) {
throw new RestApiException(ChatBotErrorCode.CONTENT_RESTRICTED_WORD);
}

final String fastApiUrl = String.format("%s/api/chats/message/ai", llmBaseUrl);

CreateAIAnswerRequest createAIAnswerRequest = ChatMessageMapper.toCreateAIAnswerRequest(request, userId);

try {
return webClient.post()
.uri(fastApiUrl)
.bodyValue(createAIAnswerRequest)
.retrieve()
.bodyToMono(CreateChatBotMessageResponse.class);
} catch (Exception e) {
throw new RestApiException(ChatBotErrorCode.LLM_TIMEOUT);
}
Expand Down
61 changes: 61 additions & 0 deletions src/main/java/com/ureca/ufit/global/config/HttpClientConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package com.ureca.ufit.global.config;

import java.time.Duration;

import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.reactive.function.client.WebClient;

import io.netty.channel.ChannelOption;
import reactor.netty.http.client.HttpClient;
import reactor.netty.resources.ConnectionProvider;

@Configuration
public class HttpClientConfig {
@Bean
public RestTemplate restTemplate() {
PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
cm.setMaxTotal(100);
cm.setDefaultMaxPerRoute(100);

RequestConfig requestConfig = RequestConfig.custom()
.setConnectTimeout(Timeout.ofMilliseconds(3_000))
.setResponseTimeout(Timeout.ofSeconds(60))
.build();

CloseableHttpClient http = HttpClients.custom()
.setConnectionManager(cm)
.setDefaultRequestConfig(requestConfig)
.evictIdleConnections(TimeValue.ofSeconds(30))
.build();

return new RestTemplate(new HttpComponentsClientHttpRequestFactory(http));
}

@Bean
public WebClient webClient() {
ConnectionProvider provider = ConnectionProvider.builder("ufit-pool")
.maxConnections(100)
.maxIdleTime(Duration.ofSeconds(30))
.pendingAcquireTimeout(Duration.ofSeconds(5))
.build();

HttpClient http = HttpClient.create(provider)
.responseTimeout(Duration.ofSeconds(60))
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 3_000);

return WebClient.builder()
.clientConnector(new ReactorClientHttpConnector(http))
.build();
}

}
13 changes: 0 additions & 13 deletions src/main/java/com/ureca/ufit/global/config/RestTemplateConfig.java

This file was deleted.