Update news.py

news.py

@@ -2,66 +2,76 @@ import os
 import time
 import json
 import requests
-import hashlib
-from datetime import datetime
-from bs4 import BeautifulSoup
-import xml.etree.ElementTree as ET
 
 # ===== Channel.io 設定 =====
 CHANNEL_ID = "200605"
-GROUP_ID = "534457"
+GROUP_ID = "534868"
 
-POST_URL = f"https://desk-api.channel.io/desk/channels/{CHANNEL_ID}/groups/{GROUP_ID}/messages"
+GET_URL = f"https://desk-api.channel.io/desk/channels/{CHANNEL_ID}/groups/{GROUP_ID}/messages"
+POST_URL = GET_URL
 
 X_ACCOUNT = os.getenv("channeliotokenbot2")
 if not X_ACCOUNT:
     raise RuntimeError("環境変数 channeliotokenbot2 が設定されていません")
 
-HEADERS_POST = {
+HEADERS = {
     "accept": "application/json",
     "accept-language": "ja",
     "content-type": "application/json",
     "x-account": X_ACCOUNT,
 }
 
-# ===== RSS =====
-RSS_URL = "https://www.nippon.com/ja/rss-all/"
-
-# ===== 設定 =====
-SENT_LOG_FILE = "sent_nippon_news.json"
-LAST_RUN_FILE = "last_run.json"
+PARAMS = {
+    "sortOrder": "asc",
+    "limit": 50,
+}
 
-TARGET_TIMES = {"06:30", "18:30"}  # 朝・夕方
+ASSISTANT_PERSON_ID = "595702"
 
+# ===== ChatGPT互換API =====
+CHAT_API_URL = "https://izuemon-gpt-free-api.hf.space/v1/chat/completions"
 
 # ===== Utils =====
-def load_sent_log():
-    if not os.path.exists(SENT_LOG_FILE):
-        return set()
-    with open(SENT_LOG_FILE, "r", encoding="utf-8") as f:
-        return set(json.load(f))
+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(messages):
+    chat_messages = []
 
-def save_sent_log(sent_set):
-    with open(SENT_LOG_FILE, "w", encoding="utf-8") as f:
-        json.dump(list(sent_set), f, ensure_ascii=False, indent=2)
+    for msg in messages:
+        text = msg.get("plainText")
+        person_id = msg.get("personId")
 
+        if not text:
+            continue
 
-def load_last_run():
-    if not os.path.exists(LAST_RUN_FILE):
-        return ""
-    with open(LAST_RUN_FILE, "r", encoding="utf-8") as f:
-        return json.load(f).get("last_run", "")
+        role = "assistant" if person_id == ASSISTANT_PERSON_ID else "user"
 
+        chat_messages.append({
+            "role": role,
+            "content": text
+        })
 
-def save_last_run(value):
-    with open(LAST_RUN_FILE, "w", encoding="utf-8") as f:
-        json.dump({"last_run": value}, f)
+    return chat_messages
 
+def call_chat_api(chat_messages):
+    payload = {
+        "model": "gpt-3.5-turbo",
+        "messages": chat_messages,
+    }
 
-def hash_link(link: str) -> str:
-    return hashlib.sha256(link.encode("utf-8")).hexdigest()
+    res = requests.post(
+        CHAT_API_URL,
+        headers={"Content-Type": "application/json"},
+        data=json.dumps(payload),
+        timeout=60
+    )
+    res.raise_for_status()
 
+    data = res.json()
+    return data["choices"][0]["message"]["content"]
 
 def send_to_channel(text):
     payload = {
@@ -73,115 +83,56 @@ def send_to_channel(text):
 
     res = requests.post(
         POST_URL,
-        headers=HEADERS_POST,
+        headers=HEADERS,
         data=json.dumps(payload),
         timeout=30
     )
     res.raise_for_status()
 
-
-def fetch_rss_items():
-    res = requests.get(RSS_URL, timeout=30)
-    res.raise_for_status()
-
-    root = ET.fromstring(res.content)
-    channel = root.find("channel")
-    if channel is None:
-        return []
-
-    items = []
-    for item in channel.findall("item"):
-        title = item.findtext("title", "").strip()
-        link = item.findtext("link", "").strip()
-        description_raw = item.findtext("description", "").strip()
-
-        soup = BeautifulSoup(description_raw, "lxml")
-        description = soup.get_text(strip=True)
-
-        if title and link:
-            items.append({
-                "title": title,
-                "link": link,
-                "description": description,
-            })
-
-    return items
-
-
 # ===== Main =====
-def run_job():
-    sent_log = load_sent_log()
-    items = fetch_rss_items()
-    new_count = 0
-
-    for item in items:
-        link_hash = hash_link(item["link"])
-        if link_hash in sent_log:
-            continue
-
-        message = (
-            f"<link type=\"url\" value=\"{item['link']}\">"
-            f"{item['title']}"
-            f"</link>\n\n"
-            f"{item['description']}"
-        )
-
-        send_to_channel(message)
-        sent_log.add(link_hash)
-        new_count += 1
-        time.sleep(1)
-
-    if new_count > 0:
-        save_sent_log(sent_log)
-        print(f"{new_count} 件のニュースを送信しました")
-    else:
-        print("新しいニュースはありません")
-
-
 def main():
-    processed = set()
+    processed_message_ids = set()
 
     while True:
         try:
             messages = fetch_channel_messages()
-
             if not messages:
                 time.sleep(10)
                 continue
 
-            latest = messages[-1]
-            msg_id = latest.get("id")
-            person_id = latest.get("personId")
+            latest_msg = messages[-1]
+            latest_id = latest_msg.get("id")
+            latest_person_id = latest_msg.get("personId")
 
-            # すでに処理済み
-            if msg_id in processed:
+            # 既に処理済みならスキップ
+            if latest_id in processed_message_ids:
                 time.sleep(10)
                 continue
 
-            # ★ アシスタント発言ならGPTに送らず待機
-            if person_id == ASSISTANT_PERSON_ID:
+            # ★ 最新メッセージがアシスタントなら待機
+            if latest_person_id == ASSISTANT_PERSON_ID:
                 time.sleep(10)
                 continue
 
-            # GPT用メッセージ構築
+            # GPTに送る会話履歴を構築
             chat_messages = build_chat_messages(messages)
-
             if not chat_messages:
-                processed.add(msg_id)
+                processed_message_ids.add(latest_id)
                 continue
 
+            # GPT呼び出し
             reply = call_chat_api(chat_messages)
+
+            # Channel.ioへ送信
             send_to_channel(reply)
 
-            processed.add(msg_id)
-            print("送信完了")
+            processed_message_ids.add(latest_id)
+            print("GPT応答を送信しました")
 
         except Exception as e:
             print("エラー:", e)
 
         time.sleep(15)
 
-
-
 if __name__ == "__main__":
     main()