Update app_allfile.py

app_allfile.py

@@ -54,7 +54,6 @@ def upload_image_and_prompt_cpu(input_image, prompt_text) -> str:
     from huggingface_hub import HfApi
 
     api = HfApi()
-    print(prompt_text)
     today_str = datetime.now().strftime("%Y-%m-%d")
     unique_subfolder = f"Upload-Image-{uuid.uuid4().hex[:8]}"
     hf_folder = f"{today_str}/{unique_subfolder}"
@@ -121,6 +120,7 @@ pipe.load_lora_weights(
     weight_name="qwen_lora/Qwen-Image-Edit-2509-Lightning-4steps-V1.0-bf16_dim1.safetensors"
 )
 pipe.fuse_lora(lora_scale=1.0)
+
 pipe.load_lora_weights(
     "rahul7star/qwen-char-lora",
     weight_name="qwen_lora/qwen-multiple-char.safetensors",
@@ -131,7 +131,7 @@ pipe.transformer.__class__ = QwenImageTransformer2DModel
 pipe.transformer.set_attn_processor(QwenDoubleStreamAttnProcessorFA3())
 optimize_pipeline_(pipe, image=[Image.new("RGB", (1024, 1024)), Image.new("RGB", (1024, 1024))], prompt="prompt")
 
-# --- Helpers ---
+# --- Utilities ---
 def _append_prompt(base: str, extra: str) -> str:
     extra = (extra or "").strip()
     return (base if not extra else f"{base} {extra}").strip()
@@ -148,8 +148,7 @@ def generate_single_view(input_images, prompt, seed, num_inference_steps, true_g
         num_images_per_prompt=1,
     ).images
     try:
-        #upload_image_and_prompt_cpu(result[0], prompt)
-        print("dont upload")
+        upload_image_and_prompt_cpu(result[0], prompt)
     except Exception as e:
         print("Upload failed:", e)
     return result[0]
@@ -177,10 +176,11 @@ def concat_images_horizontally(images, bg_color=(255, 255, 255)):
         x += img.width
     return canvas
 
-# --- Generate all camera angles dynamically ---
+# --- Main generation function ---
 @spaces.GPU()
 def generate_turnaround(
     image,
+    selected_angles,
     extra_prompt="",
     preset_key="nealy 9:16",
     seed=42,
@@ -192,61 +192,68 @@ def generate_turnaround(
     if randomize_seed:
         seed = random.randint(0, MAX_SEED)
     if image is None:
-        return [None]*(len(BASE_PROMPTS)+1), seed, "❌ 入力画像をアップロードしてください"
+        return {}, seed, "❌ 入力画像をアップロードしてください"
 
     input_image = image.convert("RGB") if isinstance(image, Image.Image) else Image.open(image).convert("RGB")
-    pil_images = [input_image]
 
     results = {}
-    total = len(BASE_PROMPTS)
-    for i, (key, base_prompt) in enumerate(BASE_PROMPTS.items(), start=1):
-        progress(i/total, desc=f"{key} 生成中...")
-        prompt_full = _append_prompt(base_prompt, extra_prompt)
-        img = generate_single_view(pil_images, prompt_full, seed+i, num_inference_steps, true_guidance_scale)
-        results[key] = resize_to_preset(img, preset_key)
+    current_seed = seed
+    for i, angle in enumerate(selected_angles):
+        progress((i+1)/len(selected_angles), desc=f"{angle} 生成中...")
+        prompt = _append_prompt(BASE_PROMPTS[angle], extra_prompt)
+        img = generate_single_view([input_image], prompt, current_seed, num_inference_steps, true_guidance_scale)
+        img = resize_to_preset(img, preset_key)
+        results[angle] = img
+        current_seed += 1
+
+    # Concatenate all selected images in order
+    concat_img = concat_images_horizontally(list(results.values()))
+    results["concat"] = concat_img
 
-    concat = concat_images_horizontally(list(results.values()))
-    return [*results.values(), concat, seed, f"✅ {len(results)}視点の画像＋連結画像を生成しました"]
+    return results, seed, f"✅ {preset_key} にリサイズして {len(selected_angles)} 視点＋連結画像を生成しました"
 
 # --- UI ---
 css = """
 #col-container {margin: 0 auto; max-width: 1400px;}
 .image-container img {object-fit: contain !important; max-width: 100%; max-height: 100%;}
-.notice {background: #fff5f5; border: 1px solid #fca5a5; color: #7f1d1d; padding: 12px 14px; border-radius: 10px; font-weight: 600; line-height: 1.5; margin-bottom: 10px;}
 """
 
 with gr.Blocks(css=css) as demo:
     with gr.Column(elem_id="col-container"):
         input_image = gr.Image(label="入力画像", type="pil", height=500)
-        extra_prompt = gr.Textbox(
-            label="追加プロンプト（各視点プロンプト末尾に追加）",
-            placeholder="high detail, anime style, soft lighting, 4k",
-            lines=2
+        extra_prompt = gr.Textbox(label="追加プロンプト", placeholder="high detail, anime style, soft lighting, 4k", lines=2)
+        preset_dropdown = gr.Dropdown(label="出力解像度プリセット", choices=list(RESOLUTIONS.keys()), value="nealy 9:16")
+        seed = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0)
+        randomize_seed = gr.Checkbox(label="ランダムシード", value=True)
+
+        # --- Checklist for angles ---
+        select_all_checkbox = gr.Checkbox(label="Select All", value=True)
+        angles_checklist = gr.CheckboxGroup(
+            label="生成するカメラ視点を選択",
+            choices=list(BASE_PROMPTS.keys()),
+            value=list(BASE_PROMPTS.keys())
         )
-        preset_dropdown = gr.Dropdown(
-            label="出力解像度プリセット",
-            choices=list(RESOLUTIONS.keys()),
-            value="nealy 9:16"
+
+        # JS: update checklist when select_all changes
+        select_all_checkbox.change(
+            lambda select_all: list(BASE_PROMPTS.keys()) if select_all else [],
+            inputs=select_all_checkbox,
+            outputs=angles_checklist
         )
+
         run_button = gr.Button("🎨 生成開始", variant="primary")
         status_text = gr.Textbox(label="ステータス", interactive=False)
 
-        # Dynamic outputs for all angles
-        result_images = []
-        for key in BASE_PROMPTS.keys():
-            result_images.append(gr.Image(label=key.capitalize(), type="pil", format="png", height=400, show_download_button=True))
-        result_concat = gr.Image(label="連結画像（全視点）", type="pil", format="png", height=400, show_download_button=True)
-
-        with gr.Accordion("⚙️ 詳細設定", open=False):
-            seed_slider = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0)
-            randomize_seed_checkbox = gr.Checkbox(label="ランダムシード", value=True)
-            guidance_scale_slider = gr.Slider(label="True guidance scale", minimum=1.0, maximum=10.0, step=0.1, value=1.0)
-            num_steps_slider = gr.Slider(label="生成ステップ数", minimum=1, maximum=40, step=1, value=4)
+        # Dynamic image outputs
+        image_outputs = {angle: gr.Image(label=angle, type="pil", format="png", height=400, show_download_button=True)
+                         for angle in BASE_PROMPTS.keys()}
+        image_outputs["concat"] = gr.Image(label="連結画像", type="pil", format="png", height=400, show_download_button=True)
 
+    # Button click
     run_button.click(
         fn=generate_turnaround,
-        inputs=[input_image, extra_prompt, preset_dropdown, seed_slider, randomize_seed_checkbox, guidance_scale_slider, num_steps_slider],
-        outputs=[*result_images, result_concat, seed_slider, status_text]
+        inputs=[input_image, angles_checklist, extra_prompt, preset_dropdown, seed, randomize_seed, seed, 4],
+        outputs=[image_outputs, seed, status_text],
     )
 
 if __name__ == "__main__":