Update app.py

app.py

@@ -23,9 +23,9 @@ client.base_url = os.getenv("OPENAI_API_BASE", "https://api.openai.com/v1")
 # Chatwoot config
 CHATWOOT_BASE_URL = os.getenv("CHATWOOT_BASE_URL")
 CHATWOOT_API_KEY = os.getenv("CHATWOOT_API_KEY")
-CHATWOOT_ACCOUNT_ID = int(os.getenv("CHATWOOT_ACCOUNT_ID", "123911"))  # Defaulting to 123911
+CHATWOOT_ACCOUNT_ID = int(os.getenv("CHATWOOT_ACCOUNT_ID"))  # e.g., 123911
 
-# Global set to track conversations where AI should stop replying
+# Track conversations where AI should stop replying
 stop_reply_conversations = set()
 
 @app.post("/ask")
@@ -33,49 +33,47 @@ async def ask(request: Request):
     payload = await request.json()
     print("📥 Incoming payload:", json.dumps(payload, indent=2))
 
-    message_type = payload.get("message_type", "").lower()
     account_id = payload.get("account", {}).get("id")
-    sender_id = payload.get("sender", {}).get("id")
     conversation_id = payload.get("conversation", {}).get("id")
+    sender_id = payload.get("sender", {}).get("id")
     sender_role = payload.get("sender", {}).get("role", "").lower()
+    message_type = payload.get("message_type", "").lower()
     message_content = payload.get("content", "").strip()
 
-    # Stop if message is not from allowed account ID
-    if account_id != CHATWOOT_ACCOUNT_ID:
-        print(f"❌ Ignoring message from account ID {account_id} (only {CHATWOOT_ACCOUNT_ID} is allowed)")
-        return {"status": "ignored: invalid account"}
-
-    # Only respond to incoming messages
+    # Ignore non-incoming messages
     if message_type != "incoming":
-        print("⚠️ Ignoring non-incoming messages")
+        print("⚠️ Ignoring non-incoming message")
         return {"status": "ignored"}
 
-    # Ignore messages from bot itself
+    # Bot must not reply to itself
     if sender_id == account_id:
-        print("⚠️ Ignoring message from bot itself")
+        print("⚠️ Ignoring bot's own message")
         return {"status": "ignored"}
 
-    # Human agent message: disable AI for this conversation
-    if sender_role == "agent":
-        if message_content.lower() == "/botresume":
-            stop_reply_conversations.discard(conversation_id)
-            print(f"ℹ️ Bot resumed for conversation {conversation_id}")
-            await send_chatwoot_message(conversation_id, "Bot resumed and will reply to users now.")
-            return {"status": "bot resumed"}
-        else:
-            stop_reply_conversations.add(conversation_id)
-            print(f"🚫 Human agent takeover. AI disabled for conversation {conversation_id}")
-            return {"status": "human takeover"}
+    # Handle special bot resume command
+    if sender_role == "agent" and message_content.lower() == "/botresume":
+        stop_reply_conversations.discard(conversation_id)
+        print(f"ℹ️ Bot resumed for conversation {conversation_id}")
+        await send_chatwoot_message(conversation_id, "Bot resumed and will reply to users now.")
+        return {"status": "bot resumed"}
 
+    # Stop AI if the message came from any account *other than* web inbox
+    if account_id != CHATWOOT_ACCOUNT_ID:
+        stop_reply_conversations.add(conversation_id)
+        print(f"🚫 Message from other inbox (account ID {account_id}) → disabling AI for conversation {conversation_id}")
+        return {"status": "AI disabled due to human intervention"}
+
+    # Check if AI is blacklisted for this conversation
     if conversation_id in stop_reply_conversations:
-        print(f"🚫 Conversation {conversation_id} blacklisted. No AI reply.")
-        return {"status": "ignored: blacklisted"}
+        print(f"🚫 AI is disabled for conversation {conversation_id}")
+        return {"status": "ignored: human takeover"}
 
+    # Ensure all data is present
     if not message_content or not conversation_id:
-        print("❌ Missing essential data")
+        print("❌ Missing content or conversation ID")
         return {"status": "invalid payload"}
 
-    # Prepare and send to OpenAI
+    # Build messages for GPT
     messages = [
         {"role": "system", "content": system_prompt},
         {"role": "user", "content": message_content},
@@ -89,17 +87,17 @@ async def ask(request: Request):
             max_tokens=200,
         )
         answer = response.choices[0].message.content.strip()
-        print("✅ OpenAI Answer:", answer)
+        print("✅ GPT Answer:", answer)
     except Exception as e:
         print("❌ OpenAI Error:", e)
         answer = "Sorry, I'm having trouble answering right now."
 
-    fallback = "I'm not sure about that. Let me connect you with a human agent."
-    if answer == fallback:
+    if answer == "I'm not sure about that. Let me connect you with a human agent.":
         stop_reply_conversations.add(conversation_id)
-        print(f"🚫 Fallback triggered. Conversation {conversation_id} blacklisted.")
+        print(f"🚫 Fallback answer, disabling AI for conversation {conversation_id}")
 
     await send_chatwoot_message(conversation_id, answer)
+
     return {"status": "ok"}
 
 
@@ -111,6 +109,7 @@ async def send_chatwoot_message(conversation_id: str, content: str):
         "content_type": "text",
         "content_attributes": {}
     }
+
     try:
         async with httpx.AsyncClient() as http:
             url = f"{CHATWOOT_BASE_URL}/api/v1/accounts/{CHATWOOT_ACCOUNT_ID}/conversations/{conversation_id}/messages"