Update jihou.py

jihou.py

@@ -1,20 +1,33 @@
 import time
 import requests
 import os
+import json
 from datetime import datetime, timedelta
 from zoneinfo import ZoneInfo
 
-BASE_URL = "https://desk-api.channel.io/desk/channels/200605"
-TARGET_GROUP_CHAT_ID = "463667"
+BASE_URL = "https://desk-api.channel.io/desk/channels/227312"
+TARGET_GROUP_CHAT_ID = "536135"
 
 HEADERS = {
     "accept-language": "ja",
     "x-account": os.getenv("dmsendertoken")
 }
 
-# 日本時間（JST）
 JST = ZoneInfo("Asia/Tokyo")
 
+WEATHER_CODE_MAP = {
+    0: "☀️晴れ",
+    1: "☁️曇り",
+    2: "吹雪",
+    3: "砂嵐",
+    4: "🌫️霧",
+    5: "🌫️霧雨",
+    6: "🌧️雨",
+    7: "🌨️雪",
+    8: "🌦️シャワー",
+    9: "⛈️雷雨",
+}
+
 
 def post_group_message(chat_id, body):
     url = f"{BASE_URL}/groups/{chat_id}/messages"
@@ -23,8 +36,10 @@ def post_group_message(chat_id, body):
     return r.json()
 
 
+# ---------- 時報（既存機能） ----------
+
 def create_time_signal_body():
-    now = datetime.now(JST)  # 日本時間
+    now = datetime.now(JST)
     hour = now.hour
 
     if hour < 12:
@@ -38,36 +53,109 @@ def create_time_signal_body():
 
     return {
         "requestId": f"desk-web-time-signal-{int(time.time())}",
-        "blocks": [
-            {
-                "type": "text",
-                "value": message
-            }
-        ],
-        "buttons": None,
-        "form": None,
-        "webPage": None,
-        "files": None,
-        "customPayload": None
+        "blocks": [{"type": "text", "value": message}],
     }
 
 
 def wait_until_next_hour():
-    now = datetime.now(JST)  # 日本時間
-    next_hour = (
-        now.replace(minute=0, second=0, microsecond=0)
-        + timedelta(hours=1)
+    now = datetime.now(JST)
+    next_hour = now.replace(minute=0, second=0, microsecond=0) + timedelta(hours=1)
+    time.sleep((next_hour - now).total_seconds())
+
+
+# ---------- 天気予報（新機能） ----------
+
+def load_todoufuken():
+    with open("todoufuken.json", encoding="utf-8") as f:
+        return json.load(f)
+
+
+def fetch_weather(todoufuken):
+    lats = ",".join(str(p["lat"]) for p in todoufuken)
+    lons = ",".join(str(p["lon"]) for p in todoufuken)
+
+    url = (
+        "https://api.open-meteo.com/v1/forecast"
+        f"?latitude={lats}"
+        f"&longitude={lons}"
+        "&hourly=relative_humidity_2m,apparent_temperature,temperature_2m,"
+        "precipitation_probability,weather_code"
+        "&forecast_days=1"
     )
-    sleep_seconds = (next_hour - now).total_seconds()
-    time.sleep(sleep_seconds)
 
+    r = requests.get(url)
+    r.raise_for_status()
+    return r.json()
+
+
+def create_weather_body():
+    now = datetime.now(JST)
+    today_6am = now.replace(hour=6, minute=0, second=0, microsecond=0)
+
+    todoufuken = load_todoufuken()
+    data = fetch_weather(todoufuken)
+
+    lines = ["<b>☀️ 本日の天気予報（6時以降）</b>"]
+
+    for idx, pref in enumerate(todoufuken):
+        hourly = data["hourly"]
+
+        times = hourly["time"]
+        target_index = None
+
+        for i, t in enumerate(times):
+            t_jst = datetime.fromisoformat(t).replace(tzinfo=ZoneInfo("UTC")).astimezone(JST)
+            if t_jst >= today_6am:
+                target_index = i
+                break
+
+        if target_index is None:
+            continue
+
+        wc = hourly["weather_code"][target_index]
+        at = hourly["apparent_temperature"][target_index]
+        temp = hourly["temperature_2m"][target_index]
+        pop = hourly["precipitation_probability"][target_index]
+        rh = hourly["relative_humidity_2m"][target_index]
+
+        line = (
+            f"{pref['name']} "
+            f"{WEATHER_CODE_MAP.get(wc, wc)} "
+            f"{at}℃ {temp}℃ {pop}% {rh}%"
+        )
+        lines.append(line)
+
+    return {
+        "requestId": f"desk-web-weather-{int(time.time())}",
+        "blocks": [{"type": "text", "value": "\n".join(lines)}],
+    }
+
+
+def wait_until_7am():
+    now = datetime.now(JST)
+    target = now.replace(hour=7, minute=0, second=0, microsecond=0)
+    if now >= target:
+        target += timedelta(days=1)
+    time.sleep((target - now).total_seconds())
+
+
+# ---------- メインループ ----------
 
 def main_loop():
     while True:
         try:
-            wait_until_next_hour()
-            body = create_time_signal_body()
-            post_group_message(TARGET_GROUP_CHAT_ID, body)
+            now = datetime.now(JST)
+
+            if now.minute == 0:
+                body = create_time_signal_body()
+                post_group_message(TARGET_GROUP_CHAT_ID, body)
+
+            if now.hour == 7 and now.minute == 0:
+                body = create_weather_body()
+                post_group_message(TARGET_GROUP_CHAT_ID, body)
+
+            time.sleep(60)
+
         except Exception as e:
             print("Error:", e)
             time.sleep(10)