Update app.py

app.py

@@ -10,57 +10,57 @@ def prepare_model():
     token = os.getenv("HF_TOKEN")
     
     if not os.path.exists(model_path):
-        print("🚀 NI-v1 マージ開始...")
+        print("🚀 NI-v1 マージ開始：Llama 4 Scout x Gemma 4 E2E")
         env = os.environ.copy()
         if token:
             env["HF_TOKEN"] = token
         
         try:
+            # mergekitで本物の次世代機をマージ
             subprocess.run(
                 ["mergekit-yaml", "config.yaml", model_path, "--allow-crimes"], 
                 check=True, 
                 env=env
             )
-            print("✨ マージ成功だぜ！")
+            print("✨ マージ成功！のっぽ、Gemma 4の力、手に入れたぜ。")
         except subprocess.CalledProcessError as e:
-            print(f"❌ マージ失敗：{e}")
+            print(f"❌ マージエラー。モデル名かゲート設定を確認だ：{e}")
             raise e
     
-    print("🧠 NI-v1 知能起動中...")
-    tokenizer = AutoTokenizer.from_pretrained(model_path)
+    print("🧠 NI-v1 意識を同期中...")
+    tokenizer = AutoTokenizer.from_pretrained(model_path, trust_remote_code=True)
     model = AutoModelForCausalLM.from_pretrained(
         model_path, 
         torch_dtype=torch.bfloat16, 
-        device_map="auto"
+        device_map="auto",
+        trust_remote_code=True
     )
     return pipeline("text-generation", model=model, tokenizer=tokenizer)
 
 # 初期化
-pipe = prepare_model()
+try:
+    pipe = prepare_model()
+except Exception as e:
+    print(f"起動エラー: {e}")
+    pipe = None
 
 def chat_fn(message, history):
-    # シンプルな対話形式に整形
-    prompt = f"User: {message}\nAssistant: "
+    if pipe is None: return "知能がまだ眠ってるみたいだ（起動失敗）。"
+    
+    # Gemma 4 / Scout 向けのプロンプト形式
+    prompt = f"<|im_start|>user\n{message}<|im_end|>\n<|im_start|>assistant\n"
     outputs = pipe(prompt, max_new_tokens=512, do_sample=True, temperature=0.7)
-    response = outputs[0]['generated_text'].split("Assistant: ")[-1]
+    response = outputs[0]['generated_text'].split("assistant\n")[-1].replace("<|im_end|>", "")
     return response
 
-def upload_to_hub(repo_id, hf_token):
-    try:
-        api = HfApi()
-        api.create_repo(repo_id=repo_id, repo_type="model", exist_ok=True)
-        api.upload_folder(folder_path="./ni_v1_model", repo_id=repo_id, token=hf_token)
-        return f"🎉 {repo_id} に公開完了したぜ！"
-    except Exception as e:
-        return f"⚠ エラー: {str(e)}"
-
+# --- UI (Noppo Style) ---
 with gr.Blocks(title="NI-v1.0") as demo:
     gr.Markdown("# 🤖 Noppo-Intelligence v1.0")
-    gr.Markdown("Llama 4 と Gemma 4 をマージした NoppoStudio の次世代AIだ。")
+    gr.Markdown("Llama 4 Scout と Gemma 4 E2E の融合。これぞ NoppoStudio の真骨頂。")
     
-    with gr.Tab("Chat"):
-        chatbot = gr.Chatbot()
-        msg = gr.Textbox(label="NI-v1 に話しかける...")
+    with gr.Tab("チャット"):
+        chatbot = gr.Chatbot(label="NI-v1 Session")
+        msg = gr.Textbox(label="問いかけ", placeholder="Gemma 4の知能を試してみるか？")
         with gr.Row():
             send = gr.Button("送信", variant="primary")
             clear = gr.Button("クリア")
@@ -73,13 +73,22 @@ with gr.Blocks(title="NI-v1.0") as demo:
         msg.submit(respond, [msg, chatbot], [msg, chatbot])
         send.click(respond, [msg, chatbot], [msg, chatbot])
         clear.click(lambda: None, None, chatbot, queue=False)
+    
+    with gr.Tab("公開"):
+        gr.Markdown("### 完成した知能を世界に公開するぜ")
+        repo_id = gr.Textbox(label="Repo ID", placeholder="noppodev/NoppoIntelligence")
+        user_token = gr.Textbox(label="Write Token", type="password")
+        pub_btn = gr.Button("Hugging Faceへアップロード")
+        status = gr.Textbox(label="Status")
+        
+        def upload(r, t):
+            try:
+                api = HfApi()
+                api.create_repo(repo_id=r, repo_type="model", exist_ok=True)
+                api.upload_folder(folder_path="./ni_v1_model", repo_id=r, token=t)
+                return "✅ 成功！のっぽ、やったな！"
+            except Exception as e: return f"❌ エラー: {e}"
         
-    with gr.Tab("Publish"):
-        gr.Markdown("### モデルを公開する")
-        repo_id = gr.Textbox(label="noppodev/NoppoIntelligence")
-        user_token = gr.Textbox(label="HF Write Token", type="password")
-        pub_btn = gr.Button("Hugging Faceへ転送")
-        status = gr.Textbox(label="ステータス", interactive=False)
-        pub_btn.click(upload_to_hub, [repo_id, user_token], status)
+        pub_btn.click(upload, [repo_id, user_token], status)
 
 demo.launch(server_name="0.0.0.0", server_port=7860)