Update app.py

app.py

@@ -396,32 +396,66 @@ os.chdir(os.path.dirname(os.path.abspath(__file__)))
 os.makedirs("user_logs", exist_ok=True)
 
 # --- 대화 기록 저장/불러오기 ---
-def save_conversation(username, history, conv_name="current"):
-    """계정별로 대화기록을 pickle로 실시간 저장"""
-    os.makedirs(f"user_logs/{username}", exist_ok=True)
+def save_conversation(username, history):
+    """로그인된 사용자는 여러 대화를 하나의 pickle 파일에 저장"""
+    if not username or username.lower() == "guest":
+        return
+
+    fname = f"{username}.pkl"
+    # 기존 데이터 불러오기
+    data = {}
+    if os.path.exists(fname):
+        try:
+            with open(fname, "rb") as f:
+                data = pickle.load(f)
+        except Exception:
+            data = {}
+
+    # 새로운 대화 요약 제목과 함께 추가
     title = summarize_title(history)
-    fname = f"user_logs/{username}/{conv_name}.pkl"
+    data[title] = {
+        "title": title,
+        "updated": datetime.datetime.now().isoformat(),
+        "history": history
+    }
+
     with open(fname, "wb") as f:
-        pickle.dump({"title": title, "history": history}, f)
+        pickle.dump(data, f)
 
-def load_conversation(username, conv_name="current"):
-    path = f"user_logs/{username}/{conv_name}.pkl"
-    if not os.path.exists(path):
+# --- 대화 불러오기 ---
+def load_conversation(username, conv_title=None):
+    """특정 사용자와 대화 제목으로 불러오기"""
+    if not username or username.lower() == "guest":
+        return []
+    fname = f"{username}.pkl"
+    if not os.path.exists(fname):
         return []
-    with open(path, "rb") as f:
+    with open(fname, "rb") as f:
         data = pickle.load(f)
-    return data.get("history", [])
-
-def list_conversations(username):
-    os.makedirs(f"user_logs/{username}", exist_ok=True)
-    files = [f for f in os.listdir(f"user_logs/{username}") if f.endswith(".pkl")]
-    titles = []
-    for f in files:
-        with open(f"user_logs/{username}/" + f, "rb") as fp:
-            data = pickle.load(fp)
-            titles.append((data.get("title", f), f))
-    return titles
-
+    if conv_title and conv_title in data:
+        return data[conv_title]["history"]
+    elif data:
+        # 가장 최근 대화 반환
+        latest = max(data.values(), key=lambda x: x["updated"])
+        return latest["history"]
+    return []
+
+# --- 대화 목록 갱신 ---
+def refresh_conversation_list(username=None):
+    """사용자별 저장된 대화 제목 목록을 새로고침"""
+    if not username or username.lower() == "guest":
+        return gr.update(choices=[], value=None)
+    fname = f"{username}.pkl"
+    if not os.path.exists(fname):
+        return gr.update(choices=[], value=None)
+    try:
+        with open(fname, "rb") as f:
+            data = pickle.load(f)
+        titles = sorted(data.keys(), reverse=True)
+        return gr.update(choices=titles, value=titles[0] if titles else None)
+    except Exception as e:
+        print(f"⚠️ 목록 불러오기 오류: {e}")
+        return gr.update(choices=[], value=None)
 # --- chat 함수 수정 ---
 def chat(message, history, username="guest", conv_name="current"):
     try:
@@ -452,13 +486,7 @@ def chat(message, history, username="guest", conv_name="current"):
     return history, history, ""
 
 # --- 불러오기 버튼 함수 ---
-def load_selected(username, file):
-    path = f"user_logs/{username}/{file}"
-    if not os.path.exists(path):
-        return []
-    with open(path, "rb") as f:
-        data = pickle.load(f)
-    return data.get("history", [])
+
 # ──────────────────────────────
 # ✅ 로그인 후 사용자 정보 가져오기
 # ──────────────────────────────
@@ -512,32 +540,6 @@ def chat(message, history, hf_token):
     return history, history, ""  # 입력 초기화
 '''
 # 예: hf_token (혹은 username) 을 입력으로 받도록 변경
-def refresh_conversation_list(username="guest"):
-    """계정별 대화 목록을 새로고침 (Gradio Dropdown 업데이트용)"""
-    base_dir = os.path.join("user_logs", username)
-    os.makedirs(base_dir, exist_ok=True)
-
-    files = sorted(
-        [f for f in os.listdir(base_dir) if f.endswith(".pkl")],
-        reverse=True
-    )
-
-    # 제목 목록 만들기
-    titles = []
-    for f in files:
-        try:
-            with open(os.path.join(base_dir, f), "rb") as fp:
-                data = pickle.load(fp)
-                title = data.get("title", f.replace(".pkl", ""))
-        except Exception:
-            title = f.replace(".pkl", "")
-        titles.append(title)
-
-    # Dropdown 업데이트
-    if titles:
-        return gr.update(choices=titles, value=titles[0])
-    else:
-        return gr.update(choices=[], value=None)
 
 
 
@@ -573,7 +575,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="PIXAL Assistant (HF Auth)") as dem
             load_btn = gr.Button("불러오���")
 
             refresh_btn.click(refresh_conversation_list, None, convo_files)
-            load_btn.click(load_selected, [convo_files], chatbot)
+            load_btn.click(load_conversation, [convo_files], chatbot)
 
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", server_port=7860)