Update app.py

app.py

@@ -110,7 +110,7 @@ def load_previous_user_request_from_github():
 
         if not json_files:
             print("Нет сохраненных запросов.")
-            return "", "", "", "", None, None, None, None, None, None
+            return "", "", "", "", "", "", "", "", "", "", None, None, None, None, None, None
 
         # Определяем новый индекс для загрузки предыдущего файла
         current_request_index -= 1
@@ -129,18 +129,18 @@ def load_previous_user_request_from_github():
             data = json.loads(file_response.text)
             description = data.get('description', "")
             advantages = data.get('advantages', "")
+            key_message = data.get('key_message', "")  # Load key message
+            approach = data.get('approach', "")  # Load approach
             personalization_params = data.get('personalization_params', [None] * 6)  # Убедитесь, что размер списка соответствует количеству полей
-            key_message = data.get('key_message', "")
-            approach = data.get('approach', "")
 
             # Возвращаем данные по отдельности для каждого компонента Gradio
             return description, advantages, key_message, approach, *personalization_params
         else:
             print(f"Ошибка при загрузке файла: {file_response.status_code}")
-            return "", "", "", "", None, None, None, None, None, None
+            return "", "", "", "", "", "", "", "", "", "", None, None, None, None, None, None
     else:
         print(f"Ошибка при обращении к GitHub: {response.status_code}")
-        return "", "", "", "", None, None, None, None, None, None
+        return "", "", "", "", "", "", "", "", "", "", None, None, None, None, None, None
 
 
 # Функция для генерации стандартного промпта
@@ -766,7 +766,7 @@ def check_errors_with_yield(*personalized_messages):
     yield error_check_prompt, error_message_gpt4o, error_message_gigachat_pro, error_message_gigachat_lite, error_message_gigachat_plus, error_message_meta_llama_405b, error_message_meta_llama_70b, error_message_meta_llama_8b, error_message_gemma_27b_it, error_message_gemma_9b_it, error_message_mistral, "Все результаты проверки сгенерированы"
 
 
-def save_to_github(personalized_message, model_name, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form):
+def save_to_github(personalized_message, model_name, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach):
     # Собираем все данные в один словарь
     data_to_save = {
         "Модель": model_name,
@@ -775,6 +775,8 @@ def save_to_github(personalized_message, model_name, comment, corrected_message,
         "Откорректированное сообщение": corrected_message,
         "Описание предложения": description,
         "Преимущества": advantages,
+        "Ключевое сообщение": key_message,  # Save key message
+        "Подход": approach,  # Save approach
         "Неперсонализированный промпт": non_personalized_prompt,
         "Неперсонализированное сообщение": non_personalized_message,
         "Пол": gender,
@@ -850,7 +852,6 @@ def personalize_and_save(
         save_user_request_to_github(description, advantages, key_message, approach, selected_values)
 
 
-
 def clear_fields():
     return (
         "", "", "", "", "", "", "", "", "", "",  # personalized outputs and prompts
@@ -1162,6 +1163,8 @@ with gr.Blocks() as demo:
         outputs=[
             description_input,  # Описание предложения
             advantages_input,   # Преимущества
+            key_message_input,  # Ключевое сообщение
+            approach_input,     # Подход
             *selections,        # Параметры персонализации (Пол, Поколение и т.д.)
         ]
     ).then(
@@ -1220,8 +1223,8 @@ with gr.Blocks() as demo:
         inputs=[],
         outputs=[save_gpt4o_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "GPT-4o", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, 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, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_gpt4o,
             comment_gpt4o,
@@ -1235,7 +1238,9 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
@@ -1245,15 +1250,16 @@ with gr.Blocks() as demo:
         fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
         outputs=[save_gpt4o_btn]
     )
-
-
+    
+    # То же самое для других кнопок:
+    
     save_gigachat_pro_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_gigachat_pro_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "GigaChat-Pro", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "GigaChat-Pro", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_gigachat_pro,
             comment_gigachat_pro,
@@ -1267,24 +1273,27 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_gigachat_pro_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_gigachat_pro_btn]
     )
-
+    
+    # Повторяем аналогично для других кнопок:
     save_gigachat_lite_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_gigachat_lite_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "GigaChat-Lite", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "GigaChat-Lite", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_gigachat_lite,
             comment_gigachat_lite,
@@ -1298,24 +1307,27 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_gigachat_lite_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_gigachat_lite_btn]
     )
 
+
     save_gigachat_plus_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_gigachat_plus_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "GigaChat-Lite+", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "GigaChat-Lite+", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_gigachat_plus,
             comment_gigachat_plus,
@@ -1329,24 +1341,26 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_gigachat_plus_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_gigachat_plus_btn]
     )
-
+    
     save_meta_llama_405b_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_meta_llama_405b_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "Meta-Llama-3.1-405B", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "Meta-Llama-3.1-405B", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_meta_llama_405b,
             comment_meta_llama_405b,
@@ -1360,24 +1374,26 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_meta_llama_405b_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_meta_llama_405b_btn]
     )
     
     save_meta_llama_70b_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_meta_llama_70b_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "Meta-Llama-3.1-70B", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "Meta-Llama-3.1-70B", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_meta_llama_70b,
             comment_meta_llama_70b,
@@ -1391,24 +1407,26 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_meta_llama_70b_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_meta_llama_70b_btn]
     )
     
     save_meta_llama_8b_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_meta_llama_8b_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "Meta-Llama-3.1-8B", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "Meta-Llama-3.1-8B", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_meta_llama_8b,
             comment_meta_llama_8b,
@@ -1422,24 +1440,26 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_meta_llama_8b_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_meta_llama_8b_btn]
     )
     
     save_gemma_27b_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_gemma_27b_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "Gemma-2-27B-IT", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "Gemma-2-27B-IT", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_gemma_27b,
             comment_gemma_27b,
@@ -1453,24 +1473,26 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_gemma_27b_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_gemma_27b_btn]
     )
     
     save_gemma_9b_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_gemma_9b_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "Gemma-2-9B-IT", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "Gemma-2-9B-IT", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_gemma_9b,
             comment_gemma_9b,
@@ -1484,24 +1506,26 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_gemma_9b_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_gemma_9b_btn]
     )
 
     save_mistral_btn.click(
-        fn=prepare_button_text,  # Сначала меняем текст на "Сохраняется..."
+        fn=prepare_button_text,
         inputs=[],
         outputs=[save_mistral_btn]
     ).then(
-        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form: 
-            save_to_github(personalized_message, "Mistral", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form),
+        fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach:
+            save_to_github(personalized_message, "Mistral", comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, key_message, approach),
         inputs=[
             personalized_output_text_mistral,
             comment_mistral,
@@ -1515,14 +1539,16 @@ with gr.Blocks() as demo:
             selections[2],  # Психотип
             selections[3],  # Стадия бизнеса
             selections[4],  # Отрасль
-            selections[5]   # ОПФ
+            selections[5],  # ОПФ
+            key_message_input,  # Ключевое сообщение
+            approach_input      # Подход
         ],
         outputs=None
     ).then(
-        fn=update_button_text,  # Обновляем текст на "Сохранено!" после сохранения
+        fn=update_button_text,
         outputs=[save_mistral_btn]
     ).then(
-        fn=reset_button_text,  # Возвращаем текст на кнопке обратно через 3 секунды
+        fn=reset_button_text,
         outputs=[save_mistral_btn]
     )