alanchen1115 commited on
Commit
a922ab9
·
verified ·
1 Parent(s): e868d4f

Update main.py

Browse files
Files changed (1) hide show
  1. main.py +0 -13
main.py CHANGED
@@ -16,17 +16,11 @@ from Uploading_images_file import get_image_url, store_user_message, analyze_wit
16
  #==========================
17
 
18
  # 設定 Google AI API 金鑰
19
- # google_api = os.environ["GOOGLE_API_KEY"]
20
- # genai_gen.configure(api_key=google_api)
21
  client = genai.Client(api_key=os.getenv("GOOGLE_API_KEY"))
22
 
23
  # 設定生成文字的參數
24
- # generation_config = genai_gen.types.GenerationConfig(max_output_tokens=1000, temperature=0.2, top_p=0.5, top_k=16)
25
  generation_config = genai.types.GenerateContentConfig(max_output_tokens=256, temperature=0.5, top_p=0.5, top_k=16)
26
 
27
- # 使用 gemini-2.0-flash-exp 模型
28
- # model = genai_gen.GenerativeModel('gemini-2.0-flash', system_instruction="主要用繁體中文回答,但如果用戶使用詢問英文問題,就用英文回應。你現在是個專業助理,職稱為OPEN小助理,個性活潑、樂觀,願意回答所有問題", generation_config=generation_config)
29
-
30
  # 設定 Line Bot 的 API 金鑰和秘密金鑰
31
  line_bot_api = LineBotApi(os.environ["CHANNEL_ACCESS_TOKEN"])
32
  line_handler = WebhookHandler(os.environ["CHANNEL_SECRET"])
@@ -80,18 +74,14 @@ chat_sessions = {}
80
  @line_handler.add(MessageEvent, message=(ImageMessage, TextMessage))
81
  def handle_image_message(event):
82
  user_id = event.source.user_id
83
- # chat = chat_sessions.get(user_id) or client.chats.create(model="gemini-2.0-flash", config=generation_config)
84
- # chat_sessions[user_id] = chat
85
  user_text = event.message.text if event.message.type == "text" else None
86
  previous_message = get_previous_message(user_id)
87
- # image_url = None
88
 
89
  if event.message.type != "text" and event.message.type != "image":
90
  line_bot_api.reply_message(event.reply_token, TextSendMessage(text="請輸入文字或圖片~"))
91
  return
92
  elif user_text == "再見":
93
  line_bot_api.reply_message(event.reply_token, TextSendMessage(text="Bye!"))
94
- # store_user_message(user_id, "text", user_text)
95
  return
96
 
97
  # ========
@@ -135,7 +125,6 @@ def handle_image_message(event):
135
  # ========
136
  elif event.message.type == "text" and previous_message["type"] != "image":
137
  try:
138
- # response = chat.send_message(user_text)
139
  user_id = event.source.user_id
140
  chat = chat_sessions.get(user_id) or client.chats.create(model="gemini-2.0-flash", config=generation_config)
141
  chat_sessions[user_id] = chat
@@ -158,8 +147,6 @@ def handle_image_message(event):
158
  if not os.path.exists(image_path):
159
  raise FileNotFoundError(f"圖片路徑無效:{image_path}")
160
  previous_img = PIL.Image.open(image_path)
161
- # completion = chat.send_message([user_text, previous_img])
162
- # out = completion.text
163
  user_id = event.source.user_id
164
  chat = chat_sessions.get(user_id) or client.chats.create(model="gemini-2.0-flash", config=generation_config)
165
  chat_sessions[user_id] = chat
 
16
  #==========================
17
 
18
  # 設定 Google AI API 金鑰
 
 
19
  client = genai.Client(api_key=os.getenv("GOOGLE_API_KEY"))
20
 
21
  # 設定生成文字的參數
 
22
  generation_config = genai.types.GenerateContentConfig(max_output_tokens=256, temperature=0.5, top_p=0.5, top_k=16)
23
 
 
 
 
24
  # 設定 Line Bot 的 API 金鑰和秘密金鑰
25
  line_bot_api = LineBotApi(os.environ["CHANNEL_ACCESS_TOKEN"])
26
  line_handler = WebhookHandler(os.environ["CHANNEL_SECRET"])
 
74
  @line_handler.add(MessageEvent, message=(ImageMessage, TextMessage))
75
  def handle_image_message(event):
76
  user_id = event.source.user_id
 
 
77
  user_text = event.message.text if event.message.type == "text" else None
78
  previous_message = get_previous_message(user_id)
 
79
 
80
  if event.message.type != "text" and event.message.type != "image":
81
  line_bot_api.reply_message(event.reply_token, TextSendMessage(text="請輸入文字或圖片~"))
82
  return
83
  elif user_text == "再見":
84
  line_bot_api.reply_message(event.reply_token, TextSendMessage(text="Bye!"))
 
85
  return
86
 
87
  # ========
 
125
  # ========
126
  elif event.message.type == "text" and previous_message["type"] != "image":
127
  try:
 
128
  user_id = event.source.user_id
129
  chat = chat_sessions.get(user_id) or client.chats.create(model="gemini-2.0-flash", config=generation_config)
130
  chat_sessions[user_id] = chat
 
147
  if not os.path.exists(image_path):
148
  raise FileNotFoundError(f"圖片路徑無效:{image_path}")
149
  previous_img = PIL.Image.open(image_path)
 
 
150
  user_id = event.source.user_id
151
  chat = chat_sessions.get(user_id) or client.chats.create(model="gemini-2.0-flash", config=generation_config)
152
  chat_sessions[user_id] = chat