Update chat_handler.py

chat_handler.py

@@ -1,6 +1,6 @@
 """
-Flare – Chat Handler  (v1.3 · robust trimming + param validation)
-=================================================================
+Flare – Chat Handler  (v1.4 · tutarsızlıklar giderildi)
+=======================================================
 """
 
 import re, json, uuid, sys, httpx, commentjson
@@ -10,6 +10,9 @@ from fastapi import APIRouter, HTTPException, Header
 from pydantic import BaseModel
 from commentjson import JSONLibraryException
 from prompt_builder import build_intent_prompt, build_parameter_prompt, log
+from api_executor import call_api as execute_api
+from config_provider import ConfigProvider
+from validation_engine import validate
 
 # ─────────────────────────  HELPERS ───────────────────────── #
 def _trim_response(raw: str) -> str:
@@ -36,17 +39,16 @@ def _safe_intent_parse(raw: str) -> (str, str):
     return name, tail
 
 # ─────────────────────────  CONFIG ───────────────────────── #
-CFG = commentjson.load(open("service_config.jsonc", encoding="utf-8"))
-PROJECTS = {p["name"]: p for p in CFG["projects"]}
-APIS     = {a["name"]: a for a in CFG["apis"]}
-SPARK_URL = CFG["config"]["spark_endpoint"].rstrip("/") + "/generate"
+cfg = ConfigProvider.get()
+PROJECTS = {p.name: p for p in cfg.projects}
+SPARK_URL = str(cfg.global_config.spark_endpoint).rstrip("/")
 ALLOWED_INTENTS = {"flight-booking", "flight-info", "booking-cancel"}
 
 # ─────────────────────────  SESSION ───────────────────────── #
 class Session:
-    def __init__(self, project: str):
+    def __init__(self, project_name: str):
         self.id = str(uuid.uuid4())
-        self.project = PROJECTS[project]
+        self.project = PROJECTS[project_name]
         self.history: List[Dict[str, str]] = []
         self.vars: Dict[str, str] = {}
         self.awaiting: Optional[Dict] = None
@@ -56,8 +58,13 @@ SESSIONS: Dict[str, Session] = {}
 
 # ─────────────────────────  SPARK ───────────────────────── #
 async def spark_generate(s: Session, prompt: str, user_msg: str) -> str:
+    # Get the first published version
+    version = next((v for v in s.project.versions if v.published), None)
+    if not version:
+        raise HTTPException(500, "No published version found")
+    
     payload = {
-        "project_name": s.project["name"],
+        "project_name": s.project.name,
         "user_input": user_msg,
         "context": s.history[-10:],
         "system_prompt": prompt
@@ -96,6 +103,11 @@ async def chat(body: Body, x_session_id: str = Header(...)):
     user = body.user_input.strip()
     s.history.append({"role": "user", "content": user})
 
+    # Get the first published version
+    version = next((v for v in s.project.versions if v.published), None)
+    if not version:
+        raise HTTPException(500, "No published version found")
+
     # ---------- follow-up ----------
     if s.awaiting:
         ans = await _followup(s, user)
@@ -104,8 +116,8 @@ async def chat(body: Body, x_session_id: str = Header(...)):
 
     # ---------- intent detect ----------
     p = build_intent_prompt(
-        s.project["versions"][0]["general_prompt"],
-        s.history, user, s.project["versions"][0]["intents"])
+        version.general_prompt,
+        s.history, user, version.intents)
     raw = await spark_generate(s, p, user)
 
     if raw == "":
@@ -125,55 +137,95 @@ async def chat(body: Body, x_session_id: str = Header(...)):
         s.history.append({"role": "assistant", "content": clean})
         return Resp(session_id=s.id, answer=clean)
 
-    cfg = _find_intent(s, intent)
-    if not cfg:
+    intent_cfg = _find_intent(s, intent)
+    if not intent_cfg:
         err = "Üzgünüm, anlayamadım."
         s.history.append({"role": "assistant", "content": err})
         return Resp(session_id=s.id, answer=err)
 
-    answer = await _handle_intent(s, cfg, user)
+    answer = await _handle_intent(s, intent_cfg, user)
     s.history.append({"role": "assistant", "content": answer})
     return Resp(session_id=s.id, answer=answer)
 
 # ──────────────────  INTENT / PARAM / API HELPERS  ────────────────── #
-def _find_intent(s, name): return next((i for i in s.project["versions"][0]["intents"] if i["name"] == name), None)
-def _missing(s, cfg):      return [p["name"] for p in cfg["parameters"] if p["variable_name"] not in s.vars]
+def _find_intent(s, name):
+    version = next((v for v in s.project.versions if v.published), None)
+    return next((i for i in version.intents if i.name == name), None) if version else None
+
+def _missing(s, intent_cfg):
+    return [p.name for p in intent_cfg.parameters if p.required and p.variable_name not in s.vars]
 
-async def _handle_intent(s, cfg, user):
-    missing = _missing(s, cfg)
+async def _handle_intent(s, intent_cfg, user):
+    missing = _missing(s, intent_cfg)
     if missing:
-        prmpt = build_parameter_prompt(cfg, missing, user, s.history)
+        prmpt = build_parameter_prompt(intent_cfg, missing, user, s.history)
         raw   = await spark_generate(s, prmpt, user)
-        if raw.startswith("#PARAMETERS:") and not _proc_params(s, cfg, raw):
-            missing = _missing(s, cfg)
+        if raw.startswith("#PARAMETERS:"):
+            _proc_params(s, intent_cfg, raw)
+            missing = _missing(s, intent_cfg)
 
     if missing:
-        s.awaiting = {"intent": cfg, "missing": missing}
-        cap = next(p for p in cfg["parameters"] if p["name"] == missing[0])["caption"]
+        s.awaiting = {"intent": intent_cfg, "missing": missing}
+        cap = next(p for p in intent_cfg.parameters if p.name == missing[0]).caption
         return f"{cap} nedir?"
     s.awaiting = None
-    return await _call_api(s, cfg)
+    return await _call_api(s, intent_cfg)
 
 async def _followup(s, user):
-    cfg = s.awaiting["intent"]; miss = s.awaiting["missing"]
-    prmpt = build_parameter_prompt(cfg, miss, user, s.history)
+    intent_cfg = s.awaiting["intent"]
+    miss = s.awaiting["missing"]
+    prmpt = build_parameter_prompt(intent_cfg, miss, user, s.history)
     raw   = await spark_generate(s, prmpt, user)
-    if not raw.startswith("#PARAMETERS:") or _proc_params(s, cfg, raw):
+    if not raw.startswith("#PARAMETERS:"):
         return "Üzgünüm, anlayamadım."
-    miss = _missing(s, cfg)
+    
+    _proc_params(s, intent_cfg, raw)
+    miss = _missing(s, intent_cfg)
     if miss:
         s.awaiting["missing"] = miss
-        cap = next(p for p in cfg["parameters"] if p["name"] == miss[0])["caption"]
+        cap = next(p for p in intent_cfg.parameters if p.name == miss[0]).caption
         return f"{cap} nedir?"
     s.awaiting = None
-    return await _call_api(s, cfg)
-
-def _proc_params(s, cfg, raw):
-    try: d = json.loads(raw[len("#PARAMETERS:"):])
-    except: return True
+    return await _call_api(s, intent_cfg)
+
+def _proc_params(s, intent_cfg, raw):
+    try: 
+        d = json.loads(raw[len("#PARAMETERS:"):])
+    except: 
+        return False
+    
     for pr in d.get("extracted", []):
-        pcfg = next(p for p in cfg["parameters"] if p["name"] == pr["name"])
-        if not re.fullmatch(pcfg.get("validation_regex", ".*"), pr["value"]):
-            return True
-        s.vars[pcfg["variable_name"]] = pr["value"]
-    return Fals
+        pcfg = next((p for p in intent_cfg.parameters if p.name == pr["name"]), None)
+        if not pcfg:
+            continue
+        
+        # Use validation engine
+        if not validate(pr["value"], pcfg):
+            continue
+            
+        s.vars[pcfg.variable_name] = pr["value"]
+    return True
+
+async def _call_api(s, intent_cfg):
+    """Execute API call and humanize response"""
+    api_name = intent_cfg.action
+    api_cfg = cfg.get_api(api_name)
+    if not api_cfg:
+        return intent_cfg.get("fallback_error_prompt", "İşlem başarısız oldu.")
+    
+    try:
+        # Call API using api_executor
+        response = execute_api(api_cfg, s.vars)
+        api_json = response.json()
+        
+        # Humanize response
+        if api_cfg.response_prompt:
+            prompt = api_cfg.response_prompt.replace("{{api_response}}", json.dumps(api_json, ensure_ascii=False))
+            human_response = await spark_generate(s, prompt, json.dumps(api_json))
+            return human_response if human_response else f"İşlem sonucu: {api_json}"
+        else:
+            return f"İşlem başarılı: {api_json}"
+            
+    except Exception as e:
+        log(f"❌ API call error: {e}")
+        return intent_cfg.get("fallback_error_prompt", "İşlem sırasında bir hata oluştu.")