Update app.py

app.py

@@ -346,18 +346,30 @@ def clear_expired_sessions():
     finally:
         conn.close()
 
-
-
 def update_session_list():
     try:
         conn = sqlite3.connect('chat_history.db')
         c = conn.cursor()
-        c.execute("SELECT session_id, created_at FROM sessions ORDER BY created_at DESC")
+        # 세션과 가장 최근 대화 시간을 함께 가져옴
+        c.execute("""
+            SELECT s.session_id, MAX(ch.timestamp) as last_chat
+            FROM sessions s
+            LEFT JOIN chat_history ch ON s.session_id = ch.session_id
+            GROUP BY s.session_id
+            ORDER BY last_chat DESC NULLS LAST
+        """)
         sessions = c.fetchall()
         conn.close()
-        # 날짜와 함께 보기 좋게 포맷팅
-        formatted_sessions = [f"{sid} ({datetime.strptime(ctime, '%Y-%m-%d %H:%M:%S.%f').strftime('%Y-%m-%d %H:%M:%S')})" 
-                            for sid, ctime in sessions]
+        
+        # 세션 ID와 시간을 포맷팅
+        formatted_sessions = []
+        for session_id, last_chat in sessions:
+            if last_chat:
+                time_str = datetime.strptime(last_chat, '%Y-%m-%d %H:%M:%S.%f').strftime('%Y-%m-%d %H:%M:%S')
+                formatted_sessions.append(f"{session_id} ({time_str})")
+            else:
+                formatted_sessions.append(session_id)
+                
         return gr.update(choices=formatted_sessions)
     except Exception as e:
         print(f"Error updating session list: {e}")
@@ -367,17 +379,44 @@ def load_session_history(selected_session):
     try:
         if not selected_session:
             return []
-        # 세션 ID 추출 (날짜 부분 제거)
-        session_id = selected_session.split(" (")[0]
-        history = get_session_history(session_id)
+        # 세션 ID 추출
+        session_id = selected_session.split(" (")[0] if " (" in selected_session else selected_session
+        
+        conn = sqlite3.connect('chat_history.db')
+        c = conn.cursor()
+        c.execute("""
+            SELECT prompt, response, timestamp 
+            FROM chat_history 
+            WHERE session_id = ? 
+            ORDER BY timestamp
+        """, (session_id,))
+        history = c.fetchall()
+        conn.close()
+        
         # 채팅 형식으로 변환
-        chat_history = []
-        for prompt, response, timestamp in history:
-            chat_history.append([prompt, response])
-        return chat_history
+        return [[prompt, response] for prompt, response, _ in history]
     except Exception as e:
         print(f"Error loading session history: {e}")
         return []
+
+        
+def save_chat(session_id, prompt, response):
+    try:
+        conn = sqlite3.connect('chat_history.db')
+        c = conn.cursor()
+        current_time = datetime.now()
+        c.execute("""
+            INSERT INTO chat_history (session_id, prompt, response, timestamp) 
+            VALUES (?, ?, ?, ?)
+        """, (session_id, prompt, response, current_time))
+        conn.commit()
+        print(f"Chat saved for session {session_id}")
+    except Exception as e:
+        print(f"Error saving chat: {e}")
+    finally:
+        if 'conn' in locals():
+            conn.close()
+
 # Demo 인스턴스 먼저 생성
 demo_instance = Demo()
 
@@ -399,7 +438,7 @@ with gr.Blocks(css_paths="app.css",theme=theme) as demo:
             with antd.Drawer(
                 open=False, 
                 title="Session History", 
-                placement="right", 
+                placement="right",  # 오른쪽으로 변경
                 width="900px",
                 elem_classes="session-drawer"
             ) as session_drawer:
@@ -412,7 +451,7 @@ with gr.Blocks(css_paths="app.css",theme=theme) as demo:
                     )
                     session_history = legacy.Chatbot(
                         show_label=False,
-                        height=960,
+                        height=700,
                         elem_classes="session-chatbot"
                     )
                     close_btn = antd.Button(
@@ -566,25 +605,6 @@ with gr.Blocks(css_paths="app.css",theme=theme) as demo:
                             with antd.Tabs.Item(key="render"):
                                 sandbox = gr.HTML(elem_classes="html_content")
 
-            # Code 실행 버튼 이벤트 핸들러
-            def execute_code(query: str):
-                if not query or query.strip() == '':
-                    return None, gr.update(active_key="empty")
-                
-                try:
-                    # HTML 코드 블록 확인
-                    if '```html' in query and '```' in query:
-                        # HTML 코드 블록 추출
-                        code = remove_code_block(query)
-                    else:
-                        # 입력된 텍스트를 그대로 코드로 사용
-                        code = query.strip()
-                    
-                    return send_to_sandbox(code), gr.update(active_key="render")
-                except Exception as e:
-                    print(f"Error executing code: {str(e)}")
-                    return None, gr.update(active_key="empty")
-
             # 이벤트 핸들러들
             execute_btn.click(
                 fn=execute_code,
@@ -592,18 +612,30 @@ with gr.Blocks(css_paths="app.css",theme=theme) as demo:
                 outputs=[sandbox, state_tab]
             )
 
-            codeBtn.click(lambda: gr.update(open=True),
-                          inputs=[], outputs=[code_drawer])
-            code_drawer.close(lambda: gr.update(
-                open=False), inputs=[], outputs=[code_drawer])
-
-            historyBtn.click(history_render, inputs=[history], outputs=[history_drawer, history_output])
-            history_drawer.close(lambda: gr.update(
-                open=False), inputs=[], outputs=[history_drawer])
-
-
+            codeBtn.click(
+                lambda: gr.update(open=True),
+                inputs=[], 
+                outputs=[code_drawer]
+            )
+            
+            code_drawer.close(
+                lambda: gr.update(open=False),
+                inputs=[], 
+                outputs=[code_drawer]
+            )
 
+            historyBtn.click(
+                history_render,
+                inputs=[history],
+                outputs=[history_drawer, history_output]
+            )
             
+            history_drawer.close(
+                lambda: gr.update(open=False),
+                inputs=[],
+                outputs=[history_drawer]
+            )
+
             # 세션 관련 이벤트 핸들러들
             sessionBtn.click(
                 lambda: (gr.update(open=True), update_session_list()),
@@ -611,7 +643,6 @@ with gr.Blocks(css_paths="app.css",theme=theme) as demo:
                 outputs=[session_drawer, session_list]
             )
 
-            # session_drawer 닫기 이벤트 추가
             session_drawer.close(
                 lambda: (gr.update(open=False), gr.update(choices=[]), []),
                 outputs=[session_drawer, session_list, session_history]
@@ -622,10 +653,8 @@ with gr.Blocks(css_paths="app.css",theme=theme) as demo:
                 outputs=[session_drawer, session_list, session_history]
             )
 
-
-
             session_list.change(
-                load_session_history, 
+                load_session_history,
                 inputs=[session_list],
                 outputs=[session_history]
             )