Update app.py

app.py

@@ -301,62 +301,53 @@ def initialize_twilio_client(acc_sid, auth_tkn):
         st.error(f"Failed to initialize Twilio client: {e}")
         return None
 
-def get_new_whatsapp_messages(twilio_client, conversation_service_sid_val, bot_start_time_utc,
-                              processed_message_sids, bot_whatsapp_identity_val):
+def get_new_whatsapp_messages(twilio_client, bot_start_time_utc, processed_message_sids, bot_whatsapp_identity_val):
     if not twilio_client:
         st.warning("Twilio client not initialized.")
         return []
-    if not conversation_service_sid_val:
-        st.warning("Twilio Conversation Service SID not provided.")
-        return []
     if not bot_whatsapp_identity_val: 
         st.warning("Twilio Bot WhatsApp Identity not provided.")
         return []
 
     new_messages_to_process = []
     try:
-        conversations = twilio_client.conversations.v1 \
-            .services(conversation_service_sid_val) \
-            .conversations \
-            .list(limit=50) 
+        # Get all conversations (not limited to a specific service)
+        conversations = twilio_client.conversations.v1.conversations.list(limit=50)
 
         for conv in conversations:
             if conv.date_updated and conv.date_updated > bot_start_time_utc:
                 messages = twilio_client.conversations.v1 \
-                    .services(conversation_service_sid_val) \
                     .conversations(conv.sid) \
                     .messages \
-                    .list(order='desc', limit=10) 
+                    .list(order='desc', limit=10)
 
                 for msg in messages:
                     if msg.sid in processed_message_sids:
-                        continue 
+                        continue
 
+                    # Check if message is from WhatsApp and not from the bot
                     if msg.author and msg.author.lower() != bot_whatsapp_identity_val.lower() and \
-                       msg.date_created and msg.date_created > bot_start_time_utc:
+                       msg.date_created and msg.date_created > bot_start_time_utc and \
+                       msg.author.startswith('whatsapp:'):
                         new_messages_to_process.append({
                             "conversation_sid": conv.sid, "message_sid": msg.sid,
                             "author_identity": msg.author, "message_body": msg.body,
                             "timestamp_utc": msg.date_created
                         })
-                        break 
+                        break
     except Exception as e:
         st.error(f"Error fetching Twilio messages: {e}")
     return sorted(new_messages_to_process, key=lambda m: m['timestamp_utc']) 
 
-def send_whatsapp_message(twilio_client, conversation_service_sid_val, conversation_sid, message_body, bot_identity_val):
+def send_whatsapp_message(twilio_client, conversation_sid, message_body, bot_identity_val):
     if not twilio_client:
         st.error("Twilio client not initialized for sending message.")
         return False
-    if not conversation_service_sid_val:
-        st.error("Twilio Conversation Service SID not provided for sending message.")
-        return False
     if not bot_identity_val:
         st.error("Bot identity not provided for sending message.")
         return False
     try:
         twilio_client.conversations.v1 \
-            .services(conversation_service_sid_val) \
             .conversations(conversation_sid) \
             .messages \
             .create(author=bot_identity_val, body=message_body)
@@ -657,18 +648,17 @@ if st.session_state.get("bot_started") and st.session_state.get("rag_pipeline_re
     if (current_time - st.session_state.last_twilio_poll_time) > polling_interval_to_use:
         st.session_state.last_twilio_poll_time = current_time
         
-        if not st.session_state.get("twilio_client") or \
-           not twilio_conversation_service_sid_to_use or \
-           not twilio_bot_whatsapp_identity_to_use or \
-           not st.session_state.get("bot_start_time_utc"):
-            st.warning("Twilio client/config missing for polling. Ensure bot is started and SIDs are set.")
+        if not st.session_state.get("twilio_client") or not twilio_bot_whatsapp_identity_to_use or not st.session_state.get("bot_start_time_utc"):
+            st.warning("Twilio client/config missing for polling. Ensure bot is started and WhatsApp identity is set.")
         else:
             with st.spinner(f"Checking WhatsApp messages (last poll: {datetime.fromtimestamp(st.session_state.last_twilio_poll_time).strftime('%H:%M:%S')})..."):
-                new_messages = get_new_whatsapp_messages(st.session_state.twilio_client, 
-                                                         twilio_conversation_service_sid_to_use,
-                                                         st.session_state.bot_start_time_utc, 
-                                                         st.session_state.processed_message_sids,
-                                                         twilio_bot_whatsapp_identity_to_use)
+                new_messages = get_new_whatsapp_messages(
+                    st.session_state.twilio_client,
+                    st.session_state.bot_start_time_utc, 
+                    st.session_state.processed_message_sids,
+                    twilio_bot_whatsapp_identity_to_use
+                )
+                
                 if new_messages:
                     st.info(f"Found {len(new_messages)} new WhatsApp message(s) to process.")
                     for msg_data in new_messages:
@@ -757,8 +747,12 @@ if st.session_state.get("bot_started") and st.session_state.get("rag_pipeline_re
                             order_status=wa_order_status
                         )
                         
-                        if send_whatsapp_message(st.session_state.twilio_client, twilio_conversation_service_sid_to_use, 
-                                                 conv_sid, response_whatsapp, twilio_bot_whatsapp_identity_to_use):
+                        if send_whatsapp_message(
+                            st.session_state.twilio_client,
+                            conv_sid, 
+                            response_whatsapp, 
+                            twilio_bot_whatsapp_identity_to_use
+                        ):
                             st.session_state.processed_message_sids.add(msg_sid)
                             st.success(f"Successfully responded to WhatsApp message SID {msg_sid} from {author_id}.")
                         else: