Update v2_gpt.py

v2_gpt.py

@@ -1,4 +1,4 @@
-# main_debug.py
+# main_janken.py
 import json
 import os
 import random
@@ -6,15 +6,11 @@ import string
 import threading
 import time
 import traceback
-from collections import deque
 from datetime import datetime
 
 import requests
-import torch
-from transformers import AutoModelForCausalLM, AutoTokenizer, pipeline, set_seed
-
 from channel_auth import ChannelWorksClient
-from channel_msg import ChannelMessenger   # ★ ライブラリ名修正
+from channel_msg import ChannelMessenger
 
 # ---------------------------------------------------------------------------
 # 設定
@@ -22,29 +18,24 @@ from channel_msg import ChannelMessenger   # ★ ライブラリ名修正
 CW_EMAIL = os.environ["CW_EMAIL"]
 CW_PASSWORD = os.environ["CW_PASSWORD"]
 
-ROOM_ID = "240996"
-TARGET_CHAT_ID = "583391"
+ROOM_ID = "241135"
+TARGET_CHAT_ID = "574798"
 GROUP_PATH = f"/groups/{TARGET_CHAT_ID}"
 
-# ★ ローカル LLM 設定
-MODEL_NAME = "sbintuitions/sarashina2.2-3b-instruct-v0.1"
-SYSTEM_PROMPT = "あなたは親切な日本語アシスタントです。簡潔に回答してください。"
-MAX_NEW_TOKENS = 256
-TEMPERATURE = 0.7
-TOP_P = 0.9
-SEED = 123
-HISTORY_MAX_TURNS = 10          # 保持する user+assistant ペア数
+# じゃんけんの手
+HANDS = ["✊", "✌", "✋"]
+# 手の強さ: ✊=0, ✌=1, ✋=2 (グー<チョキ<パー<グー の三すくみ)
+HAND_INDEX = {h: i for i, h in enumerate(HANDS)}
 
-# 生成中に届いたメッセージをまとめるまでの待ち時間(秒)
-BATCH_DEBOUNCE_SEC = 0.3
+# じゃんけんを促すキーワード
+TRIGGER_WORDS = ["じゃんけん", "じゃんけんぽん", "じゃんけんぽい", "じゃんけんほい"]
 
 CHANNEL_SEND_URL = (
     f"https://api.channel.works/desk/channels/{ROOM_ID}"
     f"/groups/{TARGET_CHAT_ID}/messages"
 )
 
-# ★ デバッグログを全開にする
-LOG_LEVEL = ChannelWorksClient.LOG_DEBUG   # 2
+LOG_LEVEL = ChannelWorksClient.LOG_DEBUG
 
 
 # ---------------------------------------------------------------------------
@@ -55,100 +46,48 @@ def log(tag: str, msg: str) -> None:
     print(f"[{ts}] [{tag}] {msg}", flush=True)
 
 
-def log_block(tag: str, title: str, body: str) -> None:
-    ts = datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
-    print(f"\n[{ts}] [{tag}] ===== {title} =====", flush=True)
-    print(body, flush=True)
-    print(f"[{ts}] [{tag}] ===== /{title} =====\n", flush=True)
-
-
 def _make_request_id() -> str:
     suffix = "".join(random.choices(string.ascii_lowercase + string.digits, k=4))
     return f"desk-web-{int(time.time() * 1000)}{suffix}"
 
 
 # ---------------------------------------------------------------------------
-# ローカル LLM (Sarashina2.2-3B-instruct)
+# じゃんけん判定
 # ---------------------------------------------------------------------------
-_chat_pipeline = None
-_model_lock = threading.Lock()
-
-
-def load_model() -> None:
-    """起動時に一度だけモデルをロードする。"""
-    global _chat_pipeline
-    log("MODEL", f"loading {MODEL_NAME} ...")
-    t0 = time.monotonic()
-
-    set_seed(SEED)
+def detect_user_hand(text: str) -> str | None:
+    """メッセージ本文からユーザーが出した手(絵文字)を探す。"""
+    for h in HANDS:
+        if h in text:
+            return h
+    return None
 
-    tokenizer = AutoTokenizer.from_pretrained(MODEL_NAME)
-    # pad_token 未設定モデルへの保険
-    if tokenizer.pad_token is None:
-        tokenizer.pad_token = tokenizer.eos_token
 
-    model = AutoModelForCausalLM.from_pretrained(
-        MODEL_NAME,
-        torch_dtype=torch.bfloat16,
-        device_map="auto",
-    )
-
-    _chat_pipeline = pipeline(
-        "text-generation",
-        model=model,
-        tokenizer=tokenizer,
-    )
-
-    log("MODEL", f"loaded in {time.monotonic() - t0:.1f}s")
+def has_trigger_word(text: str) -> bool:
+    """じゃんけんを促すキーワードが含まれているか。"""
+    return any(w in text for w in TRIGGER_WORDS)
 
 
-def _extract_answer(output: dict) -> str:
+def judge(my_hand: str, user_hand: str) -> str:
     """
-    pipeline の出力から assistant の本文だけを取り出す。
-    - return_full_text=False かつ messages 入力の場合は文字列で返ることが多い
-    - 環境によっては messages のリストで返ることもあるため両対応
+    自分の手と相手の手から勝敗メッセージを返す。
+    ✊(0) < ✌(1) < ✋(2) < ✊(0) の三すくみ。
+    (my - user) % 3 == 1 なら自分(ボット)の勝ち
+    (my - user) % 3 == 2 なら相手の勝ち
+    0 ならあいこ
     """
-    gen = output.get("generated_text")
-    if isinstance(gen, list):
-        for m in reversed(gen):
-            if isinstance(m, dict) and m.get("role") == "assistant":
-                return (m.get("content") or "").strip()
-        return ""
-    if isinstance(gen, str):
-        return gen.strip()
-    return str(gen).strip()
-
-
-def ask_model(history: list[dict], user_text: str) -> str:
-    """
-    history: [{"role": "user"/"assistant", "content": "..."}] のリスト
-    user_text: 今回のユーザー入力 (生成中に溜まったメッセージを連結したもの)
-    """
-    messages = [{"role": "system", "content": SYSTEM_PROMPT}]
-    messages.extend(history)
-    messages.append({"role": "user", "content": user_text})
-
-    log_block("LLM-REQ", "messages",
-              json.dumps(messages, ensure_ascii=False, indent=2)[:4000])
-
-    t0 = time.monotonic()
-    # 推論は直列化する (同時呼び出しによる VRAM 圧迫を避ける)
-    with _model_lock:
-        outputs = _chat_pipeline(
-            messages,
-            max_new_tokens=MAX_NEW_TOKENS,
-            do_sample=True,
-            temperature=TEMPERATURE,
-            top_p=TOP_P,
-            return_full_text=False,
-            num_return_sequences=1,
-        )
-    dt = time.monotonic() - t0
-    log("LLM-RES", f"elapsed={dt:.2f}s")
-
-    answer = _extract_answer(outputs[0])
-    log_block("LLM-RES-BODY", "answer", answer[:2000])
-    return answer
+    diff = (HAND_INDEX[my_hand] - HAND_INDEX[user_hand]) % 3
+    if diff == 0:
+        return "あいこ"
+    if diff == 1:
+        return "私の勝ち！"
+    return "あなたの勝ち！"
+
+
+def make_reply(user_hand: str) -> str:
+    """ランダムな手を出して勝敗メッセージを生成する。"""
+    my_hand = random.choice(HANDS)
+    result = judge(my_hand, user_hand)
+    return f"{my_hand} {result}"
 
 
 # ---------------------------------------------------------------------------
@@ -159,8 +98,6 @@ def send_channel_message(client: ChannelWorksClient, text: str) -> requests.Resp
     x_account = tokens.get("x-account") or ""
     x_account_refresh = tokens.get("x-account-refresh") or ""
 
-    log("SEND-TOK", f"x-account={x_account[:24]}... refresh={x_account_refresh[:24]}...")
-
     cookie_parts = []
     if x_account:
         cookie_parts.append(f"x-account={x_account}")
@@ -194,19 +131,14 @@ def send_channel_message(client: ChannelWorksClient, text: str) -> requests.Resp
         "customPayload": None,
     }
 
-    log("SEND-REQ", f"POST {CHANNEL_SEND_URL}")
-    log_block("SEND-REQ-BODY", "request", json.dumps(body, ensure_ascii=False, indent=2))
-
-    t0 = time.monotonic()
+    log("SEND-REQ", f"POST {CHANNEL_SEND_URL} text={text!r}")
     resp = requests.post(
         CHANNEL_SEND_URL,
         headers=headers,
         data=json.dumps(body, ensure_ascii=False).encode("utf-8"),
         timeout=30,
     )
-    dt = time.monotonic() - t0
-    log("SEND-RES", f"status={resp.status_code} elapsed={dt:.2f}s")
-    log_block("SEND-RES-BODY", "response", resp.text[:2000])
+    log("SEND-RES", f"status={resp.status_code}")
     return resp
 
 
@@ -214,12 +146,8 @@ def send_channel_message(client: ChannelWorksClient, text: str) -> requests.Resp
 # メイン
 # ---------------------------------------------------------------------------
 def main() -> None:
-    log("BOOT", f"CW_EMAIL={CW_EMAIL[:3]}*** / room_id={ROOM_ID} / target_chat_id={TARGET_CHAT_ID}")
-
-    # --- 0) モデルロード (最初にやる。ログインより先でも可) ---
-    load_model()
+    log("BOOT", f"room_id={ROOM_ID} / target_chat_id={TARGET_CHAT_ID}")
 
-    # --- 1) ログイン ---
     log("AUTH", "ChannelWorksClient 初期化")
     client = ChannelWorksClient(
         room_id=ROOM_ID,
@@ -227,14 +155,8 @@ def main() -> None:
         password=CW_PASSWORD,
         log_level=LOG_LEVEL,
     )
-    log("AUTH", "sign_in + boot 実行")
     client.login()
     log("AUTH", "login() 完了")
-    tokens = client.get_tokens() or {}
-    log("AUTH", f"tokens: {[k for k, v in tokens.items() if v]}")
-
-    log("AUTH", f"room_id(client)={getattr(client, 'room_id', None)}")
-    log("AUTH", f"_account_id={getattr(client, '_account_id', None)}")
 
     client.start_auto_touch()
     log("AUTH", "auto_touch 開始")
@@ -242,86 +164,12 @@ def main() -> None:
     my_account_id = str(getattr(client, "_account_id", "") or "")
     log("AUTH", f"my_account_id={my_account_id}")
 
-    # --- 2) 会話履歴 & 生成ジョブ用の状態 ---
-    history: deque[dict] = deque(maxlen=HISTORY_MAX_TURNS * 2)
-    history_lock = threading.Lock()
-
-    # 生成中に届いたメッセージをためるバッファ
-    pending_texts: list[str] = []
-    pending_lock = threading.Lock()
-    new_message_event = threading.Event()
-
-    # 重複受信防止
     seen_ids: set[str] = set()
     seen_lock = threading.Lock()
 
-    # --- 3) 1 回分の処理 ---
-    def handle_message(user_text: str) -> None:
-        log("HANDLE", f"start text={user_text!r}")
-        with history_lock:
-            hist_snapshot = list(history)
-
-        try:
-            answer = ask_model(hist_snapshot, user_text)
-        except Exception as exc:
-            log("HANDLE-ERR", f"ask_model 失敗: {exc!r}")
-            traceback.print_exc()
-            return
-        log("HANDLE", f"answer={answer[:100]!r}...")
-
-        try:
-            resp = send_channel_message(client, answer)
-            if 200 <= resp.status_code < 300:
-                log("SEND-OK", f"status={resp.status_code}")
-            else:
-                log("SEND-NG", f"status={resp.status_code} body={resp.text[:300]}")
-        except Exception as exc:
-            log("SEND-ERR", f"{exc!r}")
-            traceback.print_exc()
-            return
-
-        # 送信に成功した分だけ履歴に積む
-        with history_lock:
-            history.append({"role": "user", "content": user_text})
-            history.append({"role": "assistant", "content": answer})
-
-    # --- 4) ワーカースレッド ---
-    # on_push は「ためて起こす」だけ。実処理はこのワーカーが直列で行う。
-    # → 生成中に来たメッセージは pending_texts に残り、次サイクルで
-    #   連結されて 1 つの入力として扱われる。
-    def worker() -> None:
-        while True:
-            new_message_event.wait()
-            # 生成直前にまとめて取り込むための小休止
-            # (この間に来たメッセージもバッチに含める)
-            time.sleep(BATCH_DEBOUNCE_SEC)
-            new_message_event.clear()
-
-            with pending_lock:
-                if not pending_texts:
-                    continue
-                # 生成中に届いたメッセージをまとめて 1 つの質問にする
-                combined = "\n".join(pending_texts)
-                pending_texts.clear()
-
-            try:
-                handle_message(combined)
-            except Exception:
-                log("WORKER-ERR", "handle_message で例外")
-                traceback.print_exc()
-
-    threading.Thread(target=worker, daemon=True, name="llm-worker").start()
-
-    # --- 5) 受信ハンドラ ---
+    # 重複・連投防止用
     def on_push(wrapper: dict) -> None:
-        log_block(
-            "PUSH-RAW",
-            f"event={wrapper.get('event')} type={wrapper.get('type')}",
-            json.dumps(wrapper, ensure_ascii=False, indent=2)[:4000],
-        )
-
         if wrapper.get("event") != "create":
-            log("PUSH-SKIP", f"event != create ({wrapper.get('event')})")
             return
 
         entity = wrapper.get("entity") or {}
@@ -330,17 +178,8 @@ def main() -> None:
         msg_id = entity.get("id") or ""
         plain = entity.get("plainText") or ""
 
-        log(
-            "PUSH-CHK",
-            f"chatId={chat_id!r} (want {TARGET_CHAT_ID!r}) "
-            f"personId={person_id!r} (self {my_account_id!r}) "
-            f"msgId={msg_id!r} plainText={plain!r}",
-        )
-
         if chat_id != TARGET_CHAT_ID:
-            log("PUSH-SKIP", f"chatId mismatch: got={chat_id!r} want={TARGET_CHAT_ID!r}")
             return
-
         if person_id and my_account_id and person_id == my_account_id:
             log("PUSH-SKIP", "自分のメッセージのため無視")
             return
@@ -348,22 +187,38 @@ def main() -> None:
         if msg_id:
             with seen_lock:
                 if msg_id in seen_ids:
-                    log("PUSH-SKIP", f"既出 msgId={msg_id!r}")
                     return
                 seen_ids.add(msg_id)
                 if len(seen_ids) > 2000:
                     seen_ids.clear()
 
         if not plain.strip():
-            log("PUSH-SKIP", "plainText が空")
             return
 
-        log("PUSH-HIT", f"キューへ追加: {plain!r}")
-        with pending_lock:
-            pending_texts.append(plain)
-        new_message_event.set()
+        log("PUSH", f"受信: {plain!r}")
+
+        # 「じゃんけん」系ワード + 手の絵文字が含まれているか判定
+        if not has_trigger_word(plain):
+            log("PUSH-SKIP", "じゃんけんワードなし")
+            return
+        user_hand = detect_user_hand(plain)
+        if user_hand is None:
+            log("PUSH-SKIP", "手の絵文字なし")
+            return
+
+        reply = make_reply(user_hand)
+        log("REPLY", f"user={user_hand} -> {reply!r}")
+
+        try:
+            resp = send_channel_message(client, reply)
+            if 200 <= resp.status_code < 300:
+                log("SEND-OK", f"status={resp.status_code}")
+            else:
+                log("SEND-NG", f"status={resp.status_code} body={resp.text[:300]}")
+        except Exception as exc:
+            log("SEND-ERR", f"{exc!r}")
+            traceback.print_exc()
 
-    # --- 6) Messenger 起動 ---
     log("WS", "ChannelMessenger 初期化")
     messenger = ChannelMessenger(
         client=client,
@@ -373,7 +228,7 @@ def main() -> None:
         on_push=on_push,
     )
 
-    log("WS", "start() 呼び出し（WS 接続開始）")
+    log("WS", "start() 呼び出し")
     try:
         messenger.start()
     except Exception as exc:
@@ -394,12 +249,10 @@ def main() -> None:
     threading.Thread(target=watchdog, daemon=True).start()
 
     try:
-        log("WS", "wait() で受信待機")
         messenger.wait()
     except KeyboardInterrupt:
         log("WS", "KeyboardInterrupt")
     finally:
-        log("WS", "停止処理")
         messenger.stop()
         client.stop_auto_touch()
         log("WS", "終了")