v3.3.0: renew richmenu, forward email

Author: linbeta

README.md

@@ -15,6 +15,8 @@ ID: @096oeofl
 
 ## 版本更新紀錄
 
+```v3.3.0``` 新增留言寄信功能，更新圖文選單，選單新增收藏的食譜。
+
 ```v3.2.0``` 新增 LIFF 留言功能
 
 ```v3.1.4``` 收藏的食譜頁版面更新

__pycache__/app.cpython-39.pyc

@@ -39,6 +39,7 @@
     channel_access_token=os.environ["LINE_CHANNEL_ACCESS_TOKEN"])
 handler = WebhookHandler(channel_secret=os.environ["LINE_CHANNEL_SECRET"])
 os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = "keys/aitouille-adam.json"
+# EMAIL_PW = os.environ["GMAIL_PASSWORD"]
 
 # 載入Follow事件
 from linebot.models.events import (
@@ -168,19 +169,6 @@ def form():
     # print(data)
     return render_template('form.html', myliffid=liffid)
 
-
-# @handler.add(MessageEvent, message=TextMessage)
-# def handle_message(event):
-#     mtext = event.message.text
-#     if mtext == '@彈性配置':
-#         sendFlex(event)
-#
-#     elif mtext[:3] == '###' and len(mtext) > 3:
-#          manageForm(event, mtext)
-
-
-
-
 # =================== LIFF靜態頁面(終) ===================
 
 

app.py

@@ -9,15 +9,12 @@
 '''
 
 from linebot import (
-    LineBotApi, WebhookHandler
+    LineBotApi
 )
 from linebot.models import TextSendMessage
 import os
 
 # 載入Follow事件
-from linebot.models.events import (
-    FollowEvent, UnfollowEvent, PostbackEvent
-)
 
 line_bot_api = LineBotApi(channel_access_token=os.environ["LINE_CHANNEL_ACCESS_TOKEN"])
 
@@ -26,15 +23,12 @@
 from services.video_service import VideoService
 from services.audio_service import AudioService
 from services.text_service import TextService
-from services.email_sevice import EmailService
 
 from google.cloud import bigquery as bq
 import os
 
 os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = "keys/aitouille-adam.json"
 
-from urllib.parse import parse_qs
-
 bq_client = bq.Client()
 
 class LineBotController:
@@ -73,16 +67,7 @@ def handle_video_message(cls, event):
     def handle_audio_message(cls, event):
         AudioService.line_user_upload_audio(event)
         return "OK"
-    # ================== 施工區分隔線 ======================
-    # 2021/12/24 USER留言轉寄EMAIL
-
-    @classmethod
-    def handle_user_message(cls, event):
-        EmailService.line_user_leave_message(event)
-        return "OK"
 
-    # ================== 施工區分隔線 ======================
-    # 2021/12/21 Charles
     @classmethod
     def handle_postback_event(cls, event):
         # 寫一個判斷處理給建議的postback data: 因為處理格式不同會出錯，需另外處理(暫時先用MessageTemplateAction，待處理)

controllers/line_bot_controller.py

@@ -9,7 +9,7 @@
 ## ========== 新增 Rich menus，並透過line API 取得 rich_menu_link ==========
 ## (! 配合圖片格式修改參數)
 
-import requests , json
+import requests, json
 
 headers = {"Authorization":"Bearer "+CHANNEL_ACCESS_TOKEN,"Content-Type":"application/json"}
 
@@ -24,22 +24,27 @@
           "action": {"type": "uri", "uri": "https://line.me/R/nv/camera/"}
         },
         {
-          "bounds": {"x": 625, "y": 0, "width": 625, "height": 635},
+          "bounds": {"x": 500, "y": 0, "width": 625, "height": 635},
           "action": {"type": "uri", "uri": "https://line.me/R/nv/cameraRoll/multi"},
         },
+        # TODO: 先傳文字開啟收藏的食譜，之後改用Postback試試看藏網址直接開網頁
         {
-          "bounds": {"x": 1250, "y": 0, "width": 625, "height": 635},
+          "bounds": {"x": 1000, "y": 0, "width": 625, "height": 635},
+          "action": {"type": "message", "text": "收藏的食譜"},
+        },
+        {
+          "bounds": {"x": 1500, "y": 0, "width": 625, "height": 635},
           "action": {"type": "uri", "uri": "https://line.me/R/nv/recommendOA/@096oeofl"}
         },
         {
-          "bounds": {"x": 1875, "y": 0, "width": 625, "height": 635},
+          "bounds": {"x": 2000, "y": 0, "width": 625, "height": 635},
           "action": {"type": "uri", "uri": "https://liff.line.me/1656700369-VlnBxlo4"}
         }
     ]
   }
 
 req = requests.request('POST', 'https://api.line.me/v2/bot/richmenu',
-                       headers=headers,data=json.dumps(body).encode('utf-8'))
+                       headers=headers, data=json.dumps(body).encode('utf-8'))
 
 richmenuId = json.loads(req.text).get("richMenuId")
 
@@ -52,7 +57,7 @@
 line_bot_api = LineBotApi(CHANNEL_ACCESS_TOKEN)
 
 ## (! 配合圖片修改檔名"richmenu.jpg"及圖片形式"image/jpeg")
-with open("pic/richmenu.jpg",'rb') as f:
+with open("pic/richmenu_5.jpg",'rb') as f:
     line_bot_api.set_rich_menu_image(richmenuId, "image/jpeg", f)
 
 
@@ -63,7 +68,7 @@
 
 req = requests.request('POST', 'https://api.line.me/v2/bot/user/all/richmenu/'+richmenuId,
                        headers=headers)
-print(req.text)
+# print(req.text)
 
 
 # # ========== 查看所有 Rich menus(最多100組) ==========

richmenu.py

@@ -1,5 +1,3 @@
-# 修改紀錄：
-# 2021/12/21 Charles
 '''
 用戶上傳音訊檔時，將音訊檔從Line取回，轉成文字訊息，
 並將音訊檔放入CloudStorage
@@ -67,10 +65,10 @@ def line_user_upload_audio(cls, event):
         # 從雲端取值的作法
         gcs_uri = 'gs://' + bucket_name + '/' + destination_blob_name
         audio = speech.RecognitionAudio(uri=gcs_uri)
-
+        reply_transcript = ""
         config = speech.RecognitionConfig(
             {
-                "encoding": speech.RecognitionConfig.AudioEncoding.MP3,  # 這邊卡關超久, 官方文件這邊有說明MP3檔要使用v1p1beta版本才行
+                "encoding": speech.RecognitionConfig.AudioEncoding.MP3,  # 官方文件這邊有說明MP3檔要使用v1p1beta版本才行
                 "sample_rate_hertz": 16000,
                 "language_code": "zh-TW"
             }
@@ -83,34 +81,20 @@ def line_user_upload_audio(cls, event):
         # 移除本地檔案
         os.remove(temp_file_path)
 
-        # option:1 ----- 將reply_transcript截取出食材，把每一個食材分別進資料庫做搜尋 ------ #
-
-        # test_voice_input = "我有雞肉白蘿蔔香菇玉米洋蔥，可以煮什麼？"
-        # utils.text_parsing裡面的方法，將一句話裡面有的食材切出來回傳一個list
-
         # 引用utils/text_parsing.py裡面的方法來把食材切出來
         ingredients_from_audio = TextService.get_ingredients(reply_transcript)
-
+        # print(ingredients_from_audio)
         reply_msg = [TextSendMessage(f"語音輸入： {reply_transcript}")]
 
         if len(ingredients_from_audio) == 0:
-            # TODO: 如果user傳來的文字訊息不包含可辨識的食材，回覆user一句話
+            # 如果user傳來的文字訊息不包含可辨識的食材，回覆user一句話
             reply_message = TextService.get_intent(reply_transcript)
             cls.line_bot_api.reply_message(
                 event.reply_token,
                 TextSendMessage(reply_message)
             )
         else:
-            # TODO ~~~~~~~~~~~~~~~~~開發中 以下為原版~~~~~~~~~~~~~~~~~~~~~~~
-            # TODO: 串接資料庫->複數食材搜尋
-            # dishes = multiple_ingredient_search(ingredients_from_audio, len(ingredients_from_audio))
-            # reply_msg += dishes
-            # # 回覆訊息給使用者
-            # cls.line_bot_api.reply_message(
-            #     event.reply_token,
-            #     reply_msg
-            # )
-            # TODO: 串接資料庫->複數食材搜尋
+            # 串接資料庫->複數食材搜尋
             # 2021/12/21 Charles 新增user_id參數
             dishes = multiple_ingredient_search(ingredients_from_audio, len(ingredients_from_audio), event.source.user_id)
             new_template = TextService.make_template(dishes)
@@ -119,5 +103,3 @@ def line_user_upload_audio(cls, event):
                 event.reply_token,
                 reply_msg
             )
-
-        # option:2 ----- 將reply_transcript截取出食材，進資料庫做複數食材搜尋 ------ #

services/audio_service.py

@@ -12,14 +12,13 @@
 import os
 import random
 import jieba
-from daos.user_dao import UserDAO
 from linebot.models import (
-    TextSendMessage, CarouselTemplate, CarouselColumn, URITemplateAction, PostbackAction, TemplateSendMessage,
-    MessageTemplateAction
+    TextSendMessage, CarouselTemplate, CarouselColumn, URITemplateAction, PostbackAction, TemplateSendMessage
 )
 # 搜尋食譜
-
+from services.user_service import UserService
 from utils.search_recipe import multiple_ingredient_search
+from utils.send_email import send_email
 
 
 class TextService:
@@ -43,20 +42,26 @@ def line_user_send_text_message(cls, event):
             cls.line_bot_api.reply_message(
                 event.reply_token,
                 TextSendMessage(f"我收藏的食譜: https://ai-touille-6qzlayuaza-de.a.run.app/my_cookbook/{user_id}")
-                # TextSendMessage(f"我收藏的食譜: https://8a57-180-218-204-111.ngrok.io/my_cookbook/{user_id}")
+                # TextSendMessage(f"我收藏的食譜: https://1854-180-218-204-111.ngrok.io/my_cookbook/{user_id}")
             )
-        # TODO: 施工區:處理官網留言
+        # 處理官網&form留言
         elif user_message[:3] == "###":
-            print("this is a message form")
-            msg = cls.manageForm(user_message)
+            # 取得用戶名字
+            user_object = UserService.get_user(event.source.user_id)
+            user_nickname = user_object.line_user_nickname
+            # print("this is a message form")
+            # 處理成易讀的格式回覆用戶收到訊息
+            msg = cls.manageForm(mtext=user_message)
             cls.line_bot_api.reply_message(
                 event.reply_token,
                 msg
             )
+            # 寄信到客服信箱
+            send_email(msg=user_message[3:], user_nickname=user_nickname)
         else:
             ingredients = cls.get_ingredients(user_message)
             if len(ingredients) == 0:
-                # TODO: 如果user傳來的文字訊息不包含可辨識的食材，回覆user一句話
+                # 如果user傳來的文字訊息不包含可辨識的食材，回覆user一句話
                 reply_message = cls.get_intent(user_message)
                 cls.line_bot_api.reply_message(
                     event.reply_token,
@@ -76,6 +81,20 @@ def line_user_send_text_message(cls, event):
                     new_template
                 )
 
+    @classmethod
+    def manageForm(cls, mtext):
+        try:
+            flist = mtext[3:].split('/')
+            text = '姓名：' + flist[0] + '\n'
+            text += '建議：' + flist[1] + '\n'
+            text += '感謝您的留言，我們已經收到囉！😃'
+            message = TextSendMessage(
+                text=text
+            )
+            return message
+        except:
+            return "發生錯誤！"
+
     # 用結巴分詞抓出資料庫中有的食材的新方法
     @classmethod
     def get_ingredients(cls, text):
@@ -147,7 +166,9 @@ def get_intent(cls, text):
             result = "你可以傳食材照片或是用打字的告訴我你有哪些食材，我會推薦適合的食譜給你，開啟麥克風傳語音訊息也可以喔！"
         # TODO: 可以針對Give feedback做另外的對話處理
         elif intent == "give_feedback":
-            result = "好的，請說 😊 https://liff.line.me/1656700369-MrdvmrAb"
+            result = "好的，請說 😊 https://liff.line.me/1656700369-9wG4ra7O"
+        elif intent == "":
+            result = "聽不到你的聲音喔！"
         else:
             result = "收到~ 更多功能開發中，敬請期待未來的AI服務！"
 
@@ -198,9 +219,11 @@ def make_template(cls, dishes):
                     label='沒有我要的食譜',
                     uri='https://icook.tw/'  # TODO 這邊先放icook的連結
                 ),
-                MessageTemplateAction(
+                URITemplateAction(
                     label='給建議',
-                    text='我要留言'
+                    # uri='https://liff.line.me/1656700369-MrdvmrAb' # 愛廚易官方留言form的LIFF URL
+                    # 開發版，串到Beta的機器人
+                    uri='https://liff.line.me/1656700369-9wG4ra7O'
                 )
             ]
         )
@@ -230,16 +253,3 @@ def get_tip(cls):
         ]
         random.shuffle(tips)
         return tips[0]
-
-    @classmethod
-    def manageForm(cls, mtext):
-        try:
-            flist = mtext[3:].split('/')
-            text1 = '姓名：' + flist[0] + '\n'
-            text1 += '建議：' + flist[1]
-            message = TextSendMessage(
-                text=text1
-            )
-            return message
-        except:
-            return "發生錯誤！"