Auto commit at 25-2025-08 23:59:36

lily_llm_api/api/routers/document_router.py

@@ -12,7 +12,7 @@ from ...models.schemas import (
     DocumentUploadResponse, RAGQueryRequest, RAGQueryResponse,
     DocumentProcessResponse, MultimodalRAGResponse
 )
-from ...services.session_registry import set_user_for_room, set_flag_for_room
+from ...services.session_registry import set_user_for_room, set_flag_for_room, set_last_document_for_room
 
 logger = logging.getLogger(__name__)
 router = APIRouter()
@@ -59,6 +59,11 @@ async def upload_document(
                     set_flag_for_room(room_id, "use_rag_images_once", True)
                 except Exception:
                     pass
+                # 방별 마지막 문서ID 기록 (후속 요청에서 기본 문서 선택)
+                try:
+                    set_last_document_for_room(room_id, result.get("document_id", document_id))
+                except Exception:
+                    pass
                 return DocumentUploadResponse(
                     success=True,
                     document_id=result.get("document_id", document_id),

lily_llm_api/api/routers/generation_router.py

@@ -161,10 +161,24 @@ async def generate(request: Request,
                         from lily_llm_core.memory_store import memory_store
                         # 간단히 최근 요약 컨텍스트를 저장하고 키토픽은 비움(후속 확장 지점)
                         summary_text = ""
+                        key_topics_csv = ""
                         if hasattr(context_manager, 'get_summary_context'):
                             summary_text = context_manager.get_summary_context(session_id)
+                        # 키토픽 추출이 가능하면 함께 저장
+                        try:
+                            if hasattr(context_manager, 'get_key_topics'):
+                                topics = context_manager.get_key_topics(session_id)
+                                if topics:
+                                    key_topics_csv = ",".join(topics)
+                        except Exception:
+                            key_topics_csv = ""
                         last_ts = time.time()
-                        memory_store.upsert_room_memory(room_id, summary_text, "", last_ts)
+                        memory_store.upsert_room_memory(room_id, summary_text, key_topics_csv, last_ts)
+                        # 사용자 장기 메모 행이 없으면 생성 (빈 노트)
+                        try:
+                            memory_store.upsert_user_memory(user_id, notes="")
+                        except Exception:
+                            pass
                     except Exception as _ms:
                         print(f"⚠️ [DEBUG] 룸 메모리 저장 실패: {_ms}")
                 except Exception as _e:

lily_llm_api/api/routers/user_memory_router.py

@@ -49,15 +49,22 @@ async def upsert_room_summary(
     try:
         from lily_llm_core.memory_store import memory_store
         import time
-        # summary가 비어있으면 현재 세션 컨텍스트 요약을 사용 가능
+        # summary가 비어있으면 해당 룸의 세션들 중 최근 세션을 찾아 요약/키토픽을 추출
         if not summary:
             try:
                 from lily_llm_core.context_manager import context_manager
-                session_id = f"room_{room_id}_group"  # 기본 세션 키 가정
-                summary = context_manager.get_summary_context(session_id)
-                topics = context_manager.get_key_topics(session_id)
-                if topics and not key_topics:
-                    key_topics = ",".join(topics)
+                # room_{room_id}_* 패턴 검색
+                candidate_sessions = [sid for sid in getattr(context_manager, 'session_conversations', {}).keys() if str(sid).startswith(f"room_{room_id}_")]
+                # 가장 최근 턴이 많은 세션을 우선 사용
+                if candidate_sessions:
+                    best_sid = max(candidate_sessions, key=lambda sid: len(context_manager.session_conversations.get(sid, [])))
+                    summary = context_manager.get_summary_context(best_sid)
+                    try:
+                        topics = context_manager.get_key_topics(best_sid)
+                        if topics and not key_topics:
+                            key_topics = ",".join(topics)
+                    except Exception:
+                        pass
             except Exception:
                 pass
         memory_store.upsert_room_memory(room_id, summary, key_topics, time.time())

lily_llm_api/services/session_registry.py

@@ -12,6 +12,7 @@ _session_to_user: Dict[str, str] = {}
 _last_user: Optional[str] = None
 _last_updated_at: float = 0.0
 _room_flags: Dict[str, Dict[str, Dict[str, Any]]] = {}
+_room_last_document: Dict[str, str] = {}
 
 def set_user_for_room(room_id: Optional[str], user_id: Optional[str]) -> None:
     if not room_id or not user_id:
@@ -51,6 +52,8 @@ def clear() -> None:
     global _last_user, _last_updated_at
     _last_user = None
     _last_updated_at = 0.0
+    _room_flags.clear()
+    _room_last_document.clear()
 
 # ---- room-scoped one-shot flags ----
 def set_flag_for_room(room_id: Optional[str], key: str, value: bool = True, ttl_seconds: Optional[float] = None) -> None:
@@ -115,4 +118,15 @@ def pop_flag_for_room(room_id: Optional[str], key: str) -> Optional[bool]:
         return None
     return bool(removed.get("value"))
 
+# ---- room-scoped last document id ----
+def set_last_document_for_room(room_id: Optional[str], document_id: Optional[str]) -> None:
+    if not room_id or not document_id:
+        return
+    _room_last_document[str(room_id)] = str(document_id)
+
+def get_last_document_for_room(room_id: Optional[str]) -> Optional[str]:
+    if not room_id:
+        return None
+    return _room_last_document.get(str(room_id))
+