Update chat_handler.py

chat_handler.py

@@ -1,14 +1,11 @@
 """
-Flare – Chat Handler  (Spark /generate + safe-intent + config-validate)
-======================================================================
-• X-Session-ID header
-• Config JSONC parse hatası -> log + graceful exit
+Flare – Chat Handler  (Spark /generate + safe-intent + config-validate + short-msg guard)
+=======================================================================================
 """
 
 import re, json, uuid, sys, httpx, commentjson
 from datetime import datetime
 from typing import Dict, List, Optional
-
 from fastapi import APIRouter, HTTPException, Header
 from pydantic import BaseModel
 from commentjson import JSONLibraryException
@@ -16,7 +13,7 @@ from commentjson import JSONLibraryException
 from prompt_builder import build_intent_prompt, build_parameter_prompt, log
 
 # --------------------------------------------------------------------------- #
-# CONFIG LOADING + VALIDATION
+# CONFIG LOAD
 # --------------------------------------------------------------------------- #
 def load_config(path: str = "service_config.jsonc") -> dict:
     try:
@@ -24,16 +21,11 @@ def load_config(path: str = "service_config.jsonc") -> dict:
             cfg = commentjson.load(f)
         log("✅ service_config.jsonc parsed successfully.")
         return cfg
-    except JSONLibraryException as e:
-        log("❌ CONFIG PARSE ERROR:")
-        log(str(e))
-        sys.exit(1)
-    except FileNotFoundError:
-        log(f"❌ Config file '{path}' not found.")
+    except (JSONLibraryException, FileNotFoundError) as e:
+        log(f"❌ CONFIG ERROR: {e}")
         sys.exit(1)
 
 CFG = load_config()
-
 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"
@@ -62,16 +54,14 @@ async def spark_generate(session: Session,
     payload = {
         "project_name": session.project["name"],
         "user_input": user_input,
-        "context": session.history[-10:],   # last 10 turns
+        "context": session.history[-10:],
         "system_prompt": system_prompt
     }
     async with httpx.AsyncClient(timeout=60) as c:
         r = await c.post(SPARK_URL, json=payload)
         r.raise_for_status()
         data = r.json()
-        return (data.get("assistant") or
-                data.get("model_answer") or
-                data.get("text", "")).strip()
+        return (data.get("assistant") or data.get("model_answer") or data.get("text", "")).strip()
 
 # --------------------------------------------------------------------------- #
 # FASTAPI ROUTER
@@ -84,10 +74,8 @@ def health():
 
 class StartSessionRequest(BaseModel):
     project_name: str
-
 class ChatBody(BaseModel):
     user_input: str
-
 class ChatResponse(BaseModel):
     session_id: str
     answer: str
@@ -104,8 +92,7 @@ async def start_session(req: StartSessionRequest):
     return ChatResponse(session_id=s.id, answer="Nasıl yardımcı olabilirim?")
 
 @router.post("/chat", response_model=ChatResponse)
-async def chat(body: ChatBody,
-               x_session_id: str = Header(...)):
+async def chat(body: ChatBody, x_session_id: str = Header(...)):
     if x_session_id not in SESSIONS:
         raise HTTPException(404, "Invalid session")
 
@@ -113,21 +100,30 @@ async def chat(body: ChatBody,
     user_msg = body.user_input.strip()
     s.history.append({"role": "user", "content": user_msg})
 
-    # ---------------- Follow-up?
+    # ---------------- follow-up?
     if s.awaiting:
         answer = await _followup(s, user_msg)
         s.history.append({"role": "assistant", "content": answer})
         return ChatResponse(session_id=s.id, answer=answer)
 
-    # ---------------- Intent detect
+    # ---------------- intent detect
     gen_prompt = s.project["versions"][0]["general_prompt"]
     intent_raw = await spark_generate(s, gen_prompt, user_msg)
 
+    # small-talk?
     if not intent_raw.startswith("#DETECTED_INTENT:"):
         s.history.append({"role": "assistant", "content": intent_raw})
         return ChatResponse(session_id=s.id, answer=intent_raw)
 
     intent_name = intent_raw.split(":", 1)[1].strip()
+
+    # short-message guard: tek/iki kelime selamlaşma + intent bastıysa yok say
+    if len(user_msg.split()) < 3:
+        clean = intent_raw.split("#DETECTED_INTENT")[0].split("\nassistant")[0].strip()
+        s.history.append({"role": "assistant", "content": clean})
+        return ChatResponse(session_id=s.id, answer=clean)
+
+    # allowed-set kontrolü
     if intent_name not in ALLOWED_INTENTS:
         clean = intent_raw.split("#DETECTED_INTENT")[0].split("\nassistant")[0].strip()
         s.history.append({"role": "assistant", "content": clean})
@@ -144,30 +140,25 @@ async def chat(body: ChatBody,
     return ChatResponse(session_id=s.id, answer=answer)
 
 # --------------------------------------------------------------------------- #
-# HELPER FUNCS
+# HELPER FUNCS (değişmeyen kısımlar)
 # --------------------------------------------------------------------------- #
 def _find_intent(project, name_):
-    return next((i for i in project["versions"][0]["intents"]
-                 if i["name"] == name_), None)
+    return next((i for i in project["versions"][0]["intents"] if i["name"] == name_), None)
 
 def _missing(s, intent_cfg):
-    return [p["name"] for p in intent_cfg["parameters"]
-            if p["variable_name"] not in s.variables]
+    return [p["name"] for p in intent_cfg["parameters"] if p["variable_name"] not in s.variables]
 
 async def _handle_intent(s, intent_cfg, user_msg):
     missing = _missing(s, intent_cfg)
     if missing:
         p_prompt = build_parameter_prompt(intent_cfg, missing, user_msg, s.history)
-        p_raw    = await spark_generate(s, p_prompt, user_msg)
-        if p_raw.startswith("#PARAMETERS:"):
-            if bad := _process_params(s, intent_cfg, p_raw):
-                return bad
+        p_raw = await spark_generate(s, p_prompt, user_msg)
+        if p_raw.startswith("#PARAMETERS:") and not _process_params(s, intent_cfg, p_raw):
             missing = _missing(s, intent_cfg)
 
     if missing:
         s.awaiting = {"intent": intent_cfg, "missing": missing}
-        cap = next(p for p in intent_cfg["parameters"]
-                   if p["name"] == missing[0])["caption"]
+        cap = next(p for p in intent_cfg["parameters"] if p["name"] == missing[0])["caption"]
         return f"{cap} nedir?"
 
     s.awaiting = None
@@ -175,36 +166,30 @@ async def _handle_intent(s, intent_cfg, user_msg):
 
 async def _followup(s, user_msg):
     intent_cfg = s.awaiting["intent"]
-    missing    = s.awaiting["missing"]
+    missing = s.awaiting["missing"]
     p_prompt = build_parameter_prompt(intent_cfg, missing, user_msg, s.history)
-    p_raw    = await spark_generate(s, p_prompt, user_msg)
-    if not p_raw.startswith("#PARAMETERS:"):
+    p_raw = await spark_generate(s, p_prompt, user_msg)
+    if not p_raw.startswith("#PARAMETERS:") or _process_params(s, intent_cfg, p_raw):
         return "Üzgünüm, anlayamadım."
-    if bad := _process_params(s, intent_cfg, p_raw):
-        return bad
-
     missing = _missing(s, intent_cfg)
     if missing:
         s.awaiting["missing"] = missing
-        cap = next(p for p in intent_cfg["parameters"]
-                   if p["name"] == missing[0])["caption"]
+        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, intent_cfg)
 
-def _process_params(s, intent_cfg, p_raw):
+def _process_params(s, intent_cfg, raw):
     try:
-        data = json.loads(p_raw[len("#PARAMETERS:"):])
+        data = json.loads(raw[len("#PARAMETERS:"):])
     except json.JSONDecodeError:
-        return "Parametreleri çözemedim."
+        return True
     for pair in data.get("extracted", []):
-        p_cfg = next(p for p in intent_cfg["parameters"]
-                     if p["name"] == pair["name"])
+        p_cfg = next(p for p in intent_cfg["parameters"] if p["name"] == pair["name"])
         if not _valid(p_cfg, pair["value"]):
-            return p_cfg.get("invalid_prompt", "Geçersiz değer.")
+            return True
         s.variables[p_cfg["variable_name"]] = pair["value"]
-    return None
+    return False
 
 def _valid(p_cfg, val):
     rx = p_cfg.get("validation_regex")
@@ -214,22 +199,16 @@ async def _call_api(s, intent_cfg):
     api = APIS[intent_cfg["action"]]
     token = "testtoken"
     headers = {k: v.replace("{{token}}", token) for k, v in api["headers"].items()}
-
     body = json.loads(json.dumps(api["body_template"]))
     for k, v in body.items():
         if isinstance(v, str) and v.startswith("{{") and v.endswith("}}"):
             body[k] = s.variables.get(v[2:-2], "")
-
     try:
         async with httpx.AsyncClient(timeout=api["timeout_seconds"]) as c:
-            r = await c.request(api["method"], api["url"],
-                                headers=headers, json=body)
+            r = await c.request(api["method"], api["url"], headers=headers, json=body)
             r.raise_for_status()
             api_json = r.json()
     except Exception:
         return intent_cfg["fallback_error_prompt"]
-
-    summary_prompt = api["response_prompt"].replace(
-        "{{api_response}}", json.dumps(api_json, ensure_ascii=False)
-    )
+    summary_prompt = api["response_prompt"].replace("{{api_response}}", json.dumps(api_json, ensure_ascii=False))
     return await spark_generate(s, summary_prompt, "")