Update main.py

main.py

@@ -84,13 +84,40 @@ def handle_image_message(event):
     user_id = event.source.user_id
     chat = chat_sessions.get(user_id) or model.start_chat(history=[])
     chat_sessions[user_id] = chat
+    previous_message = get_previous_message(user_id)
 
+    user_text = event.message.text if event.message.type == "text" else None
+    image_url = None
+    
+    if previous_message and previous_message["type"] == "image" and event.message.type == "text":
+        image_path = previous_message["content"]
+        user_text = event.message.text
+        store_user_message(user_id, "text", user_text)
+        try:
+            if not os.path.exists(image_path):
+                raise FileNotFoundError(f"圖片路徑無效：{image_path}")
+            previous_img = PIL.Image.open(image_path)
+            completion = chat.send_message([user_text, previous_img])
+            out = completion.text
+        except Exception as e:
+            out = f"發生錯誤: {e}"
+            
+    # ========
+    # 上傳圖片
+    # ========
+    elif event.message.type == "image":
+        image_path = get_image_url(event.message.id)
+        if image_path:
+            store_user_message(user_id, "image", image_path)
+            line_bot_api.reply_message(event.reply_token, TextSendMessage(text="圖片已接收成功囉，幫我輸入你想詢問的問題喔~"))
+        else:
+            line_bot_api.reply_message(event.reply_token, TextSendMessage(text="沒有接收到圖片~"))
+        return
+        
     # ========
     # 生成圖片
     # ========
-    user_text = event.message.text if event.message.type == "text" else None
-    image_url = None
-    if user_text and user_text.startswith("生成圖片"):
+    elif user_text and user_text.startswith("生成圖片"):
         prompt = user_text.replace("生成圖片", "").strip()
 
          # 先立即回覆避免token過期
@@ -122,49 +149,22 @@ def handle_image_message(event):
                 TextSendMessage(text="⚠️ 圖片生成失敗，請稍後再試~")
             )
         return
-        
-    # ========
-    # 上傳圖片
-    # ========
-    if event.message.type == "image":
-        image_path = get_image_url(event.message.id)
-        if image_path:
-            store_user_message(user_id, "image", image_path)
-            line_bot_api.reply_message(event.reply_token, TextSendMessage(text="圖片已接收成功囉，幫我輸入你想詢問的問題喔~"))
-        else:
-            line_bot_api.reply_message(event.reply_token, TextSendMessage(text="沒有接收到圖片~"))
-        return
-
-    previous_message = get_previous_message(user_id)
-    if previous_message and previous_message["type"] == "image" and event.message.type == "text":
-        image_path = previous_message["content"]
-        user_text = event.message.text
-        store_user_message(user_id, "text", user_text)
-        try:
-            if not os.path.exists(image_path):
-                raise FileNotFoundError(f"圖片路徑無效：{image_path}")
-            organ = PIL.Image.open(image_path)
-            completion = chat.send_message([user_text, organ])
-            out = completion.text
-        except Exception as e:
-            out = f"發生錯誤: {e}"
 
     # ========
     # 純文字
     # ========
-    else:
-        if event.message.type != "text":
+    elif event.message.type != "text" or event.message.type != "image":
             line_bot_api.reply_message(event.reply_token, TextSendMessage(text="請輸入文字或圖片~"))
             return
-        if event.message.text == "再見":
+    elif event.message.text == "再見":
             line_bot_api.reply_message(event.reply_token, TextSendMessage(text="Bye!"))
             return
-        if working_status:
-            try:
-                prompt = event.message.text
-                store_user_message(user_id, "text", prompt)
-                completion = chat.send_message(prompt)
-                out = completion.text if completion.text else "我不太懂什麼意思也~"
+    elif working_status:
+        try:
+            prompt = event.message.text
+            store_user_message(user_id, "text", prompt)
+            completion = chat.send_message(prompt)
+            out = completion.text if completion.text else "我不太懂什麼意思也~"
             except:
                 out = "執行出錯!請換個說法！"