Update app.py

app.py

@@ -50,23 +50,46 @@ def webhook():
             print(f"Messaging event: {messaging_event}")
 
             if 'message' in messaging_event:
+                # Ignore echo messages
+                if messaging_event['message'].get('is_echo'):
+                    print("Echo message received. Ignoring.")
+                    return jsonify({'status': 'ok'})
+
                 sender_id = messaging_event['sender']['id']
                 message_text = messaging_event['message'].get('text', '')
 
+                if not message_text:
+                    print("Empty message text received. Ignoring.")
+                    return jsonify({'status': 'ok'})
+
                 print(f"Received message from {sender_id}: {message_text}")
 
                 # Set typing on
                 set_typing_on(sender_id)
-                # Get response with possible image URLs
-                response_data = chat_completion(message_text, sender_id)
-                print("ChatBot Response:\n", response_data)
-                # Convert response_data to dictionary if it's a string
-                if isinstance(response_data, str):
-                    response_data = json.loads(response_data)
-                print(type(response_data))
+
                 try:
-                    
+                    # Get response with possible image URLs
+                    response_data = chat_completion(message_text, sender_id)
+                    print("ChatBot Response:\n", response_data)
+
                     # Ensure response_data is a dictionary
+                    if isinstance(response_data, str):
+                        try:
+                            response_data = json.loads(response_data)
+                        except json.JSONDecodeError:
+                            # Extract text and URLs from the string
+                            response_text, image_urls = extract_text_and_urls(response_data)
+                            print(f"Extracted Text: {response_text}")
+                            print(f"Extracted Image URLs: {image_urls}")
+
+                            # Send text and/or images
+                            if response_text:
+                                send_message(sender_id, response_text)
+                            if image_urls:
+                                for url in image_urls:
+                                    send_image(sender_id, url)
+                            response_data = {}
+
                     if isinstance(response_data, dict):
                         response_text = response_data.get('msg', '')
                         image_urls = response_data.get('image_urls', [])
@@ -80,26 +103,13 @@ def webhook():
                         if image_urls:
                             for url in image_urls:
                                 send_image(sender_id, url)
-                    elif isinstance(response_data, str):
-                        # Extract text and URLs from the string
-                        response_text, image_urls = extract_text_and_urls(response_data)
-                        
-                        print(f"Extracted Text: {response_text}")
-                        print(f"Extracted Image URLs: {image_urls}")
-
-                        # Send text and/or images
-                        if response_text:
-                            send_message(sender_id, response_text)
-                        if image_urls:
-                            for url in image_urls:
-                                send_image(sender_id, url)
-
                     else:
                         print("Error: ChatBot response is not a dictionary.")
-                        send_message(sender_id, response_data)
+                        send_message(sender_id, "Sorry, I couldn't process your request.")
                 except Exception as e:
                     print(f"Exception occurred: {e}")
-                    
+                    send_message(sender_id, "Sorry, something went wrong. Please try again later.")
+                
                 # Mark message as seen
                 mark_seen(sender_id)
                 # Set typing off after responding
@@ -167,7 +177,7 @@ def set_typing_off(recipient_id):
     print(f"Sending typing off request: {payload}")
     response = requests.post(url, headers=headers, json=payload)
     print(f"Typing off response: {response.status_code}, {response.text}")
-    
+
 def mark_seen(recipient_id):
     url = f'https://graph.facebook.com/v12.0/me/messages?access_token={PAGE_ACCESS_TOKEN}'
     headers = {'Content-Type': 'application/json'}
@@ -178,6 +188,6 @@ def mark_seen(recipient_id):
     print(f"Sending mark seen request: {payload}")
     response = requests.post(url, headers=headers, json=payload)
     print(f"Mark seen response: {response.status_code}, {response.text}")
-    
+
 if __name__ == '__main__':
     app.run(host="0.0.0.0", port=7860, debug=True)