fixed Intent switch detection false switching

Author: nuwangeek

DSL/Ruuter.private/rag-search/POST/ckb/agency_data_import.yml

@@ -210,17 +210,21 @@ async def search(
         connection_id: Optional[str] = None,
         top_k: int = API_TOOL_SEARCH_TOP_K,
         precomputed_embedding: Optional[List[float]] = None,
+        min_cosine_override: Optional[float] = None,
     ) -> List[APIToolSearchResult]:
         """Search api_tool_collection for the best matching API endpoints.
 
         Uses a two-step approach:
         1. Dense search → get real cosine similarity scores
         2. Hybrid search (dense + sparse + RRF) → get best-ranked matches
 
-        Returns endpoints annotated with confidence level:
+        The effective minimum cosine threshold is determined by ``min_cosine_override``
+        when provided, otherwise ``API_TOOL_MIN_THRESHOLD`` is used. Confidence levels
+        are always evaluated against the same effective minimum:
+
         - "high":   cosine >= API_TOOL_HIGH_CONFIDENCE_THRESHOLD AND score gap is large
-        - "medium": cosine >= API_TOOL_MIN_THRESHOLD but ambiguous
-        - "none":   cosine < API_TOOL_MIN_THRESHOLD (no match)
+        - "medium": cosine >= effective minimum threshold but ambiguous
+        - "none":   cosine < effective minimum threshold (no match)
 
         Args:
             query: Natural language user query.
@@ -230,6 +234,11 @@ async def search(
             precomputed_embedding: Dense vector already computed upstream (e.g. by
                 the service classifier). When provided the embedding step is skipped
                 entirely, saving one embedding API call per request.
+            min_cosine_override: Optional cosine similarity threshold that replaces
+                ``API_TOOL_MIN_THRESHOLD`` for this call. Pass a lower value to
+                broaden matching (e.g. during multi-intent re-classification) or a
+                higher value to tighten it. When None, ``API_TOOL_MIN_THRESHOLD``
+                applies unchanged.
 
         Returns:
             List containing exactly one APIToolSearchResult (the resolved best match),
@@ -263,17 +272,23 @@ async def search(
         )
         cosine_gap = top_cosine - second_cosine
 
+        effective_min = (
+            min_cosine_override
+            if min_cosine_override is not None
+            else API_TOOL_MIN_THRESHOLD
+        )
+
         logger.info(f"APISemanticSearcher: query={query!r}")
         logger.info(
             f"APISemanticSearcher: dense top={dense_results[0]['name']} "
             f"(cosine={top_cosine:.4f}), gap={cosine_gap:.4f}"
         )
 
         # Below minimum threshold → no match
-        if top_cosine < API_TOOL_MIN_THRESHOLD:
+        if top_cosine < effective_min:
             logger.info(
                 f"APISemanticSearcher: cosine {top_cosine:.4f} < "
-                f"threshold {API_TOOL_MIN_THRESHOLD} — no API tool match"
+                f"threshold {effective_min} — no API tool match"
             )
             return []
 
@@ -319,11 +334,12 @@ async def search(
 
             if (
                 point_cosine >= API_TOOL_HIGH_CONFIDENCE_THRESHOLD
+                and point_cosine >= effective_min
                 and effective_gap >= API_TOOL_SCORE_GAP_THRESHOLD
                 and i == 0
             ):
                 confidence = "high"
-            elif point_cosine >= API_TOOL_MIN_THRESHOLD:
+            elif point_cosine >= effective_min:
                 confidence = "medium"
             else:
                 continue  # Skip results below threshold

src/tool_classifier/api_semantic_searcher.py

@@ -38,6 +38,7 @@
     DENSE_MIN_THRESHOLD,
     DENSE_HIGH_CONFIDENCE_THRESHOLD,
     DENSE_SCORE_GAP_THRESHOLD,
+    API_TOOL_INTENT_SWITCH_THRESHOLD,
 )
 
 from tool_classifier.sparse_encoder import SparseVector, compute_sparse_vector
@@ -191,7 +192,9 @@ async def classify(
                         # If so, abandon the old session and start fresh rather
                         # than treating the new query as a param-collection reply.
                         new_api_match = await self._try_api_tool_classification(
-                            query, request
+                            query,
+                            request,
+                            min_cosine_override=API_TOOL_INTENT_SWITCH_THRESHOLD,
                         )
                         if (
                             new_api_match is not None
@@ -760,6 +763,7 @@ async def _try_api_tool_classification(
         query: str,
         request: Optional[OrchestrationRequest] = None,
         precomputed_embedding: Optional[List[float]] = None,
+        min_cosine_override: Optional[float] = None,
     ) -> Optional[ClassificationResult]:
         """Search api_tool_collection and return a ClassificationResult if a match is found.
 
@@ -772,6 +776,12 @@ async def _try_api_tool_classification(
             precomputed_embedding: Dense embedding vector already computed for this
                 query by the service search step. When provided, the ATC searcher
                 reuses it instead of making a second embedding API call.
+            min_cosine_override: Optional cosine similarity threshold that replaces
+                the default ATC minimum score configured in the searcher. When
+                provided, only endpoints whose cosine score meets or exceeds this
+                value are considered a match. Use a lower value to broaden matching
+                (e.g. during multi-intent re-classification) or a higher value to
+                tighten it. When None, the searcher's default threshold applies.
 
         Returns:
             ClassificationResult with API_TOOL_CALLING workflow if a match is found,
@@ -790,6 +800,7 @@ async def _try_api_tool_classification(
                 environment=environment,
                 connection_id=connection_id,
                 precomputed_embedding=precomputed_embedding,
+                min_cosine_override=min_cosine_override,
             )
             if results:
                 matched = results[0]

src/tool_classifier/classifier.py

@@ -130,6 +130,11 @@
 API_TOOL_SCORE_GAP_THRESHOLD = 0.05
 """Cosine score gap (top - second) for high-confidence API tool classification."""
 
+API_TOOL_INTENT_SWITCH_THRESHOLD = 0.50
+"""Minimum cosine required to abandon an active session and switch intent.
+Higher than API_TOOL_MIN_THRESHOLD (0.40).
+Only a clear, unambiguous new query (cosine >= 0.50) should override a session."""
+
 
 # ============================================================================
 # Agentic Loop — Continuation Threshold

src/tool_classifier/constants.py

@@ -38,11 +38,13 @@
   {
     "endpointId": "3b8d4e33-7f6a-4c2d-a911-2c4b8f330004",
     "name": "get_vehicle_tax_info",
-    "description": "Arvuta sõidukimaks registreerimisnumbri alusel.",
-    "url": "https://avalik.emta.ee/msm-public/v1/vehicle-tax",
-    "method": "POST",
+    "description": "Arvuta sõidukimaks ja registreerimistasu Eesti sõiduki registreerimisnumbri alusel. Tagastab aastase sõidukimaksu ja ühekordse registreerimistasu koos CO2 ja massikomponentidega.",
+    "url": "https://avalik.emta.ee/msm-public/v1/vehicle-tax/calculate-by-reg-nr",
+    "method": "GET",
     "params": [
-      { "name": "registrationNumber", "type": "string", "required": true, "description": "Sõiduki registreerimisnumber" }
+      { "name": "regNr", "type": "string", "required": true, "description": "Sõiduki registreerimisnumber (nt 123ABC, 456DEF)" },
+      { "name": "calculationYear", "type": "integer", "required": true, "description": "Aasta, mille kohta maksu arvutatakse (nt 2026, 2027). Kohustuslik parameeter — kasutaja peab aasta täpsustama." },
+      { "name": "showRegFee", "type": "boolean", "required": false, "description": "Kui true, lisatakse vastusesse ka ühekordne registreerimistasu (regFee). Vaikimisi false. Kasuta true, kui kasutaja küsib registreerimistasu kohta." }
     ]
   },
   {
@@ -154,5 +156,17 @@
     "url": "https://ilmmicroservice.envir.ee/api/forecasts",
     "method": "GET",
     "params": []
+  },
+  {
+    "endpointId": "9b4d0e99-7a8b-4c9d-b033-9d1c5f990016",
+    "name": "check_legal_eligibility",
+    "description": "Kontrolli isiku õiguslikku sobivust teatud toimingute tegemiseks vanuse ja kodakondsuse alusel.",
+    "url": "https://bcd831cf-cd1b-40b9-af86-b760cd6143e8.mock.pstmn.io/api/legal-check",
+    "method": "POST",
+    "params": [
+      { "name": "action", "type": "string", "required": true, "description": "Toiming, mille jaoks sobivust kontrollitakse (nt start_business, vote, drive)" },
+      { "name": "citizenship", "type": "string", "required": true, "description": "Kahetäheline ISO kodakondsuskood (nt EE, LV, FI)" },
+      { "name": "age", "type": "integer", "required": true, "description": "Isiku vanus täisaastates" }
+    ]
   }
 ]