Update app.py

app.py

@@ -89,10 +89,10 @@ CUSTOM_LABELS = {
     "zh": "自定义（用中文输入）",
 }
 
-# i18n 辞書
+# i18n 辞書（表示は単言語）
 I18N = {
     "title": {
-        "en": "Camera Work ",
+        "en": "Camera Work",
         "ja": "カメラワーク",
         "zh": "镜头控制",
     },
@@ -103,14 +103,14 @@ I18N = {
     },
     "input_image": {"en": "Input image", "ja": "入力画像", "zh": "输入图像"},
     "dropdown_label": {
-        "en": "Camera work (label shows CN + selected language)",
-        "ja": "カメラワーク（表示は 中国語＋選択言語）",
-        "zh": "镜头操作（显示为 中文＋所选语言）",
+        "en": "Camera work",
+        "ja": "カメラワーク",
+        "zh": "镜头操作",
     },
     "custom_cn_label": {
-        "en": "Custom Chinese prompt",
-        "ja": "自由入力の中国語プロンプト",
-        "zh": "自定义中文提示词",
+        "en": "Custom prompt(English and Chinese recommended)",
+        "ja": "自由入力のプロンプト(英語、中国語がおすすめ)",
+        "zh": "自定义提示词(推荐英文和中文)",
     },
     "custom_cn_ph": {
         "en": "e.g., 将镜头转为斜俯视 并 拉远镜头",
@@ -118,14 +118,14 @@ I18N = {
         "zh": "例如：将镜头转为斜俯视 并 拉远镜头",
     },
     "extra_label": {
-        "en": "Extra prompt (optional, appended at end)",
-        "ja": "追加プロンプト（任意・末尾に付加）",
-        "zh": "附加提示词（可选，追加在末尾）",
+        "en": "Extra prompt (optional, appended at end)(English and Chinese recommended)",
+        "ja": "追加プロンプト（任意・末尾に付加）(英語、中国語がおすすめ)",
+        "zh": "附加提示词（可选，追加在末尾）(推荐英文和中文)",
     },
     "extra_ph": {
-        "en": "e.g., high detail, soft lighting, anime style, 4k",
-        "ja": "例: high detail, soft lighting, anime style, 4k",
-        "zh": "例如：high detail, soft lighting, anime style, 4k",
+        "en": "e.g., Subject is a girl",
+        "ja": "例: 被摄体是一名女孩子",
+        "zh": "例如：被摄体是一名女孩子",
     },
     "accordion": {"en": "Show advanced settings", "ja": "詳細設定を開く", "zh": "展开高级设置"},
     "seed": {"en": "Seed", "ja": "Seed", "zh": "Seed"},
@@ -133,23 +133,12 @@ I18N = {
     "tgs": {"en": "True guidance scale", "ja": "True guidance scale", "zh": "True guidance scale"},
     "steps": {"en": "Steps", "ja": "生成ステップ数", "zh": "生成步数"},
     "run": {"en": "Generate", "ja": "生成", "zh": "生成"},
-    "sel_cn": {
-        "en": "Selected camera prompt (to be sent, Chinese)",
-        "ja": "選択中のカメラプロンプト（送信対象・中国語）",
-        "zh": "所选镜头提示（发送内容，中文）",
-    },
-    "final_prev": {
-        "en": "Final prompt to be sent (Chinese + extra)",
-        "ja": "最終的に送信されるプロンプト（中国語＋追記）",
-        "zh": "最终发送的提示（中文＋附加）",
-    },
     "output": {"en": "Output image", "ja": "出力画像", "zh": "输出图像"},
     "status": {"en": "Status", "ja": "ステータス", "zh": "状态"},
-    "sent_hdr": {"en": "**Prompt sent (for reference)**", "ja": "**送信プロンプト（確認用）**", "zh": "**已发送提示（供参考）**"},
     "status_ok": {
-        "en": "✅ Generated 1 image with Chinese prompt (PNG).",
-        "ja": "✅ 中国語プロンプトで1枚生成しました（PNG）。",
-        "zh": "✅ 使用中文提示生成了 1 张图片（PNG）。",
+        "en": "Generated 1 image (PNG).",
+        "ja": "1枚生成しました（PNG）。",
+        "zh": "已生成 1 张图片（PNG）。",
     },
     "err_no_img": {
         "en": "Error: Please upload an input image.",
@@ -157,9 +146,9 @@ I18N = {
         "zh": "错误：请先上传输入图像。",
     },
     "err_no_custom": {
-        "en": "Error: Please enter a custom Chinese prompt.",
-        "ja": "エラー: 自由入力の中国語プロンプトを入力してください",
-        "zh": "错误：请输入自定义中文提示词。",
+        "en": "Error: Please enter a custom prompt.",
+        "ja": "エラー: 自由入力のプロンプトを入力してください",
+        "zh": "错误：请输入自定义提示词。",
     },
     "lang_label": {"en": "UI Language", "ja": "UI言語", "zh": "界面语言"},
 }
@@ -168,13 +157,13 @@ def t(key, lang):
     return I18N[key][lang]
 
 def build_dropdown_choices(lang):
-    # ラベルは「中国語 + （選択言語の説明）」で表示、送信値は常に中国語
+    # 表示は選択言語のみ（送信値は中国語）
     if lang not in ("en", "ja", "zh"):
         lang = "en"
     ch = []
     for item in CAMERA_OPTIONS:
-        label = f"{item['cn']}, {item[lang]}"
-        ch.append((label, item["cn"]))
+        label = item[lang]  # 単言語表示
+        ch.append((label, item["cn"]))  # 値は中国語を送る
     ch.append((CUSTOM_LABELS[lang], CUSTOM_OPTION_VALUE))
     return ch
 
@@ -212,7 +201,7 @@ def generate_from_dropdown(
         seed = random.randint(0, MAX_SEED)
 
     if image is None:
-        return None, t("err_no_img", lang), ""
+        return None, t("err_no_img", lang)
 
     if isinstance(image, Image.Image):
         input_image = image.convert("RGB")
@@ -224,7 +213,7 @@ def generate_from_dropdown(
     if dropdown_value_cn == CUSTOM_OPTION_VALUE:
         base_cn = (custom_cn or "").strip()
         if not base_cn:
-            return None, t("err_no_custom", lang), ""
+            return None, t("err_no_custom", lang)
     else:
         base_cn = dropdown_value_cn or CAMERA_OPTIONS[0]["cn"]
 
@@ -234,7 +223,7 @@ def generate_from_dropdown(
     out = generate_single_view(pil_images, final_prompt, seed, num_inference_steps, true_guidance_scale)
     progress(1.0, desc="Done" if lang=="en" else ("完了" if lang=="ja" else "完成"))
 
-    return out, t("status_ok", lang), final_prompt
+    return out, t("status_ok", lang)
 
 # --- UI ---
 css = """
@@ -289,7 +278,7 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
                 dropdown = gr.Dropdown(
                     label=I18N["dropdown_label"]["en"],
                     choices=build_dropdown_choices("en"),
-                    value=CAMERA_OPTIONS[0]["cn"],
+                    value=CAMERA_OPTIONS[0]["cn"],  # 値は中国語（見た目は単言語ラベル）
                     allow_custom_value=False,
                     interactive=True,
                 )
@@ -316,42 +305,34 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
 
                 run_button = gr.Button(I18N["run"]["en"], variant="primary")
 
-                selected_cn = gr.Textbox(label=I18N["sel_cn"]["en"], value=CAMERA_OPTIONS[0]["cn"], interactive=False)
-                final_prompt_preview = gr.Textbox(label=I18N["final_prev"]["en"], value="", interactive=False)
-
-                # 選択/入力のたびにプレビュー更新 & 自由入力欄の表示切替
-                def _sync(v_cn, extra, custom_text):
-                    is_custom = (v_cn == CUSTOM_OPTION_VALUE)
-                    base = (custom_text.strip() if is_custom else (v_cn or CAMERA_OPTIONS[0]["cn"]))
-                    final = _append_prompt(base, extra) if base else ""
-                    return base, final, gr.update(visible=is_custom)
-
-                dropdown.change(
-                    fn=_sync,
-                    inputs=[dropdown, extra_prompt, custom_cn],
-                    outputs=[selected_cn, final_prompt_preview, custom_cn]
-                )
-                extra_prompt.change(
-                    fn=_sync,
-                    inputs=[dropdown, extra_prompt, custom_cn],
-                    outputs=[selected_cn, final_prompt_preview, custom_cn]
-                )
-                custom_cn.change(
-                    fn=_sync,
-                    inputs=[dropdown, extra_prompt, custom_cn],
-                    outputs=[selected_cn, final_prompt_preview, custom_cn]
-                )
-
         with gr.Row():
             with gr.Column(scale=1, elem_classes=["card"]):
                 result_image = gr.Image(label=I18N["output"]["en"], type="pil", format="png", height=520, show_download_button=True)
                 status_text = gr.Textbox(label=I18N["status"]["en"], interactive=False)
-                sent_hdr_md = gr.Markdown(I18N["sent_hdr"]["en"])
-                final_prompt_small = gr.Textbox(show_label=False, interactive=False, elem_classes=["preview", "small"])
 
-    # 言語切替の実装
+    # ドロップダウン選択に応じた「自由入力」欄の表示切替のみ残す
+    def _toggle_custom(v_cn, extra, custom_text):
+        is_custom = (v_cn == CUSTOM_OPTION_VALUE)
+        return gr.update(visible=is_custom)
+
+    dropdown.change(
+        fn=_toggle_custom,
+        inputs=[dropdown, extra_prompt, custom_cn],
+        outputs=[custom_cn]
+    )
+    extra_prompt.change(
+        fn=_toggle_custom,
+        inputs=[dropdown, extra_prompt, custom_cn],
+        outputs=[custom_cn]
+    )
+    custom_cn.change(
+        fn=_toggle_custom,
+        inputs=[dropdown, extra_prompt, custom_cn],
+        outputs=[custom_cn]
+    )
+
+    # 言語切替（単言語表示に統一）
     def _switch_lang(lang, current_dropdown_value):
-        # ラベル/見出し/プレースホルダの更新 + ドロップダンのchoicesの再構築
         return (
             gr.update(label=I18N["lang_label"][lang]),                                # lang_selector label
             I18N["title"][lang],                                                      # title_md value
@@ -365,13 +346,10 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
             gr.update(label=I18N["seed"][lang]),                                     # seed
             gr.update(label=I18N["rand"][lang]),                                     # randomize_seed
             gr.update(label=I18N["tgs"][lang]),                                      # true_guidance_scale
-            gr.update(label=I18N["steps"][lang]),                                    # num_inference_steps
+            gr.update(label=I18N["steps"][lang]),                                     # num_inference_steps
             gr.update(value=I18N["run"][lang]),                                      # run_button text
-            gr.update(label=I18N["sel_cn"][lang]),                                   # selected_cn
-            gr.update(label=I18N["final_prev"][lang]),                               # final_prompt_preview
             gr.update(label=I18N["output"][lang]),                                   # result_image
             gr.update(label=I18N["status"][lang]),                                   # status_text
-            I18N["sent_hdr"][lang],                                                  # sent_hdr_md
         )
 
     lang_selector.change(
@@ -390,19 +368,16 @@ with gr.Blocks(css=css, theme=gr.themes.Soft()) as demo:
             true_guidance_scale,   # tgs label
             num_inference_steps,   # steps label
             run_button,            # button text
-            selected_cn,           # label
-            final_prompt_preview,  # label
             result_image,          # label
             status_text,           # label
-            sent_hdr_md,           # markdown content
         ],
     )
 
-    # 実行：アコーディオンの値も渡す + 言語も渡す
+    # 実行（UIは単言語表示、送信は中国語値）
     run_button.click(
         fn=generate_from_dropdown,
         inputs=[input_image, dropdown, custom_cn, extra_prompt, seed, randomize_seed, true_guidance_scale, num_inference_steps, lang_selector],
-        outputs=[result_image, status_text, final_prompt_small],
+        outputs=[result_image, status_text],
     )
 
 if __name__ == "__main__":