Update app.py

app.py

@@ -3,9 +3,9 @@ import requests
 import json
 import os
 import uuid
-from db import fetch_json_from_github  # Import the GitHub JSON fetcher
-from qwen import get_qwen_response  # Import the Qwen response function
-from upload import upload_image_to_cdn  # Import the new upload function
+from db import fetch_json_from_github
+from qwen import get_qwen_response
+from upload import upload_image_to_cdn
 
 app = Flask(__name__)
 
@@ -45,7 +45,7 @@ def handle_message():
     body = request.get_json()
 
     for entry in body["entry"]:
-        page_id = entry["id"]  # Extract page_id from the incoming message
+        page_id = entry["id"]
         page_token = PAGE_CREDENTIALS.get(page_id)
 
         if not page_token:
@@ -65,7 +65,6 @@ def handle_message():
                     if attachment["type"] == "image":
                         image_url = attachment["payload"]["url"]
                         try:
-                            # Download image from Messenger
                             img_response = requests.get(image_url)
                             img_response.raise_for_status()
                             temp_path = f"temp_{uuid.uuid4()}.jpg"
@@ -73,7 +72,6 @@ def handle_message():
                             with open(temp_path, "wb") as f:
                                 f.write(img_response.content)
                             
-                            # Upload to Qwen CDN
                             cdn_url = upload_image_to_cdn(BASE_URL, AUTH_TOKEN, temp_path)
                             if cdn_url:
                                 image_cdn_urls.append(cdn_url)
@@ -83,19 +81,14 @@ def handle_message():
                             if os.path.exists(temp_path):
                                 os.remove(temp_path)
 
-                # Build message content for Qwen
-                user_content = []
-                
-                # Add text content if it exists
-                if text_content:
-                    user_content.append({"type": "text", "text": text_content})
-                
-                # Add image CDN URLs
-                for cdn_url in image_cdn_urls:
-                    user_content.append({"type": "image", "image": cdn_url})
+                # Build message content for Qwen (single object with text + images)
+                user_content = {
+                    "text": text_content,
+                    "images": image_cdn_urls
+                }
 
-                # Send user_content to Qwen if it's not empty
-                if user_content:
+                # Send to Qwen only if there's content
+                if user_content["text"] or user_content["images"]:
                     ai_response = get_qwen_response(user_content)
                     
                     # Send response back to user
@@ -106,7 +99,7 @@ def handle_message():
                     payload = {
                         "recipient_id": sender_id,
                         "message_text": ai_response,
-                        "page_access_token": page_token  # Include page-specific token
+                        "page_access_token": page_token
                     }
                     requests.post(AI_SERVICE_URL, json=payload, headers=headers)