Update main.py

main.py

@@ -20,14 +20,16 @@ from Uploading_images_file import get_image_url, store_user_message, analyze_wit
 #==========================
 
 # 設定 Google AI API 金鑰
-google_api = os.environ["GOOGLE_API_KEY"]
-genai_gen.configure(api_key=google_api)
+# google_api = os.environ["GOOGLE_API_KEY"]
+# genai_gen.configure(api_key=google_api)
+client = genai.Client(api_key=os.getenv("GOOGLE_API_KEY"))
 
 # 設定生成文字的參數
-generation_config = genai_gen.types.GenerationConfig(max_output_tokens=1000, temperature=0.2, top_p=0.5, top_k=16) #2048
+# generation_config = genai_gen.types.GenerationConfig(max_output_tokens=1000, temperature=0.2, top_p=0.5, top_k=16)
+generation_config = genai.types.GenerateContentConfig(max_output_tokens=256, temperature=0.5, top_p=0.5, top_k=16)
 
 # 使用 gemini-2.0-flash-exp 模型
-model = genai_gen.GenerativeModel('gemini-2.0-flash', system_instruction="主要用繁體中文回答，但如果用戶使用詢問英文問題，就用英文回應。你現在是個專業助理，職稱為OPEN小助理，個性活潑、樂觀，願意回答所有問題", generation_config=generation_config)
+# model = genai_gen.GenerativeModel('gemini-2.0-flash', system_instruction="主要用繁體中文回答，但如果用戶使用詢問英文問題，就用英文回應。你現在是個專業助理，職稱為OPEN小助理，個性活潑、樂觀，願意回答所有問題", generation_config=generation_config)
 
 # 設定 Line Bot 的 API 金鑰和秘密金鑰
 line_bot_api = LineBotApi(os.environ["CHANNEL_ACCESS_TOKEN"])
@@ -109,7 +111,7 @@ def handle_image_message(event):
         image_binary = image_generator.generate_image_with_gemini(prompt)
 
         if image_binary:
-            image_url = 'https://alanchen1115-linebot.hf.space/'+image_generator.upload_image_to_tmp(image_binary)
+            image_url = 'https://alanchen1115-linebot.hf.space/'+image_generator.upload_image_to_tmp(image_binary) ### 要改 https
 
             if image_url:
                 # 使用 push message 發送圖片，避免 reply token 超時
@@ -137,7 +139,13 @@ def handle_image_message(event):
     # ========
     elif event.message.type == "text" and previous_message["type"] != "image":
         try: 
-            response = chat.send_message(user_text)
+            # response = chat.send_message(user_text)
+            user_id = event.source.user_id
+            chat = chat_sessions.get(user_id) or client.chats.create(model="gemini-2.0-flash", config=generation_config)
+            chat_sessions[user_id] = chat
+            # 取得使用者輸入的文字
+            user_input = event.message.text
+            response = chat.send_message(user_input)
             if (response.text != None):
                 out = response.text
             else:
@@ -154,8 +162,15 @@ def handle_image_message(event):
             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
+            # completion = chat.send_message([user_text, previous_img])
+            # out = completion.text
+            user_id = event.source.user_id
+            chat = chat_sessions.get(user_id) or client.chats.create(model="gemini-2.0-flash", config=generation_config)
+            chat_sessions[user_id] = chat
+            # 取得使用者輸入的文字
+            user_input = event.message.text
+            response = chat.send_message([previous_img, user_input])
+            
         except Exception as e:
             out = f"發生錯誤: {e}"