Update app.py

app.py

@@ -335,46 +335,46 @@ def generate_messages(description, advantages, key_message, approach, *selected_
 
     results = {
         "prompt": standard_prompt,
-        "gpt4o": None,
         "gigachat_pro": None,
         "gigachat_lite": None,
         "gigachat_plus": None,
+        "gpt4o": None,
         "meta_llama_3_1_405b": None
     }
 
     yield results["prompt"], "", "", "", "", ""
 
     # Generating messages using existing models (as before)
-    results["gpt4o"] = generate_message_gpt4o_with_retry(standard_prompt)
-    gpt4o_length = len(results["gpt4o"])
-    gpt4o_display = f"{results['gpt4o']}\n\n------\nКоличество знаков: {gpt4o_length}"
-    yield results["prompt"], gpt4o_display, "", "", "", ""
-
     results["gigachat_pro"] = generate_message_gigachat_pro_with_retry(standard_prompt)
     gigachat_pro_length = len(results["gigachat_pro"])
     gigachat_pro_display = f"{results['gigachat_pro']}\n\n------\nКоличество знаков: {gigachat_pro_length}"
-    yield results["prompt"], gpt4o_display, gigachat_pro_display, "", "", ""
+    yield results["prompt"], gigachat_pro_display, "", "", "", ""
 
-    time.sleep(2)
-    
     results["gigachat_lite"] = generate_message_gigachat_lite_with_retry(standard_prompt)
     gigachat_lite_length = len(results["gigachat_lite"])
     gigachat_lite_display = f"{results['gigachat_lite']}\n\n------\nКоличество знаков: {gigachat_lite_length}"
-    yield results["prompt"], gpt4o_display, gigachat_pro_display, gigachat_lite_display, "", ""
+    yield results["prompt"], gigachat_pro_display, gigachat_lite_display, "", "", ""
 
     time.sleep(2)
     
     results["gigachat_plus"] = generate_message_gigachat_plus_with_retry(standard_prompt)
     gigachat_plus_length = len(results["gigachat_plus"])
     gigachat_plus_display = f"{results['gigachat_plus']}\n\n------\nКоличество знаков: {gigachat_plus_length}"
-    yield results["prompt"], gpt4o_display, gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, ""
+    yield results["prompt"], gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, "", ""
+
+    time.sleep(2)
+    
+    results["gpt4o"] = generate_message_gpt4o_with_retry(standard_prompt)
+    gpt4o_length = len(results["gpt4o"])
+    gpt4o_display = f"{results['gpt4o']}\n\n------\nКоличество знаков: {gpt4o_length}"
+    yield results["prompt"], gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, gpt4o_display, ""
 
     time.sleep(2)
 
     results["meta_llama_3_1_405b"] = generate_message_meta_llama_3_1_405b_with_retry(standard_prompt)
     meta_llama_405b_length = len(results["meta_llama_3_1_405b"])
     meta_llama_405b_display = f"{results['meta_llama_3_1_405b']}\n\n------\nКоличество знаков: {meta_llama_405b_length}"
-    yield results["prompt"], gpt4o_display, gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, meta_llama_405b_display
+    yield results["prompt"], gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, gpt4o_display, meta_llama_405b_display
 
     time.sleep(2)
 
@@ -467,11 +467,11 @@ def perform_personalization_meta_llama_405b(standard_message, personalization_pr
     return generate_message_meta_llama_3_1_405b_with_retry(full_prompt)
 
 # Updated function to include additional models in personalization
-def personalize_messages_with_yield(
-    gpt4o_message, 
+def personalize_messages_with_yield( 
     gigachat_pro_message, 
     gigachat_lite_message, 
-    gigachat_plus_message, 
+    gigachat_plus_message,
+    gpt4o_message,
     meta_llama_405b_message,
     key_message,
     approach,
@@ -479,32 +479,32 @@ def personalize_messages_with_yield(
 ):
     
     personalization_prompt = generate_personalization_prompt(key_message, approach, *selected_values)
-    yield personalization_prompt, "", "", "", "", "", "", "", "", "", ""
-
-    personalized_message_gpt4o = perform_personalization(gpt4o_message, personalization_prompt)
-    gpt4o_length = len(personalized_message_gpt4o)
-    gpt4o_display = f"{personalized_message_gpt4o}\n\n------\nКоличество знаков: {gpt4o_length}"
-    yield personalization_prompt, gpt4o_display, "", "", "", "", "", "", "", "", ""
+    yield personalization_prompt, "", "", "", "", ""
 
     personalized_message_gigachat_pro = perform_personalization_gigachat(gigachat_pro_message, personalization_prompt, "gigachat_pro")
     gigachat_pro_length = len(personalized_message_gigachat_pro)
     gigachat_pro_display = f"{personalized_message_gigachat_pro}\n\n------\nКоличество знаков: {gigachat_pro_length}"
-    yield personalization_prompt, gpt4o_display, gigachat_pro_display, "", "", "", "", "", "", "", ""
+    yield personalization_prompt, gigachat_pro_display, "", "", "", ""
 
     personalized_message_gigachat_lite = perform_personalization_gigachat(gigachat_lite_message, personalization_prompt, "gigachat_lite")
     gigachat_lite_length = len(personalized_message_gigachat_lite)
     gigachat_lite_display = f"{personalized_message_gigachat_lite}\n\n------\nКоличество знаков: {gigachat_lite_length}"
-    yield personalization_prompt, gpt4o_display, gigachat_pro_display, gigachat_lite_display, "", "", "", "", "", "", ""
+    yield personalization_prompt, gigachat_pro_display, gigachat_lite_display, "", "", ""
 
     personalized_message_gigachat_plus = perform_personalization_gigachat(gigachat_plus_message, personalization_prompt, "gigachat_plus")
     gigachat_plus_length = len(personalized_message_gigachat_plus)
-    gigachat_plus_display = f"{personalized_message_gigachat_plus}\n\n------\nКоличество знаков: {gigachat_plus_length}"
-    yield personalization_prompt, gpt4o_display, gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, "", "", "", "", "", ""
+    gigachat_plus_display = f"{personalized_message_gigachat_plus}\n\n------\nКоличество знаков: {gigachat_lite_length}"
+    yield personalization_prompt, gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, "", ""
+
+    personalized_message_gpt4o = perform_personalization(gpt4o_message, personalization_prompt)
+    gpt4o_length = len(personalized_message_gpt4o)
+    gpt4o_display = f"{personalized_message_gpt4o}\n\n------\nКоличество знаков: {gpt4o_length}"
+    yield personalization_prompt, gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, gpt4o_display, ""
 
     personalized_message_meta_llama_405b = perform_personalization_meta_llama_405b(meta_llama_405b_message, personalization_prompt)
     meta_llama_405b_length = len(personalized_message_meta_llama_405b)
     meta_llama_405b_display = f"{personalized_message_meta_llama_405b}\n\n------\nКоличество знаков: {meta_llama_405b_length}"
-    yield personalization_prompt, gpt4o_display, gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, meta_llama_405b_display, "", "", "", "", ""
+    yield personalization_prompt, gigachat_pro_display, gigachat_lite_display, gigachat_plus_display, gpt4o_display, meta_llama_405b_display
 
 
 # Функция для генерации промпта проверки текста
@@ -594,11 +594,11 @@ def save_to_github(personalized_message, model_name, comment, corrected_message,
     response = requests.put(url, headers=headers, data=json.dumps(data))
 
 
-def personalize_and_save(
-    gpt4o_message, 
+def personalize_and_save( 
     gigachat_pro_message, 
     gigachat_lite_message, 
-    gigachat_plus_message, 
+    gigachat_plus_message,
+    gpt4o_message,
     meta_llama_405b_message, 
     description,
     advantages,
@@ -607,11 +607,11 @@ def personalize_and_save(
     *selected_values
 ):
     # Персонализация с использованием yield для последовательного вывода
-    personalization_generator = personalize_messages_with_yield(
-        gpt4o_message, 
+    personalization_generator = personalize_messages_with_yield( 
         gigachat_pro_message, 
         gigachat_lite_message, 
-        gigachat_plus_message, 
+        gigachat_plus_message,
+        gpt4o_message,
         meta_llama_405b_message, 
         key_message,
         approach,
@@ -788,58 +788,58 @@ with gr.Blocks() as demo:
         
     # Ряд кнопок "Перегенерировать"
     with gr.Row():
-        regen_gpt4o_btn = gr.Button("Перегенерировать")
         regen_gigachat_pro_btn = gr.Button("Перегенерировать")
         regen_gigachat_lite_btn = gr.Button("Перегенерировать")
         regen_gigachat_plus_btn = gr.Button("Перегенерировать")
+        regen_gpt4o_btn = gr.Button("Перегенерировать")
         regen_meta_llama_405b_btn = gr.Button("Перегенерировать") 
     
     # Первый ряд: неперсонализированные сообщения
     with gr.Row():
-        output_text_gpt4o = gr.Textbox(label="Неперсонализированное сообщение GPT-4o", lines=3, interactive=False)
         output_text_gigachat_pro = gr.Textbox(label="Неперсонализированное сообщение GigaChat-Pro", lines=3, interactive=False)
         output_text_gigachat_lite = gr.Textbox(label="Неперсонализированное сообщение GigaChat-Lite", lines=3, interactive=False)
-        output_text_gigachat_plus = gr.Textbox(label="Неперсонализированное сообщение GigaChat-Plus", lines=3, interactive=False)
+        output_text_gigachat_plus = gr.Textbox(label="Неперсонализированное сообщение GigaChat-Lite+", lines=3, interactive=False)
+        output_text_gpt4o = gr.Textbox(label="Неперсонализированное сообщение GPT-4o", lines=3, interactive=False)
         output_text_meta_llama_405b = gr.Textbox(label="Неперсонализированное сообщение Meta-Llama-3.1-405B", lines=3, interactive=False)
 
     # Ряд кнопок "Персонализировать"
     with gr.Row():
-        personalize_gpt4o_btn = gr.Button("Персонализировать")
         personalize_gigachat_pro_btn = gr.Button("Персонализировать")
         personalize_gigachat_lite_btn = gr.Button("Персонализировать")
         personalize_gigachat_plus_btn = gr.Button("Персонализировать")
+        personalize_gpt4o_btn = gr.Button("Персонализировать")
         personalize_meta_llama_405b_btn = gr.Button("Персонализировать")
     
     # Второй ряд: персонализированные сообщения
     with gr.Row():
-        personalized_output_text_gpt4o = gr.Textbox(label="Персонализированное сообщение GPT-4o", lines=3, interactive=False)
         personalized_output_text_gigachat_pro = gr.Textbox(label="Персонализированное сообщение GigaChat-Pro", lines=3, interactive=False)
         personalized_output_text_gigachat_lite = gr.Textbox(label="Персонализированное сообщение GigaChat-Lite", lines=3, interactive=False)
-        personalized_output_text_gigachat_plus = gr.Textbox(label="Персонализированное сообщение GigaChat-Plus", lines=3, interactive=False)
+        personalized_output_text_gigachat_plus = gr.Textbox(label="Персонализированное сообщение GigaChat-Lite+", lines=3, interactive=False)
+        personalized_output_text_gpt4o = gr.Textbox(label="Персонализированное сообщение GPT-4o", lines=3, interactive=False)
         personalized_output_text_meta_llama_405b = gr.Textbox(label="Персонализированное сообщение Meta-Llama-3.1-405B", lines=3, interactive=False)
     
     # Третий ряд: комментарии
     with gr.Row():
-        comment_gpt4o = gr.Textbox(label="Комментарий к сообщению GPT-4o", lines=3)
         comment_gigachat_pro = gr.Textbox(label="Комментарий к сообщению GigaChat-Pro", lines=3)
         comment_gigachat_lite = gr.Textbox(label="Комментарий к сообщению GigaChat-Lite", lines=3)
-        comment_gigachat_plus = gr.Textbox(label="Комментарий к сообщению GigaChat-Plus", lines=3)
+        comment_gigachat_plus = gr.Textbox(label="Комментарий к сообщению GigaChat-Lite+", lines=3)
+        comment_gpt4o = gr.Textbox(label="Комментарий к сообщению GPT-4o", lines=3)
         comment_meta_llama_405b = gr.Textbox(label="Комментарий к сообщению Meta-Llama-3.1-405B", lines=3)
     
     # Четвертый ряд: откорректированные сообщения
     with gr.Row():
-        corrected_gpt4o = gr.Textbox(label="Откорректированное сообщение GPT-4o", lines=3)
         corrected_gigachat_pro = gr.Textbox(label="Откорректированное сообщение GigaChat-Pro", lines=3)
         corrected_gigachat_lite = gr.Textbox(label="Откорректированное сообщение GigaChat-Lite", lines=3)
-        corrected_gigachat_plus = gr.Textbox(label="Откорректированное сообщение GigaChat-Plus", lines=3)
+        corrected_gigachat_plus = gr.Textbox(label="Откорректированное сообщение GigaChat-Lite+", lines=3)
+        corrected_gpt4o = gr.Textbox(label="Откорректированное сообщение GPT-4o", lines=3)
         corrected_meta_llama_405b = gr.Textbox(label="Откорректированное сообщение Meta-Llama-3.1-405B", lines=3)
     
     # Пятый ряд: кнопки сохранения
     with gr.Row():
-        save_gpt4o_btn = gr.Button("Сохранить в базу")
         save_gigachat_pro_btn = gr.Button("Сохранить в базу")
         save_gigachat_lite_btn = gr.Button("Сохранить в базу")
         save_gigachat_plus_btn = gr.Button("Сохранить в базу")
+        save_gpt4o_btn = gr.Button("Сохранить в базу")
         save_meta_llama_405b_btn = gr.Button("Сохранить в базу")
 
    
@@ -849,19 +849,19 @@ with gr.Blocks() as demo:
         inputs=[],
         outputs=[
             personalization_prompt,
-            personalized_output_text_gpt4o,
             personalized_output_text_gigachat_pro,
             personalized_output_text_gigachat_lite,
             personalized_output_text_gigachat_plus,
+            personalized_output_text_gpt4o,
             personalized_output_text_meta_llama_405b,
-            comment_gpt4o,  
-            corrected_gpt4o,
             comment_gigachat_pro,
             corrected_gigachat_pro,
             comment_gigachat_lite,
             corrected_gigachat_lite,
             comment_gigachat_plus,
             corrected_gigachat_plus,
+            comment_gpt4o,  
+            corrected_gpt4o,
             comment_meta_llama_405b,
             corrected_meta_llama_405b
         ]
@@ -871,11 +871,11 @@ with gr.Blocks() as demo:
         generate_messages, 
         inputs=[description_input, advantages_input, key_message_input, approach_input] + selections, 
         outputs=[
-            prompt_display, 
-            output_text_gpt4o, 
+            prompt_display,  
             output_text_gigachat_pro, 
             output_text_gigachat_lite, 
-            output_text_gigachat_plus, 
+            output_text_gigachat_plus,
+            output_text_gpt4o,
             output_text_meta_llama_405b
         ]
     )
@@ -885,19 +885,19 @@ with gr.Blocks() as demo:
         fn=clear_personalization_fields,
         inputs=[],
         outputs=[
-            personalized_output_text_gpt4o,
             personalized_output_text_gigachat_pro,
             personalized_output_text_gigachat_lite,
             personalized_output_text_gigachat_plus,
+            personalized_output_text_gpt4o,
             personalized_output_text_meta_llama_405b,
-            comment_gpt4o,  
-            corrected_gpt4o,
             comment_gigachat_pro,
             corrected_gigachat_pro,
             comment_gigachat_lite,
             corrected_gigachat_lite,
             comment_gigachat_plus,
             corrected_gigachat_plus,
+            comment_gpt4o,  
+            corrected_gpt4o,
             comment_meta_llama_405b,
             corrected_meta_llama_405b
         ]
@@ -905,11 +905,11 @@ with gr.Blocks() as demo:
     
     personalize_btn.click(
         fn=personalize_and_save,
-        inputs=[
-            output_text_gpt4o, 
+        inputs=[ 
             output_text_gigachat_pro, 
             output_text_gigachat_lite, 
-            output_text_gigachat_plus, 
+            output_text_gigachat_plus,
+            output_text_gpt4o,
             output_text_meta_llama_405b,
             description_input,
             advantages_input,
@@ -918,10 +918,10 @@ with gr.Blocks() as demo:
         ] + selections,
         outputs=[
             personalization_prompt,
-            personalized_output_text_gpt4o,
             personalized_output_text_gigachat_pro,
             personalized_output_text_gigachat_lite,
             personalized_output_text_gigachat_plus,
+            personalized_output_text_gpt4o,
             personalized_output_text_meta_llama_405b
         ]
     )
@@ -943,35 +943,29 @@ with gr.Blocks() as demo:
         outputs=[
             prompt_display,
             personalization_prompt,  # Очищаем personalization_prompt
-            output_text_gpt4o,
             output_text_gigachat_pro,
             output_text_gigachat_lite,
             output_text_gigachat_plus,
+            output_text_gpt4o,
             output_text_meta_llama_405b,
-            personalized_output_text_gpt4o,
             personalized_output_text_gigachat_pro,
             personalized_output_text_gigachat_lite,
             personalized_output_text_gigachat_plus,
+            personalized_output_text_gpt4o,
             personalized_output_text_meta_llama_405b,
-            comment_gpt4o,  
-            corrected_gpt4o,
             comment_gigachat_pro,
             corrected_gigachat_pro,
             comment_gigachat_lite,
             corrected_gigachat_lite,
             comment_gigachat_plus,
             corrected_gigachat_plus,
+            comment_gpt4o,  
+            corrected_gpt4o,
             comment_meta_llama_405b,
             corrected_meta_llama_405b
         ]
     )
 
-    regen_gpt4o_btn.click(
-        regen_message_gpt4o,
-        inputs=[description_input, advantages_input, key_message_input, approach_input] + selections,
-        outputs=output_text_gpt4o
-    )
-    
     regen_gigachat_pro_btn.click(
         regen_message_gigachat_pro,
         inputs=[description_input, advantages_input, key_message_input, approach_input] + selections,
@@ -989,19 +983,19 @@ with gr.Blocks() as demo:
         inputs=[description_input, advantages_input, key_message_input, approach_input] + selections,
         outputs=output_text_gigachat_plus
     )
+
+    regen_gpt4o_btn.click(
+        regen_message_gpt4o,
+        inputs=[description_input, advantages_input, key_message_input, approach_input] + selections,
+        outputs=output_text_gpt4o
+    )
     
     regen_meta_llama_405b_btn.click(
         regen_message_meta_llama_405b,
         inputs=[description_input, advantages_input, key_message_input, approach_input] + selections,
         outputs=output_text_meta_llama_405b
     )
-    
-    personalize_gpt4o_btn.click(
-        personalize_message_gpt4o,
-        inputs=[output_text_gpt4o, key_message_input, approach_input] + selections,
-        outputs=personalized_output_text_gpt4o
-    )
-    
+     
     personalize_gigachat_pro_btn.click(
         personalize_message_gigachat_pro,
         inputs=[output_text_gigachat_pro, key_message_input, approach_input] + selections,
@@ -1019,6 +1013,12 @@ with gr.Blocks() as demo:
         inputs=[output_text_gigachat_plus, key_message_input, approach_input] + selections,
         outputs=personalized_output_text_gigachat_plus
     )
+
+    personalize_gpt4o_btn.click(
+        personalize_message_gpt4o,
+        inputs=[output_text_gpt4o, key_message_input, approach_input] + selections,
+        outputs=personalized_output_text_gpt4o
+    )
     
     personalize_meta_llama_405b_btn.click(
         personalize_message_meta_llama_405b,
@@ -1026,43 +1026,7 @@ with gr.Blocks() as demo:
         outputs=personalized_output_text_meta_llama_405b
     )
 
-    # Привязка кнопок к функциям сохранения
-    save_gpt4o_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
-        inputs=[],
-        outputs=[save_gpt4o_btn]
-    ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, personalization_prompt, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach: 
-            save_to_github(personalized_message, "GPT-4o", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, personalization_prompt, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
-        inputs=[
-            personalized_output_text_gpt4o,
-            comment_gpt4o,
-            corrected_gpt4o,
-            description_input,
-            advantages_input,
-            prompt_display,
-            output_text_gpt4o,
-            personalization_prompt,
-            selections[0],  # Пол
-            selections[1],  # Поколение
-            selections[2],  # Психотип
-            selections[3],  # Стадия бизнеса
-            selections[4],  # Отрасль
-            selections[5],  # ОПФ
-            key_message_input,  # Ключевое сообщение
-            approach_input      # Подход
-        ],
-        outputs=None
-    ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
-        outputs=[save_gpt4o_btn]
-    ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
-        outputs=[save_gpt4o_btn]
-    )
-    
-    # То же самое для других кнопок:
-    
+    # Привязка кнопок к функциям сохранения   
     save_gigachat_pro_btn.click(
         fn=prepare_button_text,
         inputs=[],
@@ -1166,6 +1130,40 @@ with gr.Blocks() as demo:
         fn=reset_button_text,
         outputs=[save_gigachat_plus_btn]
     )
+
+    save_gpt4o_btn.click(
+        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        inputs=[],
+        outputs=[save_gpt4o_btn]
+    ).then(
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, personalization_prompt, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach: 
+            save_to_github(personalized_message, "GPT-4o", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, personalization_prompt, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
+        inputs=[
+            personalized_output_text_gpt4o,
+            comment_gpt4o,
+            corrected_gpt4o,
+            description_input,
+            advantages_input,
+            prompt_display,
+            output_text_gpt4o,
+            personalization_prompt,
+            selections[0],  # Пол
+            selections[1],  # Поколение
+            selections[2],  # Психотип
+            selections[3],  # Стадия бизнеса
+            selections[4],  # Отрасль
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
+        ],
+        outputs=None
+    ).then(
+        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        outputs=[save_gpt4o_btn]
+    ).then(
+        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        outputs=[save_gpt4o_btn]
+    )
     
     save_meta_llama_405b_btn.click(
         fn=prepare_button_text,