Update turbowarp-server/gpt.py

turbowarp-server/gpt.py

@@ -5,8 +5,8 @@ import requests
 PROJECT_ID = "1290918780"
 
 SYSTEM_PROMPT = {
- "role":"system",
- "content":"You are a conversational AI that runs on Scratch. Do not use Markdown in your responses; speak in natural conversation. The creator of this assistant is Izuemon."
+    "role": "system",
+    "content": "You are a conversational AI that runs on Scratch. Do not use Markdown in your responses; speak in natural conversation. The creator of this assistant is Izuemon."
 }
 
 tw = scratchcommunication.TwCloudConnection(
@@ -15,206 +15,193 @@ tw = scratchcommunication.TwCloudConnection(
     contact_info="contact"
 )
 
-slots = [f"n{i}" for i in range(1,10)]
-
-# ---------------------
-# クラウド変数取得
-# ---------------------
-
-def get_vars():
-    return tw.get_cloud_variables()
-
-def get_var(name):
-    return get_vars().get(name)
-
+slots = [f"n{i}" for i in range(1, 10)]
 
 # ---------------------
 # 文字テーブル
 # ---------------------
 
 chars = []
-
-with open("turbowarp-server/n-chars.txt",encoding="utf8") as f:
+with open("turbowarp-server/n-chars.txt", encoding="utf8") as f:
     for line in f:
         chars.append(line.strip())
 
 def encode(text):
-
-    out=""
-
+    out = ""
     for c in text:
-
         if c in chars:
             i = chars.index(c)
             out += f"{i:02d}"
-
     return out
 
 def decode(data):
-
-    text=""
-
-    for i in range(0,len(data),2):
-
+    text = ""
+    for i in range(0, len(data), 2):
         num = int(data[i:i+2])
-
-        if num==99:
-            text+="\n"
+        if num == 99:
+            text += "\n"
         else:
-            text+=chars[num]
-
+            text += chars[num]
     return text
 
+# ---------------------
+# TwCloudConnection の正しいラッパー
+# ---------------------
+
+def get_var(name):
+    """
+    TwCloudConnection の get_variable はキーワード引数で使う必要があるので
+    ここでラップする（戻り値はそのまま）。
+    """
+    try:
+        # name_literal を必要に応じて True に切り替えてください
+        return tw.get_variable(name=name, name_literal=False)
+    except Exception:
+        # 例外は None を返す（呼び出し側でチェック）
+        return None
+
+def set_var(name, value):
+    try:
+        return tw.set_variable(name=name, value=value, name_literal=False)
+    except Exception:
+        return None
 
 # ---------------------
 # n0管理
 # ---------------------
 
 def get_used():
-
     v = get_var("n0")
-
     if not v:
         return []
-
     return list(v)
 
 def add_used(i):
-
     u = get_used()
-
     if str(i) not in u:
         u.append(str(i))
-
-    tw.set_variable("n0","".join(u))
+    set_var("n0", "".join(u))
 
 def remove_used(i):
-
     u = get_used()
-
     if str(i) in u:
         u.remove(str(i))
-
-    tw.set_variable("n0","".join(u))
-
+    set_var("n0", "".join(u))
 
 # ---------------------
 # API
 # ---------------------
 
 def ask_gpt(history):
-
-    messages=[SYSTEM_PROMPT]+history
-
-    r=requests.post(
+    messages = [SYSTEM_PROMPT] + history
+    r = requests.post(
         "https://izuemon-gpt-free-api.hf.space/v1/chat/completions",
         json={
-            "model":"gpt-3.5-turbo",
-            "messages":messages
-        }
+            "model": "gpt-3.5-turbo",
+            "messages": messages
+        },
+        timeout=30
     )
-
-    data=r.json()
-
+    r.raise_for_status()
+    data = r.json()
     return data["choices"][0]["message"]["content"]
 
-
 # ---------------------
 # 送信
 # ---------------------
 
-def send(slot,text):
+def send(slot, text):
+    encoded = encode(text)
 
-    encoded=encode(text)
+    # TurboWarp 環境なら問題ないとのことなのでそのまま
+    size = 99996
 
-    size=99996
-
-    packets=[encoded[i:i+size] for i in range(0,len(encoded),size)]
-
-    total=len(packets)
+    packets = [encoded[i:i+size] for i in range(0, len(encoded), size)]
+    total = len(packets)
 
     for p in packets:
-
-        packet=f"1{total}0{p}"
-
-        start=time.time()
-
-        tw.set_variable(slot,packet)
+        packet = f"1{total}0{p}"
+        start = time.time()
+        set_var(slot, packet)
 
         while True:
-
-            v=get_var(slot)
-
-            if v and len(v) > 2 and v[2]=="1":
+            v = get_var(slot)
+            # 値が存在して、長さが期待を満たすか、安全に確認
+            if v and len(v) > 2 and v[2] == "1":
                 break
-
-            if time.time()-start>10:
+            if time.time() - start > 10:
+                # タイムアウト
                 return
-
             time.sleep(0.1)
 
-
 # ---------------------
 # メインループ
 # ---------------------
 
-buffers={}
+buffers = {}
 
 while True:
-
-    vars=get_vars()
-
-    for i,slot in enumerate(slots,1):
-
-        v=vars.get(slot)
+    for i, slot in enumerate(slots, 1):
+        v = get_var(slot)
 
         if not v:
             continue
 
-        if len(v)<3:
+        if len(v) < 3:
             continue
 
-        unread=v[2]=="0"
-
+        unread = v[2] == "0"
         if not unread:
             continue
 
         add_used(i)
 
-        total=int(v[1])
-        data=v[3:]
+        # v のフォーマットは "フラグ(1桁) + total(1桁) + '0' + データ..." の前提
+        try:
+            total = int(v[1])
+        except Exception:
+            # 不正データならスキップして使用解除
+            remove_used(i)
+            continue
+
+        data = v[3:]
 
-        tw.set_variable(slot,v[:2]+"1"+v[3:])
+        # 既読フラグを立てる（インデックス 2 を "1" にする）
+        # 文字列操作で安全にセット
+        if len(v) >= 3:
+            newv = v[:2] + "1" + v[3:]
+            set_var(slot, newv)
 
         if slot not in buffers:
-            buffers[slot]=[]
+            buffers[slot] = []
 
         buffers[slot].append(data)
 
-        if len(buffers[slot])<total:
+        if len(buffers[slot]) < total:
             continue
 
-        joined="".join(buffers[slot])
-
-        decoded=decode(joined)
-
-        history=[]
+        joined = "".join(buffers[slot])
+        decoded = decode(joined)
 
-        parts=decoded.split("\n")
-
-        for j in range(0,len(parts),2):
+        history = []
+        parts = decoded.split("\n")
 
+        for j in range(0, len(parts), 2):
+            # parts[j] がユーザーメッセージ、parts[j+1] が（将来の拡張用など）
+            if parts[j].strip() == "":
+                continue
             history.append({
-                "role":"user",
-                "content":parts[j]
+                "role": "user",
+                "content": parts[j]
             })
 
-        reply=ask_gpt(history)
-
-        send(slot,reply)
-
-        buffers[slot]=[]
+        try:
+            reply = ask_gpt(history)
+        except Exception:
+            reply = "エラーが発生しました。"
 
+        send(slot, reply)
+        buffers[slot] = []
         remove_used(i)
 
     time.sleep(0.2)