Update prompt_builder.py

prompt_builder.py

@@ -1,7 +1,8 @@
 """
-Flare – Prompt Builder  (v2, değişmedi)
-=======================================
+Flare – Prompt Builder  (v4 · detection_prompt destekli)
+========================================================
 • build_intent_prompt
+    – Genel kurallar + INTENT INDEX (detection_prompt + examples)
 • build_parameter_prompt
 """
 
@@ -9,56 +10,113 @@ from typing import List, Dict
 from datetime import datetime
 
 
+# ─────────────────────────────────────────────────────────────────────────────
+# Küçük, zaman damgalı log
+# ─────────────────────────────────────────────────────────────────────────────
 def log(msg: str) -> None:
     print(f"[{datetime.now().strftime('%H:%M:%S')}] {msg}", flush=True)
 
 
-# ---------------------------------------------------------------------------
+# ─────────────────────────────────────────────────────────────────────────────
 # INTENT DETECTION PROMPT
-# ---------------------------------------------------------------------------
+# ─────────────────────────────────────────────────────────────────────────────
 def build_intent_prompt(general_prompt: str,
                         conversation: List[Dict[str, str]],
-                        user_input: str) -> str:
-    history = "\n".join(
+                        user_input: str,
+                        intents: List[Dict]) -> str:
+    """
+    Creates the system prompt for Spark /generate.
+
+    Parameters
+    ----------
+    general_prompt : str
+        The project-level general system prompt.
+    conversation : List[Dict[str,str]]
+        Last chat turns (role/user etc.).
+    user_input : str
+        Current user message.
+    intents : List[Dict]
+        The intents list from service_config (“intents” section).
+
+    Returns
+    -------
+    str
+        System prompt passed to Spark LLM.
+    """
+    # === 1) INTENT INDEX with detection_prompt ===
+    lines = ["### INTENT INDEX ###"]
+    for it in intents:
+        det = it.get("detection_prompt", "").strip()
+        det_part = f"  • detection_prompt → “{det}”" if det else ""
+        exs = " | ".join(it.get("examples", []))
+        ex_part = f"  • examples → {exs}" if exs else ""
+        lines.append(f"{it['name']}:{det_part}{'\\n' if det_part and ex_part else ''}{ex_part}")
+    intent_index = "\n".join(lines)
+
+    # === 2) HISTORY (last 10 messages) ===
+    history_block = "\n".join(
         f"{m['role'].upper()}: {m['content']}" for m in conversation[-10:]
     )
+
+    # === 3) Compose prompt ===
     prompt = (
         f"{general_prompt}\n\n"
-        f"Conversation so far:\n{history}\n\n"
+        f"{intent_index}\n\n"
+        f"Conversation so far:\n{history_block}\n\n"
         f"USER: {user_input.strip()}"
     )
-    log("✅ Intent prompt built")
+    log("✅ Intent prompt built (index with detection_prompt)")
     return prompt
 
 
-# ---------------------------------------------------------------------------
-# PARAMETER EXTRACTION PROMPT
-# ---------------------------------------------------------------------------
-_FMT = ("Return exactly ONE line in the format:\n"
-        "#PARAMETERS:{\"extracted\":[{\"name\":\"<param>\",\"value\":\"<val>\"},...],"
-        "\"missing\":[\"<param>\",...]}")
+# ─────────────────────────────────────────────────────────────────────────────
+# PARAMETER EXTRACTION PROMPT (değişmedi)
+# ─────────────────────────────────────────────────────────────────────────────
+_FMT = (
+    "Return exactly ONE line in the format:\n"
+    "#PARAMETERS:{"
+    "\"extracted\":[{\"name\":\"<param>\",\"value\":\"<val>\"},...],"
+    "\"missing\":[\"<param>\",...]}"
+)
 
 def build_parameter_prompt(intent_cfg: Dict,
                            missing_params: List[str],
                            user_input: str,
                            conversation: List[Dict[str, str]]) -> str:
-    lines = [
+    """
+    Builds the parameter-extraction prompt for Spark.
+
+    Parameters
+    ----------
+    intent_cfg : Dict
+        Single intent config dictionary.
+    missing_params : List[str]
+        Names of parameters still required.
+    user_input : str
+        Current user message.
+    conversation : List[Dict]
+        Chat history.
+    """
+    parts: List[str] = [
         "You will extract ONLY the parameters listed below.",
         "If a parameter cannot be found OR fails validation, keep it in the "
         "\"missing\" list. Never guess values."
     ]
+
+    # Parametre bazlı extraction_prompt’lar
     for p in intent_cfg["parameters"]:
         if p["name"] in missing_params:
-            lines.append(f"* {p['name']}: {p['extraction_prompt']}")
-    lines.append(_FMT)
+            parts.append(f"* {p['name']}: {p['extraction_prompt']}")
+
+    parts.append(_FMT)
 
-    history = "\n".join(
+    history_block = "\n".join(
         f"{m['role'].upper()}: {m['content']}" for m in conversation[-10:]
     )
 
     prompt = (
-        "\n".join(lines) +
-        "\n\nConversation so far:\n" + history +
+        "\n".join(parts) +
+        "\n\nConversation so far:\n" + history_block +
         "\n\nUSER: " + user_input.strip()
     )
     log("✅ Parameter prompt built")