Update app.py

app.py

@@ -3,6 +3,7 @@ import requests
 import base64
 import logging
 import os
+import threading
 
 app = Flask(__name__)
 logging.basicConfig(level=logging.INFO)
@@ -16,15 +17,9 @@ CW_PRIVATE_KEY = os.environ.get("CW_PRIVATE_KEY", "kOwo89oUO6SVVSYi")
 CW_CLIENT_ID   = os.environ.get("CW_CLIENT_ID",   "e45cf35f-24a8-4f5f-b47a-19376cafce64")
 BASE_URL       = "https://api-na.myconnectwise.net/v4_6_release/apis/3.0"
 
-# ── HARDCODED FALLBACKS ────────────────────────────────────────────────────────
-# Set these as Hugging Face Secrets once you find the real values in ConnectWise.
-# Log into ConnectWise manually and check:
-#   CW_BOARD_ID      → Service Desk → Boards → open your board → ID is in the URL
-#   CW_COMPANY_NUM_ID→ Companies → your company → ID in URL
-#   CW_PRIORITY_ID   → Service Desk → Priority List → ID in URL
-CW_BOARD_ID       = os.environ.get("CW_BOARD_ID",       "")   # e.g. "1"
-CW_COMPANY_NUM_ID = os.environ.get("CW_COMPANY_NUM_ID", "")   # e.g. "250"
-CW_PRIORITY_ID    = os.environ.get("CW_PRIORITY_ID",    "")   # e.g. "8"
+CW_BOARD_ID       = os.environ.get("CW_BOARD_ID",       "")
+CW_COMPANY_NUM_ID = os.environ.get("CW_COMPANY_NUM_ID", "")
+CW_PRIORITY_ID    = os.environ.get("CW_PRIORITY_ID",    "")
 
 auth         = f"{CW_COMPANY_ID}+{CW_PUBLIC_KEY}:{CW_PRIVATE_KEY}"
 encoded_auth = base64.b64encode(auth.encode()).decode()
@@ -35,45 +30,58 @@ CW_HEADERS = {
     "Content-Type":  "application/json",
 }
 
+# ── Deduplication: track already-processed Slack event IDs ────────────────────
+# Stores the last 500 event IDs to prevent duplicate processing
+processed_events = set()
+processed_lock   = threading.Lock()
 
-# ── Discovery (works only once 403 is fixed) ───────────────────────────────────
+def already_seen(event_id):
+    """Returns True if we've already processed this event. Thread-safe."""
+    with processed_lock:
+        if event_id in processed_events:
+            return True
+        processed_events.add(event_id)
+        # Keep the set from growing forever
+        if len(processed_events) > 500:
+            oldest = next(iter(processed_events))
+            processed_events.discard(oldest)
+        return False
+
+
+# ── Discovery ──────────────────────────────────────────────────────────────────
 
 def discover():
-    """Try to pull board/company/priority IDs from the API."""
     board_id = company_id = priority_id = None
     board_name = "default"
 
     try:
         r = requests.get(f"{BASE_URL}/service/boards", headers=CW_HEADERS,
                          params={"pageSize": 100}, timeout=10)
-        logger.info("Boards %s: %s", r.status_code, r.text[:400])
         if r.status_code == 200 and r.json():
             b = r.json()[0]
             board_id, board_name = b["id"], b["name"]
+            logger.info("Discovered board: %s id=%s", board_name, board_id)
     except Exception as e:
         logger.warning("Board discover error: %s", e)
 
     try:
         r = requests.get(f"{BASE_URL}/company/companies", headers=CW_HEADERS,
                          params={"pageSize": 50}, timeout=10)
-        logger.info("Companies %s: %s", r.status_code, r.text[:400])
         if r.status_code == 200 and r.json():
-            # Try to match our company name, else take first
-            all_companies = r.json()
+            all_cos = r.json()
             match = next(
-                (c for c in all_companies
+                (c for c in all_cos
                  if CW_COMPANY_ID.lower() in (c.get("name","") + c.get("identifier","")).lower()),
-                all_companies[0]
+                all_cos[0]
             )
             company_id = match["id"]
-            logger.info("Matched company: %s id=%s", match.get("name"), company_id)
+            logger.info("Discovered company: %s id=%s", match.get("name"), company_id)
     except Exception as e:
         logger.warning("Company discover error: %s", e)
 
     try:
         r = requests.get(f"{BASE_URL}/service/priorities", headers=CW_HEADERS,
                          params={"pageSize": 50}, timeout=10)
-        logger.info("Priorities %s: %s", r.status_code, r.text[:300])
         if r.status_code == 200 and r.json():
             priority_id = r.json()[0]["id"]
     except Exception as e:
@@ -85,33 +93,24 @@ def discover():
 # ── Ticket creation ────────────────────────────────────────────────────────────
 
 def post_ticket(payload):
-    r = requests.post(
-        f"{BASE_URL}/service/tickets",
-        headers=CW_HEADERS,
-        json=payload,
-        timeout=10,
-    )
-    logger.info("CW POST %s: %s", r.status_code, r.text[:500])
+    r = requests.post(f"{BASE_URL}/service/tickets",
+                      headers=CW_HEADERS, json=payload, timeout=10)
+    logger.info("CW POST %s: %s", r.status_code, r.text[:400])
     return r
 
 
 def create_ticket(issue):
     summary = issue[:100]
 
-    # Use hardcoded env var IDs if set, otherwise try discovery
     if CW_BOARD_ID and CW_COMPANY_NUM_ID:
         board_id    = int(CW_BOARD_ID)
         company_id  = int(CW_COMPANY_NUM_ID)
         priority_id = int(CW_PRIORITY_ID) if CW_PRIORITY_ID else None
         board_name  = "configured"
-        logger.info("Using env var IDs: board=%s company=%s priority=%s",
-                    board_id, company_id, priority_id)
     else:
         board_id, board_name, company_id, priority_id = discover()
 
-    attempts = []
-
-    # ── 1. Numeric IDs (most reliable) ───────────────────────────────────────
+    # Attempt 1: full numeric IDs
     if board_id and company_id:
         payload = {
             "summary": summary, "initialDescription": issue,
@@ -123,51 +122,31 @@ def create_ticket(issue):
         r = post_ticket(payload)
         if r.status_code in (200, 201):
             return r.json().get("id"), board_name
-        attempts.append(r.text)
 
-    # ── 2. Company numeric ID only (no board) ────────────────────────────────
+    # Attempt 2: company only
     if company_id:
-        payload = {
-            "summary": summary, "initialDescription": issue,
-            "company": {"id": company_id},
-        }
-        r = post_ticket(payload)
+        r = post_ticket({"summary": summary, "initialDescription": issue,
+                         "company": {"id": company_id}})
         if r.status_code in (200, 201):
             return r.json().get("id"), "default"
-        attempts.append(r.text)
 
-    # ── 3. Member's own company as the company (common CW pattern) ───────────
-    # When company = the MSP itself, CW sometimes needs companyType or contactId
-    # Try with just the member company ID from login
+    # Attempt 3: use member's own company ID
     try:
-        r2 = requests.get(
-            f"{BASE_URL}/system/members/me",
-            headers=CW_HEADERS, timeout=10
-        )
+        r2 = requests.get(f"{BASE_URL}/system/members/me", headers=CW_HEADERS, timeout=10)
         if r2.status_code == 200:
-            me = r2.json()
-            my_company_id = me.get("company", {}).get("id")
-            logger.info("Member company id: %s", my_company_id)
-            if my_company_id:
-                payload = {
-                    "summary": summary, "initialDescription": issue,
-                    "company": {"id": my_company_id},
-                }
+            my_cid = r2.json().get("company", {}).get("id")
+            if my_cid:
+                payload = {"summary": summary, "initialDescription": issue,
+                           "company": {"id": my_cid}}
                 if board_id:
                     payload["board"] = {"id": board_id}
                 r = post_ticket(payload)
                 if r.status_code in (200, 201):
                     return r.json().get("id"), board_name or "default"
-                attempts.append(r.text)
     except Exception as e:
         logger.warning("Member lookup failed: %s", e)
 
-    # ── 4. Absolute minimum ───────────────────────────────────────────────────
-    r = post_ticket({"summary": summary, "initialDescription": issue})
-    if r.status_code in (200, 201):
-        return r.json().get("id"), "default"
-
-    logger.error("All attempts failed. Last errors: %s", attempts[-3:])
+    logger.error("All ticket attempts failed")
     return None, None
 
 
@@ -183,6 +162,36 @@ def send_slack(channel, text):
     )
 
 
+def handle_event(event_data):
+    """Run in background thread so Slack gets 200 instantly."""
+    event = event_data.get("event", {})
+
+    if event.get("bot_id") or event.get("subtype") == "bot_message":
+        return
+
+    if event.get("type") != "message":
+        return
+
+    text    = event.get("text", "")
+    channel = event.get("channel")
+    text    = text.replace("<@U0AL3KRRELE>", "").strip()
+
+    if not text:
+        return
+
+    ticket_id, board_used = create_ticket(text)
+
+    if ticket_id:
+        reply = f"✅ Ticket created!\n🎫 ID: `{ticket_id}`\n📋 Board: {board_used}"
+    else:
+        reply = (
+            "⚠️ Could not create ConnectWise ticket.\n"
+            "Visit /debug/cw to check API permissions."
+        )
+
+    send_slack(channel, reply)
+
+
 # ── Routes ─────────────────────────────────────────────────────────────────────
 
 @app.route("/")
@@ -192,15 +201,6 @@ def home():
 
 @app.route("/debug/cw")
 def debug_cw():
-    """
-    Visit /debug/cw to see what your API key CAN access.
-    If you see 403 errors here, your API key needs more permissions in ConnectWise.
-    Go to: System → Members → API Members → Security Role → enable Inquire on:
-      Companies > Company Maintenance
-      Service Desk > Service Boards
-      Service Desk > Service Tickets (Add + Inquire)
-      Service Desk > Priorities
-    """
     out = {
         "env_vars": {
             "CW_BOARD_ID":       CW_BOARD_ID or "NOT SET",
@@ -208,19 +208,17 @@ def debug_cw():
             "CW_PRIORITY_ID":    CW_PRIORITY_ID or "NOT SET",
         }
     }
-
     for label, url, params in [
-        ("boards",     f"{BASE_URL}/service/boards",      {"pageSize": 50}),
-        ("companies",  f"{BASE_URL}/company/companies",   {"pageSize": 20}),
-        ("priorities", f"{BASE_URL}/service/priorities",  {"pageSize": 20}),
-        ("member_me",  f"{BASE_URL}/system/members/me",   {}),
+        ("boards",     f"{BASE_URL}/service/boards",     {"pageSize": 50}),
+        ("companies",  f"{BASE_URL}/company/companies",  {"pageSize": 20}),
+        ("priorities", f"{BASE_URL}/service/priorities", {"pageSize": 20}),
+        ("member_me",  f"{BASE_URL}/system/members/me",  {}),
     ]:
         try:
             r = requests.get(url, headers=CW_HEADERS, params=params, timeout=10)
             out[label] = {"status": r.status_code, "data": r.json()}
         except Exception as e:
             out[label] = {"error": str(e)}
-
     return jsonify(out)
 
 
@@ -228,34 +226,19 @@ def debug_cw():
 def slack_events():
     data = request.get_json()
 
+    # URL verification handshake
     if data.get("type") == "url_verification":
         return jsonify({"challenge": data.get("challenge")})
 
-    event = data.get("event", {})
-
-    if event.get("bot_id") or event.get("subtype") == "bot_message":
+    # ── Deduplicate: drop retries of the same event ────────────────────────
+    event_id = data.get("event_id", "")
+    if event_id and already_seen(event_id):
+        logger.info("Duplicate event %s — ignored", event_id)
         return "", 200
 
-    if event.get("type") == "message":
-        text    = event.get("text", "")
-        channel = event.get("channel")
-        text    = text.replace("<@U0AL3KRRELE>", "").strip()
-
-        if not text:
-            return "", 200
-
-        ticket_id, board_used = create_ticket(text)
-
-        if ticket_id:
-            reply = f"✅ Ticket created!\n🎫 ID: `{ticket_id}`\n📋 Board: {board_used}"
-        else:
-            reply = (
-                "⚠️ Could not create ticket. Your API key needs more permissions in ConnectWise.\n"
-                "Go to: System → Members → API Members → Security Role\n"
-                "Enable Inquire on: Company Maintenance, Service Boards, Service Tickets, Priorities"
-            )
-
-        send_slack(channel, reply)
+    # ── Return 200 immediately so Slack stops retrying ─────────────────────
+    thread = threading.Thread(target=handle_event, args=(data,), daemon=True)
+    thread.start()
 
     return "", 200