Update prompt_builder.py

prompt_builder.py

@@ -1,45 +1,93 @@
 """
-Flare – Prompt Builder
+Flare – Prompt Builder (Refactored with Multi-language Support)
+==============================================================
 """
 
-from typing import Dict, List, Optional
-from datetime import datetime
-import json
-import re
-
+from typing import List, Dict, Any
+from datetime import datetime, timedelta
 from config_provider import ConfigProvider
-from locale_manager import LocaleManager
 from utils import log
+from locale_manager import LocaleManager
 
-# ─────────────────────────────────────────────────────────────────────────────
-# DATE CONTEXT
-# ─────────────────────────────────────────────────────────────────────────────
+# Date helper for locale-aware date expressions
 def _get_date_context(locale_code: str = "tr") -> Dict[str, str]:
-    """Get today/tomorrow dates with weekday names in target locale"""
-    from datetime import timedelta
-    
-    today = datetime.now()
-    tomorrow = today + timedelta(days=1)
+    """Generate date context for date expressions"""
+    now = datetime.now()
     
+    # Get locale data
     locale_data = LocaleManager.get_locale(locale_code)
-    weekday_names = locale_data.get("weekdays", {
-        "0": "Monday", "1": "Tuesday", "2": "Wednesday", "3": "Thursday",
-        "4": "Friday", "5": "Saturday", "6": "Sunday"
-    })
+    weekdays = locale_data.get("weekdays", ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"])
     
-    # Get localized date format
-    date_format = locale_data.get("date_format", "%Y-%m-%d")
+    today_weekday = weekdays[now.weekday()]
     
+    # Calculate various dates
     dates = {
-        "today": today.strftime(date_format),
-        "tomorrow": tomorrow.strftime(date_format),
-        "today_weekday": weekday_names.get(str(today.weekday()), ""),
-        "tomorrow_weekday": weekday_names.get(str(tomorrow.weekday()), ""),
+        "today": now.strftime("%Y-%m-%d"),
+        "tomorrow": (now + timedelta(days=1)).strftime("%Y-%m-%d"),
+        "day_after_tomorrow": (now + timedelta(days=2)).strftime("%Y-%m-%d"),
+        "this_weekend_saturday": (now + timedelta(days=(5-now.weekday())%7)).strftime("%Y-%m-%d"),
+        "this_weekend_sunday": (now + timedelta(days=(6-now.weekday())%7)).strftime("%Y-%m-%d"),
+        "next_week_same_day": (now + timedelta(days=7)).strftime("%Y-%m-%d"),
+        "two_weeks_later": (now + timedelta(days=14)).strftime("%Y-%m-%d"),
+        "today_weekday": today_weekday,
+        "today_day": now.day,
+        "today_month": now.month,
+        "today_year": now.year,
         "locale_code": locale_code
     }
     
     return dates
 
+def _build_locale_aware_date_prompt(param, date_ctx: Dict, locale_data: Dict, locale_code: str) -> str:
+    """Build locale-aware date extraction prompt"""
+    
+    # Get locale-specific date patterns
+    date_patterns = locale_data.get("date_patterns", {})
+    months = locale_data.get("months", [])
+    
+    prompt_parts = [f"• {param.name}: {param.extraction_prompt}"]
+    prompt_parts.append(f"  IMPORTANT DATE RULES for {locale_data.get('name', 'this language')}:")
+    
+    # Add locale-specific patterns
+    if locale_code == "tr":
+        prompt_parts.extend([
+            f"  - 'bugün' = {date_ctx['today']}",
+            f"  - 'yarın' = {date_ctx['tomorrow']}",
+            f"  - 'öbür gün' = {date_ctx['day_after_tomorrow']}",
+            f"  - 'bu hafta sonu' = {date_ctx['this_weekend_saturday']} or {date_ctx['this_weekend_sunday']}",
+            f"  - 'bu cumartesi' = {date_ctx['this_weekend_saturday']}",
+            f"  - 'bu pazar' = {date_ctx['this_weekend_sunday']}",
+            f"  - 'haftaya' or 'gelecek hafta' = add 7 days to current date",
+            f"  - 'haftaya bugün' = {date_ctx['next_week_same_day']}",
+            f"  - 'iki hafta sonra' = {date_ctx['two_weeks_later']}",
+            f"  - '15 gün sonra' = add 15 days to today",
+            f"  - '10 Temmuz' = {date_ctx['today_year']}-07-10",
+            f"  - Turkish months: Ocak=01, Şubat=02, Mart=03, Nisan=04, Mayıs=05, Haziran=06, "
+            f"Temmuz=07, Ağustos=08, Eylül=09, Ekim=10, Kasım=11, Aralık=12"
+        ])
+    elif locale_code == "en":
+        prompt_parts.extend([
+            f"  - 'today' = {date_ctx['today']}",
+            f"  - 'tomorrow' = {date_ctx['tomorrow']}",
+            f"  - 'day after tomorrow' = {date_ctx['day_after_tomorrow']}",
+            f"  - 'this weekend' = {date_ctx['this_weekend_saturday']} or {date_ctx['this_weekend_sunday']}",
+            f"  - 'this Saturday' = {date_ctx['this_weekend_saturday']}",
+            f"  - 'this Sunday' = {date_ctx['this_weekend_sunday']}",
+            f"  - 'next week' = add 7 days to current date",
+            f"  - 'next {date_ctx['today_weekday']}' = {date_ctx['next_week_same_day']}",
+            f"  - 'in two weeks' = {date_ctx['two_weeks_later']}",
+            f"  - 'July 10' or '10th of July' = {date_ctx['today_year']}-07-10",
+            f"  - English months: January=01, February=02, March=03, April=04, May=05, June=06, "
+            f"July=07, August=08, September=09, October=10, November=11, December=12"
+        ])
+    
+    # Add month mappings if available
+    if months:
+        month_mapping = [f"{month}={i+1:02d}" for i, month in enumerate(months)]
+        prompt_parts.append(f"  - Month names: {', '.join(month_mapping)}")
+    
+    return "\n".join(prompt_parts)
+
 # ─────────────────────────────────────────────────────────────────────────────
 # INTENT PROMPT
 # ─────────────────────────────────────────────────────────────────────────────
@@ -47,9 +95,10 @@ 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
+    # Get config
     cfg = ConfigProvider.get()
     
     # Get internal prompt from LLM provider settings
@@ -61,10 +110,9 @@ 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 locale info
-    from locale_manager import LocaleManager
+    # Get project language name
     locale_data = LocaleManager.get_locale(project_locale)
-    project_language = locale_data.get("name", "Turkish") if locale_data else "Turkish"
+    project_language = locale_data.get("name", "Turkish")
     
     # Replace placeholders in internal prompt
     if internal_prompt:
@@ -110,7 +158,7 @@ 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)")
+    log("✅ Intent prompt built (with internal prompt and locale support)")
     return prompt
 
 # ─────────────────────────────────────────────────────────────────────────────
@@ -122,18 +170,11 @@ def build_parameter_prompt(intent_cfg,
                            missing_params: List[str],
                            user_input: str,
                            conversation: List[Dict[str, str]],
-                           locale_code: str = None) -> str:
+                           locale_code: str = "tr") -> str:
     
-    # Use project locale if not specified
-    if not locale_code:
-        locale_code = "tr"  # Default
-    
-    # Get locale info
-    from locale_manager import LocaleManager
+    date_ctx = _get_date_context(locale_code)
     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']}.",
@@ -154,7 +195,7 @@ def build_parameter_prompt(intent_cfg,
     parts.append("Parameters to extract:")
     for p in intent_cfg.parameters:
         if p.name in missing_params:
-            # Get caption for locale
+            # Get localized caption
             caption = p.get_caption_for_locale(locale_code)
             
             # Special handling for date type parameters
@@ -164,15 +205,15 @@ def build_parameter_prompt(intent_cfg,
                 )
                 parts.append(date_prompt)
             else:
-                parts.append(f"• {p.name}: {p.extraction_prompt}")
-                parts.append(f"  Caption: {caption}")
+                parts.append(f"• {p.name}: {p.extraction_prompt} (Display: {caption})")
     
-    # Rest of the function remains the same...
+    # 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)
     
+    # Add conversation history
     history_block = "\n".join(
         f"{m['role'].upper()}: {m['content']}" for m in conversation[-10:]
     )
@@ -183,134 +224,113 @@ def build_parameter_prompt(intent_cfg,
         "\n\nUSER: " + user_input.strip()
     )
     
-    log(f"📝 Parameter prompt built for missing: {missing_params}")
+    log(f"📝 Parameter prompt built for missing: {missing_params} in locale: {locale_code}")
     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"""
-    caption = param.get_caption_for_locale(locale_code)
+# ─────────────────────────────────────────────────────────────────────────────
+# SMART PARAMETER COLLECTION PROMPT
+# ─────────────────────────────────────────────────────────────────────────────
+def build_smart_parameter_question_prompt(intent_cfg,
+                                        missing_params: List[str],
+                                        conversation: List[Dict[str, str]],
+                                        collection_config: Dict[str, Any],
+                                        project_language: str) -> str:
+    """Build prompt for smart parameter collection"""
+    
+    # Get the collection prompt template
+    template = collection_config.get("collection_prompt", "Ask for the missing parameters.")
     
-    # Get locale-specific date info
-    month_names = locale_data.get("months", {})
-    relative_dates = locale_data.get("relative_dates", {
-        "today": "today", "tomorrow": "tomorrow", 
-        "yesterday": "yesterday", "this_week": "this week"
-    })
+    # Replace placeholders
+    prompt = template.replace("{{max_params}}", str(collection_config.get("max_params_per_question", 2)))
+    prompt = prompt.replace("{{project_language}}", project_language)
     
+    # Add parameter information
+    param_info = []
+    for param_name in missing_params[:collection_config.get("max_params_per_question", 2)]:
+        param = next((p for p in intent_cfg.parameters if p.name == param_name), None)
+        if param:
+            # Get caption for default locale (first supported locale)
+            caption = param.get_caption_for_locale("tr")  # Default to Turkish
+            param_info.append(f"- {param_name}: {caption}")
+    
+    # Add context
     parts = [
-        f"• {param.name} ({caption}): Extract date in YYYY-MM-DD format.",
-        f"  - Today is {date_ctx['today']} ({date_ctx['today_weekday']})",
-        f"  - '{relative_dates.get('today', 'today')}' → {date_ctx['today']}",
-        f"  - '{relative_dates.get('tomorrow', 'tomorrow')}' → {date_ctx['tomorrow']}"
+        prompt,
+        "",
+        "Missing parameters:",
+        "\n".join(param_info),
+        "",
+        "Recent conversation:"
     ]
     
-    if param.extraction_prompt:
-        parts.append(f"  - {param.extraction_prompt}")
+    # Add recent conversation
+    for msg in conversation[-5:]:
+        parts.append(f"{msg['role'].upper()}: {msg['content']}")
     
     return "\n".join(parts)
 
 # ─────────────────────────────────────────────────────────────────────────────
-# SMART PARAMETER QUESTION
+# PARAMETER EXTRACTION FROM QUESTION
 # ─────────────────────────────────────────────────────────────────────────────
-def build_smart_parameter_question_prompt(
-    collection_config,
-    intent_config,
-    missing_params: List[str],
-    session,
-    project_language: str = "Turkish",
-    locale_code: str = None
-) -> str:
-    """Build prompt for smart parameter collection"""
-    
-    # Get parameter collection config from LLM provider settings
-    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)
+def extract_params_from_question(question: str, param_names: List[str]) -> Dict[str, str]:
+    """Extract parameters that might be embedded in the question itself"""
+    extracted = {}
     
-    # Use locale if specified
-    if not locale_code:
-        locale_code = "tr"
+    # Simple pattern matching for common cases
+    # This is a basic implementation - can be enhanced with NLP
     
-    # Get locale info
-    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(locale_code)
-            missing_params_list.append(f"- {caption} ({param.name})")
-    missing_params_str = "\n".join(missing_params_list)
-    
-    # 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)
-    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)
+    # Example: "İstanbul'dan Ankara'ya ne zaman gitmek istiyorsunuz?"
+    # Could extract origin=İstanbul, destination=Ankara
     
-    log(f"📝 Smart parameter question prompt built for {len(missing_params)} params in {locale_code}")
-    return prompt
-
-# ─────────────────────────────────────────────────────────────────────────────
-# PARAMETER EXTRACTION FROM QUESTION
-# ─────────────────────────────────────────────────────────────────────────────
-def extract_params_from_question(question: str, intent_config, project_locale: str = "tr") -> List[str]:
-    """Extract which parameters are being asked in the question"""
-    asked_params = []
-    question_lower = question.lower()
-    
-    # Check each missing parameter
-    for param in intent_config.parameters:
-        # Check all locale captions
-        for caption_obj in param.caption:
-            caption = caption_obj.caption.lower()
-            # Check if caption appears in question
-            if caption in question_lower:
-                asked_params.append(param.name)
-                break
-        
-        # Also check parameter name
-        if param.name.lower() in question_lower:
-            if param.name not in asked_params:
-                asked_params.append(param.name)
+    # For now, return empty dict
+    # This function can be enhanced based on specific use cases
     
-    return asked_params
+    return extracted
 
 # ─────────────────────────────────────────────────────────────────────────────
 # API RESPONSE PROMPT
 # ─────────────────────────────────────────────────────────────────────────────
 def build_api_response_prompt(api_config, api_response: Dict) -> str:
-    """Build prompt for API response humanization"""
+    """Build prompt for API response with mappings"""
     
     response_prompt = api_config.response_prompt
     if not response_prompt:
-        response_prompt = "Convert this API response to a friendly message: {{api_response}}"
+        return "İşlem başarıyla tamamlandı."
+    
+    # Apply response mappings if available
+    mapped_data = {}
+    if hasattr(api_config, 'response_mappings'):
+        for mapping in api_config.response_mappings:
+            field_path = mapping.get('field_path', '')
+            display_name = mapping.get('display_name', field_path)
+            
+            # Extract value from response
+            value = _extract_value_from_path(api_response, field_path)
+            if value is not None:
+                mapped_data[display_name] = value
     
-    # Replace placeholders
-    response_prompt = response_prompt.replace("{{api_response}}", json.dumps(api_response, ensure_ascii=False))
+    # Replace placeholders in response prompt
+    for key, value in mapped_data.items():
+        response_prompt = response_prompt.replace(f"{{{key}}}", str(value))
+    
+    # Also try direct field replacement
+    for key, value in api_response.items():
+        response_prompt = response_prompt.replace(f"{{{key}}}", str(value))
     
-    return response_prompt
+    return response_prompt
+
+def _extract_value_from_path(data: Dict, path: str) -> Any:
+    """Extract value from nested dict using dot notation"""
+    try:
+        parts = path.split('.')
+        value = data
+        for part in parts:
+            if isinstance(value, dict):
+                value = value.get(part)
+            elif isinstance(value, list) and part.isdigit():
+                value = value[int(part)]
+            else:
+                return None
+        return value
+    except:
+        return None