Update app.py

app.py

@@ -14,10 +14,9 @@ openai_api_key = os.getenv('GPT_KEY')
 gc_key = os.getenv('GC_KEY')
 token = os.getenv('GITHUB_TOKEN')
 
-# Авторизация в сервисе GigaChat
-chat_pro = GigaChat(credentials=gc_key, model='GigaChat-Pro', max_tokens=68, verify_ssl_certs=False)
-chat_lite = GigaChat(credentials=gc_key, model='GigaChat', max_tokens=68, verify_ssl_certs=False)
-chat_plus = GigaChat(credentials=gc_key, model='GigaChat-Plus', max_tokens=68, verify_ssl_certs=False)
+def authenticate_gigachat(model, max_tokens, temperature):
+    return GigaChat(credentials=gc_key, model=model, max_tokens=max_tokens, temperature=temperature, verify_ssl_certs=False)
+
 
 # Загрузка данных из Excel-файла
 try:
@@ -104,64 +103,54 @@ def clean_message(message):
 
 # Обновленные функции генерации сообщений с учетом обрезки незаконченных предложений
 def generate_message_gigachat_pro(prompt, temperature):
-    try:
-        messages = [SystemMessage(content=prompt)]
-        chat_pro = authenticate_gigachat('GigaChat-Pro', 68, temperature)
-        res = chat_pro(messages)
-        return clean_message(res.content.strip())
-    except Exception as e:
-        return f"Ошибка при обращении к GigaChat-Pro: {e}"
+    messages = [SystemMessage(content=prompt)]
+    chat_pro = authenticate_gigachat('GigaChat-Pro', 68, temperature)
+    res = chat_pro(messages)
+    return clean_message(res.content.strip())
 
 def generate_message_gigachat_lite(prompt, temperature):
-    try:
-        messages = [SystemMessage(content=prompt)]
-        chat_lite = authenticate_gigachat('GigaChat', 68, temperature)
-        res = chat_lite(messages)
-        cleaned_message = clean_message(res.content.strip())
-        return cleaned_message
-    except Exception as e:
-        return f"Ошибка при обращении к GigaChat-Lite: {e}"
+    messages = [SystemMessage(content=prompt)]
+    chat_lite = authenticate_gigachat('GigaChat', 68, temperature)
+    res = chat_lite(messages)
+    return clean_message(res.content.strip())
 
 def generate_message_gigachat_plus(prompt, temperature):
-    try:
-        messages = [SystemMessage(content=prompt)]
-        chat_plus = authenticate_gigachat('GigaChat-Plus', 68, temperature)
-        res = chat_plus(messages)
-        cleaned_message = clean_message(res.content.strip())
-        return cleaned_message
-    except Exception as e:
-        return f"Ошибка при обращении к GigaChat-Plus: {e}"
+    messages = [SystemMessage(content=prompt)]
+    chat_plus = authenticate_gigachat('GigaChat-Plus', 68, temperature)
+    res = chat_plus(messages)
+    return clean_message(res.content.strip())
+
 
-def generate_message_gpt4o_with_retry(prompt):
+def generate_message_gpt4o_with_retry(prompt, temperature):
     for _ in range(10):  # Максимум 10 попыток
-        message = generate_message_gpt4o(prompt)
+        message = generate_message_gpt4o(prompt, temperature)
         if len(message) <= 250:
             return message
     return message  # Возвращаем последнее сгенерированное сообщение, если все попытки не удались
 
-def generate_message_gigachat_pro_with_retry(prompt):
+def generate_message_gigachat_pro_with_retry(prompt, temperature):
     for _ in range(10):
-        message = generate_message_gigachat_pro(prompt)
+        message = generate_message_gigachat_pro(prompt, temperature)
         if len(message) <= 250:
             return message
     return message
 
-def generate_message_gigachat_lite_with_retry(prompt):
+def generate_message_gigachat_lite_with_retry(prompt, temperature):
     for _ in range(10):
-        message = generate_message_gigachat_lite(prompt)
+        message = generate_message_gigachat_lite(prompt, temperature)
         if len(message) <= 250:
             return message
     return message
 
-def generate_message_gigachat_plus_with_retry(prompt):
+def generate_message_gigachat_plus_with_retry(prompt, temperature):
     for _ in range(10):
-        message = generate_message_gigachat_plus(prompt)
+        message = generate_message_gigachat_plus(prompt, temperature)
         if len(message) <= 250:
             return message
     return message
 
 # Обновляем генерацию сообщений для отображения в интерфейсе
-def generate_messages(description, advantages, *selected_values):
+def generate_messages(description, advantages, gpt4o_temperature, gigachat_pro_temperature, gigachat_lite_temperature, gigachat_plus_temperature, *selected_values):
     standard_prompt = generate_standard_prompt(description, advantages, *selected_values)
 
     results = {
@@ -174,26 +163,26 @@ def generate_messages(description, advantages, *selected_values):
 
     yield results["prompt"], "", "", "", "", "Генерация стандартного промпта завершена"
 
-    results["gpt4o"] = generate_message_gpt4o_with_retry(standard_prompt)
+    results["gpt4o"] = generate_message_gpt4o_with_retry(standard_prompt, gpt4o_temperature)
     gpt4o_length = len(results["gpt4o"])
     gpt4o_display = f"{results['gpt4o']}\n\n------\nКоличество знаков: {gpt4o_length}"
     yield results["prompt"], gpt4o_display, "", "", "", "Сообщение GPT-4o сгенерировано"
 
-    results["gigachat_pro"] = generate_message_gigachat_pro_with_retry(standard_prompt)
+    results["gigachat_pro"] = generate_message_gigachat_pro_with_retry(standard_prompt, gigachat_pro_temperature)
     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, "", "", "Сообщение GigaChat-Pro сгенерировано"
 
     time.sleep(2)
 
-    results["gigachat_lite"] = generate_message_gigachat_lite_with_retry(standard_prompt)
+    results["gigachat_lite"] = generate_message_gigachat_lite_with_retry(standard_prompt, gigachat_lite_temperature)
     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, "", "Сообщение GigaChat-Lite сгенерировано"
 
     time.sleep(2)
 
-    results["gigachat_plus"] = generate_message_gigachat_plus_with_retry(standard_prompt)
+    results["gigachat_plus"] = generate_message_gigachat_plus_with_retry(standard_prompt, gigachat_plus_temperature)
     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, "Все сообщения сгенерированы"
@@ -232,13 +221,14 @@ def perform_personalization_gigachat(standard_message, personalization_prompt, m
     return clean_message(result)
 
 
-def perform_personalization_with_retry(standard_message, personalization_prompt, temperature):
+def perform_personalization_with_retry(standard_message, personalization_prompt):
     for _ in range(10):  # Максимум 10 попыток
-        message = perform_personalization(standard_message, personalization_prompt, temperature)
+        message = perform_personalization(standard_message, personalization_prompt)
         if len(message) <= 250:
             return message
     return message  # Возвращаем последнее сгенерированное сообщение, если все попытки не удались
 
+
 def perform_personalization_gigachat_with_retry(standard_message, personalization_prompt, model, temperature):
     for _ in range(10):
         message = perform_personalization_gigachat(standard_message, personalization_prompt, model, temperature)
@@ -326,15 +316,15 @@ def check_errors_with_yield(*personalized_messages):
 
     error_check_prompt = generate_error_check_prompt()
     yield error_check_prompt, "", "", "", "", "Промпт для проверки текста сгенерирован"
-
-    error_message_gpt4o = perform_personalization(f"{error_check_prompt}\n\n{personalized_messages[0]}", "")
+   
+    error_message_gpt4o = perform_personalization(f"{error_check_prompt}\n\n{personalized_messages[0]}", error_check_prompt)
     yield error_check_prompt, error_message_gpt4o, "", "", "", "Результат проверки GPT-4o сгенерирован"
 
-    error_message_gigachat_pro = perform_personalization_gigachat(f"{error_check_prompt}\n\n{personalized_messages[1]}", "", "gigachat_pro")
+    error_message_gigachat_pro = perform_personalization_gigachat(f"{error_check_prompt}\n\n{personalized_messages[1]}", error_check_prompt, "gigachat_pro")
     yield error_check_prompt, error_message_gpt4o, error_message_gigachat_pro, "", "", "Результат проверки GigaChat-Pro сгенерирован"
     
     time.sleep(3)
-    error_message_gigachat_lite = perform_personalization_gigachat(f"{error_check_prompt}\n\n{personalized_messages[2]}", "", "gigachat_lite")
+    error_message_gigachat_lite = perform_personalization_gigachat(f"{error_check_prompt}\n\n{personalized_messages[2]}", error_check_prompt, "gigachat_lite")
     yield error_check_prompt, error_message_gpt4o, error_message_gigachat_pro, error_message_gigachat_lite, "", "Результат проверки GigaChat-Lite сгенерирован"
     
     try:
@@ -483,7 +473,7 @@ with gr.Blocks() as demo:
 
         # Привязка кнопок к функциям сохранения
         save_gpt4o_btn.click(
-            fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, temperature: 
+            fn=lambda personalized_message, comment, corrected_message, description, advantages, non_personalized_prompt, non_personalized_message, gender, generation, psychotype, business_stage, industry, legal_form, temperature:
                 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, temperature),
             inputs=[
                 personalized_output_text_gpt4o,