Update app.py

app.py

@@ -39,13 +39,13 @@ for p in (MODELS, LORA, UPSCALE): p.mkdir(parents=True, exist_ok=True)
 # 3. モデル ID / ファイル
 ##############################################################################
 # --- BRA v7 (公開) ---
-BRA_REPO = "AIGaming/beautiful_realistic_asians"
+BRA_REPO = "AIGaming/beautiful_realistic_asians"          # :contentReference[oaicite:0]
 BRA_FILE = "beautifulRealistic_v7.safetensors"
 BRA_REV  = "801a9b1999dd7018e58a1e2b432fdccd3d1d723d"     # 固定 revision
 
 # --- IP-Adapter 本体 & LoRA ---
-### 修正 ### IP-Adapterのファイルは 'models' サブフォルダにあります
-IP_REPO,  IP_SUBF, IP_BIN  = "h94/IP-Adapter", "models", "ip-adapter-plus-face_sd15.bin"
+### 修正 ### 重みファイルへのフルパスを指定し、サブフォルダ定義を削除
+IP_REPO,  IP_BIN  = "h94/IP-Adapter", "models/ip-adapter-plus-face_sd15.bin"
 LORA_REPO,IP_LORA = "h94/IP-Adapter-FaceID", "ip-adapter-faceid-plusv2_sd15_lora.safetensors"
 
 # --- ControlNet (MediaPipe Face) ---
@@ -94,10 +94,10 @@ def init():
     pipe_.scheduler = DPMSolverMultistepScheduler.from_config(pipe_.scheduler.config)
 
     # 6-4 IP-Adapter
-    ### 修正 ### dl関数にサブフォルダ(IP_SUBF)を渡します
-    ip_bin  = dl(IP_REPO,  IP_BIN, sub=IP_SUBF)
+    ### 修正 ### load_ip_adapter がダウンロードを処理するため、個別のdlは不要。
+    ###        また、呼び出し方を修正し、リポジトリIDと重みのフルパスを渡す。
     ip_lora = dl(LORA_REPO, IP_LORA)
-    pipe_.load_ip_adapter(str(ip_bin.parent.parent), IP_SUBF, ip_bin.name) # load_ip_adapterはサブフォルダを要求します
+    pipe_.load_ip_adapter(IP_REPO, weight_name=IP_BIN, cache_dir=str(MODELS))
     AttnProcsLayers(pipe_.unet.attn_processors).load_lora_weights(
         ip_lora, adapter_name="ip_faceid", safe_load=True
     )
@@ -137,7 +137,6 @@ def generate(face: Image.Image, subj: str, add: str, neg: str,
                num_inference_steps=steps, guidance_scale=cfg,
                image=face, width=w, height=h).images[0]
     if up:
-        # upsampler.scale = 4 if upf==4 else 8  <- This is also a bug, radio button gives string value
         upsampler.scale = int(upf)
         img, _ = upsampler.enhance(np.array(img)); img = Image.fromarray(img)
     return img
@@ -155,8 +154,7 @@ with gr.Blocks(title="BRA v7 × InstantID (ZeroGPU)") as demo:
     with gr.Row():
         st = gr.Slider(10,50,30,1,"Steps"); W = gr.Slider(512,1024,768,64,"W"); H = gr.Slider(512,1024,768,64,"H")
     with gr.Row():
-        # ### 修正 ### gr.Radioはデフォルトで文字列を返すため、infoを追加して型を明示します
-        up = gr.Checkbox(label="Real-ESRGAN"); upf = gr.Radio([4,8], value=4, label="アップスケール", info="Upscale factor")
+        up = gr.Checkbox(label="Real-ESRGAN"); upf = gr.Radio([4,8], value=4, label="アップスケール")
     btn = gr.Button("Generate"); out = gr.Image(type="pil", label="Result")
     btn.click(generate, [f,s,ap,ng,cf,ip,st,W,H,up,upf], out, show_progress=True)