Update app.py

app.py

@@ -388,52 +388,47 @@ def summarize_title(history):
     except Exception:
         return "요약 실패"
 
-def save_conversation(username, history):
-    os.makedirs("user_logs", exist_ok=True)
-    if not history: return
+import pickle
+import os, datetime
+
+# 현재 디렉터리로 고정
+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)
     title = summarize_title(history)
-    fname = f"user_logs/{username}_{datetime.datetime.now().strftime('%Y%m%d_%H%M%S')}.json"
-    with open(fname, "w", encoding="utf-8") as f:
-        json.dump({"title": title, "history": history}, f, ensure_ascii=False, indent=2)
+    fname = f"user_logs/{username}/{conv_name}.pkl"
+    with open(fname, "wb") as f:
+        pickle.dump({"title": title, "history": history}, f)
+
+def load_conversation(username, conv_name="current"):
+    path = f"user_logs/{username}/{conv_name}.pkl"
+    if not os.path.exists(path):
+        return []
+    with open(path, "rb") as f:
+        data = pickle.load(f)
+    return data.get("history", [])
 
 def list_conversations(username):
-    os.makedirs("user_logs", exist_ok=True)
-    files = [f for f in os.listdir("user_logs") if f.startswith(username)]
-    data = []
+    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(os.path.join("user_logs", f), encoding="utf-8") as jf:
-            info = json.load(jf)
-            data.append((info.get("title", f), f))
-    return data
-
-def load_conversation(file):
-    with open(os.path.join("user_logs", file), encoding="utf-8") as jf:
-        return json.load(jf)["history"]
+        with open(f"user_logs/{username}/" + f, "rb") as fp:
+            data = pickle.load(fp)
+            titles.append((data.get("title", f), f))
+    return titles
 
-# ──────────────────────────────
-# ✅ 로그인 후 사용자 정보 가져오기
-# ──────────────────────────────
-def get_hf_user(token):
-    """HF OAuth 토큰으로 사용자 정보 조회"""
+# --- chat 함수 수정 ---
+def chat(message, history, username="guest", conv_name="current"):
     try:
-        r = requests.get("https://huggingface.co/api/whoami-v2", headers={"Authorization": f"Bearer {token}"})
-        if r.status_code == 200:
-            data = r.json()
-            return data.get("name") or data.get("email") or "unknown_user"
-    except Exception:
-        pass
-    return "guest"
-import re, json
-
-def chat(message, history,username="default_user"):
-    try:
-        # 시스템 메시지 포함 프롬프트 구성
-        prompt=message
-
-        raw_response = agent.run(prompt)
+        raw_response = agent.run(message)
         text = str(raw_response)
 
-        # ✅ JSON 형태로 응답 시 파싱
+        # JSON 형식 응답 파싱
         output = text
         match = re.search(r"\{.*\}", text, re.DOTALL)
         if match:
@@ -448,17 +443,38 @@ def chat(message, history,username="default_user"):
                 )
             except Exception:
                 output = text
-
     except Exception as e:
         output = f"⚠️ 오류: {e}"
 
-    # ✅ Gradio용 채팅 형식 업데이트
+    # 기록 추가 및 즉시 저장
     history = history + [(message, output)]
-    os.makedirs("user_logs", exist_ok=True)
-    file_path = os.path.join("user_logs", f"{username}_current.json")
-    with open(file_path, "w", encoding="utf-8") as f:
-        json.dump({"history": history}, f, ensure_ascii=False, indent=2)
+    save_conversation(username, history, conv_name)
     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", [])
+# ──────────────────────────────
+# ✅ 로그인 후 사용자 정보 가져오기
+# ──────────────────────────────
+def get_hf_user(token):
+    """HF OAuth 토큰으로 사용자 정보 조회"""
+    try:
+        r = requests.get("https://huggingface.co/api/whoami-v2", headers={"Authorization": f"Bearer {token}"})
+        if r.status_code == 200:
+            data = r.json()
+            return data.get("name") or data.get("email") or "unknown_user"
+    except Exception:
+        pass
+    return "guest"
+import re, json
+
+
 '''
 def chat(message, history, hf_token):
     username = get_hf_user(hf_token) if hf_token else "guest"
@@ -496,25 +512,32 @@ def chat(message, history, hf_token):
     return history, history, ""  # 입력 초기화
 '''
 # 예: hf_token (혹은 username) 을 입력으로 받도록 변경
-def refresh_conversation_list(*_):
-    """대화 목록을 새로고침 (Gradio 호출 대응)"""
-    if not os.path.exists("user_logs"):
-        return gr.Dropdown.update(choices=[], value=None)
-    files = sorted(os.listdir("user_logs"), reverse=True)
-    titles = [f.replace(".json", "") for f in files]
-    return gr.Dropdown.update(choices=titles, value=titles[0] if titles else None)
-def load_selected(file):
-    """선택된 대화를 불러와 이어서 대화"""
-    path = os.path.join("user_logs", file)
-    if not os.path.exists(path):
-        return []
-    with open(path, "r", encoding="utf-8") as f:
-        data = json.load(f)
-    return data.get("history", [])
-
-
-
-
+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)