Deploy updated SLM customer-support chatbot

SLM_CService.py

@@ -126,17 +126,14 @@ ALLOWED_KEYWORDS = (
 )
 
 # Robust order detection:
-# - "#67890" / "# 67890"
-# - "order 67890", "order no. 67890", "order number 67890", "order id 67890"
 ORDER_RX = re.compile(
-    r"(?:#\s*(\d{3,12})|order(?:\s*(?:no\.?|number|id))?\s*#?\s*(\d{3,12}))",
+    r"(?:#\s*([\d]{3,12})|order(?:\s*(?:no\.?|number|id))?\s*#?\s*([\d]{3,12}))",
     flags=re.I,
 )
-
 def extract_order(text: str):
-    m = ORDER_RX.search(text or "")
-    if not m: return None
-    return m.group(1) or m.group(2)
+    if not text: return None
+    m = ORDER_RX.search(text)
+    return (m.group(1) or m.group(2)) if m else None
 
 def handle_status(o): return f"Order #{o} is in transit and should arrive in 3–5 business days."
 def handle_eta(o):    return f"Delivery for order #{o} typically takes 3–5 days; you can track it at https://track.example.com/{o}"
@@ -147,7 +144,7 @@ def handle_return_policy(_=None):
             "Would you like me to connect you with a human agent?")
 def handle_warranty_policy(_=None):
     return ("We provide a 1-year limited warranty against manufacturing defects. "
-            "For issues within 30 days, you can return or exchange; after that, warranty service applies. "
+            "Within 30 days you can return or exchange; afterwards, warranty service applies. "
             "Need help starting a claim?")
 def handle_cancel(o=None):
     return (f"I’ve submitted a cancellation request for order #{o}. If it has already shipped, "
@@ -159,7 +156,6 @@ def handle_ask_action(o): return (f"I’ve saved order #{o}. What would you like
 stored_order   = None
 pending_intent = None
 
-# public reset hook (called from app.py)
 def reset_state():
     global stored_order, pending_intent
     stored_order = None
@@ -216,28 +212,37 @@ def chat_with_memory(user_input: str) -> str:
         memory.save_context({"input": ui}, {"output": reply})
         return reply
 
-    # 3) Order number FIRST (so “It’s # 67890” completes the prior request)
+    # 3) PENDING-INTENT SHORT-CIRCUIT (fix for "It's #26790" case)
     new_o = extract_order(ui)
+    if pending_intent:
+        if new_o:
+            stored_order = new_o
+            fn = {"status": handle_status, "eta": handle_eta,
+                  "track": handle_track, "link": handle_link,
+                  "cancel": handle_cancel}[pending_intent]
+            reply = fn(stored_order)
+            pending_intent = None
+            memory.save_context({"input": ui}, {"output": reply})
+            return reply
+        # still waiting for an order number
+        reply = "Got it—please share your order number (e.g., #12345)."
+        memory.save_context({"input": ui}, {"output": reply})
+        return reply
+
+    # 4) If message provides an order number (no pending intent yet), save it & ask action
     if new_o:
         stored_order = new_o
-        if pending_intent in ("status","eta","track","link","cancel"):
-            fn = {"status": handle_status,"eta": handle_eta,"track": handle_track,
-                  "link": handle_link,"cancel": handle_cancel}[pending_intent]
-            reply = fn(stored_order); pending_intent = None
-            memory.save_context({"input": ui}, {"output": reply}); return reply
-        # no pending intent → ask what they want to do with this order
         reply = handle_ask_action(stored_order)
         memory.save_context({"input": ui}, {"output": reply})
         return reply
 
-    # 4) Support-only guard (skip if we have a pending intent)
-    if pending_intent is None:
-        if not any(k in low for k in ALLOWED_KEYWORDS) and not any(k in low for k in ("hi","hello","hey")):
-            reply = "I’m for store support only (orders, shipping, returns, warranty, account). How can I help with those?"
-            memory.save_context({"input": ui}, {"output": reply})
-            return reply
+    # 5) Support-only guard (message must be support-ish)
+    if not any(k in low for k in ALLOWED_KEYWORDS) and not any(k in low for k in ("hi","hello","hey")):
+        reply = "I’m for store support only (orders, shipping, returns, warranty, account). How can I help with those?"
+        memory.save_context({"input": ui}, {"output": reply})
+        return reply
 
-    # 5) Intent classification (added warranty/guarantee/policy)
+    # 6) Intent classification
     if any(k in low for k in ["status","where is my order","check status"]):
         intent = "status"
     elif any(k in low for k in ["how long","eta","delivery time"]):
@@ -255,7 +260,7 @@ def chat_with_memory(user_input: str) -> str:
     else:
         intent = "fallback"
 
-    # 6) Handle intents
+    # 7) Handle intents
     if intent in ("status","eta","track","link","cancel"):
         if not stored_order:
             pending_intent = intent
@@ -264,17 +269,20 @@ def chat_with_memory(user_input: str) -> str:
             fn = {"status": handle_status,"eta": handle_eta,"track": handle_track,
                   "link": handle_link,"cancel": handle_cancel}[intent]
             reply = fn(stored_order)
-        memory.save_context({"input": ui}, {"output": reply}); return reply
+        memory.save_context({"input": ui}, {"output": reply})
+        return reply
 
     if intent == "warranty_policy":
         reply = handle_warranty_policy()
-        memory.save_context({"input": ui}, {"output": reply}); return reply
+        memory.save_context({"input": ui}, {"output": reply})
+        return reply
 
     if intent == "return_policy":
         reply = handle_return_policy()
-        memory.save_context({"input": ui}, {"output": reply}); return reply
+        memory.save_context({"input": ui}, {"output": reply})
+        return reply
 
-    # 7) LLM fallback (on-topic) + post-check
+    # 8) LLM fallback (on-topic) + post-check
     reply = _generate_reply(ui)
     if is_sexual_or_toxic(reply): reply = REFUSAL
     memory.save_context({"input": ui}, {"output": reply})