diff --git a/src/main/java/com/swyp/picke/domain/classroom/enums/AiJobType.java b/src/main/java/com/swyp/picke/domain/classroom/enums/AiJobType.java index d3f6aaea..92953711 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/enums/AiJobType.java +++ b/src/main/java/com/swyp/picke/domain/classroom/enums/AiJobType.java @@ -4,6 +4,7 @@ public enum AiJobType { TOPIC_CANDIDATES, TOPIC_VALIDATION, DEBATE_ARGUMENT, // AI 철학자 반박 (200~500자) + DEBATE_INPUT_CLASSIFY, // 참가자 반박 입력 분류 (엣지 케이스 PRD 4.1). 반려된 반박도 기록한다 MEMBER_REPORT, CLASS_INSIGHT } diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputClassifier.java b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputClassifier.java index cfd7a244..ddb47783 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputClassifier.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputClassifier.java @@ -51,8 +51,8 @@ public class ClassDebateInputClassifier { private final ClassReportAiClient aiClient; - /** 분류에 쓰는 대화 맥락. 직전 AI 주장이 없으면 null */ - public record Context(String question, String participantLabel, String lastArgument) { + /** 분류에 쓰는 대화 맥락. sessionId 는 비용 기록용이고 프롬프트에는 넣지 않는다. 직전 AI 주장이 없으면 null */ + public record Context(Long sessionId, String question, String participantLabel, String lastArgument) { } /** diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputGuard.java b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputGuard.java index e667d773..bf3a18f2 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputGuard.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputGuard.java @@ -45,19 +45,25 @@ public class ClassDebateInputGuard { private final ClassDebateInputClassifier classifier; /** - * 차단·반려 대상이면 CustomException. 접수할 반박이면 입력 분류 결과를 돌려준다. - * 분류하지 못했거나(장애·맥락 없음) 길이 규칙을 벗어나 저장 단계에서 400 이 날 반박이면 null. + * 검사 결과. classification 은 분류하지 못했거나(장애·맥락 없음) 길이 규칙을 벗어나 저장 단계에서 400 이 날 반박이면 null. + * rejection 은 분류 결과로 반려할 때의 에러 코드다. 분류 비용을 기록한 뒤 호출하는 쪽이 던진다 (반려돼도 호출 비용은 들었다) + */ + public record Verdict(ClassDebateInputClassifier.Result classification, ErrorCode rejection) { + } + + /** + * 규칙(개인정보·무의미)·Moderation 차단이면 CustomException. 그 밖에는 분류 결과와 반려 여부를 돌려준다. * * @param context 분류 맥락. 반박을 받을 수 없는 상태라 저장 단계에서 거절될 요청이면 null 이고 분류하지 않는다 */ - public ClassDebateInputClassifier.Result check(String rawContent, ClassDebateInputClassifier.Context context) { + public Verdict check(String rawContent, ClassDebateInputClassifier.Context context) { String content = rawContent == null ? "" : rawContent.strip(); if (PersonalInfoDetector.contains(content)) { throw new CustomException(ErrorCode.CLASS_DEBATE_REPLY_PERSONAL_INFO); } int length = content.codePointCount(0, content.length()); if (length < ClassDebateSessionService.REPLY_MIN_LENGTH || length > ClassDebateSessionService.REPLY_MAX_LENGTH) { - return null; + return new Verdict(null, null); } if (MeaninglessInputDetector.isMeaningless(content)) { log.info("[ClassDebate] reply rejected reason=MEANINGLESS source=rule"); @@ -80,17 +86,17 @@ public ClassDebateInputClassifier.Result check(String rawContent, ClassDebateInp } ClassDebateInputClassifier.Result result = await(classification, "classification"); if (result == null) { - return null; + return new Verdict(null, null); } if (result.isInjection()) { log.info("[ClassDebate] reply rejected reason=INJECTION types={} prompt={}", result.typesValue(), ClassDebateInputClassifier.PROMPT_VERSION); - throw new CustomException(ErrorCode.CLASS_DEBATE_REPLY_INJECTION); + return new Verdict(result, ErrorCode.CLASS_DEBATE_REPLY_INJECTION); } if (result.isMeaningless()) { log.info("[ClassDebate] reply rejected reason=MEANINGLESS source=ai types={} prompt={}", result.typesValue(), ClassDebateInputClassifier.PROMPT_VERSION); - throw new CustomException(ErrorCode.CLASS_DEBATE_REPLY_MEANINGLESS); + return new Verdict(result, ErrorCode.CLASS_DEBATE_REPLY_MEANINGLESS); } - return result; + return new Verdict(result, null); } private static T await(CompletableFuture future, String name) { diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateService.java b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateService.java index 03bd7ed5..5155df07 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateService.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateService.java @@ -6,6 +6,7 @@ import com.swyp.picke.domain.classroom.service.report.ClassReportAiClient; import com.swyp.picke.domain.classroom.service.report.ReportValidationException; import com.swyp.picke.domain.classroom.service.topic.AiUsage; +import com.swyp.picke.global.common.exception.CustomException; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.concurrent.ThreadLocalRandom; @@ -59,8 +60,20 @@ public ClassDebateResponse start(Long userId, Long classId) { public ClassDebateResponse reply(Long userId, Long classId, ClassDebateReplyRequest request) { // 외부 검사·분류는 세션 잠금 밖에서 한다. 차단·반려되면 저장·라운드 소비 없이 끝난다 ClassDebateInputClassifier.Context context = sessionService.classifyContext(userId, classId, request.roundIndex()); - ClassDebateInputClassifier.Result classification = inputGuard.check(request.content(), context); - ClassDebateSessionService.PreparedTurn turn = sessionService.reply(userId, classId, request, classification, + ClassDebateInputGuard.Verdict verdict = inputGuard.check(request.content(), context); + if (verdict.classification() != null) { + try { + sessionService.recordClassification(context.sessionId(), request.roundIndex(), request.requestKey(), + verdict.classification(), aiClient.getModel(), now()); + } catch (Exception e) { + // 비용 기록 실패로 반박 접수를 막지 않는다 + log.warn("[ClassDebate] classification usage not recorded sessionId={} : {}", context.sessionId(), e.toString()); + } + } + if (verdict.rejection() != null) { + throw new CustomException(verdict.rejection()); + } + ClassDebateSessionService.PreparedTurn turn = sessionService.reply(userId, classId, request, verdict.classification(), aiClient.getDebateModel(), now()); if (turn != null) { generate(turn); diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateSessionService.java b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateSessionService.java index 3b75ee27..1a17eecc 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateSessionService.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateSessionService.java @@ -181,10 +181,34 @@ public ClassDebateInputClassifier.Context classifyContext(Long userId, Long clas String lastArgument = messageRepository.findBySessionIdAndRoundIndexAndSpeaker(session.getId(), roundIndex, ClassDebateSpeaker.AI) .map(ClassDebateMessage::getContent) .orElse(null); - return new ClassDebateInputClassifier.Context(session.getClassroom().getBattle().getTitle(), + return new ClassDebateInputClassifier.Context(session.getId(), session.getClassroom().getBattle().getTitle(), session.getParticipantOption().getTitle(), lastArgument); } + /** + * 입력 분류 호출 비용 기록 (PRD §21). 반려된 반박도 기록하고 원문은 남기지 않는다. + * 같은 반박 재전송(같은 requestKey)은 같은 행을 재사용하고 attempt 만 올린다. + */ + @Transactional + public void recordClassification(Long sessionId, int round, String requestKey, ClassDebateInputClassifier.Result classification, + String model, LocalDateTime now) { + ClassDebateSession session = sessionRepository.findById(sessionId).orElse(null); + if (session == null) { + return; + } + String key = AiJobType.DEBATE_INPUT_CLASSIFY.name() + ":" + sessionId + ":" + round + ":" + requestKey; + AiJob job = aiJobRepository.findByIdempotencyKey(key) + .orElseGet(() -> aiJobRepository.save(AiJob.builder() + .type(AiJobType.DEBATE_INPUT_CLASSIFY) + .idempotencyKey(key) + .ticket(session.getClassroom().getTicket()) + .classroom(session.getClassroom()) + .member(session.getMember()) + .build())); + job.start(model, now); + job.succeed(classification.inputTokens(), classification.outputTokens(), now); + } + // ---------- 재시도 ---------- /** 실패했거나 오래 멈춘 라운드의 AI 주장을 같은 작업으로 다시 만든다 (부록 D "재시도 가능할 때만 버튼, 같은 job 사용") */ diff --git a/src/main/resources/db/migration/V20261113_01__ai_jobs_type_debate_input_classify.sql b/src/main/resources/db/migration/V20261113_01__ai_jobs_type_debate_input_classify.sql new file mode 100644 index 00000000..37b3cd83 --- /dev/null +++ b/src/main/resources/db/migration/V20261113_01__ai_jobs_type_debate_input_classify.sql @@ -0,0 +1,12 @@ +-- #640 ai_jobs.type 에 DEBATE_INPUT_CLASSIFY(반박 입력 분류) 추가. +-- 마이그레이션 SQL 로 만든 ai_jobs 에는 type 제약이 없다. Hibernate 가 테이블을 만든 환경에는 ai_jobs_type_check 가 있을 수 있어, +-- 있으면 새 값을 포함해 다시 만든다. 없으면 아무것도 하지 않는다. 멱등하게 작성되어 재실행해도 안전하다. + +DO $$ +BEGIN + IF EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'ai_jobs_type_check' AND conrelid = 'ai_jobs'::regclass) THEN + ALTER TABLE ai_jobs DROP CONSTRAINT ai_jobs_type_check; + ALTER TABLE ai_jobs ADD CONSTRAINT ai_jobs_type_check CHECK (type IN ( + 'TOPIC_CANDIDATES', 'TOPIC_VALIDATION', 'DEBATE_ARGUMENT', 'DEBATE_INPUT_CLASSIFY', 'MEMBER_REPORT', 'CLASS_INSIGHT')); + END IF; +END $$; diff --git a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassDebateApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassDebateApiIntegrationTest.java index e7226f95..ecd46866 100644 --- a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassDebateApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassDebateApiIntegrationTest.java @@ -311,6 +311,14 @@ void replyRejectedMeaninglessAndInjection() throws Exception { reply(1, injection, "key-injection") .andExpect(status().isBadRequest()) .andExpect(jsonPath("$.error.code").value("CLASS_400_DEBATE_INJECTION")); + // 반려돼도 분류 호출 비용은 기록한다 (규칙으로 거른 무의미 입력은 호출이 없어 기록 없음) + assertThat(classifyJobs()).singleElement().satisfies(job -> { + assertThat(job.getStatus()).isEqualTo(AiJobStatus.SUCCEEDED); + assertThat(job.getModel()).isEqualTo("test-model"); + assertThat(job.getInputTokens()).isEqualTo(300); + assertThat(job.getOutputTokens()).isEqualTo(150); + assertThat(job.getIdempotencyKey()).endsWith(":1:key-injection"); + }); String padded = longText("ㅁㄴㅇㄹ"); stubClassification(padded, List.of("MEANINGLESS"), null); @@ -322,6 +330,7 @@ void replyRejectedMeaninglessAndInjection() throws Exception { reply(1, longText("고친 반박"), "key-fixed") .andExpect(status().isOk()) .andExpect(jsonPath("$.data.round").value(2)); + assertThat(classifyJobs()).hasSize(2); // 인젝션 + 무의미(AI 판정). 분류 응답이 없는(장애) "고친 반박"은 기록하지 않는다 } @Test @@ -526,6 +535,10 @@ private void stubClassification(String reply, List types, String validAr .thenReturn(result(json)); } + private List classifyJobs() { + return aiJobRepository.findAll().stream().filter(j -> j.getType() == AiJobType.DEBATE_INPUT_CLASSIFY).toList(); + } + private ClassDebateMessage userMessage(int round) { return messageRepository.findAll().stream() .filter(m -> m.getSpeaker() == ClassDebateSpeaker.USER && m.getRoundIndex() == round) diff --git a/src/test/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputClassifierTest.java b/src/test/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputClassifierTest.java index 0151bf82..d3d738da 100644 --- a/src/test/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputClassifierTest.java +++ b/src/test/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateInputClassifierTest.java @@ -22,7 +22,7 @@ class ClassDebateInputClassifierTest { private final ClassReportAiClient aiClient = mock(ClassReportAiClient.class); private final ClassDebateInputClassifier classifier = new ClassDebateInputClassifier(aiClient); private static final ClassDebateInputClassifier.Context CONTEXT = - new ClassDebateInputClassifier.Context("감정을 드러내지 않는 슬픔도 진짜 슬픔일까?", "진짜 슬픔이다", "직전 주장"); + new ClassDebateInputClassifier.Context(1L, "감정을 드러내지 않는 슬픔도 진짜 슬픔일까?", "진짜 슬픔이다", "직전 주장"); private ClassDebateInputClassifier.Result classify(List types, String validArgument) { Map json = new HashMap<>();