Update main.py
Browse files
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 |
# ζͺ’ζ₯ηζη΅ζζ―ε¦ηΊη©Ί
|