Update prompt_builder.py

prompt_builder.py

@@ -47,7 +47,6 @@ 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:
     
     # Get config when needed
@@ -62,9 +61,10 @@ def build_intent_prompt(general_prompt: str,
     intent_names = [it.name for it in intents]
     intent_captions = [it.caption or it.name for it in intents]
     
-    # Get project language name from locale
-    locale_info = LocaleManager.get_locale(project_locale)
-    project_language = locale_info.get("name", "Turkish")
+    # Get locale info
+    from locale_manager import LocaleManager
+    locale_data = LocaleManager.get_locale(project_locale)
+    project_language = locale_data.get("name", "Turkish") if locale_data else "Turkish"
     
     # Replace placeholders in internal prompt
     if internal_prompt:
@@ -82,16 +82,14 @@ def build_intent_prompt(general_prompt: str,
     # === INTENT INDEX ===
     lines = ["### INTENT INDEX ###"]
     for it in intents:
-        # Get examples for project locale
-        locale_examples = it.get_examples_for_locale(project_locale)
-        
+        # IntentConfig object attribute access
         det = it.detection_prompt.strip() if it.detection_prompt else ""
         det_part = f'  • detection_prompt → "{det}"' if det else ""
         
-        ex_part = ""
-        if locale_examples:
-            exs = " | ".join(locale_examples)
-            ex_part = f"  • examples → {exs}"
+        # Get examples for project locale
+        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}")
@@ -124,15 +122,18 @@ def build_parameter_prompt(intent_cfg,
                            missing_params: List[str],
                            user_input: str,
                            conversation: List[Dict[str, str]],
-                           locale_code: str = None,
-                           project_locale: str = "tr") -> str:
+                           locale_code: str = None) -> str:
+    
     # Use project locale if not specified
     if not locale_code:
-        locale_code = project_locale
-
-    date_ctx = _get_date_context(locale_code)
+        locale_code = "tr"  # Default
+    
+    # Get locale info
+    from locale_manager import LocaleManager
     locale_data = LocaleManager.get_locale(locale_code)
     
+    date_ctx = _get_date_context()
+    
     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']}.",
@@ -149,12 +150,12 @@ def build_parameter_prompt(intent_cfg,
         ""
     ]
     
-    # Add parameter descriptions with localized captions
+    # 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, project_locale)
+            # Get caption for locale
+            caption = p.get_caption_for_locale(locale_code)
             
             # Special handling for date type parameters
             if p.type == "date":
@@ -163,25 +164,27 @@ def build_parameter_prompt(intent_cfg,
                 )
                 parts.append(date_prompt)
             else:
-                extraction = p.extraction_prompt or f"Extract {p.name}"
-                parts.append(f"• {p.name} ({caption}): {extraction}")
+                parts.append(f"• {p.name}: {p.extraction_prompt}")
+                parts.append(f"  Caption: {caption}")
     
-    # Add format instruction
+    # Rest of the function remains the same...
     parts.append("")
     parts.append("IMPORTANT: Your response must start with '#PARAMETERS:' followed by the JSON.")
-    parts.append(f"Format: {_FMT}")
-    parts.append("No other text before or after.")
+    parts.append("Return ONLY this format with no extra text before or after:")
+    parts.append(_FMT)
     
-    # Add conversation history
-    parts.append("")
-    parts.append("Recent conversation:")
-    for msg in conversation[-5:]:
-        parts.append(f"{msg['role'].upper()}: {msg['content']}")
+    history_block = "\n".join(
+        f"{m['role'].upper()}: {m['content']}" for m in conversation[-10:]
+    )
     
-    # Add current input
-    parts.append(f"USER: {user_input}")
+    prompt = (
+        "\n".join(parts) + 
+        "\n\nConversation so far:\n" + history_block +
+        "\n\nUSER: " + user_input.strip()
+    )
     
-    return "\n".join(parts)
+    log(f"📝 Parameter prompt built for missing: {missing_params}")
+    return prompt
 
 def _build_locale_aware_date_prompt(param, date_ctx: Dict, locale_data: Dict, locale_code: str) -> str:
     """Build date extraction prompt with locale awareness"""
@@ -210,67 +213,66 @@ def _build_locale_aware_date_prompt(param, date_ctx: Dict, locale_data: Dict, lo
 # SMART PARAMETER QUESTION
 # ─────────────────────────────────────────────────────────────────────────────
 def build_smart_parameter_question_prompt(
+    collection_config,
     intent_config,
     missing_params: List[str],
-    collected_params: Dict[str, str],
-    conversation: List[Dict[str, str]],
-    project_locale: str = "tr",
-    unanswered_params: List[str] = None
+    session,
+    project_language: str = "Turkish",
+    locale_code: str = None
 ) -> str:
     """Build prompt for smart parameter collection"""
     
-    cfg = ConfigProvider.get()
-    
     # Get parameter collection config from LLM provider settings
-    collection_config = {}
+    cfg = ConfigProvider.get()
     if cfg.global_config.llm_provider and cfg.global_config.llm_provider.settings:
-        collection_config = cfg.global_config.llm_provider.settings.get("parameter_collection_config", {})
+        collection_config = cfg.global_config.llm_provider.settings.get("parameter_collection_config", collection_config)
     
-    # Get collection prompt template
-    collection_prompt = collection_config.get("collection_prompt", """
-You are a helpful assistant collecting information from the user.
-
-Intent: {{intent_name}} - {{intent_caption}}
-Still needed: {{missing_params}}
-
-Ask for the missing parameters in a natural, conversational way in {{project_language}}.
-Generate ONLY the question, nothing else.
-""")
+    # Use locale if specified
+    if not locale_code:
+        locale_code = "tr"
     
     # Get locale info
-    locale_info = LocaleManager.get_locale(project_locale)
-    project_language = locale_info.get("name", "Turkish")
-    
-    # Build missing params description with localized captions
-    missing_param_descriptions = []
+    from locale_manager import LocaleManager
+    locale_data = LocaleManager.get_locale(locale_code)
+    if locale_data:
+        project_language = locale_data.get("name", project_language)
+    
+    # Rest of the function implementation...
+    template = collection_config.get("collection_prompt", "")
+    
+    # Format conversation history
+    conversation_history = _format_conversation_history(session.chat_history)
+    
+    # Format collected parameters with locale-aware captions
+    collected_params = ""
+    if session.variables:
+        params_list = []
+        for param_name, value in session.variables.items():
+            param = next((p for p in intent_config.parameters if p.name == param_name), None)
+            if param:
+                caption = param.get_caption_for_locale(locale_code)
+                params_list.append(f"- {caption}: {value}")
+        collected_params = "\n".join(params_list)
+    
+    # Format missing parameters with locale-aware captions
+    missing_params_list = []
     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)
-            missing_param_descriptions.append(f"{param_name} ({caption})")
+            caption = param.get_caption_for_locale(locale_code)
+            missing_params_list.append(f"- {caption} ({param.name})")
+    missing_params_str = "\n".join(missing_params_list)
     
-    # Build collected params description
-    collected_descriptions = []
-    for param_name, value in collected_params.items():
-        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)
-            collected_descriptions.append(f"{param_name} ({caption}): {value}")
-    
-    # Build conversation history
-    conv_history = "\n".join([f"{msg['role']}: {msg['content']}" for msg in conversation[-5:]])
-    
-    # Replace placeholders
-    prompt = collection_prompt
-    prompt = prompt.replace("{{conversation_history}}", conv_history)
+    # Rest of template replacement...
+    prompt = template.replace("{{conversation_history}}", conversation_history)
     prompt = prompt.replace("{{intent_name}}", intent_config.name)
-    prompt = prompt.replace("{{intent_caption}}", intent_config.caption or intent_config.name)
-    prompt = prompt.replace("{{collected_params}}", "\n".join(collected_descriptions) if collected_descriptions else "None")
-    prompt = prompt.replace("{{missing_params}}", ", ".join(missing_param_descriptions))
-    prompt = prompt.replace("{{unanswered_params}}", ", ".join(unanswered_params) if unanswered_params else "None")
+    prompt = prompt.replace("{{intent_caption}}", intent_config.caption)
+    prompt = prompt.replace("{{collected_params}}", collected_params)
+    prompt = prompt.replace("{{missing_params}}", missing_params_str)
     prompt = prompt.replace("{{max_params}}", str(collection_config.get("max_params_per_question", 2)))
     prompt = prompt.replace("{{project_language}}", project_language)
     
+    log(f"📝 Smart parameter question prompt built for {len(missing_params)} params in {locale_code}")
     return prompt
 
 # ─────────────────────────────────────────────────────────────────────────────