10-11차 배포

cs25-service/Dockerfile

@@ -22,37 +22,27 @@ LABEL type="application" module="cs25-service"
 # 작업 디렉토리
 WORKDIR /apps
 
-# Node.js 22 설치 + 공식 Brave MCP 서버 설치 + 래퍼 스크립트 생성
-RUN apt-get update \
- && apt-get install -y --no-install-recommends curl ca-certificates gnupg bash \
- && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
- && apt-get install -y --no-install-recommends nodejs \
- \
- # 공식 패키지 설치 (deprecated 패키지 제거)
- && npm install -g @brave/brave-search-mcp-server \
- \
- # 전역 모듈 경로 계산
- && NPM_PREFIX="$(npm prefix -g)" \
- && SRCDIR="${NPM_PREFIX}/lib/node_modules/@brave/brave-search-mcp-server" \
- \
-# 실행 래퍼 (args는 전부 "$@"로 위임)
-&& { \
-  echo '#!/bin/sh'; \
-  echo 'NODE=$(command -v node || echo /usr/bin/node)'; \
-  echo 'exec "$NODE" "'"$SRCDIR"'/dist/index.js" "$@"'; \
-} > /usr/local/bin/server-brave-search \
-&& chmod 0755 /usr/local/bin/server-brave-search \
- \
- # 설치/실행 점검
- && echo "=== which server-brave-search ===" && which server-brave-search \
- && echo "=== server-brave-search --help ===" && server-brave-search --help || (echo "[ERROR] server-brave-search 실행 실패" && exit 1) \
- \
- # 정리
- && npm cache clean --force \
- && apt-get autoremove -y --purge \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
+# Node.js 22 + Brave MCP 서버 설치 + 실행 래퍼 생성
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends curl ca-certificates gnupg bash; \
+    curl -fsSL https://deb.nodesource.com/setup_22.x | bash -; \
+    apt-get install -y --no-install-recommends nodejs; \
+    npm install -g @brave/brave-search-mcp-server; \
+    NPM_PREFIX="$(npm prefix -g)"; \
+    SRCDIR="${NPM_PREFIX}/lib/node_modules/@brave/brave-search-mcp-server"; \
+    # 실행 래퍼 (전달 인자 전부 위임)
+    printf '%s\n' '#!/bin/sh' \
+                  'exec node "'"$SRCDIR"'/dist/index.js" "$@"' \
+      > /usr/local/bin/server-brave-search; \
+    chmod 0755 /usr/local/bin/server-brave-search; \
+    # sanity check (없으면 빌드 실패)
+    /usr/local/bin/server-brave-search --help >/dev/null; \
+    # 정리
+    npm cache clean --force; \
+    apt-get purge -y gnupg; \
+    apt-get autoremove -y --purge; \
+    rm -rf /var/lib/apt/lists/*
 
 # jar 복사
 COPY --from=builder /build/cs25-service/build/libs/*.jar app.jar

cs25-service/build.gradle

@@ -33,6 +33,12 @@ dependencies {
     implementation "org.springframework.ai:spring-ai-starter-mcp-client:1.0.0"
     implementation "org.springframework.ai:spring-ai-starter-mcp-client-webflux:1.0.0"
 
+    // resilience4j
+    implementation 'io.github.resilience4j:resilience4j-spring-boot3:2.3.0'
+    implementation 'io.github.resilience4j:resilience4j-circuitbreaker:2.3.0'
+    implementation 'io.github.resilience4j:resilience4j-retry:2.3.0'
+    implementation 'io.github.resilience4j:resilience4j-reactor:2.3.0'
+
     //JavaMailSender
     implementation 'jakarta.mail:jakarta.mail-api:2.1.0'
 

cs25-service/src/main/java/com/example/cs25service/domain/ai/client/ClaudeChatClient.java

@@ -2,6 +2,7 @@
 
 import com.example.cs25service.domain.ai.exception.AiException;
 import com.example.cs25service.domain.ai.exception.AiExceptionCode;
+import com.example.cs25service.domain.ai.resilience.AiResilience;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -11,18 +12,23 @@
 public class ClaudeChatClient implements AiChatClient {
 
     private final ChatClient anthropicChatClient;
+    private final AiResilience resilience;
 
-    public ClaudeChatClient(@Qualifier("anthropicChatClient") ChatClient anthropicChatClient) {
+    public ClaudeChatClient(@Qualifier("anthropicChatClient") ChatClient anthropicChatClient,
+        AiResilience resilience) {
         this.anthropicChatClient = anthropicChatClient;
+        this.resilience = resilience;
     }
 
     @Override
     public String call(String systemPrompt, String userPrompt) {
-        return anthropicChatClient.prompt()
-            .system(systemPrompt)
-            .user(userPrompt)
-            .call()
-            .content();
+        return resilience.executeSync("claude", () ->
+            anthropicChatClient.prompt()
+                .system(systemPrompt)
+                .user(userPrompt)
+                .call()
+                .content()
+        );
     }
 
     @Override
@@ -32,13 +38,12 @@ public ChatClient raw() {
 
     @Override
     public Flux<String> stream(String systemPrompt, String userPrompt) {
-        return anthropicChatClient.prompt()
-            .system(systemPrompt)
-            .user(userPrompt)
-            .stream()
-            .content()
-            .onErrorResume(error -> {
-                throw new AiException(AiExceptionCode.INTERNAL_SERVER_ERROR);
-            });
+        return resilience.executeStream("claude", () ->
+            anthropicChatClient.prompt()
+                .system(systemPrompt)
+                .user(userPrompt)
+                .stream()
+                .content()
+        ).onErrorMap(e -> new AiException(AiExceptionCode.INTERNAL_SERVER_ERROR));
     }
 }

cs25-service/src/main/java/com/example/cs25service/domain/ai/client/OpenAiChatClient.java

@@ -2,6 +2,7 @@
 
 import com.example.cs25service.domain.ai.exception.AiException;
 import com.example.cs25service.domain.ai.exception.AiExceptionCode;
+import com.example.cs25service.domain.ai.resilience.AiResilience;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -11,19 +12,25 @@
 public class OpenAiChatClient implements AiChatClient {
 
     private final ChatClient openAiChatClient;
+    private final AiResilience resilience;
 
-    public OpenAiChatClient(@Qualifier("openAiChatModelClient") ChatClient openAiChatClient) {
+    public OpenAiChatClient(
+        @Qualifier("openAiChatModelClient") ChatClient openAiChatClient,
+        AiResilience resilience) {
         this.openAiChatClient = openAiChatClient;
+        this.resilience = resilience;
     }
 
     @Override
     public String call(String systemPrompt, String userPrompt) {
-        return openAiChatClient.prompt()
-            .system(systemPrompt)
-            .user(userPrompt)
-            .call()
-            .content()
-            .trim();
+        return resilience.executeSync("openai", () ->
+            openAiChatClient.prompt()
+                .system(systemPrompt)
+                .user(userPrompt)
+                .call()
+                .content()
+                .trim()
+        );
     }
 
     @Override
@@ -33,13 +40,12 @@ public ChatClient raw() {
 
     @Override
     public Flux<String> stream(String systemPrompt, String userPrompt) {
-        return openAiChatClient.prompt()
-            .system(systemPrompt)
-            .user(userPrompt)
-            .stream()
-            .content()
-            .onErrorResume(error -> {
-                throw new AiException(AiExceptionCode.INTERNAL_SERVER_ERROR);
-            });
+        return resilience.executeStream("openai", () ->
+            openAiChatClient.prompt()
+                .system(systemPrompt)
+                .user(userPrompt)
+                .stream()
+                .content()
+        ).onErrorMap(e -> new AiException(AiExceptionCode.INTERNAL_SERVER_ERROR));
     }
 }

cs25-service/src/main/java/com/example/cs25service/domain/ai/resilience/AiResilience.java

@@ -0,0 +1,45 @@
+package com.example.cs25service.domain.ai.resilience;
+
+import io.github.resilience4j.circuitbreaker.CircuitBreaker;
+import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.github.resilience4j.reactor.circuitbreaker.operator.CircuitBreakerOperator;
+import io.github.resilience4j.reactor.retry.RetryOperator;
+import io.github.resilience4j.retry.Retry;
+import io.github.resilience4j.retry.RetryRegistry;
+import java.util.function.Supplier;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+
+@Component
+@RequiredArgsConstructor
+public class AiResilience {
+
+    private final CircuitBreakerRegistry cbRegistry;
+    private final RetryRegistry retryRegistry;
+
+    /**
+     * 동기 호출: Retry → CircuitBreaker 순서
+     */
+    public <T> T executeSync(String name, Supplier<T> supplier) {
+        CircuitBreaker cb = cbRegistry.circuitBreaker(name);
+        Retry retry = retryRegistry.retry(name);
+
+        Supplier<T> withRetry = Retry.decorateSupplier(retry, supplier);
+        Supplier<T> withCb = CircuitBreaker.decorateSupplier(cb, withRetry);
+
+        return withCb.get();
+    }
+
+    /**
+     * Flux 스트리밍: RetryOperator → CircuitBreakerOperator 순서
+     */
+    public <T> Flux<T> executeStream(String name, Supplier<Flux<T>> supplier) {
+        CircuitBreaker cb = cbRegistry.circuitBreaker(name);
+        Retry retry = retryRegistry.retry(name);
+
+        return supplier.get()
+            .transformDeferred(RetryOperator.of(retry))
+            .transformDeferred(CircuitBreakerOperator.of(cb));
+    }
+}