dfa

command/googlechat.py

@@ -1,6 +1,9 @@
 import os
 import json
+import requests
 from google.oauth2 import service_account
+from google.auth.transport.requests import Request
+from googleapiclient.discovery import build
 
 # 環境変数からサービスアカウントのJSON内容を取得
 service_account_info = os.getenv('GOOGLE_APPLICATION_CREDENTIALS_CONTENT')
@@ -12,23 +15,54 @@ if service_account_info is None:
 service_account_info_dict = json.loads(service_account_info)
 
 # サービスアカウント情報を使用して認証情報を作成
-credentials = service_account.Credentials.from_service_account_info(service_account_info_dict)
-
-# これでcredentialsを使用してGoogle Chat APIにアクセスできます。
-# 例えば、Google Chat APIクライアントを作成するには次のようにします。
-from googleapiclient.discovery import build
+credentials = service_account.Credentials.from_service_account_info(
+    service_account_info_dict,
+    scopes=['https://www.googleapis.com/auth/chat.bot']  # 必要なスコープを指定
+)
 
+# Google Chat APIクライアントを作成
 chat_service = build('chat', 'v1', credentials=credentials)
 
-# 例: メッセージを送信する
-space_name = 'spaces/your-space-id'
-message = {
-    'text': 'Hello from the Google Chat API!'
+# メッセージを送信するスペースの名前（適切な形式に修正）
+space_name = 'spaces/AAAAv_S3Bco'  # ここを実際のスペースIDに置き換えてください
+
+# 初回メッセージを送信
+initial_message = {
+    'text': 'スレッドへ返信に変更テスト'
 }
 
-response = chat_service.spaces().messages().create(
+initial_response = chat_service.spaces().messages().create(
     parent=space_name,
-    body=message
+    body=initial_message
 ).execute()
 
-print('Message sent: ', response)
+# スレッドキーを取得
+thread_name = initial_response['thread']['name']
+print('Initial message sent. Thread name:', thread_name)
+
+return thread_name
+
+
+# 後続のメッセージをスレッド内に送信するためのURLを構築
+url = f'https://chat.googleapis.com/v1/{space_name}/messages?messageReplyOption=REPLY_MESSAGE_OR_FAIL'
+
+# 後続のメッセージをスレッド内に送信
+follow_up_message = {
+    'text': 'スレッドへ返信.',
+    'thread': {
+        'name': thread_name
+    }
+}
+
+# アクセストークンを取得
+credentials.refresh(Request())
+access_token = credentials.token
+
+headers = {
+    'Authorization': f'Bearer {access_token}',
+    'Content-Type': 'application/json'
+}
+
+response = requests.post(url, headers=headers, data=json.dumps(follow_up_message))
+
+print('Follow-up message sent:', response.json())

command/googlechatthread.py

@@ -0,0 +1,28 @@
+import requests
+import json
+
+# Webhook URL
+webhook_url = 'https://chat.googleapis.com/v1/spaces/AAAAA/messages?key=YOUR_WEBHOOK_KEY&token=YOUR_WEBHOOK_TOKEN&messageReplyOption=REPLY_MESSAGE_OR_FAIL'  # ここを実際のWebhook URLに置き換えてください
+
+# スレッドキーを設定（任意の一意な値）
+thread_key = 'example-thread-key'
+
+# 初回メッセージを送信
+initial_message = {
+    'text': 'Hello from the Google Chat Webhook!',
+    'threadKey': thread_key
+}
+
+response = requests.post(webhook_url, data=json.dumps(initial_message), headers={'Content-Type': 'application/json'})
+
+print('Initial message response:', response.json())
+
+# スレッド内に返信メッセージを送信
+follow_up_message = {
+    'text': 'This is a follow-up message in the same thread.',
+    'threadKey': thread_key
+}
+
+response = requests.post(webhook_url, data=json.dumps(follow_up_message), headers={'Content-Type': 'application/json'})
+
+print('Follow-up message response:', response.json())

mysite/interpreter/google_chat.py

@@ -59,3 +59,67 @@ def send_google_chat_card(webhook_url, title, subtitle, link_text, link_url):
         print("Message posted successfully.")
     else:
         print(f"Failed to post message: {response.status_code}, {response.text}")
+    
+    thread_name = response['thread']['name']
+    return thread_name
+
+def send_google_chat_card_thread(webhook_url, title, subtitle, link_text, link_url,thread_name):
+    headers = {
+        'Content-Type': 'application/json; charset=UTF-8'
+    }
+
+    subtitle = convert_newlines_to_google_chat_format(subtitle)
+
+    card_message = {
+        "cards": [
+            {
+                "header": {
+                    "title": title,
+                },
+                "sections": [
+                    {
+                        "widgets": [
+                            {
+                                "textParagraph": {
+                                    "text": subtitle
+                                }
+                            },
+                            {
+                                "textParagraph": {
+                                    "text": "<b>{}</b>".format(link_text)
+                                }
+                            },
+                            {
+                                "buttons": [
+                                    {
+                                        "textButton": {
+                                            "text": "Open Link",
+                                            "onClick": {
+                                                "openLink": {
+                                                    "url": link_url
+                                                }
+                                            }
+                                        }
+                                    }
+                                ]
+                            },
+                        ]
+                    }
+                ]
+            }
+        ],
+        "thread": {
+            "name":thread_name
+        } 
+    }
+
+    #https://chat.googleapis.com/v1/spaces/AAAAv_S3Bco/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=D635e0eoj7MdO8HV6Ufs1HUZdNiDdz-Eo3Td3OqAFKI&messageReplyOption=REPLY_MESSAGE_OR_FAIL
+    response = requests.post(webhook_url+"&messageReplyOption=REPLY_MESSAGE_OR_FAIL", headers=headers, data=json.dumps(card_message))
+
+    if response.status_code == 200:
+        print("Message posted successfully.")
+    else:
+        print(f"Failed to post message: {response.status_code}, {response.text}")
+    
+    thread_name = response['thread']['name']
+    return thread_name

mysite/routers/fastapi.py

@@ -12,7 +12,7 @@ from mysite.libs.utilities import validate_signature, no_process_file
 #from mysite.database.database import ride,create_ride
 from controllers.gra_04_database.rides import test_set_lide
 from mysite.interpreter.prompt import prompt_genalate,test_prompt
-from mysite.interpreter.google_chat import send_google_chat_card
+from mysite.interpreter.google_chat import send_google_chat_card,send_google_chat_card_thread
 #from mysite.interpreter.interpreter import chat_with_interpreter
 from controllers.gra_02_openInterpreter.OpenInterpreter import chat_with_interpreter_no_stream
 from mysite.appsheet.appsheet import get_senario
@@ -207,7 +207,9 @@ def setup_webhook_routes(app: FastAPI):
                     link_text = "データを確認する"
                     link_url = "https://kenken999-php.hf.space/diamondprice_list.php"
                     #test_set_lide(subtitle, text)
-                    send_google_chat_card(webhook_url, title, subtitle, link_text, link_url)
+                    thread_name = send_google_chat_card(webhook_url, title, subtitle, link_text, link_url)
+                    thread_name = send_google_chat_card(webhook_url, title, subtitle, link_text, link_url,thread_name)
+                    return
                     #test case
                     #########################################################################
                     first_line = text.split('\n')[0]