Merge pull request #193 from capgoing/langchain

🐛 [fix] 지식그래프 생성 순환참조 오류 해결

Author: khyaejin

Backend_Config

@@ -11,11 +11,28 @@
 @Getter
 @Builder
 public class CreateChatbotResponseDto {
-    private String chatContent;                 // 챗봇 응답
-    private String graphId;                     // 지식그래프 ID
+    private String chatContent;
+    private String graphId;
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm")
-    private LocalDateTime createdAt;            // 응답 생성 시각
-    private List<String> retrievedChunks;       // RAG: 검색된 문장들
-    private List<String> sourceNodes;           //  RAG: 참조된 지식그래프 노드 ID
-    private Map<String, String> ragMeta;        //  RAG: 점수, 검색 method 등
+    private LocalDateTime createdAt;
+    private List<String> retrievedChunks;
+    private List<String> sourceNodes;
+    private Map<String, String> ragMeta;
+
+    public static CreateChatbotResponseDto of(
+            String chatContent,
+            String graphId,
+            LocalDateTime createdAt,
+            List<String> retrievedChunks,
+            List<String> sourceNodes
+    ) {
+        return CreateChatbotResponseDto.builder()
+                .chatContent(chatContent)
+                .graphId(graphId)
+                .createdAt(createdAt)
+                .retrievedChunks(retrievedChunks)
+                .sourceNodes(sourceNodes)
+                .ragMeta(Map.of("chunkCount", String.valueOf(retrievedChunks.size())))
+                .build();
+    }
 }

src/main/java/com/going/server/domain/chatbot/dto/CreateChatbotResponseDto.java

@@ -26,4 +26,22 @@ public class Chatting {
     private Sender sender;
 
     private LocalDateTime createdAt;
+
+    public static Chatting ofUser(Graph graph, String content) {
+        return Chatting.builder()
+                .graph(graph)
+                .content(content)
+                .sender(Sender.USER)
+                .createdAt(LocalDateTime.now())
+                .build();
+    }
+
+    public static Chatting ofGPT(Graph graph, String content) {
+        return Chatting.builder()
+                .graph(graph)
+                .content(content)
+                .sender(Sender.GPT)
+                .createdAt(LocalDateTime.now())
+                .build();
+    }
 }

src/main/java/com/going/server/domain/chatbot/entity/Chatting.java

@@ -6,15 +6,14 @@
 import com.going.server.domain.chatbot.entity.Sender;
 import com.going.server.domain.chatbot.repository.ChattingRepository;
 import com.going.server.domain.graph.entity.Graph;
-import com.going.server.domain.graph.entity.GraphNode;
 import com.going.server.domain.graph.exception.GraphContentNotFoundException;
 import com.going.server.domain.graph.repository.GraphRepository;
 import com.going.server.domain.graph.repository.GraphNodeRepository;
 import com.going.server.domain.openai.dto.ImageCreateRequestDto;
 import com.going.server.domain.openai.service.ImageCreateService;
-import com.going.server.domain.openai.service.RAGAnswerCreateService;
 import com.going.server.domain.openai.service.SimpleAnswerCreateService;
 import com.going.server.domain.openai.service.TextSummaryCreateService;
+import com.going.server.domain.rag.service.GraphRAGService;
 import com.going.server.domain.rag.service.SimilarityFilterService;
 import com.going.server.domain.rag.util.PromptBuilder;
 import lombok.RequiredArgsConstructor;
@@ -24,8 +23,6 @@
 import java.time.LocalDateTime;
 import java.util.*;
 
-import java.util.stream.Collectors;
-
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -38,13 +35,15 @@ public class ChatbotServiceImpl implements ChatbotService {
     // openai 관련 service
     private final TextSummaryCreateService textSummaryCreateService;
     private final SimpleAnswerCreateService simpleAnswerCreateService;
-    private final RAGAnswerCreateService ragAnswerCreateService;
     private final ImageCreateService imageCreateService;
+    // graphRAG
+    private final GraphRAGService graphRAGService;
 
     // 원문 반환
     @Override
     public CreateChatbotResponseDto getOriginalText(String graphId) {
-        Graph graph = graphRepository.getByGraph(Long.valueOf(graphId));
+        Long dbId = graphRepository.findDbIdByGraphId(Long.valueOf(graphId));
+        Graph graph = graphRepository.getByGraph(dbId);
 
         return CreateChatbotResponseDto.builder()
                 .chatContent(graph.getContent())           // 원문 텍스트
@@ -56,7 +55,8 @@ public CreateChatbotResponseDto getOriginalText(String graphId) {
     // 요약본 생성
     @Override
     public CreateChatbotResponseDto getSummaryText(String graphId) {
-        Graph graph = graphRepository.getByGraph(Long.valueOf(graphId));
+        Long dbId = graphRepository.findDbIdByGraphId(Long.valueOf(graphId));
+        Graph graph = graphRepository.getByGraph(dbId);
 
         String context = Optional.ofNullable(graph.getContent())
                 .filter(s -> !s.trim().isEmpty())
@@ -71,120 +71,53 @@ public CreateChatbotResponseDto getSummaryText(String graphId) {
                 .build();
     }
 
-
-    // RAG 챗봇 응답 생성
+    // GraphRAG 챗봇 응답 생성
     @Override
-    public CreateChatbotResponseDto createAnswerWithRAG(String graphStrId, CreateChatbotRequestDto createChatbotRequestDto) {
-        Long graphId = Long.valueOf(graphStrId);
-
-        // 404 : 지식그래프 찾을 수 없음
-        Graph graph = graphRepository.getByGraph(graphId);
-
-        // RAG: 사용자 질문
-        String userQuestion = createChatbotRequestDto.getChatContent();
-
-        // RAG : 키워드 추출
-        List<String> keywords = extractKeywords(userQuestion);
-        System.out.println("[RAG] 추출된 키워드: " + keywords);
-
-        // RAG: 유사 노드 검색 및 문장 추출
-        List<GraphNode> matchedNodes = graphNodeRepository.findByGraphIdAndKeywords(graphId, keywords);
-//        List<GraphNode> matchedNodes = graphNodeRepository.findByGraphIdAndKeywordsWithEdges(graphId, keywords);
-        System.out.println("[RAG] matchedNodes: " + matchedNodes);
-
-        List<String> candidateSentences = matchedNodes.stream()
-                .map(GraphNode::getIncludeSentence)
-                .filter(Objects::nonNull)
-                .distinct()
-                .collect(Collectors.toList());
-
-        // RAG: 유사 문장 필터링
-        List<String> filteredChunks = similarityFilterService.filterRelevantSentences(userQuestion, candidateSentences);
-
-        // RAG: 최종 프롬프트 구성
-        String finalPrompt = promptBuilder.buildPrompt(filteredChunks, userQuestion);
-        System.out.println("finalPrompt: " + finalPrompt);
-
-        // RAG: 메타정보 수집
-        List<String> retrievedChunks = new ArrayList<>(filteredChunks);
-        List<String> sourceNodes = new ArrayList<>(
-                matchedNodes.stream().map(GraphNode::getLabel).distinct().toList()
-        );
-        Map<String, String> ragMeta = Map.of(
-                "chunkCount", String.valueOf(filteredChunks.size())
-        );
+    public CreateChatbotResponseDto createAnswerWithRAG(String graphStrId, CreateChatbotRequestDto requestDto) {
+        Long dbId = graphRepository.findDbIdByGraphId(Long.valueOf(graphStrId));
+        Graph graph = graphRepository.getByGraph(dbId);
 
-        // 새로운 대화인 경우 기존 채팅 삭제
-        if (createChatbotRequestDto.isNewChat()) {
-            deletePreviousChat(graphId);
+        if (requestDto.isNewChat()) {
+            deletePreviousChat(dbId);
         }
 
-        // 기존 채팅 내역 조회
-        List<Chatting> chatHistory = chattingRepository.findAllByGraphId(graphId);
-
-        // 새로운 채팅
-        String newChat = createChatbotRequestDto.getChatContent();
-
-        // 새로운 채팅 repository에 저장
-        Chatting chatting = Chatting.builder()
+        Chatting userChat = Chatting.builder()
                 .graph(graph)
-                .content(newChat)
+                .content(requestDto.getChatContent())
                 .sender(Sender.USER)
                 .createdAt(LocalDateTime.now())
                 .build();
-        chattingRepository.save(chatting);
-
-        // 응답 생성
-        String chatContent;
-
-        // RAG: 유사 문장이 있을 경우 컨텍스트 활용
-        if (retrievedChunks.isEmpty()) {
-            System.out.println("[INFO] RAG 미적용 - 일반 채팅 기반 응답");
-            System.out.println("[INFO] RAG 미적용 - 유사 문장 없음");
-            System.out.println("[DEBUG] matchedNodes.size(): " + matchedNodes.size());
-            System.out.println("[DEBUG] candidateSentences.size(): " + candidateSentences.size());
-            System.out.println("[DEBUG] filteredChunks.size(): " + filteredChunks.size());
-            chatContent = ragAnswerCreateService.chat(chatHistory, newChat);
-        } else {
-            System.out.println("[INFO] RAG 적용됨 - 유사 문장 " + retrievedChunks.size() + "개 포함");
-            chatContent = ragAnswerCreateService.chatWithContext(chatHistory, finalPrompt);
-        }
+        chattingRepository.save(userChat);
 
-        // 응답 repository에 저장
-        Chatting answer = Chatting.builder()
-                .graph(graph)
-                .content(chatContent)
-                .sender(Sender.GPT)
-                .createdAt(LocalDateTime.now())
-                .build();
-        chattingRepository.save(answer);
+        List<Chatting> chatHistory = chattingRepository.findAllByGraphId(dbId);
 
-        // 반환
-        return CreateChatbotResponseDto.builder()
-                .chatContent(chatContent)
-                .graphId(graphStrId)
-                .createdAt(answer.getCreatedAt())
-                .retrievedChunks(retrievedChunks)
-                .sourceNodes(sourceNodes)
-                .ragMeta(ragMeta)
-                .build();
+        // RAG 응답 생성 (응답 + 메타 포함)
+        CreateChatbotResponseDto responseDto = graphRAGService.createAnswerWithGraphRAG(
+                dbId,
+                requestDto.getChatContent(),
+                chatHistory
+        );
+
+        // 응답 채팅 저장
+        Chatting gptChat = Chatting.ofGPT(graph, responseDto.getChatContent());
+        chattingRepository.save(gptChat);
+
+        return responseDto;
     }
 
-    // RAG 사용하지 않는 응답 생성
+    // 기본 응답 생성
     @Override
     public CreateChatbotResponseDto createSimpleAnswer(String graphStrId, CreateChatbotRequestDto createChatbotRequestDto) {
-        Long graphId = Long.valueOf(graphStrId);
-
-        // 404 : 지식그래프 찾을 수 없음
-        Graph graph = graphRepository.getByGraph(graphId);
+        Long dbId = graphRepository.findDbIdByGraphId(Long.valueOf(graphStrId));
+        Graph graph = graphRepository.getByGraph(dbId);
 
         // 새로운 대화인 경우 기존 채팅 삭제
         if (createChatbotRequestDto.isNewChat()) {
-            deletePreviousChat(graphId);
+            deletePreviousChat(dbId);
         }
 
         // 기존 채팅 내역 조회
-        List<Chatting> chatHistory = chattingRepository.findAllByGraphId(graphId);
+        List<Chatting> chatHistory = chattingRepository.findAllByGraphId(dbId);
 
         // 사용자 입력 채팅
         String newChat = createChatbotRequestDto.getChatContent();
@@ -293,17 +226,4 @@ private void deletePreviousChat(Long graphId) {
         chattingRepository.deleteByGraphId(graphId);
     }
 
-
-    // RAG : 키워드 추출
-    private List<String> extractKeywords(String text) {
-        List<String> stopwords = List.of("은", "는", "이", "가", "을", "를", "에", "의", "와", "과", "에서", "하다");
-
-        return Arrays.stream(text.split("[\\s,.!?]+"))
-                .map(word -> word.replaceAll("(은|는|이|가|을|를|에|의|와|과|에서)$", "")) // ✅ 조사 제거
-                .map(String::toLowerCase)
-                .filter(word -> word.length() > 1 && !stopwords.contains(word))
-                .distinct()
-                .limit(5)
-                .collect(Collectors.toList());
-    }
 }

src/main/java/com/going/server/domain/chatbot/service/ChatbotServiceImpl.java

@@ -6,6 +6,7 @@
 import lombok.Setter;
 import org.springframework.data.neo4j.core.schema.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Node("Graph")
@@ -15,7 +16,10 @@
 public class Graph extends BaseEntity {
     @Id
     @GeneratedValue
-    private Long id; //그래프 id -> 프론트와 통신에서는 String 값으로 사용
+    private Long dbId; // 내부 관리용 elementId와 연결됨
+
+    @Property("id")
+    private Long id; // 우리가 직접 사용하는 명시적 ID
 
     private String title;
 
@@ -26,11 +30,8 @@ public class Graph extends BaseEntity {
     private boolean connectPerfect; //connect 퀴즈 만접 여부
     private boolean picturePerfect; //picture 퀴즈 만접 여부
 
+    @Builder.Default
     @Relationship(type = "HAS_NODE", direction = Relationship.Direction.OUTGOING)
-    private List<GraphNode> nodes;
+    private List<GraphNode> nodes = new ArrayList<>();
 
-    // Long → String 변환 (프론트 전송 시)
-    public String getIdAsString() {
-        return id != null ? String.valueOf(id) : null;
-    }
 }

src/main/java/com/going/server/domain/graph/entity/Graph.java

@@ -1,11 +1,15 @@
 package com.going.server.domain.graph.entity;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.data.neo4j.core.schema.*;
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.RelationshipProperties;
+import org.springframework.data.neo4j.core.schema.TargetNode;
 
-import java.util.ArrayList;
+import java.util.Objects;
 
 @RelationshipProperties
 @Getter
@@ -15,32 +19,30 @@ public class GraphEdge {
 
     @Id
     @GeneratedValue
-    private Long id; // Neo4j 내부 ID
+    private Long id;
 
+    @EqualsAndHashCode.Include
     private String source;
 
-    private String label; // 관계 라벨
+    @EqualsAndHashCode.Include
+    private String label;
 
+    @EqualsAndHashCode.Include
     @TargetNode
-    private GraphNode target; // 연결 대상 노드
-
-//    private GraphEdge createEdge(Long edgeId, String label, GraphNode source, GraphNode target) {
-//        GraphEdge edge = new GraphEdge();
-//        edge.setEdgeId(edgeId);
-//        edge.setLabel(label);
-//        edge.setTarget(target);
-//
-//        // outbound edge를 source에 연결
-//        if (source.getEdges() == null) {
-//            source.setEdges(new ArrayList<>());
-//        }
-//        source.getEdges().add(edge);
-//        return edge;
-//    }
-
-    // Long → String 변환 (프론트 전송 시)
-    public String getIdAsString() {
-        return id != null ? String.valueOf(id) : null;
+    private GraphNode target; // 여기에 방향 붙이지 마세요
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof GraphEdge edge)) return false;
+        return Objects.equals(source, edge.source) &&
+                Objects.equals(label, edge.label) &&
+                target != null && edge.target != null &&
+                Objects.equals(target.getNodeId(), edge.target.getNodeId());
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(source, label, target != null ? target.getNodeId() : null);
+    }
 }