Update app.py

app.py

@@ -1,13 +1,21 @@
-# app.py
-import gradio as gr
-import numpy as np
+# server.py
+import http.server
+import socketserver
 import random
+import numpy as np
 from PIL import Image, ImageDraw
+import io
+import base64
+from urllib.parse import parse_qs, urlparse
+import threading
+import time
 
 # ============== НАСТРОЙКИ ==============
-WORLD_SIZE = 30
-CELL_SIZE = 12
-MAX_CREATURES = 30
+WORLD_SIZE = 40
+CELL_SIZE = 10
+MAX_CREATURES = 50
+PORT = 7890
+UPDATE_INTERVAL = 0.3  # секунд между обновлениями
 
 # ============== ПРОСТАЯ НЕЙРОСЕТЬ ==============
 class SimpleBrain:
@@ -50,13 +58,11 @@ class Creature:
         self.brain = SimpleBrain()
     
     def think(self, world, creatures):
-        # Входные данные
         hunger = 1.0 - self.food / 100.0
         thirst = 1.0 - self.water / 100.0
         health = self.health / 100.0
         energy = self.energy / 100.0
         
-        # Обзор
         nearby = []
         for dx in [-1, 0, 1]:
             for dy in [-1, 0, 1]:
@@ -76,7 +82,6 @@ class Creature:
                 else:
                     nearby.append(0.0)
         
-        # Друзья и враги
         partners = 0
         enemies = 0
         for other in creatures:
@@ -94,7 +99,6 @@ class Creature:
         
         output = self.brain.forward(inputs)
         
-        # Действия
         dx = int(round(output[0] * 2))
         dy = int(round(output[1] * 2))
         build = output[2] > 0.3
@@ -233,29 +237,28 @@ def create_world():
     world = np.zeros((WORLD_SIZE, WORLD_SIZE, 3), dtype=np.uint8)
     world[:, :] = [100, 200, 100]
     
-    # Ресурсы
-    for _ in range(15):
+    for _ in range(20):
         for _ in range(30):
             x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
             if world[x, y][0] == 100 and world[x, y][1] == 200 and world[x, y][2] == 100:
                 world[x, y] = [34, 139, 34]
                 break
     
-    for _ in range(12):
+    for _ in range(15):
         for _ in range(30):
             x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
             if world[x, y][0] == 100 and world[x, y][1] == 200 and world[x, y][2] == 100:
                 world[x, y] = [0, 150, 0]
                 break
     
-    for _ in range(8):
+    for _ in range(10):
         for _ in range(30):
             x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
             if world[x, y][0] == 100 and world[x, y][1] == 200 and world[x, y][2] == 100:
                 world[x, y] = [128, 128, 128]
                 break
     
-    for _ in range(4):
+    for _ in range(5):
         for _ in range(30):
             x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
             if world[x, y][0] == 100 and world[x, y][1] == 200 and world[x, y][2] == 100:
@@ -263,14 +266,26 @@ def create_world():
                 break
     
     creatures = []
-    creatures.append(Creature(5, 5, [255, 50, 50], "red"))
-    creatures.append(Creature(25, 25, [50, 50, 255], "blue"))
-    creatures.append(Creature(15, 15, [255, 215, 0], "gold"))
+    # Красные (верхний левый угол)
+    for i in range(3):
+        creatures.append(Creature(5 + i*2, 5 + i*2, [255, 50, 50], "red"))
+    # Синие (нижний правый угол)
+    for i in range(3):
+        creatures.append(Creature(WORLD_SIZE-5 - i*2, WORLD_SIZE-5 - i*2, [50, 50, 255], "blue"))
+    # Золотые (центр)
+    for i in range(2):
+        creatures.append(Creature(WORLD_SIZE//2 + i*2, WORLD_SIZE//2 + i*2, [255, 215, 0], "gold"))
     
     return world, creatures
 
-# ============== СИМУЛЯЦИЯ ==============
-def simulate_step(world, creatures, step):
+# ============== ГЛОБАЛЬНОЕ СОСТОЯНИЕ ==============
+world, creatures = create_world()
+step_counter = 0
+
+# ============== ФУНКЦИИ СИМУЛЯЦИИ ==============
+def simulate_step():
+    global world, creatures, step_counter
+    
     new_creatures = []
     
     for creature in creatures[:]:
@@ -292,7 +307,7 @@ def simulate_step(world, creatures, step):
     creatures.extend(new_creatures)
     creatures = [c for c in creatures if c.alive]
     
-    if step % 5 == 0:
+    if step_counter % 5 == 0:
         for _ in range(2):
             for _ in range(20):
                 x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
@@ -306,11 +321,11 @@ def simulate_step(world, creatures, step):
             c.alive = False
         creatures = [c for c in creatures if c.alive]
     
-    return world, creatures
+    step_counter += 1
 
-# ============== ОТРИСОВКА ==============
-def render_world(world, creatures, step):
-    img = Image.new('RGB', (WORLD_SIZE * 12, WORLD_SIZE * 12 + 80), (30, 30, 30))
+def render_world():
+    # Размер изображения подстраивается под окно
+    img = Image.new('RGB', (WORLD_SIZE * 12, WORLD_SIZE * 12 + 60), (30, 30, 30))
     draw = ImageDraw.Draw(img)
     
     for i in range(WORLD_SIZE):
@@ -322,15 +337,15 @@ def render_world(world, creatures, step):
         if not creature.alive:
             continue
         x, y = creature.x * 12, creature.y * 12
-        draw.ellipse([x+1, y+1, x+11, y+11], fill=tuple(creature.color), outline=(255,255,255))
+        draw.ellipse([x+2, y+2, x+10, y+10], fill=tuple(creature.color), outline=(255,255,255))
         
-        hw = int((creature.health / 100) * 12)
-        fw = int((creature.food / 100) * 12)
-        ww = int((creature.water / 100) * 12)
+        hw = int((creature.health / 100) * 10)
+        fw = int((creature.food / 100) * 10)
+        ww = int((creature.water / 100) * 10)
         
-        draw.rectangle([x, y-6, x + hw, y-4], fill=(255, 0, 0))
-        draw.rectangle([x, y-4, x + fw, y-2], fill=(255, 165, 0))
-        draw.rectangle([x, y-2, x + ww, y], fill=(0, 200, 255))
+        draw.rectangle([x+1, y-4, x + hw, y-2], fill=(255, 0, 0))
+        draw.rectangle([x+1, y-2, x + fw, y], fill=(255, 165, 0))
+        draw.rectangle([x+1, y, x + ww, y+2], fill=(0, 200, 255))
     
     y_offset = WORLD_SIZE * 12 + 10
     
@@ -347,83 +362,271 @@ def render_world(world, creatures, step):
     
     best = max([c.fitness for c in creatures if c.alive] + [0])
     
-    draw.text([10, y_offset], f"Шаг:{step} | Существ:{len(creatures)}", fill=(255,255,255))
-    draw.text([10, y_offset + 20], f"🔴:{red}  🔵:{blue}  🟡:{gold}", fill=(255,255,255))
-    draw.text([10, y_offset + 40], f"🌳:{trees}  🫐:{foods}  🪨:{stones}", fill=(255,255,255))
-    draw.text([10, y_offset + 60], f"⭐ Лучший:{best}", fill=(255,255,255))
+    draw.text([10, y_offset], f"Шаг: {step_counter} | Существ: {len(creatures)}", fill=(255,255,255))
+    draw.text([10, y_offset + 20], f"🔴: {red} | 🔵: {blue} | 🟡: {gold}", fill=(255,255,255))
+    draw.text([10, y_offset + 40], f"🌳: {trees} | 🫐: {foods} | 🪨: {stones} | ⭐: {best}", fill=(255,255,255))
     
     return img
 
-# ============== GRADIO ==============
-world, creatures = create_world()
-step_counter = 0
-
-def run_simulation(steps):
-    global world, creatures, step_counter
-    
-    images = []
-    
-    for i in range(steps):
-        step_counter += 1
-        world, creatures = simulate_step(world, creatures, step_counter)
-        
-        if i % 2 == 0:
-            img = render_world(world, creatures, step_counter)
-            images.append(img)
-    
-    # Статистика
-    red = sum(1 for c in creatures if c.alive and c.team == "red")
-    blue = sum(1 for c in creatures if c.alive and c.team == "blue")
-    gold = sum(1 for c in creatures if c.alive and c.team == "gold")
-    
-    trees = sum(1 for i in range(WORLD_SIZE) for j in range(WORLD_SIZE) 
-                if world[i, j][0] == 34 and world[i, j][1] == 139 and world[i, j][2] == 34)
-    foods = sum(1 for i in range(WORLD_SIZE) for j in range(WORLD_SIZE) 
-                if world[i, j][0] == 0 and world[i, j][1] == 150 and world[i, j][2] == 0)
-    stones = sum(1 for i in range(WORLD_SIZE) for j in range(WORLD_SIZE) 
-                 if world[i, j][0] == 128 and world[i, j][1] == 128 and world[i, j][2] == 128)
-    best = max([c.fitness for c in creatures if c.alive] + [0])
-    
-    stats = f"""СТАТИСТИКА
-
-Шаг: {step_counter}
-Существ: {len(creatures)}
-
-🔴 Красных: {red}
-🔵 Синих: {blue}
-🟡 Золотых: {gold}
+# ============== ПОТОК СИМУЛЯЦИИ ==============
+def simulation_loop():
+    while True:
+        simulate_step()
+        time.sleep(UPDATE_INTERVAL)
 
-🌳 Деревьев: {trees}
-🫐 Ягод: {foods}
-🪨 Камней: {stones}
+# ============== HTTP СЕРВЕР ==============
+HTML_TEMPLATE = """
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>🧬 Эволюция</title>
+    <style>
+        * { margin: 0; padding: 0; }
+        html, body {
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+            background: #0a0a1a;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+        body {
+            font-family: 'Segoe UI', Arial, sans-serif;
+        }
+        .container {
+            width: 100vw;
+            height: 100vh;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            background: #0a0a1a;
+        }
+        .world-wrapper {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding: 10px;
+        }
+        .world-wrapper img {
+            max-width: 100%;
+            max-height: 100%;
+            width: auto;
+            height: auto;
+            image-rendering: pixelated;
+            border-radius: 5px;
+            box-shadow: 0 0 60px rgba(78, 205, 196, 0.1);
+        }
+        .stats-overlay {
+            position: fixed;
+            bottom: 20px;
+            left: 50%;
+            transform: translateX(-50%);
+            background: rgba(10, 10, 30, 0.85);
+            padding: 12px 25px;
+            border-radius: 12px;
+            border: 1px solid rgba(78, 205, 196, 0.3);
+            color: #aaa;
+            font-size: 14px;
+            text-align: center;
+            backdrop-filter: blur(10px);
+            pointer-events: none;
+            user-select: none;
+            display: flex;
+            gap: 20px;
+            flex-wrap: wrap;
+            justify-content: center;
+        }
+        .stats-overlay span {
+            color: #eee;
+        }
+        .stat-label {
+            color: #666;
+            font-size: 12px;
+            text-transform: uppercase;
+            letter-spacing: 1px;
+        }
+        .stat-value {
+            color: #4ecdc4;
+            font-weight: bold;
+            font-size: 16px;
+        }
+        .stat-red .stat-value { color: #ff6b6b; }
+        .stat-blue .stat-value { color: #4dabf7; }
+        .stat-gold .stat-value { color: #ffd93d; }
+        .stat-item {
+            display: flex;
+            align-items: baseline;
+            gap: 5px;
+        }
+        @media (max-width: 700px) {
+            .stats-overlay {
+                font-size: 11px;
+                padding: 8px 15px;
+                gap: 10px;
+                bottom: 10px;
+                flex-wrap: wrap;
+            }
+            .stat-value { font-size: 13px; }
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="world-wrapper">
+            <img id="worldImage" src="/image" alt="Эволюция">
+        </div>
+    </div>
+    
+    <div class="stats-overlay" id="stats">
+        <div class="stat-item">
+            <span class="stat-label">Шаг</span>
+            <span class="stat-value" id="step">0</span>
+        </div>
+        <div class="stat-item">
+            <span class="stat-label">Существ</span>
+            <span class="stat-value" id="count">0</span>
+        </div>
+        <div class="stat-item stat-red">
+            <span class="stat-label">🔴</span>
+            <span class="stat-value" id="red">0</span>
+        </div>
+        <div class="stat-item stat-blue">
+            <span class="stat-label">🔵</span>
+            <span class="stat-value" id="blue">0</span>
+        </div>
+        <div class="stat-item stat-gold">
+            <span class="stat-label">🟡</span>
+            <span class="stat-value" id="gold">0</span>
+        </div>
+        <div class="stat-item">
+            <span class="stat-label">🌳</span>
+            <span class="stat-value" id="trees">0</span>
+        </div>
+        <div class="stat-item">
+            <span class="stat-label">🫐</span>
+            <span class="stat-value" id="food">0</span>
+        </div>
+        <div class="stat-item">
+            <span class="stat-label">⭐</span>
+            <span class="stat-value" id="fitness">0</span>
+        </div>
+    </div>
 
-⭐ Лучший фитнес: {best}"""
-    
-    return images, stats
-
-def reset_simulation():
-    global world, creatures, step_counter
-    world, creatures = create_world()
-    step_counter = 0
-    img = render_world(world, creatures, 0)
-    return [img], "Мир сброшен"
+    <script>
+        function updateImage() {
+            document.getElementById('worldImage').src = '/image?t=' + Date.now();
+        }
+        
+        function updateStats() {
+            fetch('/stats')
+                .then(r => r.json())
+                .then(data => {
+                    document.getElementById('step').textContent = data.step;
+                    document.getElementById('count').textContent = data.total;
+                    document.getElementById('red').textContent = data.red;
+                    document.getElementById('blue').textContent = data.blue;
+                    document.getElementById('gold').textContent = data.gold;
+                    document.getElementById('trees').textContent = data.trees;
+                    document.getElementById('food').textContent = data.food;
+                    document.getElementById('fitness').textContent = data.best_fitness;
+                })
+                .catch(() => {});
+        }
+        
+        function update() {
+            updateImage();
+            updateStats();
+        }
+        
+        // Обновляем каждые 300ms
+        setInterval(update, 300);
+        
+        // Первое обновление
+        update();
+    </script>
+</body>
+</html>
+"""
 
-# ============== ИНТЕРФЕЙС ==============
-with gr.Blocks() as demo:
-    gr.Markdown("# 🧬 Эволюционная симуляция")
-    gr.Markdown("🔴 Красные | 🔵 Синие | 🟡 Золотые")
-    
-    with gr.Row():
-        gallery = gr.Gallery(label="Мир", columns=1, rows=1, height=500)
-        stats = gr.Textbox(label="Статистика", lines=15)
-    
-    with gr.Row():
-        steps = gr.Slider(minimum=5, maximum=50, value=20, step=5, label="Шагов")
-        run_btn = gr.Button("▶️ Запустить")
-        reset_btn = gr.Button("🔄 Сбросить")
-    
-    run_btn.click(run_simulation, inputs=[steps], outputs=[gallery, stats])
-    reset_btn.click(reset_simulation, outputs=[gallery, stats])
+class SimulationHandler(http.server.BaseHTTPRequestHandler):
+    def do_GET(self):
+        parsed = urlparse(self.path)
+        path = parsed.path
+        
+        if path == '/':
+            self.send_response(200)
+            self.send_header('Content-type', 'text/html; charset=utf-8')
+            self.end_headers()
+            self.wfile.write(HTML_TEMPLATE.encode('utf-8'))
+            
+        elif path == '/image':
+            img = render_world()
+            buffer = io.BytesIO()
+            img.save(buffer, format='PNG')
+            buffer.seek(0)
+            
+            self.send_response(200)
+            self.send_header('Content-type', 'image/png')
+            self.send_header('Cache-Control', 'no-cache, no-store, must-revalidate')
+            self.end_headers()
+            self.wfile.write(buffer.getvalue())
+            
+        elif path == '/stats':
+            red = sum(1 for c in creatures if c.alive and c.team == "red")
+            blue = sum(1 for c in creatures if c.alive and c.team == "blue")
+            gold = sum(1 for c in creatures if c.alive and c.team == "gold")
+            
+            trees = sum(1 for i in range(WORLD_SIZE) for j in range(WORLD_SIZE) 
+                        if world[i, j][0] == 34 and world[i, j][1] == 139 and world[i, j][2] == 34)
+            foods = sum(1 for i in range(WORLD_SIZE) for j in range(WORLD_SIZE) 
+                        if world[i, j][0] == 0 and world[i, j][1] == 150 and world[i, j][2] == 0)
+            stones = sum(1 for i in range(WORLD_SIZE) for j in range(WORLD_SIZE) 
+                         if world[i, j][0] == 128 and world[i, j][1] == 128 and world[i, j][2] == 128)
+            
+            best = max([c.fitness for c in creatures if c.alive] + [0])
+            
+            stats = {
+                'total': len([c for c in creatures if c.alive]),
+                'red': red,
+                'blue': blue,
+                'gold': gold,
+                'trees': trees,
+                'food': foods,
+                'stones': stones,
+                'best_fitness': best,
+                'step': step_counter
+            }
+            
+            self.send_response(200)
+            self.send_header('Content-type', 'application/json')
+            self.end_headers()
+            self.wfile.write(json.dumps(stats).encode())
+            
+        else:
+            self.send_response(404)
+            self.end_headers()
+    
+    def log_message(self, format, *args):
+        pass
 
-if __name__ == "__main__":
-    demo.launch(share=False)
+# ============== ЗАПУСК ==============
+if __name__ == '__main__':
+    # Запускаем симуляцию в отдельном потоке
+    sim_thread = threading.Thread(target=simulation_loop, daemon=True)
+    sim_thread.start()
+    
+    print(f"🧬 Эволюционная симуляция запущена!")
+    print(f"🌍 Открой в браузере: http://localhost:{PORT}")
+    print("=" * 50)
+    print("⏹️ Для остановки нажми Ctrl+C")
+    
+    with socketserver.TCPServer(("", PORT), SimulationHandler) as httpd:
+        try:
+            httpd.serve_forever()
+        except KeyboardInterrupt:
+            print("\n⏹️ Остановка сервера...")