Update jihou.py

jihou.py

@@ -15,6 +15,8 @@ HEADERS = {
 
 JST = ZoneInfo("Asia/Tokyo")
 
+# ---------------- 天気コード ----------------
+
 WEATHER_CODE_MAP = {
     0: "☀️晴れ",
     1: "☁️曇り",
@@ -29,14 +31,32 @@ WEATHER_CODE_MAP = {
 }
 
 
+def format_weather_code(code: int) -> str:
+    if code < 10:
+        return WEATHER_CODE_MAP.get(code, str(code))
+
+    main = code // 10
+    sub = code % 10
+
+    main_str = WEATHER_CODE_MAP.get(main)
+    sub_str = WEATHER_CODE_MAP.get(sub)
+
+    if main_str and sub_str:
+        return f"{main_str}、{sub_str}"
+
+    return str(code)
+
+# ---------------- Channel 投稿 ----------------
+
+
 def post_group_message(chat_id, body):
     url = f"{BASE_URL}/groups/{chat_id}/messages"
     r = requests.post(url, headers=HEADERS, json=body)
     r.raise_for_status()
     return r.json()
 
+# ---------------- 時報 ----------------
 
-# ---------- 時報（既存機能） ----------
 
 def create_time_signal_body():
     now = datetime.now(JST)
@@ -56,14 +76,8 @@ def create_time_signal_body():
         "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)
-    time.sleep((next_hour - now).total_seconds())
-
-
-# ---------- 天気予報（新機能） ----------
 
 def load_todoufuken():
     with open("todoufuken.json", encoding="utf-8") as f:
@@ -90,68 +104,63 @@ def fetch_weather(todoufuken):
 
 def create_weather_body():
     now = datetime.now(JST)
-    today_6am = now.replace(hour=6, minute=0, second=0, microsecond=0)
+    today_7am = now.replace(hour=7, minute=0, second=0, microsecond=0)
 
     todoufuken = load_todoufuken()
     data = fetch_weather(todoufuken)
 
-    lines = ["<b>☀️ 本日の天気予報（6時以降）</b>"]
+    lines = ["<b>☀️ 本日の天気予報（7時以降・1時間ごと）</b>"]
 
     for idx, pref in enumerate(todoufuken):
         hourly = data[idx]["hourly"]
-
         times = hourly["time"]
-        target_index = None
+
+        lines.append(f"\n<b>{pref['name']}：</b>")
 
         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)
+            t_jst = (
+                datetime.fromisoformat(t)
+                .replace(tzinfo=ZoneInfo("UTC"))
+                .astimezone(JST)
+            )
+
+            if t_jst < today_7am:
+                continue
+
+            wc = hourly["weather_code"][i]
+            at = hourly["apparent_temperature"][i]
+            temp = hourly["temperature_2m"][i]
+            pop = hourly["precipitation_probability"][i]
+            rh = hourly["relative_humidity_2m"][i]
+
+            wc_str = format_weather_code(wc)
+
+            line = (
+                f"　{t_jst.strftime('%H時')}："
+                f"{wc_str} "
+                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:
             now = datetime.now(JST)
 
-            # 毎正時（必要ならそのまま）
+            # 毎正時の時報
             if now.minute == 0:
                 body = create_time_signal_body()
                 post_group_message(TARGET_GROUP_CHAT_ID, body)
 
-            # 午後2時5分に実行
+            # 午後2時9分に天気予報
             if now.hour == 14 and now.minute == 9:
                 body = create_weather_body()
                 post_group_message(TARGET_GROUP_CHAT_ID, body)
@@ -163,6 +172,5 @@ def main_loop():
             time.sleep(10)
 
 
-
 if __name__ == "__main__":
     main_loop()