Update main.py

main.py

@@ -694,7 +694,7 @@ def _set_incident_resolved(sys_id: str) -> bool:
         notes_field = os.getenv("SERVICENOW_RESOLUTION_NOTES_FIELD", "close_notes")
         payload_C = clean({
             "state": "6",
-            code_field: close_code_val,
+            code_field: close_notes_val,  # (if you have custom fields, adjust here)
             notes_field: close_notes_val,
             "caller_id": caller_sysid,
             "resolved_at": datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"),
@@ -1030,8 +1030,9 @@ async def chat_with_ai(input_data: ChatInput):
                 },
             }
 
-        # ---------- Action-focused extraction + boilerplate cleanup (NEW) ----------
-        MONTH_TERMS = ("january","february","march","april","may","june","july","august","september","october","november","december")
+        # ---------- Action-focused extraction + boilerplate cleanup ----------
+        MONTH_TERMS = ("january", "february", "march", "april", "may", "june",
+                       "july", "august", "september", "october", "november", "december")
 
         def _detect_action_from_query(q: str) -> Optional[str]:
             qlow = (q or "").lower()
@@ -1049,7 +1050,6 @@ async def chat_with_ai(input_data: ChatInput):
                 is_change_hist = ("change history" in low) or ("initial draft" in low) or ("review" in low) or ("version" in low)
                 has_month_year = any(m in low for m in MONTH_TERMS) and bool(re.search(r"\b20\d{2}\b", low))
                 is_title_line = ("sop document" in low) or ("contents" in low)
-                # Drop lines that look like doc header/footer metadata
                 if is_change_hist or has_month_year or is_title_line:
                     continue
                 cleaned.append(ln)
@@ -1058,46 +1058,68 @@ async def chat_with_ai(input_data: ChatInput):
         def _extract_action_block(raw_context: str, target_act: Optional[str]) -> str:
             """
             Extract the contiguous block of lines for the target action (create/update/delete).
-            Start when a line mentions the target action OR looks like the creation intro,
-            stop when a line mentions any other action.
+            Start when a line mentions the target action OR looks procedural for 'create',
+            and stop ONLY when a line is a clear boundary:
+              - inline heading for another topic (e.g., 'Appointment schedule updation', 'Appointment deletion'), OR
+              - a line that strongly signals a different action (update/delete) via extended synonyms.
             """
             if not raw_context.strip():
                 return raw_context
+
             lines = _normalize_lines(raw_context)
-            if not target_act:
+            if not lines or not target_act:
                 return raw_context
 
+            INLINE_BOUNDARIES = (
+                "appointment schedule updation",
+                "schedule updation",
+                "appointment deletion",
+                "deletion",
+            )
+
             other_terms: List[str] = []
             for act, syns in ACTION_SYNONYMS_EXT.items():
                 if act != target_act:
                     other_terms.extend(syns)
+            other_terms_low = set(t.lower() for t in other_terms)
+
+            def is_boundary_line(low: str) -> bool:
+                if any(h in low for h in INLINE_BOUNDARIES):
+                    return True
+                if any(t in low for t in other_terms_low):
+                    return True
+                return False
+
+            PROCEDURAL_VERBS = ("select", "choose", "click", "open", "add", "assign", "save",
+                                "navigate", "tag", "displayed", "triggered")
+            def is_procedural(low: str) -> bool:
+                return any(v in low for v in PROCEDURAL_VERBS)
+
+            target_terms_low = set(t.lower() for t in ACTION_SYNONYMS_EXT.get(target_act, []))
 
             started = False
             block: List[str] = []
+
             for ln in lines:
                 low = ln.lower()
-                contains_target = any(s in low for s in ACTION_SYNONYMS_EXT.get(target_act, []))
-                contains_other = any(s in low for s in other_terms)
 
-                # Heuristic: creation often starts with overview-like sentences; allow start on first procedural line if not yet started
-                is_procedural = any(k in low for k in ("select", "choose", "click", "open", "add", "assign", "save", "navigate"))
-                if not started and (contains_target or (target_act == "create" and is_procedural)):
-                    started = True
+                contains_target = any(t in low for t in target_terms_low)
+                if not started:
+                    if contains_target or (target_act == "create" and is_procedural(low)):
+                        started = True
+                        block.append(ln)
+                    continue
+
+                if is_boundary_line(low):
+                    break
 
-                if started:
-                    if contains_other:
-                        break  # end of target block
-                    block.append(ln)
+                block.append(ln)
 
-            # Fallback: if we never 'started', return original (minus boilerplate)
             return "\n".join(block).strip() if block else raw_context
 
         def _filter_steps_by_action(raw_context: str, asked_act: Optional[str]) -> str:
-            # 1) strip boilerplate (title/date/author/change-history)
             cleaned = _strip_boilerplate(raw_context)
-            # 2) extract the contiguous action block
             block = _extract_action_block(cleaned, asked_act)
-            # 3) as a final guard, remove any stray lines that mention other actions
             if asked_act:
                 other_terms: List[str] = []
                 for act, syns in ACTION_SYNONYMS_EXT.items():
@@ -1112,8 +1134,8 @@ async def chat_with_ai(input_data: ChatInput):
         if is_perm_query:
             detected_intent = "errors"
 
-        escalation_line = None  # SOP escalation candidate
-        full_errors = None      # keep for possible escalation extraction
+        escalation_line = None
+        full_errors = None
         next_step_applied = False
         next_step_info: Dict[str, Any] = {}
 
@@ -1126,16 +1148,13 @@ async def chat_with_ai(input_data: ChatInput):
                         full_steps = get_section_text(best_doc, sec)
 
                 if full_steps:
-                    # Apply action-focused extraction & cleanup FIRST
                     asked_action = _detect_action_from_query(input_data.user_message)
                     full_steps = _filter_steps_by_action(full_steps, asked_action)
 
-                    # Use numbered form only for matching; keep raw for full output
                     numbered_full = _ensure_numbering(full_steps)
                     next_only = _resolve_next_steps(input_data.user_message, numbered_full, max_next=6, min_score=0.35)
 
                     if next_only is not None:
-                        # "what's next" mode
                         if len(next_only) == 0:
                             context = "You are at the final step of this SOP. No further steps."
                             next_step_applied = True
@@ -1147,8 +1166,6 @@ async def chat_with_ai(input_data: ChatInput):
                             next_step_info = {"count": len(next_only)}
                             context_preformatted = True
                     else:
-                        # Normal mode: return the full SOP section (raw),
-                        # and we'll number it below once.
                         context = full_steps
                         context_preformatted = False
 
@@ -1159,7 +1176,6 @@ async def chat_with_ai(input_data: ChatInput):
                     if is_perm_query:
                         context = _filter_permission_lines(ctx_err, max_lines=6)
                     else:
-                        # Decide specific vs generic:
                         is_specific_error = len(_detect_error_families(msg_low)) > 0
                         if is_specific_error:
                             context = _filter_error_lines_by_query(ctx_err, input_data.user_message, max_lines=1)
@@ -1173,7 +1189,6 @@ async def chat_with_ai(input_data: ChatInput):
                             )
                     escalation_line = _extract_escalation_line(full_errors)
                 else:
-                    # Fallback when Errors section is missing: show steps
                     full_steps = get_best_steps_section_text(best_doc) or get_section_text(best_doc, sec_title or "")
                     if full_steps:
                         asked_action = _detect_action_from_query(input_data.user_message)
@@ -1187,7 +1202,6 @@ async def chat_with_ai(input_data: ChatInput):
                 if full_prereqs:
                     context = full_prereqs.strip()
                 else:
-                    # Fallback when Prereqs section is missing: show steps
                     full_steps = get_best_steps_section_text(best_doc) or get_section_text(best_doc, sec_title or "")
                     if full_steps:
                         asked_action = _detect_action_from_query(input_data.user_message)
@@ -1230,8 +1244,6 @@ Return ONLY the rewritten guidance."""
 
         # Deterministic local formatting
         if detected_intent == "steps":
-            # If we trimmed to next steps, 'context' is already formatted (or a sentence).
-            # Only number when returning full SOP raw text.
             if ('context_preformatted' in locals()) and context_preformatted:
                 bot_text = context
             else: