Update chat_handler.py

chat_handler.py

@@ -2,10 +2,11 @@ from fastapi import Request
 from fastapi.responses import JSONResponse
 import traceback
 import random
-from intent_utils import extract_parameters, validate_variable_formats, detect_intent
+from llm_model import Message, LLMModel
 from intent_api import execute_intent
+from intent_utils import validate_variable_formats
+from parse_llm_blocks import parse_llm_blocks
 from log import log
-from llm_model import Message, LLMModel
 
 async def handle_chat(msg: Message, request: Request, app, service_config, session, llm_model: LLMModel):
     try:
@@ -14,137 +15,69 @@ async def handle_chat(msg: Message, request: Request, app, service_config, sessi
 
         project_name = session.project_name
         project_config = service_config.get_project_llm_config(project_name)
-        project_intents = service_config.get_project_intents(project_name)
-        intent_conf_threshold = project_config["intent_confidence_treshold"]
-
-        if llm_model.model is None or llm_model.tokenizer is None:
-            return {"error": f"{project_name} için model yüklenmedi."}
-
-        current_intent = session.last_intent
-        awaiting_variable = session.awaiting_variable
-
-        # 🧩 1. PARAMETRE TAMAMLAMA MODU
-        if awaiting_variable and current_intent:
-            log(f"🔄 Parametre tamamlama modu: intent={current_intent}, beklenen={awaiting_variable}")
-            intent_def = next(i for i in project_intents if i["name"] == current_intent)
-            pattern_list = intent_def.get("variables", [])
-            variable_format_map = intent_def.get("variable_formats", {})
-            data_formats = service_config.data_formats
-
-            extracted = extract_parameters(pattern_list, user_input)
-            if extracted:
-                for p in extracted:
-                    session.variables[p["key"]] = p["value"]
-                    log(f"✅ Parametre dolduruldu: {p['key']} = {p['value']}")
-                session.awaiting_variable = None
-
-                # Doğrulama + execute_intent’e geçiş
-                is_valid, validation_errors = validate_variable_formats(session.variables, variable_format_map, data_formats)
-                log(f"📛 Validasyon hataları: {validation_errors}")
-
-                expected_vars = list(variable_format_map.keys())
-                missing_vars = [v for v in expected_vars if v not in session.variables]
-                log(f"📌 Beklenen parametreler: {expected_vars}, Eksik: {missing_vars}")
-
-                if not is_valid:
-                    session.awaiting_variable = list(validation_errors.keys())[0]
-                    return {"response": list(validation_errors.values())[0]}
-
-                if missing_vars:
-                    if len(missing_vars) > 1:
-                        ordered_list = ", ".join(missing_vars)
-                        return {"response": f"Lütfen şu bilgileri sırayla belirtir misiniz: {ordered_list}."}
-                    else:
-                        session.awaiting_variable = missing_vars[0]
-                        return {"response": f"Lütfen {missing_vars[0]} bilgisini belirtir misiniz?"}
 
-                log("🚀 execute_intent() çağrılıyor...")
-                result = execute_intent(
-                    current_intent,
-                    user_input,
-                    session.__dict__,
-                    {i["name"]: i for i in project_intents},
-                    data_formats,
-                    project_name,
-                    service_config
-                )
-                if "reply" in result:
-                    return {"reply": result["reply"]}
-                elif "errors" in result:
-                    return {"response": list(result["errors"].values())[0]}
-                else:
-                    return {"response": random.choice(project_config["fallback_answers"])}
-            else:
-                # ❌ Parametre yine çıkarılamadı → konu değişmiş olabilir
-                log("⚠️ Parametre bulunamadı → intent detect tetikleniyor")
-                session.awaiting_variable = None
-                session.variables = {}
-
-        # 🧩 2. NORMAL INTENT DEĞERLENDİRMESİ
-        detected_intent, intent_conf = await detect_intent(user_input, project_name)
-        log(f"🎯 Intent tespit edildi: {detected_intent}, Confidence: {intent_conf:.2f}")
-
-        intent_is_valid = (
-            detected_intent and
-            intent_conf > intent_conf_threshold and
-            any(i["name"] == detected_intent for i in project_intents)
+        # Chat history'ye user mesajını ekle
+        session.chat_history.append({"role": "user", "content": user_input})
+
+        # === LLM çağrısı
+        llm_response = await llm_model.generate_response_with_messages(session.chat_history, project_config)
+        log(f"🤖 LLM cevabı: {llm_response}")
+
+        # === LLM cevabını parse et
+        parsed = parse_llm_blocks(llm_response)
+        intent = parsed["intent"]
+        params = parsed["params"]
+        missing = parsed["missing"]
+        action_json = parsed["action_json"]
+
+        # Chat history'ye assistant cevabını ekle
+        session.chat_history.append({"role": "assistant", "content": llm_response})
+
+        # === INTENT yok → havadan sudan konuşma
+        if intent == "NONE":
+            session.awaiting_variable = None
+            session.last_intent = None
+            session.variables.clear()
+            return {"response": llm_response}
+
+        # === INTENT varsa
+        session.last_intent = intent
+        session.variables.update(params)
+
+        # Eksik parametre varsa
+        if missing:
+            session.awaiting_variable = missing[0]
+            return {"response": f"Lütfen {', '.join(missing)} bilgisini belirtir misiniz?"}
+
+        # === API çağrısı yap
+        intent_definitions = {i["name"]: i for i in service_config.get_project_intents(project_name)}
+        data_formats = service_config.data_formats
+
+        # Parametreleri validasyonla kontrol et (backend güvenlik katmanı)
+        variable_format_map = intent_definitions[intent].get("variable_formats", {})
+        is_valid, validation_errors = validate_variable_formats(session.variables, variable_format_map, data_formats)
+
+        if not is_valid:
+            session.awaiting_variable = list(validation_errors.keys())[0]
+            return {"response": list(validation_errors.values())[0]}
+
+        log("🚀 execute_intent() çağrılıyor...")
+        result = execute_intent(
+            intent,
+            user_input,
+            session.__dict__,
+            intent_definitions,
+            data_formats,
+            project_name,
+            service_config
         )
-        log(f"✅ Intent geçerli mi?: {intent_is_valid}")
-
-        if intent_is_valid:
-            session.last_intent = detected_intent
-            intent_def = next(i for i in project_intents if i["name"] == detected_intent)
-            pattern_list = intent_def.get("variables", [])
-            variable_format_map = intent_def.get("variable_formats", {})
-            data_formats = service_config.data_formats
-
-            extracted = extract_parameters(pattern_list, user_input)
-            variables = {p["key"]: p["value"] for p in extracted}
-            session.variables.update(variables)
-
-            is_valid, validation_errors = validate_variable_formats(session.variables, variable_format_map, data_formats)
-            log(f"📛 Validasyon hataları: {validation_errors}")
-
-            expected_vars = list(variable_format_map.keys())
-            missing_vars = [v for v in expected_vars if v not in session.variables]
-            log(f"📌 Beklenen parametreler: {expected_vars}, Eksik: {missing_vars}")
-
-            if not is_valid:
-                session.awaiting_variable = list(validation_errors.keys())[0]
-                return {"response": list(validation_errors.values())[0]}
-
-            if missing_vars:
-                if len(missing_vars) > 1:
-                    ordered_list = ", ".join(missing_vars)
-                    return {"response": f"Lütfen şu bilgileri sırayla belirtir misiniz: {ordered_list}."}
-                else:
-                    session.awaiting_variable = missing_vars[0]
-                    return {"response": f"Lütfen {missing_vars[0]} bilgisini belirtir misiniz?"}
-
-            log("🚀 execute_intent() çağrılıyor...")
-            result = execute_intent(
-                detected_intent,
-                user_input,
-                session.__dict__,
-                {i["name"]: i for i in project_intents},
-                data_formats,
-                project_name,
-                service_config
-            )
-            if "reply" in result:
-                return {"reply": result["reply"]}
-            elif "errors" in result:
-                return {"response": list(result["errors"].values())[0]}
-            else:
-                return {"response": random.choice(project_config["fallback_answers"])}
 
-        log("🤖 execute_intent çağrılmadı → LLM fallback devrede")
-        session.awaiting_variable = None
-        session.variables = {}
-        response, response_conf = await llm_model.generate_response(user_input, project_config)
-        if response_conf is not None and response_conf < project_config["llm_confidence_treshold"]:
+        if "reply" in result:
+            return {"reply": result["reply"]}
+        elif "errors" in result:
+            return {"response": list(result["errors"].values())[0]}
+        else:
             return {"response": random.choice(project_config["fallback_answers"])}
-        return {"response": response}
 
     except Exception as e:
         traceback.print_exc()