Update app.py

app.py

@@ -65,13 +65,24 @@ def load_text(path: str) -> str:
         return f.read()
 
 # =========================
-# 書き換え（プロンプト同一）
+# ★追加：プロンプト選択
 # =========================
-def rewrite_level(text: str, target_level: int) -> str:
+PROMPT_MODES = {
+    "既存（シンプル）": "legacy",
+    "最終プロンプトセット（FRE制御）": "final_v1",
+}
+
+def build_prompt(text: str, target_level: int, prompt_mode: str) -> str:
+    """
+    prompt_mode:
+      - "legacy": 元の1本プロンプト（現状踏襲）
+      - "final_v1": あなたの最終プロンプトセットを1つに落とし込み
+    """
     level_to_flesch = {1: 90, 2: 75, 3: 65, 4: 55, 5: 40}
     target_flesch = level_to_flesch[int(target_level)]
 
-    prompt = f"""
+    if prompt_mode == "legacy":
+        return f"""
 Rewrite the following passage so it fits about {target_flesch} Flesch Reading Ease Score
 - Extract only the portions of the text that should be read as the main body,
 excluding the title, author name, source information, chapter number, annotations, and footers.
@@ -82,6 +93,87 @@ excluding the title, author name, source information, chapter number, annotation
 {text}
 """
 
+    # ---- final_v1: あなたの「最終プロンプトセット」をコードに落とし込み ----
+    # Level番号(1..5) -> 学習者レベル名
+    level_name = {
+        1: "Level 90",
+        2: "Level 75",
+        3: "Level 65",
+        4: "Level 55",
+        5: "Level 40",
+    }[int(target_level)]
+
+    level_constraints = {
+        5: [
+            "- Average sentence length: 18–25 words",
+            "- Use abstract nouns (e.g., system, process, structure, responsibility)",
+            "- Allow multi-syllable words",
+            "- Use complex sentences with relative clauses",
+            "- Prefer formal, academic tone",
+            "- Avoid short sentences",
+        ],
+        4: [
+            "- Average sentence length: 14–18 words",
+            "- Mix abstract and concrete vocabulary",
+            "- Avoid very short sentences",
+            "- Limit technical jargon",
+            "- Use clear logical flow",
+        ],
+        3: [
+            "- Average sentence length: 10–14 words",
+            "- Use common vocabulary",
+            "- One main idea per sentence",
+            "- Prefer active voice",
+            "- Avoid abstract nominalizations",
+            "- Split long sentences into shorter independent sentences",
+        ],
+        2: [
+            "- Average sentence length: 7–10 words",
+            "- Use everyday vocabulary only",
+            "- Avoid complex connectors (however, therefore, although)",
+            "- Use short, simple sentences",
+            "- Repeat key ideas using different simple wording",
+        ],
+        1: [
+            "- Average sentence length: 4–6 words",
+            "- Use only basic vocabulary",
+            "- One action or fact per sentence",
+            "- Avoid abstract words completely",
+            "- Avoid explanations and reasoning",
+            "- Prefer many short declarative sentences",
+        ],
+    }[int(target_level)]
+
+    constraints_block = "\n".join(level_constraints)
+
+    # 「Target FRE は補助。Constraintsが主」前提の骨格をそのままテンプレ化
+    return f"""Rewrite the following text for learners at {level_name}.
+
+Requirements:
+- Target Flesch Reading Ease: around {target_flesch} (±3)
+- Keep the original meaning.
+- Do not add new information.
+- Output only the rewritten text.
+
+Constraints:
+{constraints_block}
+
+Additional handling (same as current system):
+- Extract only the portions of the text that should be read as the main body, excluding title/author/source/chapter numbers/annotations/footers.
+- When outputting, make sure sections divided by chapters are clearly distinguishable by leaving a blank line between them.
+
+Text:
+<<<
+{text}
+>>>
+"""
+
+# =========================
+# 書き換え（プロンプト切替）
+# =========================
+def rewrite_level(text: str, target_level: int, prompt_mode: str) -> str:
+    prompt = build_prompt(text=text, target_level=target_level, prompt_mode=prompt_mode)
+
     max_tokens_candidates = [3000, 2000, 1500, 1000]
     last_error = None
 
@@ -180,7 +272,7 @@ def init_state():
     files = list_passage_files_sorted(PASSAGES_DIR)
     return {"files": files, "idx": 0}
 
-def start(level: int):
+def start(level: int, prompt_mode: str):
     set_stop(False)
     st = init_state()
     total = len(st["files"])
@@ -190,7 +282,7 @@ def start(level: int):
     msg = f"準備完了: {total}件。次に処理するのは #Text {st['files'][0][0]} です。"
     return st, msg, "", "", "", None, None
 
-def run_one(level: int, state: dict):
+def run_one(level: int, prompt_mode: str, state: dict):
     set_stop(False)
 
     files = state.get("files", [])
@@ -203,7 +295,7 @@ def run_one(level: int, state: dict):
     text_id, path = files[idx]
     original = load_text(path)
 
-    rewritten = rewrite_level(original, target_level=level)
+    rewritten = rewrite_level(original, target_level=level, prompt_mode=prompt_mode)
     fre, wc = compute_metrics(rewritten)
 
     ts = (datetime.utcnow() + timedelta(hours=9)).strftime("%Y-%m-%d %H:%M:%S")
@@ -230,6 +322,7 @@ def run_one(level: int, state: dict):
     header = (
         f"#Text {text_id}\n"
         f"Target Level: {level}\n"
+        f"Prompt Mode: {prompt_mode}\n"
         f"Flesch Reading Ease: {fre:.2f}\n"
         f"Word Count: {wc}\n"
         f"Saved CSV: {CSV_PATH}\n"
@@ -238,7 +331,7 @@ def run_one(level: int, state: dict):
     progress = f"{state['idx']} / {total}"
     return state, "1件処理しました。", header, progress, rewritten, None, None
 
-def run_all(level: int, state: dict):
+def run_all(level: int, prompt_mode: str, state: dict):
     set_stop(False)
 
     files = state.get("files", [])
@@ -259,7 +352,7 @@ def run_all(level: int, state: dict):
         text_id, path = files[idx]
         original = load_text(path)
 
-        rewritten = rewrite_level(original, target_level=level)
+        rewritten = rewrite_level(original, target_level=level, prompt_mode=prompt_mode)
         fre, wc = compute_metrics(rewritten)
 
         ts = (datetime.utcnow() + timedelta(hours=9)).strftime("%Y-%m-%d %H:%M:%S")
@@ -284,6 +377,7 @@ def run_all(level: int, state: dict):
         last_header = (
             f"#Text {text_id}\n"
             f"Target Level: {level}\n"
+            f"Prompt Mode: {prompt_mode}\n"
             f"Flesch Reading Ease: {fre:.2f}\n"
             f"Word Count: {wc}\n"
             f"Saved CSV: {CSV_PATH}\n"
@@ -384,9 +478,16 @@ with gr.Blocks() as demo:
 
     state = gr.State(init_state())
 
+    # ★追加：プロンプト選択UI
+    prompt_mode_ui = gr.Dropdown(
+        choices=list(PROMPT_MODES.keys()),
+        value="既存（シンプル）",
+        label="Prompt Mode（試すプロンプトを選択）"
+    )
+
     level = gr.Dropdown(choices=[1, 2, 3, 4, 5], value=1, label="Target Level (1..5)")
     status = gr.Textbox(label="Status", interactive=False)
-    header = gr.Textbox(label="Result Header (#Text / FRE / Words)", lines=6, interactive=False)
+    header = gr.Textbox(label="Result Header (#Text / FRE / Words)", lines=7, interactive=False)
     progress = gr.Textbox(label="Progress", interactive=False)
     output_text = gr.Textbox(label="Rewritten Text", lines=18, interactive=False)
 
@@ -427,10 +528,27 @@ with gr.Blocks() as demo:
     gr.Markdown(f"📄 CSVパス: `{CSV_PATH}`")
     gr.Markdown(f"📝 TXTフォルダ: `{REWRITE_DIR}`")
 
-    # ---- 既存ボタン ----
-    start_btn.click(fn=start, inputs=[level], outputs=[state, status, header, progress, output_text, download_one_file, download_zip_file])
-    one_btn.click(fn=run_one, inputs=[level, state], outputs=[state, status, header, progress, output_text, download_one_file, download_zip_file])
-    all_btn.click(fn=run_all, inputs=[level, state], outputs=[state, status, header, progress, output_text, download_one_file, download_zip_file])
+    # ---- 既存ボタン（prompt_mode を追加して渡すだけ）----
+    # UI値(日本語ラベル) -> 内部キー("legacy"/"final_v1")に変換
+    def _pm_key(pm_label: str) -> str:
+        return PROMPT_MODES.get(pm_label, "legacy")
+
+    start_btn.click(
+        fn=lambda lvl, pm: start(lvl, _pm_key(pm)),
+        inputs=[level, prompt_mode_ui],
+        outputs=[state, status, header, progress, output_text, download_one_file, download_zip_file]
+    )
+    one_btn.click(
+        fn=lambda lvl, pm, st: run_one(lvl, _pm_key(pm), st),
+        inputs=[level, prompt_mode_ui, state],
+        outputs=[state, status, header, progress, output_text, download_one_file, download_zip_file]
+    )
+    all_btn.click(
+        fn=lambda lvl, pm, st: run_all(lvl, _pm_key(pm), st),
+        inputs=[level, prompt_mode_ui, state],
+        outputs=[state, status, header, progress, output_text, download_one_file, download_zip_file]
+    )
+
     stop_btn.click(fn=stop, inputs=[], outputs=[status])
     reset_btn.click(fn=reset_csv, inputs=[], outputs=[status])
     reset_txt_btn.click(fn=reset_rewrite_folder, inputs=[], outputs=[status])