Update chatgpt.py

chatgpt.py

@@ -2,11 +2,10 @@ import os
 import time
 import json
 import requests
-from datetime import datetime, timezone
 
-# ===== Channel.io =====
-CHANNEL_ID = "200605"
+# ===== Channel.io 設定 =====
 GROUP_ID = "534868"
+CHANNEL_ID = "200605"
 
 GET_URL = f"https://desk-api.channel.io/desk/channels/{CHANNEL_ID}/groups/{GROUP_ID}/messages"
 POST_URL = GET_URL
@@ -29,37 +28,27 @@ PARAMS = {
 
 ASSISTANT_PERSON_ID = "595702"
 
-# ===== LLM API =====
-LLM_ENDPOINT = "https://izuemon-gpt-free-api.hf.space/v1"
-
+# ===== ChatGPT互換API =====
+CHAT_API_URL = "https://izuemon-gpt-free-api.hf.space/v1/chat/completions"
 
 # ===== Utils =====
-def parse_updated_at(value):
-    if isinstance(value, (int, float)):
-        return datetime.fromtimestamp(value / 1000, tz=timezone.utc)
-    elif isinstance(value, str):
-        return datetime.fromisoformat(value.replace("Z", "+00:00"))
-    return None
-
-
-def fetch_messages():
+def fetch_channel_messages():
     res = requests.get(GET_URL, headers=HEADERS, params=PARAMS, timeout=30)
     res.raise_for_status()
     return res.json().get("messages", [])
 
-
-def build_chat_messages(channel_messages):
-    """
-    Channel.io → ChatGPT messages 変換
-    """
+def build_chat_messages(messages):
     chat_messages = []
 
-    for msg in channel_messages:
+    for msg in messages:
         text = msg.get("plainText")
+        person_id = msg.get("personId")
+
         if not text:
             continue
 
-        role = "assistant" if msg.get("personId") == ASSISTANT_PERSON_ID else "user"
+        role = "assistant" if person_id == ASSISTANT_PERSON_ID else "user"
+
         chat_messages.append({
             "role": role,
             "content": text
@@ -67,15 +56,14 @@ def build_chat_messages(channel_messages):
 
     return chat_messages
 
-
-def call_llm(messages):
+def call_chat_api(chat_messages):
     payload = {
         "model": "gpt-3.5-turbo",
-        "messages": messages
+        "messages": chat_messages,
     }
 
     res = requests.post(
-        LLM_ENDPOINT,
+        CHAT_API_URL,
         headers={"Content-Type": "application/json"},
         data=json.dumps(payload),
         timeout=60
@@ -85,13 +73,12 @@ def call_llm(messages):
     data = res.json()
     return data["choices"][0]["message"]["content"]
 
-
 def send_to_channel(text):
     payload = {
         "requestId": f"desk-web-{int(time.time() * 1000)}",
         "blocks": [
             {"type": "text", "value": text}
-        ]
+        ],
     }
 
     res = requests.post(
@@ -102,50 +89,42 @@ def send_to_channel(text):
     )
     res.raise_for_status()
 
-
 # ===== Main =====
 def main():
-    processed_until = None
+    processed = set()
 
     while True:
         try:
-            messages = fetch_messages()
+            messages = fetch_channel_messages()
 
-            # 新しいメッセージのみ抽出
-            new_messages = []
-            for msg in messages:
-                t = parse_updated_at(msg.get("updatedAt"))
-                if not t:
-                    continue
+            if not messages:
+                time.sleep(10)
+                continue
 
-                if processed_until is None or t > processed_until:
-                    new_messages.append(msg)
+            # 最新メッセージをトリガーにする
+            latest = messages[-1]
+            msg_id = latest.get("id")
 
-            if not new_messages:
+            if msg_id in processed:
                 time.sleep(10)
                 continue
 
-            # ChatGPT 用メッセージ構築
             chat_messages = build_chat_messages(messages)
 
-            # LLM 呼び出し
-            reply = call_llm(chat_messages)
+            if not chat_messages:
+                processed.add(msg_id)
+                continue
 
-            # Channel.io に送信
+            reply = call_chat_api(chat_messages)
             send_to_channel(reply)
 
-            # 処理済み時刻更新
-            processed_until = max(
-                parse_updated_at(m["updatedAt"]) for m in new_messages
-            )
-
-            print("返信送信完了")
+            processed.add(msg_id)
+            print("送信完了")
 
         except Exception as e:
             print("エラー:", e)
 
         time.sleep(15)
 
-
 if __name__ == "__main__":
     main()