Back to normal app.py v1.4

app.py

@@ -5,45 +5,37 @@ from core.mbti_analyzer import analyze_mbti
 from core.interviewer import generate_question, session_state
 
 def analyze_and_ask(user_text, prev_count):
-    """Главная функция генерации (анализ → вопрос)."""
     if not user_text.strip():
         yield "⚠️ Please enter your answer.", "", prev_count
         return
 
     user_id = "default_user"
+
     try:
         n = int(prev_count.split("/")[0]) + 1
     except Exception:
         n = 1
-
     counter = f"{n}/8"
 
-    # 1️⃣ Шаг 1 — анализ
+    # 1️⃣ Сразу показываем “Thinking...”
+    yield "⏳ Analyzing personality...", "💭 Interviewer is thinking...", counter
+
+    # 2️⃣ Анализ MBTI
     mbti_gen = analyze_mbti(user_text)
     mbti_text = ""
     for chunk in mbti_gen:
         mbti_text = chunk
         yield mbti_text, "💭 Interviewer is thinking...", counter
 
-    # 2️⃣ Шаг 2 — генерация вопроса
-    q_gen = generate_question(user_id)
-    next_q = ""
-    cat = ""
-    for data in q_gen:
-        if isinstance(data, str):
-            next_q = data
-            yield mbti_text, next_q, counter
-        else:
-            cat, next_q = data
+    # 3️⃣ Генерация вопроса
+    question = generate_question(user_id)
 
-    # Если все категории пройдены — показываем финальный результат
-    if next_q.startswith("✅ All"):
-        session = session_state[user_id]
-        yield (
-            f"{mbti_text}\n\nSession completed.",
-            "🎯 All MBTI axes covered.",
-            "8/8"
-        )
+    if question.startswith("✅ All"):
+        yield f"{mbti_text}\n\nSession complete.", "🎯 All MBTI axes covered.", "8/8"
+        return
+
+    # 4️⃣ Финальный вывод
+    yield mbti_text, question, counter
 
 # --------------------------------------------------------------
 # Интерфейс Gradio
@@ -70,7 +62,8 @@ with gr.Blocks(theme=gr.themes.Soft(), title="MBTI Personality Interviewer") as
     btn.click(
         analyze_and_ask,
         inputs=[inp, progress],
-        outputs=[mbti_out, interviewer_out, progress]
+        outputs=[mbti_out, interviewer_out, progress],
+        show_progress=True
     )
 
     demo.load(

core/interviewer.py

@@ -18,7 +18,6 @@ llm_pipe = pipeline(
     top_p=0.9,
 )
 
-# Основные оси MBTI
 CATEGORIES = [
     "Introversion", "Extroversion",
     "Sensing", "Intuition",
@@ -26,20 +25,12 @@ CATEGORIES = [
     "Judging", "Perceiving"
 ]
 
-# Память по сессиям
 session_state = {}
 
 def init_session(user_id: str):
-    """Создаёт новую сессию."""
-    session_state[user_id] = {
-        "asked": [],
-        "answers": {},
-        "iteration": 1,
-        "dominant_axis": None
-    }
+    session_state[user_id] = {"asked": [], "answers": {}, "iteration": 1}
 
 def select_next_category(user_id: str):
-    """Выбирает категорию, не повторяя."""
     s = session_state[user_id]
     remaining = [c for c in CATEGORIES if c not in s["asked"]]
     if not remaining:
@@ -49,29 +40,24 @@ def select_next_category(user_id: str):
     return next_cat
 
 def build_prompt(category: str):
-    """Формирует промпт для TinyLlama."""
     return (
-        f"Ask one open-ended psychological question about {category}. "
-        f"Do not repeat previous questions. "
-        f"Output only the question text."
+        f"Ask one open-ended question about {category}. "
+        f"Do not repeat or rephrase previous questions. "
+        f"Output only the question itself."
     )
 
-def generate_question(user_id: str):
-    """Генератор вопроса по MBTI категории."""
+def generate_question(user_id: str) -> str:
+    """Возвращает только финальный вопрос."""
     if user_id not in session_state:
         init_session(user_id)
 
     category = select_next_category(user_id)
     if not category:
-        yield "✅ All 8 categories completed."
-        return None, None
+        return "✅ All 8 categories completed."
 
-    yield f"💭 Interviewer is thinking (category: {category})..."
     prompt = build_prompt(category)
     raw = llm_pipe(prompt)[0]["generated_text"]
-
-    # Очистка
     question = raw.strip().split("\n")[0]
     if "?" not in question:
         question += "?"
-    return category, question
+    return f"({category}) {question}"