Update chat_handler.py

chat_handler.py

@@ -11,7 +11,7 @@ from fastapi import APIRouter, HTTPException, Header
 from pydantic import BaseModel
 import requests
 
-from prompt_builder import build_intent_prompt, build_parameter_prompt
+from prompt_builder import build_intent_prompt, build_parameter_prompt, build_smart_parameter_question_prompt, extract_params_from_question
 from utils import log
 from api_executor import call_api as execute_api  
 from validation_engine import validate
@@ -292,7 +292,7 @@ async def _handle_new_message(session: Session, user_input: str, version) -> str
     return await _extract_parameters(session, intent_config, user_input)
 
 async def _handle_parameter_followup(session: Session, user_input: str, version) -> str:
-    """Handle parameter collection followup"""
+    """Handle parameter collection followup with smart question generation"""
     if not session.last_intent:
         log("⚠️ No last intent in session")
         session.reset_flow()
@@ -315,24 +315,46 @@ async def _handle_parameter_followup(session: Session, user_input: str, version)
     # Try parsing with or without #PARAMETERS: prefix
     success = _process_parameters(session, intent_config, raw)
     
-    if not success:
-        # Increment miss count
-        session.missing_ask_count += 1
-        log(f"⚠️ No parameters extracted, miss count: {session.missing_ask_count}")
-        
+    # Hangi parametreler hala eksik?
+    still_missing = _get_missing_parameters(session, intent_config)
+    
+    # Sorulan ama cevaplanmayan parametreleri belirle
+    asked_but_not_answered = []
+    for param in session.awaiting_parameters:
+        if param in still_missing:
+            asked_but_not_answered.append(param)
+    
+    # Cevaplanmayanları session'a kaydet
+    if asked_but_not_answered:
+        session.mark_parameters_unanswered(asked_but_not_answered)
+        log(f"❓ Parameters not answered: {asked_but_not_answered}")
+    
+    # Cevaplananları işaretle
+    for param in session.awaiting_parameters:
+        if param not in still_missing:
+            session.mark_parameter_answered(param)
+            log(f"✅ Parameter answered: {param}")
+    
+    if still_missing:
+        # Maksimum deneme kontrolü
         if session.missing_ask_count >= 3:
             session.reset_flow()
             return "Üzgünüm, istediğiniz bilgileri anlayamadım. Başka bir konuda yardımcı olabilir miyim?"
-        return "Üzgünüm, anlayamadım. Lütfen tekrar söyler misiniz?"
-    
-    # Check if we have all required parameters
-    missing = _get_missing_parameters(session, intent_config)
-    log(f"📊 Still missing params: {missing}")
-    
-    if missing:
-        session.awaiting_parameters = missing
-        param = next(p for p in intent_config.parameters if p.name == missing[0])
-        return f"{param.caption} bilgisini alabilir miyim?"
+        
+        session.missing_ask_count += 1
+        
+        # Akıllı soru üret
+        question = await _generate_smart_parameter_question(
+            session, intent_config, still_missing, version
+        )
+        
+        # Sorulan parametreleri tahmin et ve kaydet
+        params_in_question = extract_params_from_question(question, still_missing, intent_config)
+        session.record_parameter_question(params_in_question)
+        session.awaiting_parameters = params_in_question
+        
+        log(f"🤖 Smart question generated for params: {params_in_question}")
+        return question
     
     # All parameters collected, call API
     log("✅ All parameters collected, calling API")
@@ -341,7 +363,12 @@ async def _handle_parameter_followup(session: Session, user_input: str, version)
 
 # ─────────────────────────  PARAMETER HANDLING ───────────────────────── #
 async def _extract_parameters(session: Session, intent_config, user_input: str) -> str:
-    """Extract parameters from user input"""
+    """Extract parameters from user input with smart question generation"""
+    
+    # Yeni intent için parametre takibini sıfırla
+    if session.parameter_ask_rounds == 0:
+        session.reset_parameter_tracking()
+    
     missing = _get_missing_parameters(session, intent_config)
     log(f"🔍 Missing parameters: {missing}")
     
@@ -364,18 +391,110 @@ async def _extract_parameters(session: Session, intent_config, user_input: str)
         log("⚠️ Failed to extract parameters from response")
     
     if missing:
-        # Still missing parameters
+        # Still missing parameters - generate smart question
         session.state = "await_param"
-        session.awaiting_parameters = missing
         session.missing_ask_count = 0
-        param = next(p for p in intent_config.parameters if p.name == missing[0])
-        log(f"❓ Asking for parameter: {param.name} ({param.caption})")
-        return f"{param.caption} bilgisini alabilir miyim?"
+        
+        # Akıllı soru üret
+        question = await _generate_smart_parameter_question(
+            session, intent_config, missing, version
+        )
+        
+        # Sorulan parametreleri tahmin et ve kaydet
+        params_in_question = extract_params_from_question(question, missing, intent_config)
+        session.record_parameter_question(params_in_question)
+        session.awaiting_parameters = params_in_question
+        
+        log(f"🤖 Smart question generated for initial params: {params_in_question}")
+        return question
     
     # All parameters collected
     log("✅ All parameters collected after extraction")
     return await _execute_api_call(session, intent_config)
 
+async def _generate_smart_parameter_question(
+    session: Session, 
+    intent_config,
+    missing_params: List[str],
+    version
+) -> str:
+    """LLM kullanarak doğal parametre sorusu üret"""
+    
+    # Config'i al
+    collection_config = cfg.global_config.parameter_collection_config
+    
+    # Öncelik sıralaması: önce cevaplanmayanlar
+    prioritized_params = []
+    
+    # 1. Daha önce sorulup cevaplanmayanlar
+    for param in session.unanswered_parameters:
+        if param in missing_params:
+            prioritized_params.append(param)
+            log(f"🔝 Priority param (unanswered): {param}")
+    
+    # 2. Hiç sorulmamışlar
+    for param in missing_params:
+        if param not in prioritized_params:
+            prioritized_params.append(param)
+            log(f"➕ Additional param (not asked): {param}")
+    
+    # Maksimum parametre sayısını belirle
+    max_params = min(
+        len(prioritized_params),
+        collection_config.max_params_per_question
+    )
+    params_to_ask = prioritized_params[:max_params]
+    
+    log(f"📋 Params to ask in this round: {params_to_ask}")
+    
+    # Proje dilini belirle
+    project_language = "Turkish"  # Default
+    if hasattr(version, 'project') and hasattr(version.project, 'default_language'):
+        lang_map = {
+            "tr": "Turkish", "en": "English", "de": "German",
+            "fr": "French", "es": "Spanish"
+        }
+        project_language = lang_map.get(version.project.default_language, "Turkish")
+    
+    # Prompt oluştur
+    prompt = build_smart_parameter_question_prompt(
+        collection_config,
+        intent_config,
+        params_to_ask,  # Sadece bu turda sorulacak parametreler
+        session,
+        project_language
+    )
+    
+    # LLM'den soru üret
+    response = await spark_generate(session, prompt, "")
+    
+    # Güvenlik: Eğer LLM boş veya hatalı response verirse fallback
+    if not response or len(response.strip()) < 10:
+        log("⚠️ Empty or invalid response from LLM, using fallback")
+        # En yüksek öncelikli parametre için fallback soru
+        param = params_to_ask[0]
+        param_config = next(p for p in intent_config.parameters if p.name == param)
+        
+        # Parametrenin kaç kez sorulduğuna göre farklı fallback
+        ask_count = session.get_parameter_ask_count(param)
+        if ask_count == 0:
+            return f"{param_config.caption} bilgisini alabilir miyim?"
+        elif ask_count == 1:
+            return f"Lütfen {param_config.caption.lower()} bilgisini paylaşır mısınız?"
+        else:
+            return f"Devam edebilmem için {param_config.caption.lower()} bilgisine ihtiyacım var."
+    
+    # Response'u temizle
+    clean_response = response.strip()
+    
+    # Eğer response yanlışlıkla başka şeyler içeriyorsa temizle
+    if "#" in clean_response or "assistant:" in clean_response.lower():
+        # İlk satırı al
+        clean_response = clean_response.split('\n')[0].strip()
+    
+    log(f"💬 Generated smart question: {clean_response[:100]}...")
+    return clean_response
+
 def _get_missing_parameters(session: Session, intent_config) -> List[str]:
     """Get list of missing required parameters"""
     missing = [