Evaaaaa06 commited on
Commit
b1adecf
Β·
verified Β·
1 Parent(s): 38279da

Update main.py

Browse files
Files changed (1) hide show
  1. main.py +5 -4
main.py CHANGED
@@ -141,11 +141,12 @@ def get_previous_message(user_id):
141
  @line_handler.add(MessageEvent, message=(ImageMessage,TextMessage))
142
  def handle_image_message(event):
143
  # 從 LINE API η²ε–εœ–η‰‡ζ•Έζ“š
 
144
  image_path = get_image_url(event.message.id)
145
  if image_path:
146
  # θ™•η†εœ–η‰‡ζˆ–ι€²θ‘Œι€²δΈ€ζ­₯εˆ†ζž
147
  print(f"εœ–η‰‡ε·²δΏε­˜θ‡³: {image_path}")
148
-
149
  # ε›žζ‡‰η”¨ζˆΆ
150
  line_bot_api.reply_message(
151
  event.reply_token,
@@ -159,14 +160,12 @@ def handle_image_message(event):
159
  )
160
 
161
 
162
- user_id = event.source.user_id
163
- store_user_message(user_id, "text", user_text)
164
  previous_message = get_previous_message(user_id)
165
-
166
  # η²ε–ε‚³ι€εœ–η‰‡εΎŒηš„η”¨ζˆΆε•ι‘ŒοΌˆζ–‡ε­—οΌ‰
167
  if previous_message and previous_message["type"] == "image":
168
  # η²ε–η”¨ζˆΆε•ι‘ŒοΌˆζ–‡ε­—οΌ‰
169
  user_text = event.message.text # θ‡ͺθ‘Œε―¦ηΎοΌŒζ Ήζ“šιœ€ζ±‚θΏ½θΉ€η”¨ζˆΆζ–‡ε­—
 
170
  # ε°‡εœ–η‰‡θˆ‡ζ–‡ε­—η΅εˆη™Όι€εˆ° OpenAI
171
  out = analyze_with_openai(image_path, user_text)
172
 
@@ -194,6 +193,8 @@ def handle_image_message(event):
194
  try:
195
  # 取得使用者輸ε…₯ηš„ζ–‡ε­—
196
  prompt = event.message.text
 
 
197
  # 使用 Gemini ζ¨‘εž‹η”Ÿζˆζ–‡ε­—
198
  completion = model.generate_content(prompt, generation_config=generation_config)
199
  # ζͺ’ζŸ₯η”Ÿζˆη΅ζžœζ˜―ε¦η‚Ίη©Ί
 
141
  @line_handler.add(MessageEvent, message=(ImageMessage,TextMessage))
142
  def handle_image_message(event):
143
  # 從 LINE API η²ε–εœ–η‰‡ζ•Έζ“š
144
+ user_id = event.source.user_id
145
  image_path = get_image_url(event.message.id)
146
  if image_path:
147
  # θ™•η†εœ–η‰‡ζˆ–ι€²θ‘Œι€²δΈ€ζ­₯εˆ†ζž
148
  print(f"εœ–η‰‡ε·²δΏε­˜θ‡³: {image_path}")
149
+ store_user_message(user_id, "image", image_path)
150
  # ε›žζ‡‰η”¨ζˆΆ
151
  line_bot_api.reply_message(
152
  event.reply_token,
 
160
  )
161
 
162
 
 
 
163
  previous_message = get_previous_message(user_id)
 
164
  # η²ε–ε‚³ι€εœ–η‰‡εΎŒηš„η”¨ζˆΆε•ι‘ŒοΌˆζ–‡ε­—οΌ‰
165
  if previous_message and previous_message["type"] == "image":
166
  # η²ε–η”¨ζˆΆε•ι‘ŒοΌˆζ–‡ε­—οΌ‰
167
  user_text = event.message.text # θ‡ͺθ‘Œε―¦ηΎοΌŒζ Ήζ“šιœ€ζ±‚θΏ½θΉ€η”¨ζˆΆζ–‡ε­—
168
+ store_user_message(user_id, "text", user_text)
169
  # ε°‡εœ–η‰‡θˆ‡ζ–‡ε­—η΅εˆη™Όι€εˆ° OpenAI
170
  out = analyze_with_openai(image_path, user_text)
171
 
 
193
  try:
194
  # 取得使用者輸ε…₯ηš„ζ–‡ε­—
195
  prompt = event.message.text
196
+ user_text = event.message.text
197
+ store_user_message(user_id, "text", user_text)
198
  # 使用 Gemini ζ¨‘εž‹η”Ÿζˆζ–‡ε­—
199
  completion = model.generate_content(prompt, generation_config=generation_config)
200
  # ζͺ’ζŸ₯η”Ÿζˆη΅ζžœζ˜―ε¦η‚Ίη©Ί