Update app.py

app.py

@@ -7,23 +7,21 @@ import json
 import os
 from filelock import FileLock
 
-# --- КОНФИГУРАЦИЯ СИСТЕМЫ ---
+# --- КОНФИГУРАЦИЯ ---
 TOTAL_ROUNDS = 3
 POLLINATIONS_URL = "https://text.pollinations.ai/"
 DB_FILE = "game_db.json"
 LOCK_FILE = f"{DB_FILE}.lock"
-MAX_CHARS = 150  # Лимит символов
-
-# --- СИСТЕМА ХРАНЕНИЯ ДАННЫХ ---
+MAX_CHARS = 150
 
+# --- БАЗА ДАННЫХ ---
 def load_db():
     if not os.path.exists(DB_FILE): return {}
     lock = FileLock(LOCK_FILE)
     with lock:
         try:
             with open(DB_FILE, "r", encoding="utf-8") as f:
-                content = f.read()
-                return json.loads(content) if content else {}
+                return json.loads(f.read()) or {}
         except: return {}
 
 def save_db(data):
@@ -32,256 +30,169 @@ def save_db(data):
         with open(DB_FILE, "w", encoding="utf-8") as f:
             json.dump(data, f, ensure_ascii=False, indent=2)
 
-# --- AI LOGIC (С ЖЕСТКИМ КОНТЕКСТОМ) ---
-
+# --- ЛОГИКА ИИ ---
 def ask_ai_judge(event, player_action):
     system_prompt = (
-        "Roleplay: Ты безжалостный рассказчик в игре на выживание.\n"
-        f"ТЕКУЩАЯ КАТАСТРОФА: {event}\n"
-        f"ДЕЙСТВИЕ ИГРОКА: {player_action}\n\n"
-        "ЗАДАЧА: Напиши историю из 3 актов о том, как игрок пытается спастись ИМЕННО ОТ ЭТОЙ КАТАСТРОФЫ.\n"
-        "ПРАВИЛА:\n"
-        "1. В Акте 1 и 2 ОБЯЗАТЕЛЬНО описывай взаимодействие с {event}.\n"
-        "2. Используй разделитель '---' между актами.\n"
-        "3. В конце Акта 3 поставь вердикт: [Survived] или [Not_Survived].\n\n"
-        "СТРУКТУРА:\n"
-        "АКТ 1 (Начало): Игрок сталкивается с {event}...\n"
-        "---\n"
-        "АКТ 2 (Напряжение): Проблемы и хаос...\n"
-        "---\n"
-        "АКТ 3 (Финал): Итог. Тег в конце."
+        "Roleplay: Ты рассказчик в игре на выживание.\n"
+        f"КАТАСТРОФА: {event}\n"
+        f"ДЕЙСТВИЕ: {player_action}\n\n"
+        "ЗАДАЧА: Напиши историю из 3 актов (разделитель '---').\n"
+        "В Акте 1 и 2 описывай влияние катастрофы.\n"
+        "В конце Акта 3 поставь тег: [Survived] или [Not_Survived].\n"
     )
-    
     try:
-        response = requests.post(POLLINATIONS_URL, data=system_prompt.encode('utf-8'))
-        if response.status_code == 200:
-            return response.text
-        return f"Акт 1: {event} пришло.\n---\nАкт 2: Сбой ИИ...\n---\nАкт 3: Выжил. [Survived]"
-    except Exception as e:
-        print(f"AI Error: {e}")
-        return "Связь потеряна.\n---\nИИ молчит.\n---\nВыжил. [Survived]"
+        resp = requests.post(POLLINATIONS_URL, data=system_prompt.encode('utf-8'))
+        return resp.text if resp.status_code == 200 else "Ошибка ИИ.\n---\n---\n[Survived]"
+    except: return "Связь потеряна.\n---\n---\n[Survived]"
 
-def ask_ai_congrats(winner_name, score):
-    prompt = f"Поздравь игрока {winner_name} (счет {score}) с победой в апокалипсисе. Эпично и коротко."
+def ask_ai_congrats(winner, score):
     try:
-        return requests.get(f"{POLLINATIONS_URL}{prompt}").text
-    except:
-        return f"Поздравляем {winner_name}!"
-
-# --- ИГРОВАЯ ЛОГИКА ---
+        return requests.get(f"{POLLINATIONS_URL}Поздравь победителя {winner} ({score} очков) эпично.").text
+    except: return f"Поздравляем {winner}!"
 
+# --- ИГРОВАЯ МЕХАНИКА ---
 def generate_code():
     return ''.join(random.choices(string.ascii_uppercase + string.digits, k=4))
 
-def add_log(room_data, message):
-    timestamp = time.strftime("%H:%M:%S")
-    room_data["logs"].append(f"[{timestamp}] {message}")
+def add_log(room, msg):
+    room["logs"].append(f"[{time.strftime('%H:%M:%S')}] {msg}")
 
-def format_lore(raw_text):
-    if not raw_text: return ""
-    parts = raw_text.split("---")
-    if len(parts) < 3: return f"**История:**\n{raw_text}"
-    return (
-        f"### 🎬 АКТ 1\n{parts[0].strip()}\n\n"
-        f"### ⚡ АКТ 2\n{parts[1].strip()}\n\n"
-        f"### 🏁 ФИНАЛ\n{parts[2].strip()}"
-    )
+def format_lore(text):
+    if not text: return ""
+    parts = text.split("---")
+    if len(parts) < 3: return f"**История:**\n{text}"
+    return f"### 🎬 АКТ 1\n{parts[0].strip()}\n\n### ⚡ АКТ 2\n{parts[1].strip()}\n\n### 🏁 ФИНАЛ\n{parts[2].strip()}"
 
-def create_room_logic(player_name):
-    if not player_name: return None, "⚠️ Введи имя!", gr.update(), gr.update()
+# --- ЛОГИКА UI ---
+def create_room(name):
+    if not name: return None, "<span style='color:red'>⚠️ Введите имя!</span>", gr.update(), gr.update()
     db, code = load_db(), generate_code()
-    
     db[code] = {
-        "host_name": player_name,
-        "phase": "LOBBY",
-        "round": 1,
-        "event": "",
-        "logs": [],
-        "winner_msg": "",
-        "players": {player_name: {"name": player_name, "score": 0, "action": None, "result": "", "is_host": True}}
+        "host": name, "phase": "LOBBY", "round": 1, "event": "", "logs": [], "winner_msg": "",
+        "players": {name: {"name": name, "score": 0, "action": None, "result": "", "is_host": True}}
     }
     add_log(db[code], f"Комната {code} создана.")
     save_db(db)
     return code, "", gr.update(visible=False), gr.update(visible=True)
 
-def join_room_logic(player_name, code):
-    if not player_name or not code: return None, "⚠️ Данные?", gr.update(), gr.update()
+def join_room(name, code):
+    if not name or not code: return None, "<span style='color:red'>⚠️ Введите данные!</span>", gr.update(), gr.update()
     code = code.upper().strip()
     db = load_db()
+    if code not in db: return None, "<span style='color:red'>⚠️ Нет комнаты!</span>", gr.update(), gr.update()
     
-    if code not in db: return None, "⚠️ Нет комнаты!", gr.update(), gr.update()
     room = db[code]
-    
-    if player_name not in room["players"]:
-        if room["phase"] != "LOBBY": return None, "⚠️ Поздно!", gr.update(), gr.update()
-        room["players"][player_name] = {"name": player_name, "score": 0, "action": None, "result": "", "is_host": False}
-        add_log(room, f"{player_name} вошел.")
+    if name not in room["players"]:
+        if room["phase"] != "LOBBY": return None, "<span style='color:red'>⚠️ Игра идет!</span>", gr.update(), gr.update()
+        room["players"][name] = {"name": name, "score": 0, "action": None, "result": "", "is_host": False}
+        add_log(room, f"{name} вошел.")
         save_db(db)
-    
     return code, "", gr.update(visible=False), gr.update(visible=True)
 
-def refresh_ui(room_code, player_name):
-    if not room_code: return (gr.update(visible=True), gr.update(visible=False), "", "", "", gr.update(), gr.update(), "")
+def refresh(code, name):
+    if not code: return (gr.update(visible=True), gr.update(visible=False), "", "", "", gr.update(), gr.update(), "")
     db = load_db()
-    if room_code not in db: return (gr.update(visible=True), gr.update(visible=False), "Закрыто", "", "", gr.update(), gr.update(), "")
+    if code not in db: return (gr.update(visible=True), gr.update(visible=False), "Закрыто", "", "", gr.update(), gr.update(), "")
     
-    room = db[room_code]
-    player = room["players"].get(player_name)
-    if not player: return (gr.update(visible=True), gr.update(visible=False), "Ошибка", "", "", gr.update(), gr.update(), "")
+    room = db[code]
+    me = room["players"].get(name)
+    if not me: return (gr.update(visible=True), gr.update(visible=False), "Ошибка", "", "", gr.update(), gr.update(), "")
 
-    # Список игроков
-    players_md = "| Статус | Игрок | Очки |\n| :--- | :--- | :--- |\n"
+    # Список
+    pl_md = "| Статус | Игрок | Очки |\n|---|---|---|\n"
     for p in room["players"].values():
         icon = "👑" if p["is_host"] else "👤"
-        if "[Survived]" in p["result"]: s = "✅"
-        elif "[Not_Survived]" in p["result"]: s = "💀"
-        elif p["action"]: s = "📩"
-        else: s = "⏳"
-        if room["phase"] == "INPUT" and not room["event"]: s = "💤"
-        players_md += f"| {s} {icon} | **{p['name']}** | {p['score']} |\n"
-
-    # Логи и Лор
-    log_txt = "\n".join(room["logs"][-15:])
-    lore_display = format_lore(player["result"]) if player["result"] else "Ждем..."
-
-    # Управление
+        stat = "⏳"
+        if "[Survived]" in p["result"]: stat = "✅"
+        elif "[Not_Survived]" in p["result"]: stat = "💀"
+        elif p["action"]: stat = "📩"
+        if room["phase"] == "INPUT" and not room["event"]: stat = "💤"
+        pl_md += f"| {stat} {icon} | **{p['name']}** | {p['score']} |\n"
+
+    # UI State
     ph = room["phase"]
     inp, btn, hdr = gr.update(visible=False), gr.update(visible=False), ""
-
+    
     if ph == "LOBBY":
         hdr = "## ⏳ ОЖИДАНИЕ"
-        if player["is_host"]: btn = gr.update(visible=True, value="🚀 СТАРТ", variant="primary")
+        if me["is_host"]: btn = gr.update(visible=True, value="🚀 СТАРТ", variant="primary")
     elif ph == "INPUT":
         if not room["event"]:
             hdr = f"## 🎬 РАУНД {room['round']}"
-            if player["is_host"]:
-                inp = gr.update(visible=True, label="Катастрофа", placeholder="Зомби-апокалипсис...")
+            if me["is_host"]:
+                inp = gr.update(visible=True, label="Катастрофа", placeholder="Например: Зомби")
                 btn = gr.update(visible=True, value="📢 ЗАДАТЬ", variant="stop")
             else: hdr += "\nХост выбирает угрозу..."
         else:
             hdr = f"## ⚠️ УГРОЗА: {room['event']}"
-            if not player["action"]:
-                inp = gr.update(visible=True, label=f"Спасение (макс {MAX_CHARS})", placeholder="Я бегу...")
+            if not me["action"]:
+                inp = gr.update(visible=True, label="Действие", placeholder="Я бегу...")
                 btn = gr.update(visible=True, value="✅ ОТПРАВИТЬ", variant="primary")
             else: hdr += "\n\n**Принято.**"
-    elif ph == "PROCESSING": hdr = "## 🤖 ИИ ГЕНЕРИРУЕТ..."
+    elif ph == "PROCESSING": hdr = "## 🤖 ИИ ДУМАЕТ..."
     elif ph == "RESULTS":
         hdr = f"## 🏁 ИТОГИ {room['round']}"
-        if player["is_host"]:
+        if me["is_host"]:
             txt = "➡️ СЛЕД. РАУНД" if room["round"] < TOTAL_ROUNDS else "🏆 ФИНАЛ"
             btn = gr.update(visible=True, value=txt, variant="secondary")
     elif ph == "GAMEOVER":
         hdr = f"## 🏆 КОНЕЦ\n\n{room['winner_msg']}"
-        if player["is_host"]: btn = gr.update(visible=True, value="🔄 РЕСТАРТ", variant="primary")
+        if me["is_host"]: btn = gr.update(visible=True, value="🔄 РЕСТАРТ", variant="primary")
 
-    return (gr.update(visible=False), gr.update(visible=True), log_txt, players_md, hdr, inp, btn, lore_display)
+    lore = format_lore(me["result"])
+    logs = "\n".join(room["logs"][-15:])
+    return (gr.update(visible=False), gr.update(visible=True), logs, pl_md, hdr, inp, btn, lore)
 
-def handle_action(room_code, player_name, text_input):
-    if not room_code: return
+def act(code, name, txt):
+    if not code: return
     db = load_db()
-    if room_code not in db: return
-    room = db[room_code]
-    player = room["players"][player_name]
+    if code not in db: return
+    room = db[code]
+    me = room["players"][name]
+    if txt and len(txt) > MAX_CHARS: txt = txt[:MAX_CHARS]
     
-    if text_input and len(text_input) > MAX_CHARS: text_input = text_input[:MAX_CHARS]
     save = False
-
-    if room["phase"] == "LOBBY" and player["is_host"]:
-        room["phase"] = "INPUT"
-        add_log(room, "СТАРТ ИГРЫ")
-        save = True
-
+    if room["phase"] == "LOBBY" and me["is_host"]:
+        room["phase"] = "INPUT"; add_log(room, "СТАРТ"); save = True
     elif room["phase"] == "INPUT":
-        if not room["event"] and player["is_host"] and text_input:
-            room["event"] = text_input
-            add_log(room, f"⚠️ СОБЫТИЕ: {text_input}")
+        if not room["event"] and me["is_host"] and txt:
+            room["event"] = txt; add_log(room, f"⚠️ {txt}"); 
             for p in room["players"].values(): p["action"], p["result"] = None, ""
             save = True
-        elif room["event"] and text_input and not player["action"]:
-            player["action"] = text_input
-            save = True
+        elif room["event"] and txt and not me["action"]:
+            me["action"] = txt; save = True
             if all(p["action"] for p in room["players"].values()):
-                room["phase"] = "PROCESSING"
-                save_db(db)
-                process_turn_sync(room_code)
-                return
-
-    elif room["phase"] == "RESULTS" and player["is_host"]:
+                room["phase"] = "PROCESSING"; save_db(db); process_ai(code); return
+    elif room["phase"] == "RESULTS" and me["is_host"]:
         if room["round"] < TOTAL_ROUNDS:
-            room["round"] += 1; room["event"] = ""; room["phase"] = "INPUT"
-            add_log(room, f"Раунд {room['round']}")
+            room["round"] += 1; room["event"] = ""; room["phase"] = "INPUT"; add_log(room, f"Раунд {room['round']}")
         else:
-            room["phase"] = "GAMEOVER"
-            w = max(room["players"].values(), key=lambda x: x["score"])
-            room["winner_msg"] = ask_ai_congrats(w["name"], w["score"])
-            add_log(room, f"Победил {w['name']}")
+            room["phase"] = "GAMEOVER"; w = max(room["players"].values(), key=lambda x: x["score"])
+            room["winner_msg"] = ask_ai_congrats(w["name"], w["score"]); add_log(room, f"Победил {w['name']}")
         save = True
-
-    elif room["phase"] == "GAMEOVER" and player["is_host"]:
-        room["phase"] = "LOBBY"; room["round"] = 1; room["event"] = ""
-        room["logs"] = ["Рестарт."]; room["winner_msg"] = ""
+    elif room["phase"] == "GAMEOVER" and me["is_host"]:
+        room["phase"] = "LOBBY"; room["round"] = 1; room["event"] = ""; room["logs"] = ["Рестарт"]
         for p in room["players"].values(): p["score"], p["action"], p["result"] = 0, None, ""
         save = True
-
+    
     if save: save_db(db)
 
-def process_turn_sync(room_code):
+def process_ai(code):
     db = load_db()
-    room = db[room_code]
+    room = db[code]
     add_log(room, "🤖 ИИ работает...")
     save_db(db)
-    
-    for p_name, p_data in room["players"].items():
-        lore = ask_ai_judge(room["event"], p_data["action"])
-        p_data["result"] = lore
-        if "[Survived]" in lore:
-            p_data["score"] += 2
-            add_log(room, f"✅ {p_name} жив")
+    for p_name, p in room["players"].items():
+        lore = ask_ai_judge(room["event"], p["action"])
+        p["result"] = lore
+        if "[Survived]" in lore: p["score"] += 2; add_log(room, f"✅ {p_name} жив")
         else: add_log(room, f"💀 {p_name} мертв")
-            
     room["phase"] = "RESULTS"
     save_db(db)
 
-# --- ЗАПУСК ДЛЯ DOCKER ---
-custom_css = """
+# --- ЗАПУСК ---
+css = """
 body { background: #0b0f19; color: #fff; } 
-#lore_box { background: #1a202c; padding: 10px; border-left: 4px solid #805ad5; }
-"""
-
-with gr.Blocks(theme=gr.themes.Monochrome(), css=custom_css, title="AI Survival Docker") as demo:
-    s_code, s_name = gr.State(""), gr.State("")
-    gr.Markdown("# 💀 SURVIVAL AI: DOCKER EDITION")
-    
-    with gr.Group() as g_login:
-        with gr.Row():
-            n_in = gr.Textbox(label="Ник")
-            b_crt = gr.Button("Создать", variant="primary")
-            c_in = gr.Textbox(label="Код")
-            b_join = gr.Button("Войти")
-        err = gr.Markdown("", color="red")
-
-    with gr.Group(visible=False) as g_game:
-        with gr.Row():
-            with gr.Column(scale=1):
-                md_rm = gr.Markdown("Комната: ---")
-                md_pl = gr.Markdown("Игроки...")
-                logs = gr.TextArea(label="Лог", interactive=False, lines=10)
-            with gr.Column(scale=2):
-                md_st = gr.Markdown("...")
-                md_lore = gr.Markdown("История...", elem_id="lore_box")
-                t_in = gr.Textbox(visible=False)
-                b_act = gr.Button(visible=False)
-
-    tmr = gr.Timer(1)
-    tmr.tick(refresh_ui, [s_code, s_name], [g_login, g_game, logs, md_pl, md_st, t_in, b_act, md_lore])
-    
-    b_crt.click(create_room_logic, [n_in], [s_code, err, g_login, g_game]).then(lambda c: f"## 🏠 {c}", [s_code], [md_rm])
-    b_join.click(join_room_logic, [n_in, c_in], [s_code, err, g_login, g_game]).then(lambda c: f"## 🏠 {c}", [s_code], [md_rm])
-    b_act.click(handle_action, [s_code, s_name, t_in], None).then(lambda: "", None, [t_in])
-
-if __name__ == "__main__":
-    if not os.path.exists(DB_FILE):
-        with open(DB_FILE, "w") as f: f.write("{}")
-    
-    # ВАЖНО: Запуск на 0.0.0.0 и порт 7860 для Docker
-    demo.launch(server_name="0.0.0.0", server_port=7860)
+#lore_box { background: #1a202c; padding: 10px; border-left: 4px solid #805ad5; margin-top: 10px; }
+.gradio-container { max-width: 900px !important; }
+"""