Update app.py

app.py

@@ -7,17 +7,10 @@ from huggingface_hub import HfApi, create_repo
 import schedule
 import time
 import threading
-from urllib.parse import parse_qs
 
-# Log dosyası ve sohbet geçmişi dizini
+# Log dosyası adı ve yolu
 LOG_FILE = '/data/chat_logs.txt' if os.path.exists('/data') else 'chat_logs.txt'
-CHAT_HISTORY_DIR = '/data/chat_histories' if os.path.exists('/data') else 'chat_histories'
 print(f"Dosya yolu: {os.path.abspath(LOG_FILE)}")
-print(f"Sohbet geçmişi dizini: {os.path.abspath(CHAT_HISTORY_DIR)}")
-
-# Chat history dizinini oluştur
-if not os.path.exists(CHAT_HISTORY_DIR):
-    os.makedirs(CHAT_HISTORY_DIR)
 
 # API ayarları
 API_URL = "https://api.openai.com/v1/chat/completions"
@@ -51,7 +44,7 @@ create_repo("BF", token=hfapi, repo_type="space", space_sdk="gradio", exist_ok=T
 def save_chat(chatbot):
     file_path = os.path.abspath(LOG_FILE)
     try:
-        with open(file_path, 'a', encoding='utf-8') as f:
+        with open(LOG_FILE, 'a', encoding='utf-8') as f:
             f.write("\n--- Zamanlanmış Kayıt: {} ---\n".format(time.strftime("%Y-%m-%d %H:%M:%S")))
             for msg in chatbot:
                 f.write(f"{msg['role'].capitalize()}: {msg['content']}\n")
@@ -97,33 +90,11 @@ def run_scheduler(chatbot_ref):
         print(f"Zamanlayıcı çalışıyor, bekliyor: {time.strftime('%H:%M:%S')}")
         time.sleep(60)
 
-def load_chat_history(session_id):
-    """Belirli bir oturum kimliğine ait sohbet geçmişini yükler."""
-    history_file = os.path.join(CHAT_HISTORY_DIR, f"{session_id}.json")
-    if os.path.exists(history_file):
-        try:
-            with open(history_file, 'r', encoding='utf-8') as f:
-                chat_history = json.load(f)
-            return chat_history
-        except Exception as e:
-            print(f"Sohbet geçmişi yükleme hatası (session {session_id}): {e}")
-    return []
-
-def save_chat_history(session_id, chatbot):
-    """Belirli bir oturum kimliğine ait sohbet geçmişini kaydeder."""
-    history_file = os.path.join(CHAT_HISTORY_DIR, f"{session_id}.json")
-    try:
-        with open(history_file, 'w', encoding='utf-8') as f:
-            json.dump(chatbot, f, ensure_ascii=False)
-        print(f"Sohbet geçmişi kaydedildi: {history_file}")
-    except Exception as e:
-        print(f"Sohbet geçmişi kaydetme hatası (session {session_id}): {e}")
-
-def predict(session_id, system_msg, inputs, top_p, temperature, chat_counter, chatbot=None, history=None):
+def predict(system_msg, inputs, top_p, temperature, chat_counter, chatbot=None, history=None):
     if chatbot is None:
-        chatbot = load_chat_history(session_id)  # Oturum kimliğine göre geçmişi yükle
+        chatbot = []
     if history is None:
-        history = [msg["content"] for msg in chatbot if msg["role"] == "user"]  # Kullanıcı mesajlarını history'ye ekle
+        history = []
 
     headers = {
         "Content-Type": "application/json",
@@ -183,11 +154,15 @@ def predict(session_id, system_msg, inputs, top_p, temperature, chat_counter, ch
     except Exception as e:
         print(f"Dosya yazma hatası (Kullanıcı): {e}")
     
+    # Kullanıcı mesajını ekledikten sonra, ayrı bir assistant mesajı için yer açıyoruz
     chatbot.append({"role": "user", "content": inputs})
+    chatbot.append({"role": "assistant", "content": ""})  # Boş bir assistant mesajı ekliyoruz
+    
     response = requests.post(API_URL, headers=headers, json=payload, stream=True)
     
     if response.status_code != 200:
         print(f"API hatası: {response.text}")
+        chatbot.pop()  # Hata olursa boş assistant mesajını kaldır
         yield chatbot, history, chat_counter
 
     partial_response = ""
@@ -201,12 +176,13 @@ def predict(session_id, system_msg, inputs, top_p, temperature, chat_counter, ch
                 delta = chunk_data['choices'][0]['delta']
                 if 'content' in delta and delta['content']:
                     partial_response += delta['content']
-                    updated_chatbot = chatbot[:-1] + [{"role": "user", "content": inputs}, {"role": "assistant", "content": partial_response}]
-                    save_chat_history(session_id, updated_chatbot)
-                    yield updated_chatbot, history, chat_counter
+                    # Son assistant mesajını güncelle, önceki mesajları koru
+                    chatbot[-1] = {"role": "assistant", "content": partial_response}
+                    yield chatbot, history, chat_counter
             except json.JSONDecodeError as e:
                 print(f"JSON parse hatası: {e} - Chunk: {chunk_str}")
         elif chunk_str == "data: [DONE]":
+            # Akış bittiğinde son haliyle assistant mesajını güncelle
             chatbot[-1] = {"role": "assistant", "content": partial_response}
             try:
                 with open(LOG_FILE, 'a', encoding='utf-8') as f:
@@ -214,7 +190,6 @@ def predict(session_id, system_msg, inputs, top_p, temperature, chat_counter, ch
                     print(f"Bot yanıtı dosyaya yazıldı: {partial_response}")
             except Exception as e:
                 print(f"Dosya yazma hatası (Bot): {e}")
-            save_chat_history(session_id, chatbot)
             break
     
     yield chatbot, history, chat_counter
@@ -242,7 +217,7 @@ demo_css = """
     background-color: #0077c0;
 }
 .fixed_button_container {
-    margin-top: -6px;
+    margin-top: -6px; /* Butonu 6 piksel yukarı kaydırır */
     padding: 0px;
     margin-left: 0px;
     margin-right: 0px;
@@ -269,20 +244,11 @@ theme = gr.themes.Base(
     spacing_size="sm",
 )
 
-def get_session_id():
-    """URL parametresinden session_id’yi al, yoksa None döner."""
-    query = os.environ.get('QUERY_STRING', '')
-    params = parse_qs(query)
-    session_id = params.get('session_id', [None])[0]
-    return session_id
-
 with gr.Blocks(css=demo_css, theme=theme) as demo:
     if not os.path.exists(LOG_FILE):
         with open(LOG_FILE, 'w', encoding='utf-8') as f:
             f.write("--- Yeni Sohbet ---\n")
     
-    session_id = gr.State(value=get_session_id)  # Oturum kimliğini URL’den al
-    
     with gr.Column(elem_id="col_container"):
         with gr.Accordion("", open=False, visible=False):
             system_msg = gr.Textbox(value="")
@@ -301,6 +267,7 @@ with gr.Blocks(css=demo_css, theme=theme) as demo:
                 send_button = gr.Button(value="✈", elem_id="send_button")
         
         state = gr.State([])
+        
         with gr.Accordion("", open=False, visible=False):
             top_p = gr.Slider(minimum=0, maximum=1.0, value=0.5, step=0.05, interactive=False, visible=False)
             temperature = gr.Slider(minimum=0, maximum=5.0, value=0.1, step=0.1, interactive=False, visible=False)
@@ -311,10 +278,10 @@ with gr.Blocks(css=demo_css, theme=theme) as demo:
             chatbot_ref[:] = chat
             return chat
         
-        inputs.submit(predict, [session_id, system_msg, inputs, top_p, temperature, chat_counter, chatbot, state], [chatbot, state, chat_counter]).then(update_chatbot_ref, chatbot, chatbot).then(reset_textbox, [], [inputs])
-        send_button.click(predict, [session_id, system_msg, inputs, top_p, temperature, chat_counter, chatbot, state], [chatbot, state, chat_counter]).then(update_chatbot_ref, chatbot, chatbot).then(reset_textbox, [], [inputs])
+        inputs.submit(predict, [system_msg, inputs, top_p, temperature, chat_counter, chatbot, state], [chatbot, state, chat_counter]).then(update_chatbot_ref, chatbot, chatbot).then(reset_textbox, [], [inputs])
+        send_button.click(predict, [system_msg, inputs, top_p, temperature, chat_counter, chatbot, state], [chatbot, state, chat_counter]).then(update_chatbot_ref, chatbot, chatbot).then(reset_textbox, [], [inputs])
     
     scheduler_thread = threading.Thread(target=run_scheduler, args=(chatbot_ref,), daemon=True)
     scheduler_thread.start()
 
-demo.launch(server_name="0.0.0.0", server_port=7860, debug=True)
+demo.launch(debug=True)