Update app.py

app.py

@@ -76,7 +76,7 @@ def generate_standard_prompt(description, advantages, *selected_values):
     return prompt
 
 # Функции для генерации сообщений
-def generate_message_gpt4o(prompt, temperature=1):
+def generate_message_gpt4o(prompt):
     try:
         headers = {
             "Content-Type": "application/json",
@@ -85,16 +85,14 @@ def generate_message_gpt4o(prompt, temperature=1):
         data = {
             "model": "chatgpt-4o-latest",
             "messages": [{"role": "system", "content": prompt}],
-            "max_tokens": 101,
-            "temperature": temperature  # Передача температуры
+            "max_tokens": 101
         }
         response = requests.post("https://api.openai.com/v1/chat/completions", json=data, headers=headers)
         response_data = response.json()
-        return clean_message(response_data["choices"][0]["message"]["content"].strip()) + f" {temperature}"
+        return response_data["choices"][0]["message"]["content"].strip()
     except Exception as e:
         return f"Ошибка при обращении к ChatGPT-4o-Latest: {e}"
 
-
 def clean_message(message):
     # Если сообщение не заканчивается на точку или восклицательный знак, обрезаем его до последней точки
     if not message.endswith(('.', '!', '?')):
@@ -104,72 +102,67 @@ def clean_message(message):
     return message
 
 # Обновленные функции генерации сообщений с учетом обрезки незаконченных предложений
-def generate_message_gigachat_pro(prompt, temperature=0.87):
+def generate_message_gigachat_pro(prompt):
     try:
         messages = [SystemMessage(content=prompt)]
-        chat_pro = GigaChat(credentials=gc_key, model='GigaChat-Pro', max_tokens=68, temperature=temperature, verify_ssl_certs=False)
         res = chat_pro(messages)
         cleaned_message = clean_message(res.content.strip())
         return cleaned_message
     except Exception as e:
         return f"Ошибка при обращении к GigaChat-Pro: {e}"
 
-def generate_message_gigachat_lite(prompt, temperature=0.87):
+def generate_message_gigachat_lite(prompt):
     try:
         time.sleep(2)
         messages = [SystemMessage(content=prompt)]
-        chat_lite = GigaChat(credentials=gc_key, model='GigaChat', max_tokens=68, temperature=temperature, verify_ssl_certs=False)
         res = chat_lite(messages)
         cleaned_message = clean_message(res.content.strip())
         return cleaned_message
     except Exception as e:
         return f"Ошибка при обращении к GigaChat-Lite: {e}"
 
-def generate_message_gigachat_plus(prompt, temperature=0.87):
+def generate_message_gigachat_plus(prompt):
     try:
         time.sleep(2)
         messages = [SystemMessage(content=prompt)]
-        chat_plus = GigaChat(credentials=gc_key, model='GigaChat-Plus', max_tokens=68, temperature=temperature, verify_ssl_certs=False)
         res = chat_plus(messages)
         cleaned_message = clean_message(res.content.strip())
         return cleaned_message
     except Exception as e:
         return f"Ошибка при обращении к GigaChat-Plus: {e}"
 
-def generate_message_gpt4o_with_retry(prompt, gpt4o_temperature):
+def generate_message_gpt4o_with_retry(prompt):
     for _ in range(10):  # Максимум 10 попыток
-        message = generate_message_gpt4o(prompt, gpt4o_temperature)
+        message = generate_message_gpt4o(prompt)
         if len(message) <= 250:
             return message
     return message  # Возвращаем последнее сгенерированное сообщение, если все попытки не удались
 
-def generate_message_gigachat_pro_with_retry(prompt, gigachat_pro_temperature):
+def generate_message_gigachat_pro_with_retry(prompt):
     for _ in range(10):
-        message = generate_message_gigachat_pro(prompt, gigachat_pro_temperature)
+        message = generate_message_gigachat_pro(prompt)
         if len(message) <= 250:
             return message
     return message
 
-def generate_message_gigachat_lite_with_retry(prompt, gigachat_lite_temperature):
+def generate_message_gigachat_lite_with_retry(prompt):
     for _ in range(10):
-        message = generate_message_gigachat_lite(prompt, gigachat_lite_temperature)
+        message = generate_message_gigachat_lite(prompt)
         if len(message) <= 250:
             return message
     return message
 
-def generate_message_gigachat_plus_with_retry(prompt, gigachat_plus_temperature):
+def generate_message_gigachat_plus_with_retry(prompt):
     for _ in range(10):
-        message = generate_message_gigachat_plus(prompt, gigachat_plus_temperature)
+        message = generate_message_gigachat_plus(prompt)
         if len(message) <= 250:
             return message
     return message
 
-                
-# Обновляем генерацию сообщений для отображения в интерфейсе
-def generate_messages(description, advantages, *selected_values, gpt4o_temperature, gigachat_pro_temperature, gigachat_lite_temperature, gigachat_plus_temperature):
 
-    # Далее используйте эти переменные для генерации сообщений
-    standard_prompt = generate_standard_prompt(description, advantages, *selected_values, gpt4o_temperature, gigachat_pro_temperature, gigachat_lite_temperature, gigachat_plus_temperature)
+# Обновляем генерацию сообщений для отображения в интерфейсе
+def generate_messages(description, advantages, *selected_values):
+    standard_prompt = generate_standard_prompt(description, advantages, *selected_values)
 
     results = {
         "prompt": standard_prompt,
@@ -181,26 +174,26 @@ def generate_messages(description, advantages, *selected_values, gpt4o_temperatu
 
     yield results["prompt"], "", "", "", "", "Генерация стандартного промпта завершена"
 
-    results["gpt4o"] = generate_message_gpt4o_with_retry(standard_prompt, gpt4o_temperature)
+    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, "", "", "", "Сообщение GPT-4o сгенерировано"
 
-    results["gigachat_pro"] = generate_message_gigachat_pro_with_retry(standard_prompt, gigachat_pro_temperature)
+    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, "", "", "Сообщение GigaChat-Pro сгенерировано"
 
     time.sleep(2)
 
-    results["gigachat_lite"] = generate_message_gigachat_lite_with_retry(standard_prompt, gigachat_lite_temperature)
+    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, "", "Сообщение GigaChat-Lite сгенерировано"
 
     time.sleep(2)
 
-    results["gigachat_plus"] = generate_message_gigachat_plus_with_retry(standard_prompt, gigachat_plus_temperature)
+    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, "Все сообщения сгенерированы"
@@ -353,11 +346,10 @@ 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, "Все результаты проверки сгенерированы"
 
 
-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, temperature):
+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):
     # Собираем все данные в один словарь
     data_to_save = {
         "Модель": model_name,
-        "Температура": temperature,  # Добавляем температуру
         "Персонализированное сообщение": personalized_message,
         "Комментарий": comment,
         "Откорректированное сообщение": corrected_message,
@@ -392,23 +384,11 @@ def save_to_github(personalized_message, model_name, comment, corrected_message,
     # Отправка POST-запроса на GitHub API для создания файла в репозитории
     response = requests.put(url, headers=headers, data=json.dumps(data))
 
-    if response.status_code == 201:
-        print("Файл успешно загружен на GitHub.")
-    else:
-        print(f"Ошибка при загрузке файла на GitHub: {response.status_code}")
-        print(f"Ответ сервера: {response.json()}")
-
 
 # Создание интерфейса Gradio
 with gr.Blocks() as demo:
     gr.Markdown("# Генерация SMS-сообщений по заданным ��ризнакам")
     
-    # Добавление элементов управления температурой для каждой модели
-    gpt4o_temperature = gr.Slider(label="GPT-4o: temperature", minimum=0, maximum=2, step=0.01, value=1).value
-    gigachat_pro_temperature = gr.Slider(label="GigaChat-Pro: temperature", minimum=0, maximum=2, step=0.01, value=0.87).value
-    gigachat_lite_temperature = gr.Slider(label="GigaChat-Lite: temperature", minimum=0, maximum=2, step=0.01, value=0.87).value
-    gigachat_plus_temperature = gr.Slider(label="GigaChat-Plus: temperature", minimum=0, maximum=2, step=0.01, value=0.87).value
-
     with gr.Row():
         with gr.Column(scale=1):
             description_input = gr.Textbox(
@@ -448,20 +428,11 @@ with gr.Blocks() as demo:
             output_text_gigachat_lite = gr.Textbox(label="Неперсонализированное сообщение GigaChat-Lite", lines=3, interactive=False)
             output_text_gigachat_plus = gr.Textbox(label="Неперсонализированное сообщение GigaChat-Lite+", lines=3, interactive=False)
             
-        submit_btn.click(
-            generate_messages, 
-            inputs=[
-                description_input, 
-                advantages_input, 
-                *selections, 
-                gpt4o_temperature, 
-                gigachat_pro_temperature, 
-                gigachat_lite_temperature, 
-                gigachat_plus_temperature
-            ], 
-            outputs=[prompt_display, output_text_gpt4o, output_text_gigachat_pro, output_text_gigachat_lite, output_text_gigachat_plus]
-        )
-
+            submit_btn.click(
+                generate_messages, 
+                inputs=[description_input, advantages_input] + selections, 
+                outputs=[prompt_display, output_text_gpt4o, output_text_gigachat_pro, output_text_gigachat_lite, output_text_gigachat_plus]
+            )
 
     with gr.Row():
         personalize_btn = gr.Button("2. Выполнить персонализацию (нажимать только после кнопки 1)", elem_id="personalize_button")
@@ -504,8 +475,8 @@ 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: 
-                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),
+            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),
             inputs=[
                 personalized_output_text_gpt4o,
                 comment_gpt4o,
@@ -519,15 +490,14 @@ with gr.Blocks() as demo:
                 selections[2],  # Психотип
                 selections[3],  # Стадия бизнеса
                 selections[4],  # Отрасль
-                selections[5],  # ОПФ
-                gpt4o_temperature  # Передача температуры
+                selections[5]   # ОПФ
             ],
             outputs=None
         )
-        
+
         save_gigachat_pro_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: 
-                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, temperature),
+            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),
             inputs=[
                 personalized_output_text_gigachat_pro,
                 comment_gigachat_pro,
@@ -541,15 +511,14 @@ with gr.Blocks() as demo:
                 selections[2],  # Психотип
                 selections[3],  # Стадия бизнеса
                 selections[4],  # Отрасль
-                selections[5],  # ОПФ
-                gigachat_pro_temperature  # Передача температуры
+                selections[5]   # ОПФ
             ],
             outputs=None
         )
-        
+
         save_gigachat_lite_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: 
-                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, temperature),
+            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),
             inputs=[
                 personalized_output_text_gigachat_lite,
                 comment_gigachat_lite,
@@ -563,15 +532,14 @@ with gr.Blocks() as demo:
                 selections[2],  # Психотип
                 selections[3],  # Стадия бизнеса
                 selections[4],  # Отрасль
-                selections[5],  # ОПФ
-                gigachat_lite_temperature  # Передача температуры
+                selections[5]   # ОПФ
             ],
             outputs=None
         )
-        
+
         save_gigachat_plus_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: 
-                save_to_github(personalized_message, "GigaChat-Plus", 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: 
+                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),
             inputs=[
                 personalized_output_text_gigachat_plus,
                 comment_gigachat_plus,
@@ -585,13 +553,11 @@ with gr.Blocks() as demo:
                 selections[2],  # Психотип
                 selections[3],  # Стадия бизнеса
                 selections[4],  # Отрасль
-                selections[5],  # ОПФ
-                gigachat_plus_temperature  # Передача температуры
+                selections[5]   # ОПФ
             ],
             outputs=None
         )
 
-
     # Использование сохраненных переменных в следующем блоке
     with gr.Row():
         check_errors_btn = gr.Button("3. Проверить текст (нажимать только после кнопки 2) - экспериментальная фича, качество пока крайне низкое", elem_id="check_errors_button")