Update app.py

app.py

@@ -69,7 +69,7 @@ for sheet_name, df in data.items():
         if sheet_name == "Пол Поколение Психотип":
             features[sheet_name] = df.set_index(['Пол', 'Поколение', 'Психотип'])['Инструкция'].to_dict()
         elif sheet_name == "Подход":
-            features[sheet_name] = df.set_index(['Пол', 'Поколение', 'Психотип'])['Подход'].to_dict()
+            features[sheet_name] = df  # Сохраняем как DataFrame
         else:
             features[sheet_name] = df.set_index(df.columns[0]).to_dict()[df.columns[1]]
     except Exception as e:
@@ -512,7 +512,7 @@ def notify_failed_checks(checks):
 #    return last_message
 
 
-def generate_message_mistral_with_retry(prompt, current_prefix, description, key_message):
+def generate_message_mistral_with_retry(prompt, approach_name, description, key_message):
     global approach_stats
     last_message = None
     for attempt in range(20):
@@ -521,7 +521,7 @@ def generate_message_mistral_with_retry(prompt, current_prefix, description, key
         if message is None:
             print("Не удалось получить сообщение от Mistral, повторная попытка...")
             time.sleep(1)
-            continue  # Retry
+            continue
         message = replace_k_with_thousands(message)
         message = correct_dash_usage(message)
         message_length = len(message)
@@ -531,10 +531,13 @@ def generate_message_mistral_with_retry(prompt, current_prefix, description, key
             continue
         checks = perform_checks(message, description, key_message)
         last_message = message
-        approach_stats[current_prefix]["total_attempts"] += 1
+        # Инициализируем статистику для подхода, если ее нет
+        if approach_name not in approach_stats:
+            approach_stats[approach_name] = {"failed_checks": defaultdict(int), "total_attempts": 0}
+        approach_stats[approach_name]["total_attempts"] += 1
         for check_name, passed in checks.items():
             if passed is False:
-                approach_stats[current_prefix]["failed_checks"][check_name] += 1
+                approach_stats[approach_name]["failed_checks"][check_name] += 1
                 break
         notify_failed_checks(checks)
         if all(checks.values()):
@@ -660,7 +663,7 @@ def generate_all_messages(desc, benefits, key_message, gender, generation, psych
     standard_prompt = generate_standard_prompt(desc, benefits, key_message)
     yield standard_prompt, None, None, None
 
-    # Map approach names to prefixes and suffixes
+    # Сопоставление названий подходов с префиксами и суффиксами
     approach_mapping = {
         "Указание на пользу": (
             "Начни сообщение с указания на пользу продукта. Используй глагол в побудительном наклонении.",
@@ -676,26 +679,48 @@ def generate_all_messages(desc, benefits, key_message, gender, generation, psych
         )
     }
 
-    # Get the approaches from the "Подход" sheet
-    approaches_sheet = features.get("Подход", {})
-    key = (gender, generation, psychotype)
+    # Получаем DataFrame подходов
+    approaches_df = features.get("Подход", None)
+
+    if approaches_df is None:
+        gr.Warning("Таблица 'Подход' не найдена.")
+        return
 
-    if not gender or not generation or not psychotype:
-        gr.Warning("Необходимо выбрать Пол, Поколение и Психотип для определения подхода.")
+    # Создаем фильтры на основе выбранных параметров
+    filters = []
+    if gender:
+        filters.append(approaches_df['Пол'] == gender)
+    if generation:
+        filters.append(approaches_df['Поколение'] == generation)
+    if psychotype:
+        filters.append(approaches_df['Психотип'] == psychotype)
+
+    if not filters:
+        gr.Warning("Необходимо выбрать хотя бы один параметр для определения подхода.")
         return
 
-    approach_list_str = approaches_sheet.get(key, "")
-    if not approach_list_str:
+    # Применяем комбинированный фильтр
+    combined_filter = filters[0]
+    for f in filters[1:]:
+        combined_filter &= f
+
+    matching_rows = approaches_df[combined_filter]
+
+    if matching_rows.empty:
         gr.Warning("Подход не найден для выбранных параметров.")
         return
 
-    approach_list = [a.strip() for a in approach_list_str.split(",")]
+    # Извлекаем уникальные подходы из отфильтрованных строк
+    approach_set = set()
+    for approaches in matching_rows['Подход']:
+        approach_names = [a.strip() for a in approaches.split(',')]
+        approach_set.update(approach_names)
 
-    # Now generate messages for the specified approaches
+    # Генерируем сообщения для каждого подхода
     non_personalized_messages = ''
     personalized_messages = ''
     flag = 1
-    for approach_name in approach_list:
+    for approach_name in approach_set:
         if approach_name not in approach_mapping:
             gr.Warning(f"Неизвестный подход: {approach_name}")
             continue
@@ -709,7 +734,7 @@ def generate_all_messages(desc, benefits, key_message, gender, generation, psych
             yield standard_prompt, display_personalization_prompt, None, None
             flag += 1
         prompt = add_prefix_suffix(standard_prompt, current_prefix, current_suffix)
-        non_personalized_message = generate_message_mistral_with_retry(prompt, current_prefix, desc, key_message)
+        non_personalized_message = generate_message_mistral_with_retry(prompt, approach_name, desc, key_message)
         non_personalized_length = len(non_personalized_message)
         non_personalized_display = f"{non_personalized_message}\n------\nКоличество знаков: {non_personalized_length}"
         if non_personalized_messages:
@@ -721,7 +746,7 @@ def generate_all_messages(desc, benefits, key_message, gender, generation, psych
             non_personalized_messages, personalized_messages
         )
         full_personalized_prompt = f"{personalization_prompt}\n\nТекст для адаптации: {non_personalized_message}"
-        personalized_message = generate_message_mistral_with_retry(full_personalized_prompt, current_prefix, desc, key_message)
+        personalized_message = generate_message_mistral_with_retry(full_personalized_prompt, approach_name, desc, key_message)
         personalized_length = len(personalized_message)
         personalized_display = f"{personalized_message}\n------\nКоличество знаков: {personalized_length}"
         if personalized_messages: