Update app.py

app.py

@@ -1,7 +1,10 @@
 import gradio as gr
 from random import randint
-from all_models import models
 
+# Пример списка моделей
+models = ["Model A", "Model B", "Model C"]
+
+# Загрузка моделей
 def load_fn(models):
     global models_load
     models_load = {}
@@ -9,224 +12,120 @@ def load_fn(models):
         if model not in models_load.keys():
             try:
                 m = gr.load(f'models/{model}')
-            except Exception as error:
+            except Exception:
                 m = gr.Interface(lambda txt: None, ['text'], ['image'])
-            models_load.update({model: m})
+            models_load[model] = m
 
 load_fn(models)
 
 num_models = len(models)
 default_models = models[:num_models]
 
+# Расширение списка выбора моделей
 def extend_choices(choices):
     return choices + (num_models - len(choices)) * ['NA']
 
+# Обновление списка изображений
 def update_imgbox(choices):
     choices_plus = extend_choices(choices)
     return [gr.Image(None, label=m, visible=(m != 'NA'), elem_id="custom_image") for m in choices_plus]
 
+# Генерация изображений
 def gen_fn(model_str, prompt):
     if model_str == 'NA':
         return None
     noise = str(randint(0, 9999999))
     return models_load[model_str](f'{prompt} {noise}')
 
+# Создание интерфейса
 def make_me():
     with gr.Row():
         with gr.Column(scale=1):
-            txt_input = gr.Textbox(label='Your prompt:', lines=3, container=False, elem_id="custom_textbox", placeholder="Prompt")
+            txt_input = gr.Textbox(label='Your prompt:', lines=3, elem_id="custom_textbox", placeholder="Prompt")
             with gr.Row():
                 gen_button = gr.Button('Generate images', elem_id="custom_gen_button")
                 stop_button = gr.Button('Stop', variant='secondary', interactive=False, elem_id="custom_stop_button")
-                
-                def on_generate_click():
-                    return gr.Button('Generate images', elem_id="custom_gen_button"), gr.Button('Stop', variant='secondary', interactive=True, elem_id="custom_stop_button")
-                
-                def on_stop_click():
-                    return gr.Button('Generate images', elem_id="custom_gen_button"), gr.Button('Stop', variant='secondary', interactive=False, elem_id="custom_stop_button")
-                
-                gen_button.click(on_generate_click, inputs=None, outputs=[gen_button, stop_button])
-                stop_button.click(on_stop_click, inputs=None, outputs=[gen_button, stop_button])
-    
+
+                # Логика кнопок
+                gen_button.click(lambda: [gen_button, stop_button], None, [gen_button, stop_button])
+                stop_button.click(lambda: [gen_button, stop_button], None, [gen_button, stop_button])
+
+    # Вывод изображений
     with gr.Row():
-        output = [gr.Image(label=m, min_width=250, height=250, elem_id="custom_image") for m in default_models]
+        output = [gr.Image(label=m, elem_id="custom_image", tool="editor") for m in default_models]
         current_models = [gr.Textbox(m, visible=False) for m in default_models]
         for m, o in zip(current_models, output):
             gen_event = gen_button.click(gen_fn, [m, txt_input], o)
-            stop_button.click(on_stop_click, inputs=None, outputs=[gen_button, stop_button], cancels=[gen_event])
-    
+            stop_button.click(lambda: [gen_button, stop_button], None, [gen_button, stop_button], cancels=[gen_event])
+
+    # Выбор моделей
     with gr.Accordion('Model selection', elem_id="custom_accordion"):
-        model_choice = gr.CheckboxGroup(models, label=f'{num_models} different models selected', value=default_models, interactive=True, elem_id="custom_checkbox_group")
+        model_choice = gr.CheckboxGroup(models, label=f'{num_models} different models selected', 
+                                        value=default_models, elem_id="custom_checkbox_group")
         model_choice.change(update_imgbox, model_choice, output)
         model_choice.change(extend_choices, model_choice, current_models)
-    
-    with gr.Row():
-        gr.HTML("")
 
 custom_css = """
-:root {
-    --body-background-fill: #2d3d4f;
-}
-
+/* Основные стили */
 body, html {
-    overflow-y: auto; /* Включаем прокрутку для всей страницы */
+    overflow-y: auto;
     height: 100%;
     margin: 0;
     padding: 0;
 }
 
+.gradio-container {
+    overflow-y: auto !important;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+}
+
+/* Прокручиваемое изображение */
 .custom_image {
+    max-width: 100%;
+    height: auto;
+    object-fit: contain;
+    overflow: auto;
     border: 1px solid #3b4252;
     background-color: #2d343f;
     border-radius: 4px;
+    cursor: grab;
     margin: 10px;
-    max-width: 100%;
-    max-height: 400px; /* Ограничиваем высоту */
-    object-fit: contain;
-    overflow: auto;
-    box-sizing: border-box;
-    cursor: grab; /* Меняем курсор для взаимодействия */
-}
-
-
-.app_title {
-    background-color: #2d3d4f;
-    color: #c5c6c7;
-    padding: 10px 20px;
-    border-bottom: 1px solid #3b4252;
-    text-align: center;
-    font-size: 24px;
-    font-weight: bold;
-    width: 100%;
-    box-sizing: border-box;
-    margin-bottom: 20px;
 }
 
+/* Стили текста и кнопок */
 .custom_textbox {
     background-color: #2d343f;
     border: 1px solid #3b4252;
     color: #7f8184;
     padding: 10px;
     border-radius: 4px;
-    margin-bottom: 10px;
     width: 100%;
     box-sizing: border-box;
 }
 
-.custom_gen_button {
-    background-color: #8b38ff;
-    border: 1px solid #ffffff;
-    color: blue;
-    padding: 15px 32px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    font-size: 16px;
-    margin: 4px 2px;
-    cursor: pointer;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-    transition: transform 0.2s, box-shadow 0.2s;
+.custom_gen_button, .custom_stop_button {
+    padding: 15px;
     border-radius: 4px;
-}
-.custom_gen_button:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 6px 10px rgba(0, 0, 0, 0.3);
-}
-.custom_stop_button {
-    background-color: #6200ea;
-    border: 1px solid #ffffff;
-    color: blue;
-    padding: 15px 32px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    font-size: 16px;
-    margin: 4px 2px;
+    transition: all 0.2s;
     cursor: pointer;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-    transition: transform 0.2s, box-shadow 0.2s;
-    border-radius: 4px;
-}
-.custom_stop_button:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 6px 10px rgba(0, 0, 0, 0.3);
 }
 
-.custom_image {
-    border: 1px solid #3b4252;
-    background-color: #2d343f;
-    border-radius: 4px;
-    margin: 10px;
-    max-width: 50%;
-    box-sizing: border-box;
+.custom_gen_button:hover, .custom_stop_button:hover {
+    transform: scale(1.05);
 }
 
 .custom_accordion {
-    background-color: #2d3d4f;
-    color: #7f8184;
-    border: 1px solid #3b4252;
-    border-radius: 4px;
     margin-top: 20px;
-    width: 100%;
-    box-sizing: border-box;
-    transition: margin 0.2s ease;
-}
-
-.custom_accordion .gr-accordion-header {
-    background-color: #2d3d4f;
-    color: #7f8184;
-    padding: 10px 20px;
-    border-bottom: 1px solid #5b6270;
-    cursor: pointer;
-    font-size: 18px;
-    font-weight: bold;
-    height: 40px;
-    display: flex;
-    align-items: center;
-}
-
-.custom_accordion .gr-accordion-header:hover {
-    background-color: #2d3d4f;
-}
-
-.custom_accordion .gr-accordion-content {
-    padding: 10px 20px;
-    background-color: #2d3d4f;
-    border-top: 1px solid #5b6270;
-    max-height: 0;
-    overflow: hidden;
-    transition: max-height 0.2s ease;
-}
-
-.custom_accordion .gr-accordion-content.open {
-    max-height: 500px;
-}
-
-.custom_checkbox_group {
-    background-color: #2d343f;
     border: 1px solid #3b4252;
-    color: #7f8184;
     border-radius: 4px;
-    padding: 10px;
-    width: 100%;
-    box-sizing: border-box;
-}
-
-@media (max-width: 320px) {
-   .gradio-container {
-        width: 90%; /* Исправлено */
-        margin: 0 auto;
-        padding: 10px;
-    }
-   .custom_textbox, .custom_image, .custom_checkbox_group {
-        width: 100%;
-        box-sizing: border-box;
-    }
 }
 """
 
+# Создание интерфейса
 with gr.Blocks(css=custom_css) as demo: 
     make_me()
 
-demo.queue(default_concurrency_limit=240, max_size=240)
-demo.launch(max_threads=400, ssr_mode=True)
+demo.queue()
+demo.launch()