Update chatgpt.py

chatgpt.py

@@ -2,19 +2,13 @@ import os
 import time
 import json
 import requests
-from datetime import datetime, timezone
 
 # ===== Channel.io 設定 =====
-GROUP_ID = "534868"
 CHANNEL_ID = "200605"
+GROUP_ID = "534868"
+ASSISTANT_PERSON_ID = "595702"
 
-GET_URL = f"https://desk-api.channel.io/desk/channels/{CHANNEL_ID}/groups/{GROUP_ID}/messages"
-POST_URL = GET_URL
-
-PARAMS = {
-    "sortOrder": "asc",  # createdAt 昇順で取得
-    "limit": 50,
-}
+MESSAGES_URL = f"https://desk-api.channel.io/desk/channels/{CHANNEL_ID}/groups/{GROUP_ID}/messages"
 
 X_ACCOUNT = os.getenv("channeliotokenbot2")
 if not X_ACCOUNT:
@@ -27,43 +21,53 @@ HEADERS = {
     "x-account": X_ACCOUNT,
 }
 
-ASSISTANT_PERSON_ID = "595702"
-
-# ===== GPT (HF Space) =====
-GPT_ENDPOINT = "https://izuemon-gpt-free-api.hf.space/v1/chat/completions"
-
-GPT_HEADERS = {
-    "Content-Type": "application/json"
+PARAMS = {
+    "sortOrder": "desc",
+    "limit": 50,
 }
 
-# ===== Utils =====
-def parse_created_at(value):
-    if isinstance(value, (int, float)):
-        return datetime.fromtimestamp(value / 1000, tz=timezone.utc)
-    return None
+# ===== GPT API =====
+GPT_API_URL = "https://izuemon-gpt-free-api.hf.space/v1/chat/completions"
 
-
-def fetch_messages():
-    res = requests.get(GET_URL, headers=HEADERS, params=PARAMS, timeout=30)
+# ===== Utils =====
+def get_messages():
+    res = requests.get(
+        MESSAGES_URL,
+        headers=HEADERS,
+        params=PARAMS,
+        timeout=30,
+    )
     res.raise_for_status()
     return res.json().get("messages", [])
 
 
 def build_chat_messages(messages):
+    """
+    Channel.io の messages から
+    ChatGPT 互換 messages を生成
+    """
     chat_messages = []
 
-    for msg in messages:
-        text = msg.get("plainText")
-        person_id = msg.get("personId")
+    # 古い順に並び替え
+    messages = sorted(
+        messages,
+        key=lambda m: m.get("createdAt", 0)
+    )
 
-        if not text:
+    for msg in messages:
+        plain = msg.get("plainText")
+        if not plain:
             continue
 
-        role = "assistant" if person_id == ASSISTANT_PERSON_ID else "user"
+        role = (
+            "assistant"
+            if str(msg.get("personId")) == ASSISTANT_PERSON_ID
+            else "user"
+        )
 
         chat_messages.append({
             "role": role,
-            "content": text
+            "content": plain
         })
 
     return chat_messages
@@ -72,14 +76,14 @@ def build_chat_messages(messages):
 def call_gpt(chat_messages):
     payload = {
         "model": "gpt-3.5-turbo",
-        "messages": chat_messages
+        "messages": chat_messages,
     }
 
     res = requests.post(
-        GPT_ENDPOINT,
-        headers=GPT_HEADERS,
+        GPT_API_URL,
+        headers={"Content-Type": "application/json"},
         data=json.dumps(payload),
-        timeout=60
+        timeout=60,
     )
     res.raise_for_status()
 
@@ -92,57 +96,63 @@ def send_to_channel(text):
         "requestId": f"desk-web-{int(time.time() * 1000)}",
         "blocks": [
             {"type": "text", "value": text}
-        ]
+        ],
     }
 
     res = requests.post(
-        POST_URL,
+        MESSAGES_URL,
         headers=HEADERS,
         data=json.dumps(payload),
-        timeout=30
+        timeout=30,
     )
     res.raise_for_status()
 
 
 # ===== Main Loop =====
 def main():
-    last_processed_created_at = 0
+    last_processed_id = None
 
     while True:
         try:
-            messages = fetch_messages()
+            messages = get_messages()
+
             if not messages:
                 time.sleep(10)
                 continue
 
-            # createdAt が最大のメッセージを確認
-            latest_msg = max(
+            # 最新メッセージ（createdAt 最大）
+            latest = max(
                 messages,
                 key=lambda m: m.get("createdAt", 0)
             )
 
-            latest_created_at = latest_msg.get("createdAt", 0)
+            latest_id = latest.get("id")
+            latest_person = str(latest.get("personId"))
+            latest_text = latest.get("plainText")
+
+            # 空メッセージは無視
+            if not latest_text:
+                time.sleep(10)
+                continue
 
             # 既に処理済み
-            if latest_created_at <= last_processed_created_at:
+            if latest_id == last_processed_id:
                 time.sleep(10)
                 continue
 
-            # 最後の送信者が assistant なら何もしない
-            if latest_msg.get("personId") == ASSISTANT_PERSON_ID:
+            # 最後が GPT（595702）なら何もしない
+            if latest_person == ASSISTANT_PERSON_ID:
                 time.sleep(10)
                 continue
 
-            # ChatGPT 形式に変換
+            # GPT に送信
             chat_messages = build_chat_messages(messages)
+            gpt_reply = call_gpt(chat_messages)
 
-            # GPT 呼び出し
-            reply = call_gpt(chat_messages)
-
-            # Channel.io に送信
-            send_to_channel(reply)
+            # Channel.io に返信
+            send_to_channel(gpt_reply)
 
-            last_processed_created_at = latest_created_at
+            last_processed_id = latest_id
             print("送信完了")
 
         except Exception as e: