са

app.py

@@ -1,33 +1,59 @@
 import gradio as gr
 from palette_generator import generate_palette
-import plotly.express as px
+import matplotlib.pyplot as plt
+import numpy as np
 
-def generate_and_plot(n, temp):
-    # Генерируем палитру
-    palette, lightness, chroma, hues, description, hex_codes = generate_palette(n, temp)
+def plot_palette(palette, lightness, chroma, hues):
+    if palette is None:
+        return "Не удалось сгенерировать палитру. Попробуйте снова.", None, None
     
-    # Создаём график
-    fig = px.scatter(x=hues, y=lightness, color=hex_codes, size=[10]*len(hues), 
-                     labels={"x": "Hue", "y": "Lightness"}, title="Color Palette")
-    
-    return fig, description, hex_codes
+    fig, ax = plt.subplots(figsize=(10, 2))
+    for i, color in enumerate(palette):
+        ax.add_patch(plt.Rectangle((i, 0), 1, 1, color=color))
+        ax.text(i + 0.5, -0.2, f"L={lightness[i]:.2f}\nC={chroma[i]:.2f}\nH={hues[i]:.1f}", 
+                ha='center', va='top')
+    ax.set_xlim(0, len(palette))
+    ax.set_ylim(0, 1)
+    ax.axis('off')
+    return fig, None, None
+
+def generate_and_plot(n_colors, temp_category):
+    try:
+        palette, lightness, chroma, hues, description, hex_codes = generate_palette(
+            n_colors, temp_category
+        )
+        # Формируем текст для HEX-кодов
+        hex_text = "\n".join(f"Цвет {i+1}: {hex_code}" for i, hex_code in enumerate(hex_codes))
+        plot, _, _ = plot_palette(palette, lightness, chroma, hues)
+        return plot, description, hex_text
+    except ValueError as e:
+        return None, f"Ошибка: {str(e)}", None
 
-# Интерфейс Gradio
 with gr.Blocks() as demo:
+    gr.Markdown("# Генератор цветовых палитр")
+    
     with gr.Row():
-        n_input = gr.Slider(1, 9, value=5, step=1, label="Количество цветов")
-        temp_input = gr.Dropdown(choices=["Все", "Тёплая", "Холодная"], value="Все", label="Температура")
-    generate_btn = gr.Button("Сгенерировать")
+        n_colors = gr.Slider(2, 9, value=5, step=1, label="Количество цветов")  # Обновлено: max 9
+    
     with gr.Row():
-        plot_output = gr.Plot(label="График палитры")
-        with gr.Column():
-            description_output = gr.Textbox(label="Описание палитры")
-            hex_output = gr.Textbox(label="HEX-коды")
+        temp_category = gr.Dropdown(
+            choices=["Все", "Тёплая", "Холодная"],
+            label="Температура",
+            value="Все",
+            interactive=True
+        )
+    
+    with gr.Column():
+        output_plot = gr.Plot(label="Палитра")
+        output_desc = gr.Textbox(label="Описание палитры", lines=5)
+        output_hex = gr.Textbox(label="HEX-коды", lines=5)
+    
+    generate_btn = gr.Button("Сгенерировать")
     
     generate_btn.click(
-        fn=generate_and_plot,
-        inputs=[n_input, temp_input],
-        outputs=[plot_output, description_output, hex_output]
+        generate_and_plot,
+        inputs=[n_colors, temp_category],
+        outputs=[output_plot, output_desc, output_hex]
     )
 
 demo.launch()