Update session.py

session.py

@@ -1,72 +1,70 @@
-"""Flare – Session & SessionStore
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Basit, thread-safe, in-memory oturum yöneticisi.
+"""
+Flare – Session Management
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+• thread-safe SessionStore
+• state-machine alanları
 """
 
-import uuid
-import threading
+from __future__ import annotations
+import threading, uuid
 from typing import Dict, List
 from utils import log
 
 
 class Session:
-    """Tek kullanıcılık sohbet durumu."""
+    """Single chat session."""
 
     def __init__(self, project_name: str):
         self.session_id: str = str(uuid.uuid4())
         self.project_name: str = project_name
+
+        # flow state
+        self.state: str = "idle"                   # idle | await_param | call_api | humanize
         self.last_intent: str | None = None
-        self.variables: Dict[str, str] = {}
         self.awaiting_parameters: List[str] = []
-        self.state: str = "intent_detection"
+        self.missing_ask_count: int = 0
+
+        # data
+        self.variables: Dict[str, str] = {}
+        self.auth_tokens: Dict[str, Dict] = {}     # api_name -> {token, expiry}
+
+        # history
         self.chat_history: List[Dict[str, str]] = []
-        self.auth_tokens: Dict[str, str] = {}
 
-    # --------- helpers ----------
-    def add_turn(self, role: str, content: str) -> None:
+    # -------- helper ----------
+    def add_turn(self, role: str, content: str):
         self.chat_history.append({"role": role, "content": content})
-        if len(self.chat_history) > 20:          # hafıza koruması
+        if len(self.chat_history) > 20:
             self.chat_history.pop(0)
 
-    def to_dict(self) -> Dict:
-        return {
-            "session_id": self.session_id,
-            "project_name": self.project_name,
-            "last_intent": self.last_intent,
-            "variables": self.variables,
-            "awaiting_parameters": self.awaiting_parameters,
-            "state": self.state,
-            "chat_history": self.chat_history,
-        }
+    # -------- reset flow ------
+    def reset_flow(self):
+        self.state = "idle"
+        self.last_intent = None
+        self.awaiting_parameters.clear()
+        self.missing_ask_count = 0
 
 
 class SessionStore:
-    """Thread-safe oturum havuzu."""
+    """Thread-safe global store."""
 
-    def __init__(self) -> None:
-        self._sessions: Dict[str, Session] = {}
+    def __init__(self):
         self._lock = threading.Lock()
+        self._sessions: Dict[str, Session] = {}
 
     def create_session(self, project_name: str) -> Session:
         with self._lock:
-            session = Session(project_name)
-            self._sessions[session.session_id] = session
-            log(f"🆕 Created session: {session.session_id} (project: {project_name})")
-            return session
-
-    def get_session(self, session_id: str) -> Session | None:
-        with self._lock:
-            return self._sessions.get(session_id)
+            s = Session(project_name)
+            self._sessions[s.session_id] = s
+            log(f"🆕 Session created {s.session_id}")
+            return s
 
-    def remove_session(self, session_id: str) -> None:
+    def get_session(self, sid: str) -> Session | None:
         with self._lock:
-            if session_id in self._sessions:
-                del self._sessions[session_id]
-                log(f"❌ Removed session: {session_id}")
+            return self._sessions.get(sid)
 
-    def __contains__(self, session_id: str) -> bool:
-        return self.get_session(session_id) is not None
+    def __contains__(self, sid: str) -> bool:
+        return self.get_session(sid) is not None
 
 
-# Global singleton
 session_store = SessionStore()