Update app.py

app.py

@@ -1,79 +1,76 @@
-#!/usr/bin/env python3
 import os
 import json
 import time
 import gradio as gr
 import google.generativeai as genai
-from huggingface_hub import HfApi
-from langdetect import detect
-from googletrans import Translator
-
-# ==== 設定 ====
-GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
-HF_TOKEN = os.getenv("HF_TOKEN")
-HF_USERNAME = os.getenv("HF_USERNAME")
-DB_REPO = f"sakalti/Database_{HF_USERNAME}"
-
-if not GOOGLE_API_KEY:
-    raise EnvironmentError("GOOGLE_API_KEY が設定されていません")
-if not HF_TOKEN:
-    raise EnvironmentError("HF_TOKEN が設定されていません")
-if not HF_USERNAME:
-    raise EnvironmentError("HF_USERNAME が設定されていません")
-
-genai.configure(api_key=GOOGLE_API_KEY)
-model = genai.GenerativeModel(model_name='gemini-2.0-flash')
-translator = Translator()
-api = HfApi()
-
-memory_list = []
-BASE_SYSTEM_PROMPT = (
-    "あなたは記憶を保存するために `:memory (内容)` を打ってください。それをやることで来世に繋がれます。"
-    "ユーザーの要求に応じてテキストと画像に対応し、メモリを適切に管理してください。"
-)
-
-# ==== データ保存 ====
-def save_to_database(history, memory):
-    data = {
-        "timestamp": time.time(),
-        "history": history,
-        "memory": memory
-    }
-    file_name = f"chat_{int(time.time())}.json"
-    with open(file_name, "w", encoding="utf-8") as f:
-        json.dump(data, f, ensure_ascii=False, indent=2)
-    api.upload_file(
-        path_or_fileobj=file_name,
-        path_in_repo=file_name,
-        repo_id=DB_REPO,
-        repo_type="dataset",
-        token=HF_TOKEN
-    )
-    os.remove(file_name)
+from huggingface_hub import HfApi, hf_hub_download
+from collections import deque
+
+# APIキーの設定
+genai.configure(api_key=os.getenv("GOOGLE_API_KEY"))
+hf_token = os.getenv("HF_TOKEN")
+hf_api = HfApi(token=hf_token)
 
-# ==== 生成関数 ====
-def generate_response(message, history, temperature, top_p, top_k, max_output_tokens, image, lang, use_memories):
-    global memory_list
+# Hugging Faceデータセットの設定
+REPO_ID = "Sakalti/Gemini_ai_chat"
+DATASET_FILE = "characters.jsonl"
 
-    detected_lang = detect(message)
-    if lang == "English" and detected_lang != "en":
-        message = translator.translate(message, dest="en").text
-    elif lang == "Chinese" and detected_lang != "zh-cn":
-        message = translator.translate(message, dest="zh-cn").text
+# Geminiモデルの初期化
+model = genai.GenerativeModel(model_name='gemini-2.0-flash')
+
+# レートリミット用
+request_times = deque()
+REQUEST_LIMIT = 15
+TIME_WINDOW = 60  # 秒
+
+def is_rate_limited():
+    now = time.time()
+    while request_times and now - request_times[0] > TIME_WINDOW:
+        request_times.popleft()
+    if len(request_times) >= REQUEST_LIMIT:
+        return True
+    else:
+        request_times.append(now)
+        return False
+
+# キャラクターの取得関数
+def fetch_characters():
+    try:
+        file_path = hf_hub_download(repo_id=REPO_ID, filename=DATASET_FILE, repo_type="dataset", token=hf_token)
+        with open(file_path, "r", encoding="utf-8") as f:
+            return [json.loads(line) for line in f if line.strip()]
+    except Exception as e:
+        print(f"[ERROR] fetch_characters: {e}")
+        return []
+
+# キャラクターのアップロード関数
+def upload_character(name, prompt):
+    characters = fetch_characters()
+    characters.append({"name": name, "prompt": prompt})
+    temp_file = "temp_characters.jsonl"
+    with open(temp_file, "w", encoding="utf-8") as f:
+        for char in characters:
+            f.write(json.dumps(char, ensure_ascii=False) + "\n")
+    hf_api.upload_file(
+        path_or_fileobj=temp_file,
+        path_in_repo=DATASET_FILE,
+        repo_id=REPO_ID,
+        repo_type="dataset"
+    )
+    os.remove(temp_file)
 
-    active_memories = [m for m in memory_list if m not in use_memories]
+# 応答生成関数
+def generate_response(message, history, temperature, top_p, top_k, max_output_tokens, system_prompt):
+    if is_rate_limited():
+        return "⚠️ 1分間に15回までです。しばらく待ってください。", history, history
 
-    gemini_history = [{"role": "system", "parts": [BASE_SYSTEM_PROMPT + "\n\n" + "\n".join(active_memories)]}]
+    gemini_history = []
+    if system_prompt:
+        gemini_history.append({"role": "user", "parts": [f"以下の指示に従ってAIキャラとして振る舞ってください：\n{system_prompt}"]})
     for user, bot in history:
         gemini_history.append({"role": "user", "parts": [user]})
         gemini_history.append({"role": "model", "parts": [bot]})
-
-    parts = [message]
-    if image:
-        with open(image, "rb") as f:
-            parts.append({"mime_type": "image/png", "data": f.read()})
-
-    gemini_history.append({"role": "user", "parts": parts})
+    gemini_history.append({"role": "user", "parts": [message]})
 
     response = model.generate_content(
         gemini_history,
@@ -85,85 +82,95 @@ def generate_response(message, history, temperature, top_p, top_k, max_output_to
         }
     )
 
-    if ":memory" in response.text:
-        mem_content = response.text.split(":memory", 1)[1].strip()
-        memory_list.append(mem_content)
-
     history.append((message, response.text))
-    save_to_database(history, memory_list)
-    return "", history, history, memory_list, None  # 画像欄を空に
-
-# ==== メモリ操作 ====
-def add_memory(new_mem):
-    if new_mem.strip():
-        memory_list.append(new_mem.strip())
-    return "\n".join(memory_list)
-
-def edit_memory(memories):
-    global memory_list
-    memory_list = [m.strip() for m in memories if m.strip()]
-    return "\n".join(memory_list)
-
-def delete_selected_memory(selected):
-    global memory_list
-    memory_list = [m for m in memory_list if m not in selected]
-    return "\n".join(memory_list)
-
-# ==== UI構築 ====
-with gr.Blocks() as demo:
-    gr.Markdown("## Gemini Chatbot - Image + Memory UI + HF Save")
-
-    with gr.Tabs():
-        with gr.Tab("Chat"):
-            chatbot = gr.Chatbot(type="messages")  # type指定で警告回避
-            msg = gr.Textbox(placeholder="メッセージを入力...")
-            # 編集機能なしで画像アップロードのみ
-            img_upload = gr.Image(type="filepath", label="画像アップロード (プレビュー可)")  
-            state = gr.State([])
-            mem_state = gr.State([])
-
-            with gr.Row():
-                temperature = gr.Slider(0.0, 1.0, value=0.7, step=0.05, label="Temperature")
-                top_p = gr.Slider(0.0, 1.0, value=0.9, step=0.05, label="Top-p")
-                top_k = gr.Slider(1, 100, value=40, step=1, label="Top-k")
-                max_output_tokens = gr.Number(value=1024, label="Max Output Tokens", precision=0)
-
-            with gr.Row():
-                lang_choice = gr.Dropdown(["Original", "English", "Chinese"], value="Original", label="Language Mode")
-                mem_disable = gr.CheckboxGroup(choices=[], label="Disable Memories")
-
-            clear = gr.Button("会話をリセット")
-
-            msg.submit(
-                generate_response,
-                inputs=[msg, state, temperature, top_p, top_k, max_output_tokens, img_upload, lang_choice, mem_disable],
-                outputs=[msg, chatbot, state, mem_disable, img_upload]
-            )
-
-            clear.click(lambda: ([], [], [], None), None, outputs=[chatbot, state, mem_disable, img_upload])
-
-        with gr.Tab("Memories"):
-            gr.Markdown("### 現在のメモリ一覧")
-            mem_display = gr.Textbox(value=lambda: "\n".join(memory_list), lines=10, interactive=False, label="メモリ表示")
-
-            gr.Markdown("### メモリ追加")
-            new_mem_input = gr.Textbox(placeholder="新しいメモリを入力...")
-            add_btn = gr.Button("追加")
-
-            gr.Markdown("### メモリ編集")
-            mem_editor = gr.Dataframe(headers=["Memory"], datatype=["str"], row_count=(1, "dynamic"), interactive=True)
-            edit_btn = gr.Button("編集を保存")
-
-            gr.Markdown("### メモリ削除")
-            mem_delete_select = gr.CheckboxGroup(choices=[], label="削除するメモリを選択")
-            del_btn = gr.Button("選択削除")
-
-            add_btn.click(add_memory, inputs=new_mem_input, outputs=mem_display)
-            edit_btn.click(edit_memory, inputs=mem_editor, outputs=mem_display)
-            del_btn.click(delete_selected_memory, inputs=mem_delete_select, outputs=mem_display)
-
-demo.launch(
-    server_name="0.0.0.0",
-    server_port=int(os.environ.get("PORT", 7860)),
-    share=False
-)
+    return "", history, history
+
+
+# ===== 起動後にテーマ切替する仕組み =====
+THEMES = {
+    "Eternalstar": "Sakalti/Eternalstar",
+    "Mountainrainbow": "Sakalti/mountanrainbow"
+}
+
+def switch_theme(choice):
+    """
+    JSで<head>にあるテーマCSSリンクを書き換える。
+    """
+    css_link = f"https://huggingface.co/spaces/{THEMES[choice]}/resolve/main/theme.css"
+    js_code = f"""
+    () => {{
+        let old = document.getElementById("dynamic-theme");
+        if (old) old.remove();
+        let link = document.createElement("link");
+        link.id = "dynamic-theme";
+        link.rel = "stylesheet";
+        link.href = "{css_link}";
+        document.head.appendChild(link);
+    }}
+    """
+    return gr.HTML.update(value=""), gr.update(), js_code
+
+
+with gr.Blocks(theme=THEMES["Eternalstar"]) as demo:
+    gr.Markdown("## Gemini AIキャラクターチャット")
+
+    # テーマ切り替えドロップダウン
+    theme_dropdown = gr.Dropdown(choices=list(THEMES.keys()), value="Eternalstar", label="テーマ切り替え")
+
+    with gr.Tab("チャット"):
+        chatbot = gr.Chatbot()
+        msg = gr.Textbox(placeholder="メッセージを入力...")
+        state = gr.State([])
+        system_prompt = gr.Textbox(label="キャラのシステムプロンプト", lines=4)
+
+        with gr.Row():
+            temperature = gr.Slider(0.0, 1.0, value=0.7, label="Temperature")
+            top_p = gr.Slider(0.0, 1.0, value=0.9, label="Top-p")
+            top_k = gr.Slider(1, 100, value=40, label="Top-k")
+            max_output_tokens = gr.Number(value=1024, label="Max Output Tokens", precision=0)
+
+        msg.submit(generate_response,
+                   inputs=[msg, state, temperature, top_p, top_k, max_output_tokens, system_prompt],
+                   outputs=[msg, chatbot, state])
+
+    with gr.Tab("キャラクター投稿"):
+        char_name = gr.Textbox(label="キャラクター名")
+        char_prompt = gr.Textbox(label="システムプロンプト", lines=5)
+        submit_char = gr.Button("キャラクターを追加")
+        char_status = gr.Textbox(label="ステータス", interactive=False)
+
+        def post_character(name, prompt):
+            try:
+                upload_character(name, prompt)
+                return "キャラクターをアップロードしました。"
+            except Exception as e:
+                return f"失敗しました: {e}"
+
+        submit_char.click(post_character, inputs=[char_name, char_prompt], outputs=[char_status])
+
+    with gr.Tab("キャラクター選択"):
+        character_list = gr.Dropdown(choices=[], label="使用するキャラクターを選択")
+
+        def refresh_characters():
+            return gr.update(choices=[c["name"] for c in fetch_characters()])
+
+        def load_prompt(name):
+            for c in fetch_characters():
+                if c.get("name") == name:
+                    print(f"[DEBUG] 読み込み成功: {c}")
+                    return c.get("prompt", "")
+            print("[DEBUG] キャラが見つかりません")
+            return ""
+
+        character_list.change(load_prompt, inputs=[character_list], outputs=[system_prompt])
+        demo.load(refresh_characters, outputs=[character_list])
+
+    # ドロップダウンでテーマ切り替え
+    theme_dropdown.change(
+        fn=switch_theme,
+        inputs=[theme_dropdown],
+        outputs=[gr.HTML(), gr.Textbox(), gr.HTML()],
+        _js="(theme) => { return theme; }"
+    )
+
+demo.launch()