Upload app.py

app.py

@@ -11,11 +11,17 @@ import re
 load_dotenv()
 GEMINI_API_KEY = os.getenv("GEMINI_API_KEY")
 GROQ_API_KEY = os.getenv("GROQ_API_KEY")
+
+# Hugging Face SpacesのSecretsに設定されているかチェック
 if not GEMINI_API_KEY or not GROQ_API_KEY:
-    raise ValueError("GEMINI_API_KEY と GROQ_API_KEY をSecretsに設定してください。")
+    # ローカルでの実行のために、環境変数が設定されていない場合はダミー値を設定
+    print("警告: APIキーがSecretsに設定されていません。")
+    # 実行を止めないようにダミーを設定（デプロイ時はSecrets設定が必須）
+    GEMINI_API_KEY = "your_gemini_api_key_here" 
+    GROQ_API_KEY = "your_groq_api_key_here"
 
 genai.configure(api_key=GEMINI_API_KEY)
-gemini_model = genai.GenerativeModel('gemini-2.5-flash-lite')
+gemini_model = genai.GenerativeModel('gemini-1.5-flash')
 groq_client = Groq(api_key=GROQ_API_KEY)
 
 print("日本語感情分析モデルをロード中...")
@@ -43,7 +49,7 @@ DEFAULT_SCENE_PARAMS = {
     "constraints": ["会話を「別に。」のような一言で終わらせない", "必ず相手の発言を拾ってリアクションを返す"]
 }
 
-# --- 2. 機能定義（省略なし） ---
+# --- 2. 機能定義 ---
 
 def detect_scene_change(history, message):
     history_text = "\n".join([f"ユーザー: {u}\n麻理: {m}" for u, m in history[-4:]])
@@ -121,7 +127,7 @@ def generate_dialogue_with_gemini(history, message, affection, stage_name, scene
     try:
         generation_config = genai.types.GenerationConfig(max_output_tokens=200, temperature=0.95)
         response = gemini_model.generate_content(system_prompt, generation_config=generation_config)
-        return response.text
+        return response.text.strip()
     except Exception as e:
         print(f"応答生成エラー(Gemini): {e}")
         return "（ごめんなさい、ちょっと考えがまとまらない……）"
@@ -142,7 +148,7 @@ def update_affection(message, affection):
         return affection
     return affection
 
-# --- メイン応答処理 ---
+# --- 3. メイン応答処理 ---
 
 def respond(message, chat_history, affection, history, scene_params):
     new_affection = update_affection(message, affection)
@@ -151,40 +157,30 @@ def respond(message, chat_history, affection, history, scene_params):
 
     final_scene_params = scene_params
 
-    if new_scene_name:
+    if new_scene_name and new_scene_name in THEME_URLS:
+        print(f"シーンチェンジを検出: {new_scene_name}")
         new_params_base = generate_scene_instruction_with_groq(new_affection, stage_name, new_scene_name, message)
         if new_params_base:
             final_scene_params = {**DEFAULT_SCENE_PARAMS, **new_params_base}
             instruction = final_scene_params.get("initial_dialogue_instruction")
             bot_message = generate_dialogue_with_gemini(history, message, new_affection, stage_name, final_scene_params, instruction=instruction)
-        else:
+        else: # Groqが失敗した場合のフォールバック
+            final_scene_params["theme"] = new_scene_name
             bot_message = generate_dialogue_with_gemini(history, message, new_affection, stage_name, final_scene_params)
     else:
         bot_message = generate_dialogue_with_gemini(history, message, new_affection, stage_name, final_scene_params)
 
     new_history = history + [(message, bot_message)]
     chat_history.append((message, bot_message))
+    
     theme_name = final_scene_params.get("theme", "default")
-    background_url = THEME_URLS.get(theme_name, THEME_URLS["default"])
-
-    js_script = f"""
-    <script>
-    setTimeout(() => {{
-        const chat = document.getElementById("chat_area");
-        if (chat) {{
-            console.log("背景画像を設定: {background_url}");
-            chat.style.backgroundImage = "url('{background_url}')";
-            chat.style.backgroundSize = "cover";
-            chat.style.backgroundPosition = "center";
-            chat.style.transition = "background-image 1s ease-in-out";
-        }}
-    }}, 100);
-    </script>
-    """
-
-    return "", chat_history, new_affection, stage_name, new_affection, new_history, final_scene_params, js_script
-
-# --- Gradio UI ---
+    
+    # 背景レイヤーのHTMLコンテンツをクラス名付きで生成
+    background_html = f'<div class="chat-background {theme_name}"></div>'
+
+    return "", chat_history, new_affection, stage_name, new_affection, new_history, final_scene_params, background_html
+
+# --- 4. Gradio UI ---
 
 with gr.Blocks(css="style.css", theme=gr.themes.Soft(primary_hue="rose", secondary_hue="pink")) as demo:
     scene_state = gr.State(DEFAULT_SCENE_PARAMS)
@@ -194,19 +190,36 @@ with gr.Blocks(css="style.css", theme=gr.themes.Soft(primary_hue="rose", seconda
     gr.Markdown("# 麻理チャット")
     with gr.Row():
         with gr.Column(scale=2):
-            chatbot = gr.Chatbot(label="麻理との会���", height=600, bubble_full_width=False, elem_id="chat_area")
-            msg_input = gr.Textbox(label="あなたのメッセージ", placeholder="「水族館はどう？」と聞いた後、「いいね、行こう！」のように返してみてください", scale=5)
+            # チャットボットと背景を重ねるためのコンテナ
+            with gr.Column(elem_id="chat_container"):
+                # 背景レイヤー
+                background_display = gr.HTML(
+                    f'<div class="chat-background {DEFAULT_SCENE_PARAMS["theme"]}"></div>',
+                    elem_id="background_container"
+                )
+                # チャットボット
+                chatbot = gr.Chatbot(
+                    label="麻理との会話", bubble_full_width=False, elem_id="chat_area", show_label=False
+                )
+
+            msg_input = gr.Textbox(
+                label="あなたのメッセージ",
+                placeholder="「水族館はどう？」と聞いた後、「いいね、行こう！」のように返してみてください",
+                scale=5,
+                show_label=False
+            )
         with gr.Column(scale=1):
-            stage_display = gr.Textbox(label="現在の関係ステージ", interactive=False)
+            stage_display = gr.Textbox(label="現在の関係ステージ", interactive=False, value=get_relationship_stage(30))
             affection_gauge = gr.Slider(minimum=0, maximum=100, label="麻理の好感度", value=30, interactive=False)
-            js_injector = gr.HTML(elem_classes="hidden")
 
+    # 応答関数とUIコンポーネントの接続を更新
     msg_input.submit(
         respond,
         [msg_input, chatbot, affection_state, history_state, scene_state],
-        [msg_input, chatbot, affection_gauge, stage_display, affection_state, history_state, scene_state, js_injector]
+        [msg_input, chatbot, affection_gauge, stage_display, affection_state, history_state, scene_state, background_display]
     )
+    # ページロード時に初期ステージを表示
+    demo.load(lambda affection: get_relationship_stage(affection), affection_state, stage_display)
 
 if __name__ == "__main__":
-    demo.launch()
-
+    demo.launch()