Upload 5 files

app.py

@@ -21,9 +21,21 @@ def create_limiter_state():
     return {"timestamps": [], "is_blocked": False}
 
 def check_limiter(limiter_state):
-    if limiter_state["is_blocked"]: return False
+    # limiter_stateが辞書であることを確認
+    if not isinstance(limiter_state, dict):
+        logger.error(f"limiter_stateが辞書ではありません: {type(limiter_state)}")
+        return False
+    
+    if limiter_state.get("is_blocked", False): 
+        return False
+    
     now = time.time()
-    limiter_state["timestamps"] = [t for t in limiter_state["timestamps"] if now - t < RATE_LIMIT_IN_SECONDS]
+    timestamps = limiter_state.get("timestamps", [])
+    if not isinstance(timestamps, list):
+        timestamps = []
+        limiter_state["timestamps"] = timestamps
+    
+    limiter_state["timestamps"] = [t for t in timestamps if now - t < RATE_LIMIT_IN_SECONDS]
     if len(limiter_state["timestamps"]) >= RATE_LIMIT_MAX_REQUESTS:
         logger.error("レートリミット超過！ API呼び出しをブロックします。")
         limiter_state["is_blocked"] = True
@@ -159,25 +171,73 @@ def detect_scene_change(history, message):
     return None # この関数はrespond内で直接ロジックを記述
 
 def generate_dialogue(history, message, affection, stage_name, scene_params, instruction=None):
-    # (中身は変更なし)
-    history_text = "\n".join([f"ユーザー: {u}\n麻理: {m}" for u, m in history])
-    user_prompt = f'# 現在の状況\n- 現在地: {scene_params.get("theme", "default")}\n- 好感度: {affection} ({stage_name})\n\n# 会話履歴\n{history_text}\n---\n# 指示\n{f"【特別指示】{instruction}" if instruction else f"ユーザーの発言「{message}」に応答してください。"}\n\n麻理の応答:'
+    if not isinstance(history, list):
+        history = []
+    if not isinstance(scene_params, dict):
+        scene_params = {"theme": "default"}
+    if not isinstance(message, str):
+        message = ""
+    
+    # 履歴を安全に処理
+    safe_history = []
+    for item in history:
+        if isinstance(item, (list, tuple)) and len(item) >= 2:
+            user_msg = str(item[0]) if item[0] is not None else ""
+            bot_msg = str(item[1]) if item[1] is not None else ""
+            safe_history.append((user_msg, bot_msg))
+    
+    history_text = "\n".join([f"ユーザー: {u}\n麻理: {m}" for u, m in safe_history])
+    
+    current_theme = scene_params.get("theme", "default")
+    user_prompt = f'''# 現在の状況
+- 現在地: {current_theme}
+- 好感度: {affection} ({stage_name})
+
+# 会話履歴
+{history_text}
+---
+# 指示
+{f"【特別指示】{instruction}" if instruction else f"ユーザーの発言「{message}」に応答してください。"}
+
+麻理の応答:'''
+    
     return call_llm(SYSTEM_PROMPT_MARI, user_prompt)
 
 def get_relationship_stage(affection):
-    # (中身は変更なし)
-    if affection < 40: return "ステージ1：警戒"; # ...
-    return "ステージ4：親密"
+    if not isinstance(affection, (int, float)):
+        affection = 30  # デフォルト値
+    
+    if affection < 20:
+        return "ステージ1：敵対"
+    elif affection < 40:
+        return "ステージ2：警戒"
+    elif affection < 60:
+        return "ステージ3：中立"
+    elif affection < 80:
+        return "ステージ4：好意"
+    else:
+        return "ステージ5：親密"
 
 def update_affection(message, affection):
-    # (中身は変更なし)
+    if not isinstance(affection, (int, float)):
+        affection = 30  # デフォルト値
+    
     analyzer = get_sentiment_analyzer()
-    if not analyzer: return affection
+    if not analyzer: 
+        return affection
+    
     try:
+        if not isinstance(message, str) or len(message.strip()) == 0:
+            return affection
+            
         result = analyzer(message)[0]
-        if result['label'] == 'positive': return min(100, affection + 3)
-        if result['label'] == 'negative': return max(0, affection - 3)
-    except Exception: pass
+        if result.get('label') == 'positive': 
+            return min(100, affection + 3)
+        elif result.get('label') == 'negative': 
+            return max(0, affection - 3)
+    except Exception as e:
+        logger.error(f"感情分析エラー: {e}")
+    
     return affection
 
 # --- 6. Gradio応答関数 (v5構文に完全対応) ---
@@ -213,6 +273,10 @@ def respond(message, chat_history, affection, scene_params, limiter_state):
         
         new_affection = update_affection(message, affection)
         stage_name = get_relationship_stage(new_affection)
+        
+        # scene_paramsが辞書であることを確認
+        if not isinstance(scene_params, dict):
+            scene_params = {"theme": "default"}
         final_scene_params = scene_params.copy()
         
         bot_message = ""
@@ -256,13 +320,21 @@ def respond(message, chat_history, affection, scene_params, limiter_state):
             try:
                 parsed = json.loads(new_scene_name_json)
                 if isinstance(parsed, dict):
-                    new_scene_name = parsed.get("scene")
+                    scene_value = parsed.get("scene")
+                    # scene_valueが文字列であることを確認
+                    if isinstance(scene_value, str):
+                        new_scene_name = scene_value
+                    else:
+                        logger.warning(f"scene値が文字列ではありません: {scene_value} (型: {type(scene_value)})")
                 else:
                     logger.warning(f"想定外のJSON形式が返されました: {parsed}")
             except Exception as e:
                 logger.error(f"JSONパースに失敗しました: {e}\n元の出力: {new_scene_name_json}")
 
-            if new_scene_name and new_scene_name != "none" and new_scene_name != final_scene_params.get("theme"):
+            if (new_scene_name and 
+                isinstance(new_scene_name, str) and 
+                new_scene_name != "none" and 
+                new_scene_name != final_scene_params.get("theme")):
                 if not check_limiter(limiter_state):
                     bot_message = "（…少し考える時間がほしい）"
                 else:

style.css

@@ -10,6 +10,31 @@ body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !important;
 }
 
+/* Gradio内部のフォント参照を上書き */
+@font-face {
+  font-family: 'ui-sans-serif';
+  src: local('system-ui'), local('-apple-system'), local('BlinkMacSystemFont');
+  font-weight: normal;
+}
+
+@font-face {
+  font-family: 'ui-sans-serif';
+  src: local('system-ui'), local('-apple-system'), local('BlinkMacSystemFont');
+  font-weight: bold;
+}
+
+@font-face {
+  font-family: 'system-ui';
+  src: local('system-ui'), local('-apple-system'), local('BlinkMacSystemFont');
+  font-weight: normal;
+}
+
+@font-face {
+  font-family: 'system-ui';
+  src: local('system-ui'), local('-apple-system'), local('BlinkMacSystemFont');
+  font-weight: bold;
+}
+
 /* --- Layout --- */
 .gradio-container {
   max-width: 1000px !important;