반환 로직 수정

build.gradle

@@ -46,10 +46,8 @@ dependencies {
     implementation platform('software.amazon.awssdk:bom:2.31.69')
     implementation 'software.amazon.awssdk:bedrock'
     implementation 'software.amazon.awssdk:bedrockruntime'
-    implementation 'software.amazon.awssdk:bedrockagentruntime'
     implementation 'software.amazon.awssdk:s3'
     implementation 'software.amazon.awssdk:apache-client:2.32.12'
-    implementation 'software.amazon.awssdk:netty-nio-client:2.32.16'
 
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'ch.qos.logback.contrib:logback-json-classic:0.1.5'

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1 @@
+toolchainVersion=17

src/main/java/com/samhap/kokomen/global/config/AwsConfig.java

@@ -1,17 +1,18 @@
 package com.samhap.kokomen.global.config;
 
+import com.samhap.kokomen.global.external.bedrock.BedrockConverseProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
-import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeAsyncClient;
 import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
 import software.amazon.awssdk.services.s3.S3Client;
 
 @Configuration
+@EnableConfigurationProperties(BedrockConverseProperties.class)
 public class AwsConfig {
 
     @Bean
@@ -22,21 +23,7 @@ public BedrockRuntimeClient bedrockRuntimeClient() {
                         .maxConnections(60)
                         .connectionAcquisitionTimeout(java.time.Duration.ofSeconds(5))
                         .connectionTimeout(java.time.Duration.ofSeconds(3))
-                        .socketTimeout(java.time.Duration.ofSeconds(15))
-                )
-                .region(Region.AP_NORTHEAST_2)
-                .build();
-    }
-
-    @Bean
-    public BedrockAgentRuntimeAsyncClient bedrockAgentRuntimeClient() {
-        return BedrockAgentRuntimeAsyncClient.builder()
-                .credentialsProvider(InstanceProfileCredentialsProvider.create())
-                .httpClientBuilder(NettyNioAsyncHttpClient.builder()
-                        .maxConcurrency(1000)
-                        .connectionAcquisitionTimeout(java.time.Duration.ofSeconds(10))
-                        .connectionTimeout(java.time.Duration.ofSeconds(3))
-                        .readTimeout(java.time.Duration.ofSeconds(180))
+                        .socketTimeout(java.time.Duration.ofSeconds(60))
                 )
                 .region(Region.AP_NORTHEAST_2)
                 .build();

src/main/java/com/samhap/kokomen/global/external/bedrock/BedrockConverseClient.java

@@ -0,0 +1,79 @@
+package com.samhap.kokomen.global.external.bedrock;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.samhap.kokomen.global.exception.ExternalApiException;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
+import software.amazon.awssdk.services.bedrockruntime.model.ContentBlock;
+import software.amazon.awssdk.services.bedrockruntime.model.ConverseRequest;
+import software.amazon.awssdk.services.bedrockruntime.model.ConverseResponse;
+import software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration;
+import software.amazon.awssdk.services.bedrockruntime.model.Message;
+import software.amazon.awssdk.services.bedrockruntime.model.StopReason;
+import software.amazon.awssdk.services.bedrockruntime.model.SystemContentBlock;
+import software.amazon.awssdk.services.bedrockruntime.model.ToolConfiguration;
+import software.amazon.awssdk.services.bedrockruntime.model.ToolUseBlock;
+
+@Slf4j
+@Component
+public class BedrockConverseClient {
+
+    private final BedrockRuntimeClient bedrockRuntimeClient;
+    private final BedrockConverseProperties properties;
+    private final ObjectMapper objectMapper;
+
+    public BedrockConverseClient(
+            BedrockRuntimeClient bedrockRuntimeClient,
+            BedrockConverseProperties properties,
+            ObjectMapper objectMapper
+    ) {
+        this.bedrockRuntimeClient = bedrockRuntimeClient;
+        this.properties = properties;
+        this.objectMapper = objectMapper;
+    }
+
+    public ConverseResponse converse(
+            List<SystemContentBlock> systemMessages,
+            List<Message> messages,
+            ToolConfiguration toolConfiguration,
+            int maxTokens
+    ) {
+        ConverseRequest request = ConverseRequest.builder()
+                .modelId(properties.modelId())
+                .system(systemMessages)
+                .messages(messages)
+                .toolConfig(toolConfiguration)
+                .inferenceConfig(InferenceConfiguration.builder()
+                        .maxTokens(maxTokens)
+                        .temperature(properties.temperature())
+                        .build())
+                .build();
+        return bedrockRuntimeClient.converse(request);
+    }
+
+    public ToolUseBlock extractToolUse(ConverseResponse response, String expectedToolName) {
+        if (response.stopReason() != StopReason.TOOL_USE) {
+            throw new ExternalApiException(
+                    "Bedrock 응답이 tool_use가 아닙니다. stopReason=" + response.stopReason()
+                            + ", expected=" + expectedToolName);
+        }
+        return response.output().message().content().stream()
+                .filter(content -> content.toolUse() != null)
+                .map(ContentBlock::toolUse)
+                .filter(toolUse -> expectedToolName.equals(toolUse.name()))
+                .findFirst()
+                .orElseThrow(() -> new ExternalApiException(
+                        "Bedrock 응답에 tool_use 블록이 없습니다. expected=" + expectedToolName));
+    }
+
+    public <T> T parseToolInput(ToolUseBlock toolUse, Class<T> type) {
+        try {
+            Object javaObject = DocumentJsonConverter.toJavaObject(toolUse.input());
+            return objectMapper.convertValue(javaObject, type);
+        } catch (Exception e) {
+            throw new ExternalApiException("Bedrock toolUse 파싱 실패: toolName=" + toolUse.name(), e);
+        }
+    }
+}

src/main/java/com/samhap/kokomen/global/external/bedrock/BedrockConverseProperties.java

@@ -0,0 +1,15 @@
+package com.samhap.kokomen.global.external.bedrock;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "aws.bedrock")
+public record BedrockConverseProperties(
+        String modelId,
+        Integer proceedMaxTokens,
+        Integer endMaxTokens,
+        Integer answerFeedbackMaxTokens,
+        Integer resumeQuestionMaxTokens,
+        Integer resumeEvaluationMaxTokens,
+        Float temperature
+) {
+}

src/main/java/com/samhap/kokomen/global/external/bedrock/DocumentJsonConverter.java

@@ -0,0 +1,38 @@
+package com.samhap.kokomen.global.external.bedrock;
+
+import com.samhap.kokomen.global.exception.ExternalApiException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import software.amazon.awssdk.core.document.Document;
+
+public final class DocumentJsonConverter {
+
+    private DocumentJsonConverter() {
+    }
+
+    public static Object toJavaObject(Document document) {
+        if (document == null || document.isNull()) {
+            return null;
+        }
+        if (document.isBoolean()) {
+            return document.asBoolean();
+        }
+        if (document.isString()) {
+            return document.asString();
+        }
+        if (document.isNumber()) {
+            return document.asNumber().bigDecimalValue();
+        }
+        if (document.isList()) {
+            return document.asList().stream()
+                    .map(DocumentJsonConverter::toJavaObject)
+                    .toList();
+        }
+        if (document.isMap()) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            document.asMap().forEach((key, value) -> map.put(key, toJavaObject(value)));
+            return map;
+        }
+        throw new ExternalApiException("알 수 없는 Document 타입입니다.");
+    }
+}

src/main/java/com/samhap/kokomen/interview/external/AnswerFeedbackBedrockClient.java

@@ -0,0 +1,45 @@
+package com.samhap.kokomen.interview.external;
+
+import com.samhap.kokomen.answer.domain.AnswerRank;
+import com.samhap.kokomen.global.annotation.ExecutionTimer;
+import com.samhap.kokomen.global.exception.ExternalApiException;
+import com.samhap.kokomen.global.external.bedrock.BedrockConverseClient;
+import com.samhap.kokomen.global.external.bedrock.BedrockConverseProperties;
+import com.samhap.kokomen.interview.external.dto.request.InterviewBedrockRequestFactory;
+import com.samhap.kokomen.interview.external.dto.response.AnswerFeedbackOnlyResponse;
+import com.samhap.kokomen.interview.tool.QuestionAndAnswers;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import software.amazon.awssdk.services.bedrockruntime.model.ConverseResponse;
+import software.amazon.awssdk.services.bedrockruntime.model.ToolUseBlock;
+
+@Slf4j
+@ExecutionTimer
+@Component
+public class AnswerFeedbackBedrockClient {
+
+    private final BedrockConverseClient converseClient;
+    private final BedrockConverseProperties properties;
+
+    public AnswerFeedbackBedrockClient(
+            BedrockConverseClient converseClient,
+            BedrockConverseProperties properties
+    ) {
+        this.converseClient = converseClient;
+        this.properties = properties;
+    }
+
+    public String requestAnswerFeedback(QuestionAndAnswers questionAndAnswers, AnswerRank curAnswerRank) {
+        ConverseResponse response = converseClient.converse(
+                InterviewBedrockRequestFactory.createAnswerFeedbackSystem(),
+                InterviewBedrockRequestFactory.createAnswerFeedbackMessages(questionAndAnswers, curAnswerRank),
+                InterviewBedrockRequestFactory.createAnswerFeedbackToolConfig(),
+                properties.answerFeedbackMaxTokens());
+        ToolUseBlock toolUse = converseClient.extractToolUse(response, InterviewBedrockRequestFactory.ANSWER_FEEDBACK_TOOL_NAME);
+        AnswerFeedbackOnlyResponse parsed = converseClient.parseToolInput(toolUse, AnswerFeedbackOnlyResponse.class);
+        if (parsed.feedback() == null || parsed.feedback().isBlank()) {
+            throw new ExternalApiException("Bedrock 답변 피드백 응답이 비어있습니다.");
+        }
+        return parsed.feedback();
+    }
+}

src/main/java/com/samhap/kokomen/interview/external/InterviewProceedBedrockClient.java

@@ -0,0 +1,56 @@
+package com.samhap.kokomen.interview.external;
+
+import com.samhap.kokomen.global.annotation.ExecutionTimer;
+import com.samhap.kokomen.global.external.bedrock.BedrockConverseClient;
+import com.samhap.kokomen.global.external.bedrock.BedrockConverseProperties;
+import com.samhap.kokomen.interview.external.dto.request.InterviewBedrockRequestFactory;
+import com.samhap.kokomen.interview.external.dto.response.BedrockConverseResponse;
+import com.samhap.kokomen.interview.tool.QuestionAndAnswers;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import software.amazon.awssdk.services.bedrockruntime.model.ConverseResponse;
+import software.amazon.awssdk.services.bedrockruntime.model.ToolUseBlock;
+
+@Slf4j
+@ExecutionTimer
+@Component
+public class InterviewProceedBedrockClient {
+
+    private final BedrockConverseClient converseClient;
+    private final BedrockConverseProperties properties;
+
+    public InterviewProceedBedrockClient(
+            BedrockConverseClient converseClient,
+            BedrockConverseProperties properties
+    ) {
+        this.converseClient = converseClient;
+        this.properties = properties;
+    }
+
+    public BedrockConverseResponse requestToBedrock(QuestionAndAnswers questionAndAnswers) {
+        if (questionAndAnswers.isProceedRequest()) {
+            return requestProceed(questionAndAnswers);
+        }
+        return requestEnd(questionAndAnswers);
+    }
+
+    private BedrockConverseResponse requestProceed(QuestionAndAnswers questionAndAnswers) {
+        ConverseResponse response = converseClient.converse(
+                InterviewBedrockRequestFactory.createProceedSystem(),
+                InterviewBedrockRequestFactory.createProceedMessages(questionAndAnswers),
+                InterviewBedrockRequestFactory.createProceedToolConfig(),
+                properties.proceedMaxTokens());
+        ToolUseBlock toolUse = converseClient.extractToolUse(response, InterviewBedrockRequestFactory.PROCEED_TOOL_NAME);
+        return new BedrockConverseResponse(toolUse.input());
+    }
+
+    private BedrockConverseResponse requestEnd(QuestionAndAnswers questionAndAnswers) {
+        ConverseResponse response = converseClient.converse(
+                InterviewBedrockRequestFactory.createEndSystem(),
+                InterviewBedrockRequestFactory.createProceedMessages(questionAndAnswers),
+                InterviewBedrockRequestFactory.createEndToolConfig(),
+                properties.endMaxTokens());
+        ToolUseBlock toolUse = converseClient.extractToolUse(response, InterviewBedrockRequestFactory.END_TOOL_NAME);
+        return new BedrockConverseResponse(toolUse.input());
+    }
+}