Update main.py

main.py

@@ -3,6 +3,7 @@ import gradio as gr
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi import FastAPI, Request,  Header, BackgroundTasks, HTTPException, status
 import google.generativeai as genai
+import mimetypes
 import base64
 from collections import defaultdict
 from linebot import LineBotApi, WebhookHandler
@@ -94,33 +95,37 @@ def upload_image_to_imgur(client, image_binary, album=None, name="gemini-image",
 
 # 使用 Gemini 生成圖片
 def generate_image_with_gemini(prompt):
-    image_model = genai.GenerativeModel("gemini-2.0-flash-exp-image-generation")
-    response = image_model.generate_content(prompt)
-    if response.parts and hasattr(response.parts[0], "inline_data"):
-        return response.parts[0].inline_data.data
-    return None
+    model_name = "gemini-2.0-flash-exp-image-generation"
+
+    client = genai.GenerativeModel(model_name)
+
+    contents = [genai.types.Content(
+        role="user",
+        parts=[genai.types.Part.from_text(prompt)]
+    )]
+
+    generate_content_config = genai.types.GenerateContentConfig(
+        temperature=1,
+        top_p=0.95,
+        top_k=40,
+        max_output_tokens=1000,
+        response_modalities=["image", "text"],
+        response_mime_type="text/plain",
+    )
+
+    for chunk in client.generate_content_stream(
+        contents=contents,
+        generation_config=generate_content_config,
+    ):
+        if not chunk.candidates or not chunk.candidates[0].content.parts:
+            continue
+        if chunk.candidates[0].content.parts[0].inline_data:
+            inline_data = chunk.candidates[0].content.parts[0].inline_data
+            file_extension = mimetypes.guess_extension(inline_data.mime_type) or ".png"
+            return inline_data.data, file_extension
+
+    return None, None
 
-def upload_image_to_imgur_with_token(image_binary, access_token):
-    """
-    使用 Imgur OAuth2 Access Token 上傳圖片（直接接收 binary，不需存檔）
-    """
-    try:
-        headers = {"Authorization": f"Bearer {access_token}"}
-        data = {
-            "image": base64.b64encode(image_binary).decode("utf-8"),
-            "type": "base64",
-        }
-
-        response = httpx.post("https://api.imgur.com/3/image", headers=headers, data=data)
-        if response.status_code == 200:
-            return response.json()["data"]["link"]
-        else:
-            print("Imgur 上傳失敗：", response.text)
-            return None
-    except Exception as e:
-        print("圖片上傳例外：", e)
-        return None
-        
 #==========================
 # 使用者上傳圖片
 #==========================
@@ -152,7 +157,6 @@ def analyze_with_gemini(image_path, user_text):
     """
     try:
         # 確保圖片存在
-        print("上傳圖片至 Imgur...")
         if not os.path.exists(image_path):
             raise FileNotFoundError(f"圖片路徑無效：{image_path}")
         
@@ -165,7 +169,6 @@ def analyze_with_gemini(image_path, user_text):
     except Exception as e:
         return f"發生錯誤: {e}"
     
-
 def get_previous_message(user_id):
     """
     獲取用戶的上一則訊息
@@ -192,15 +195,23 @@ def handle_image_message(event):
         prompt = user_text.replace("請幫我生成圖片", "").strip()
 
         client = ImgurClient(client_id, client_secret, access_token, refresh_token)
-        image_binary = generate_image_with_gemini(prompt)
+        image_binary, _ = generate_image_with_gemini(prompt)
 
         if image_binary:
             album = "nvsYwgq"  # 你的相簿ID
             image_url = upload_image_to_imgur(client, image_binary, album)
-            print(f"圖片網址: {image_url}")
+            line_bot_api.reply_message(
+            event.reply_token,
+            [
+                TextSendMessage(text="這是我為你生成的圖片喔～ ✨"),
+                ImageSendMessage(original_content_url=image_url, preview_image_url=image_url)
+            ]
+            )
         else:
-            print("Gemini 圖片生成失敗")
-        return
+            line_bot_api.reply_message(
+            event.reply_token,
+            TextSendMessage(text="圖片生成失敗，請稍後再試~")
+            )
 
     if event.message.type == "image":
         image_path = get_image_url(event.message.id)