Update prompt_builder.py

prompt_builder.py

@@ -91,12 +91,10 @@ def _build_locale_aware_date_prompt(param, date_ctx: Dict, locale_data: Dict, lo
 # ─────────────────────────────────────────────────────────────────────────────
 # INTENT PROMPT
 # ─────────────────────────────────────────────────────────────────────────────
-def build_intent_prompt(general_prompt: str,
-                        conversation: List[Dict[str, str]],
-                        user_input: str,
-                        intents: List,
-                        project_name: str = None,
-                        project_locale: str = "tr") -> str:
+def build_intent_prompt(version: Any,  # VersionConfig
+                       conversation: List[Dict[str, str]], 
+                       project_locale: str) -> str:
+    """Build intent detection prompt with enhanced detection prompts and examples"""
     
     # Get config
     cfg = ConfigProvider.get()
@@ -107,12 +105,13 @@ def build_intent_prompt(general_prompt: str,
         internal_prompt = cfg.global_config.llm_provider.settings.get("internal_prompt", "")
     
     # Extract intent names and captions
-    intent_names = [it.name for it in intents]
-    intent_captions = [it.caption or it.name for it in intents]
+    intent_names = [it.name for it in version.intents]
+    intent_captions = [str(it.caption) if it.caption else it.name for it in version.intents]
     
     # Get project language name
     locale_data = LocaleManager.get_locale(project_locale)
     project_language = locale_data.get("name", "Turkish")
+    current_language_name = project_language
     
     # Replace placeholders in internal prompt
     if internal_prompt:
@@ -126,21 +125,28 @@ def build_intent_prompt(general_prompt: str,
         
         # Project language
         internal_prompt = internal_prompt.replace("<project language>", project_language)
+        internal_prompt = internal_prompt.replace("{{current_language_name}}", current_language_name)
+        internal_prompt = internal_prompt.replace("{{project_language}}", project_language)
 
-    # === INTENT INDEX ===
-    lines = ["### INTENT INDEX ###"]
-    for it in intents:
-        # IntentConfig object attribute access
-        det = it.detection_prompt.strip() if it.detection_prompt else ""
-        det_part = f'  • detection_prompt → "{det}"' if det else ""
+    # === ENHANCED INTENT INDEX WITH DETECTION PROMPTS AND EXAMPLES ===
+    lines = ["### INTENT DETECTION RULES ###"]
+    for it in version.intents:
+        lines.append(f"\n{it.name}:")
         
-        # Get examples for project locale
+        # Add detection prompt
+        if it.detection_prompt:
+            lines.append(f"  Detection Rule: {it.detection_prompt}")
+        
+        # Add examples to enhance detection
         examples = it.get_examples_for_locale(project_locale)
-        exs = " | ".join(examples) if examples else ""
-        ex_part = f"  • examples → {exs}" if exs else ""
-
-        newline_between = "\n" if det_part and ex_part else ""
-        lines.append(f"{it.name}:{det_part}{newline_between}{ex_part}")
+        if examples:
+            # Combine detection prompt with examples
+            examples_str = " | ".join([f'"{ex}"' for ex in examples[:5]])  # Max 5 examples
+            lines.append(f"  Examples that match this intent: {examples_str}")
+        
+        # If we have both detection prompt and examples, make it clear
+        if it.detection_prompt and examples:
+            lines.append(f"  → This intent should be detected when user says something similar to the examples above AND matches the detection rule.")
 
     intent_index = "\n".join(lines)
 
@@ -150,7 +156,10 @@ def build_intent_prompt(general_prompt: str,
     )
 
     # Combine prompts
-    combined_prompt = internal_prompt + "\n\n" + general_prompt if internal_prompt else general_prompt
+    combined_prompt = internal_prompt + "\n\n" + version.general_prompt if internal_prompt else version.general_prompt
+
+    # Get last user message
+    user_input = conversation[-1]['content'] if conversation else ""
 
     prompt = (
         f"{combined_prompt}\n\n"
@@ -158,7 +167,8 @@ def build_intent_prompt(general_prompt: str,
         f"Conversation so far:\n{history_block}\n\n"
         f"USER: {user_input.strip()}"
     )
-    log("✅ Intent prompt built (with internal prompt and locale support)")
+    
+    log("✅ Intent prompt built with enhanced detection prompts and examples")
     return prompt
 
 # ─────────────────────────────────────────────────────────────────────────────
@@ -166,65 +176,73 @@ def build_intent_prompt(general_prompt: str,
 # ─────────��───────────────────────────────────────────────────────────────────
 _FMT = """#PARAMETERS:{"extracted":[{"name":"<param>","value":"<val>"},...],"missing":["<param>",...]}"""
 
-def build_parameter_prompt(intent_cfg,
-                           missing_params: List[str],
-                           user_input: str,
-                           conversation: List[Dict[str, str]],
-                           locale_code: str = "tr") -> str:
-    
-    date_ctx = _get_date_context(locale_code)
-    locale_data = LocaleManager.get_locale(locale_code)
-    
-    parts: List[str] = [
-        f"You are extracting parameters from user messages in {locale_data.get('name', 'the target language')}.",
-        f"Today is {date_ctx['today']} ({date_ctx['today_weekday']}). Tomorrow is {date_ctx['tomorrow']}.",
-        "Extract ONLY the parameters listed below from the conversation.",
-        "Look at BOTH the current message AND previous messages to find parameter values.",
-        "If a parameter cannot be found, is invalid, or wasn't provided, keep it in the \"missing\" list.",
-        "Never guess or make up values. Only extract values explicitly given by the user.",
-        "",
-        "IMPORTANT: If the user is NOT providing the requested parameter but instead:",
-        "- Asking for recommendations or advice (e.g. 'nereye gitsem?', 'önerin var mı?')",
-        "- Expressing uncertainty (e.g. 'tam net değil', 'emin değilim', 'bilmiyorum')",
-        "- Changing the subject or asking something else",
-        "Then DO NOT extract any value for that parameter. Keep it in the 'missing' list.",
-        ""
-    ]
-    
-    # Add parameter descriptions
-    parts.append("Parameters to extract:")
-    for p in intent_cfg.parameters:
-        if p.name in missing_params:
-            # Get localized caption
-            caption = p.get_caption_for_locale(locale_code)
-            
-            # Special handling for date type parameters
-            if p.type == "date":
-                date_prompt = _build_locale_aware_date_prompt(
-                    p, date_ctx, locale_data, locale_code
-                )
-                parts.append(date_prompt)
-            else:
-                parts.append(f"• {p.name}: {p.extraction_prompt} (Display: {caption})")
+def build_parameter_prompt(
+    version: Any,  # VersionConfig
+    intent_config: Any,  # IntentConfig
+    chat_history: List[Dict[str, str]],
+    collected_params: Dict[str, Any],
+    missing_params: List[str],
+    params_to_ask: List[str],
+    max_params: int,
+    project_locale: str,
+    unanswered_params: List[str] = None
+) -> str:
+    """Build parameter collection prompt with approval support"""
+    
+    # Check if we're asking for approval parameter
+    is_approval_question = len(params_to_ask) == 1 and params_to_ask[0] == "is_approved"
+    
+    if is_approval_question:
+        # For approval, use special format without LLM collection prompt
+        # This will be handled in chat_handler with custom approval_question
+        return ""  # Return empty, chat_handler will use custom question
+    
+    # Normal parameter collection
+    cfg = ConfigProvider.get()
+    collection_config = cfg.global_config.llm_provider.settings.get("parameter_collection_config", {})
+    collection_prompt = collection_config.get("collection_prompt", "")
+    
+    if not collection_prompt:
+        # Fallback prompt
+        collection_prompt = "Ask for the missing parameters naturally."
+    
+    # Build conversation history string
+    history_str = "\n".join([
+        f"{msg['role'].upper()}: {msg['content']}" 
+        for msg in chat_history[-5:]  # Last 5 messages
+    ])
+    
+    # Build collected params string
+    collected_str = "\n".join([
+        f"- {k}: {v}" for k, v in collected_params.items()
+    ])
+    
+    # Build missing params string with captions
+    missing_str = []
+    for param_name in missing_params:
+        param = next((p for p in intent_config.parameters if p.name == param_name), None)
+        if param:
+            caption = param.get_caption_for_locale(project_locale) if hasattr(param, 'get_caption_for_locale') else param_name
+            missing_str.append(f"- {param_name} ({caption})")
+        else:
+            missing_str.append(f"- {param_name}")
+    missing_str = "\n".join(missing_str)
     
-    # Add format instruction
-    parts.append("")
-    parts.append("IMPORTANT: Your response must start with '#PARAMETERS:' followed by the JSON.")
-    parts.append("Return ONLY this format with no extra text before or after:")
-    parts.append(_FMT)
+    # Build unanswered params string
+    unanswered_str = "\n".join([f"- {p}" for p in (unanswered_params or [])])
     
-    # Add conversation history
-    history_block = "\n".join(
-        f"{m['role'].upper()}: {m['content']}" for m in conversation[-10:]
-    )
-    
-    prompt = (
-        "\n".join(parts) + 
-        "\n\nConversation so far:\n" + history_block +
-        "\n\nUSER: " + user_input.strip()
-    )
+    # Replace placeholders
+    prompt = collection_prompt
+    prompt = prompt.replace("{{conversation_history}}", history_str)
+    prompt = prompt.replace("{{intent_name}}", intent_config.name)
+    prompt = prompt.replace("{{intent_caption}}", str(intent_config.caption))
+    prompt = prompt.replace("{{collected_params}}", collected_str)
+    prompt = prompt.replace("{{missing_params}}", missing_str)
+    prompt = prompt.replace("{{unanswered_params}}", unanswered_str)
+    prompt = prompt.replace("{{max_params}}", str(max_params))
+    prompt = prompt.replace("{{project_language}}", project_locale)
+    prompt = prompt.replace("{{current_language_name}}", project_locale)  # For compatibility
     
-    log(f"📝 Parameter prompt built for missing: {missing_params} in locale: {locale_code}")
     return prompt
 
 # ─────────────────────────────────────────────────────────────────────────────