Update app.py

app.py

@@ -60,23 +60,33 @@ def list_passage_files_sorted(passages_dir: str) -> list[tuple[int, str]]:
     items.sort(key=lambda x: x[0])
     return items
 
+
 def load_text(path: str) -> str:
     with open(path, "r", encoding="utf-8") as f:
         return f.read()
 
+
 # =========================
 # ★追加：プロンプト選択
 # =========================
 PROMPT_MODES = {
     "既存プロンプト": "legacy",
-    "AIプロンプトセット（FRE制御）": "final_v1",
+    "最終プロンプトセット（FRE制御）": "final_v1",
 }
 
+
+def prompt_tag_from_mode(prompt_mode: str) -> str:
+    """
+    ダウンロードファイル名で判別できるように、ファイル名安全な短いタグにする
+    """
+    return "legacy" if prompt_mode == "legacy" else "finalv1"
+
+
 def build_prompt(text: str, target_level: int, prompt_mode: str) -> str:
     """
     prompt_mode:
       - "legacy": 元の1本プロンプト（現状踏襲）
-      - "final_v1": あなたの最終プロンプトセットを1つに落とし込み
+      - "final_v1": 最終プロンプトセット（Constraints重視）
     """
     level_to_flesch = {1: 90, 2: 75, 3: 65, 4: 55, 5: 40}
     target_flesch = level_to_flesch[int(target_level)]
@@ -94,7 +104,6 @@ excluding the title, author name, source information, chapter number, annotation
 """
 
     # ---- final_v1: あなたの「最終プロンプトセット」をコードに落とし込み ----
-    # Level番号(1..5) -> 学習者レベル名
     level_name = {
         1: "Level 90",
         2: "Level 75",
@@ -146,7 +155,6 @@ excluding the title, author name, source information, chapter number, annotation
 
     constraints_block = "\n".join(level_constraints)
 
-    # 「Target FRE は補助。Constraintsが主」前提の骨格をそのままテンプレ化
     return f"""Rewrite the following text for learners at {level_name}.
 
 Requirements:
@@ -168,6 +176,7 @@ Text:
 >>>
 """
 
+
 # =========================
 # 書き換え（プロンプト切替）
 # =========================
@@ -196,22 +205,26 @@ def rewrite_level(text: str, target_level: int, prompt_mode: str) -> str:
 
     raise RuntimeError(f"Rewrite failed after retries: {last_error}")
 
+
 # =========================
 # 指標（FRE + 単語数）
 # =========================
 def count_words_english(text: str) -> int:
     return len(_word_re.findall(text))
 
+
 def compute_metrics(text: str) -> tuple[float, int]:
     fre = float(textstat.flesch_reading_ease(text))
     wc = count_words_english(text)
     return fre, wc
 
+
 # =========================
 # CSV追記
 # =========================
 _csv_lock = threading.Lock()
 
+
 def append_csv_row(row: dict):
     fieldnames = ["timestamp_jst", "Text#", "target_level", "flesch_reading_ease", "word_count", "rewritten_text"]
     with _csv_lock:
@@ -222,20 +235,24 @@ def append_csv_row(row: dict):
                 w.writeheader()
             w.writerow({k: row.get(k, "") for k in fieldnames})
 
+
 # =========================
-# txt追記
+# txt追記（★ファイル名に prompt_tag を付ける）
 # =========================
 _txt_lock = threading.Lock()
 
+
 def append_rewrite_txt(
     text_id: int,
     target_level: int,
+    prompt_mode: str,  # ★追加
     fre: float,
     word_count: int,
     rewritten_text: str,
 ):
     ts = (datetime.utcnow() + timedelta(hours=9)).strftime("%Y-%m-%d %H:%M:%S")
-    path = os.path.join(REWRITE_DIR, f"Text_{text_id}_{target_level}.txt")
+    tag = prompt_tag_from_mode(prompt_mode)
+    path = os.path.join(REWRITE_DIR, f"Text_{text_id}_{target_level}_{tag}.txt")
 
     block = (
         f"# Text {text_id}\n"
@@ -253,6 +270,7 @@ def append_rewrite_txt(
         with open(path, "a", encoding="utf-8") as f:
             f.write(block)
 
+
 # =========================
 # 停止フラグ
 # =========================
@@ -261,10 +279,12 @@ def set_stop(flag: bool):
     with _stop_flag_lock:
         _stop_flag = flag
 
+
 def get_stop() -> bool:
     with _stop_flag_lock:
         return _stop_flag
 
+
 # =========================
 # UIロジック
 # =========================
@@ -272,6 +292,7 @@ def init_state():
     files = list_passage_files_sorted(PASSAGES_DIR)
     return {"files": files, "idx": 0}
 
+
 def start(level: int, prompt_mode: str):
     set_stop(False)
     st = init_state()
@@ -282,6 +303,7 @@ def start(level: int, prompt_mode: str):
     msg = f"準備完了: {total}件。次に処理するのは #Text {st['files'][0][0]} です。"
     return st, msg, "", "", "", None, None
 
+
 def run_one(level: int, prompt_mode: str, state: dict):
     set_stop(False)
 
@@ -312,6 +334,7 @@ def run_one(level: int, prompt_mode: str, state: dict):
     append_rewrite_txt(
         text_id=text_id,
         target_level=level,
+        prompt_mode=prompt_mode,  # ★追加
         fre=fre,
         word_count=wc,
         rewritten_text=rewritten,
@@ -319,6 +342,7 @@ def run_one(level: int, prompt_mode: str, state: dict):
 
     state["idx"] = idx + 1
 
+    tag = prompt_tag_from_mode(prompt_mode)
     header = (
         f"#Text {text_id}\n"
         f"Target Level: {level}\n"
@@ -326,11 +350,12 @@ def run_one(level: int, prompt_mode: str, state: dict):
         f"Flesch Reading Ease: {fre:.2f}\n"
         f"Word Count: {wc}\n"
         f"Saved CSV: {CSV_PATH}\n"
-        f"Saved TXT: {os.path.join(REWRITE_DIR, f'Text_{text_id}_{level}.txt')}"
+        f"Saved TXT: {os.path.join(REWRITE_DIR, f'Text_{text_id}_{level}_{tag}.txt')}"
     )
     progress = f"{state['idx']} / {total}"
     return state, "1件処理しました。", header, progress, rewritten, None, None
 
+
 def run_all(level: int, prompt_mode: str, state: dict):
     set_stop(False)
 
@@ -369,11 +394,13 @@ def run_all(level: int, prompt_mode: str, state: dict):
         append_rewrite_txt(
             text_id=text_id,
             target_level=level,
+            prompt_mode=prompt_mode,  # ★追加
             fre=fre,
             word_count=wc,
             rewritten_text=rewritten,
         )
 
+        tag = prompt_tag_from_mode(prompt_mode)
         last_header = (
             f"#Text {text_id}\n"
             f"Target Level: {level}\n"
@@ -381,7 +408,7 @@ def run_all(level: int, prompt_mode: str, state: dict):
             f"Flesch Reading Ease: {fre:.2f}\n"
             f"Word Count: {wc}\n"
             f"Saved CSV: {CSV_PATH}\n"
-            f"Saved TXT: {os.path.join(REWRITE_DIR, f'Text_{text_id}_{level}.txt')}"
+            f"Saved TXT: {os.path.join(REWRITE_DIR, f'Text_{text_id}_{level}_{tag}.txt')}"
         )
         last_text = rewritten
 
@@ -390,16 +417,19 @@ def run_all(level: int, prompt_mode: str, state: dict):
 
     return state, "全件処理が完了しました。", last_header, f"{idx} / {total}", last_text, None, None
 
+
 def stop():
     set_stop(True)
     return "停止要求を受け付けました（処理中の1件が終わったタイミングで止まります）。"
 
+
 def reset_csv():
     with _csv_lock:
         if os.path.exists(CSV_PATH):
             os.remove(CSV_PATH)
     return f"CSVを削除しました: {CSV_PATH}"
 
+
 def reset_rewrite_folder():
     removed = 0
     with _txt_lock:
@@ -411,13 +441,16 @@ def reset_rewrite_folder():
                 pass
     return f"rewrite_passages の Text_*.txt を削除しました（{removed}件）: {REWRITE_DIR}"
 
+
 # =========================
 # ★追加：ダウンロード機能
 # =========================
 def list_generated_txt_files() -> list[str]:
-    files = sorted(glob.glob(os.path.join(REWRITE_DIR, "Text_*_*.txt")))
+    # ★ファイル名が Text_{id}_{level}_{tag}.txt になったのでパターン更新
+    files = sorted(glob.glob(os.path.join(REWRITE_DIR, "Text_*_*_*.txt")))
     return [os.path.basename(f) for f in files]
 
+
 def build_single_txt_path(selected_name: str) -> str:
     """
     選択されたtxtをダウンロード用に返す（gr.Fileに渡す）
@@ -427,6 +460,7 @@ def build_single_txt_path(selected_name: str) -> str:
         raise FileNotFoundError(f"Not found: {path}")
     return path
 
+
 def build_zip_of_txts(mode: str, n_last: int) -> str:
     """
     mode:
@@ -461,15 +495,18 @@ def build_zip_of_txts(mode: str, n_last: int) -> str:
 
     return zip_path
 
+
 def download_csv() -> str:
     if not os.path.exists(CSV_PATH):
         raise FileNotFoundError("rewrite_scores.csv is not created yet.")
     return CSV_PATH
 
+
 def refresh_txt_dropdown() -> gr.Dropdown:
     names = list_generated_txt_files()
     return gr.Dropdown(choices=names, value=(names[-1] if names else None))
 
+
 # =========================
 # Gradio UI（Spaces向け）
 # =========================
@@ -506,7 +543,10 @@ with gr.Blocks() as demo:
 
     with gr.Row():
         refresh_btn = gr.Button("txt一覧を更新")
-        txt_dropdown = gr.Dropdown(choices=list_generated_txt_files(), label="生成済み txt を選択（1個ダウンロード）")
+        txt_dropdown = gr.Dropdown(
+            choices=list_generated_txt_files(),
+            label="生成済み txt を選択（1個ダウンロード）"
+        )
         download_one_btn = gr.Button("選択したtxtをダウンロード")
         download_one_file = gr.File(label="Download (single txt)")
 
@@ -529,7 +569,6 @@ with gr.Blocks() as demo:
     gr.Markdown(f"📝 TXTフォルダ: `{REWRITE_DIR}`")
 
     # ---- 既存ボタン（prompt_mode を追加して渡すだけ）----
-    # UI値(日本語ラベル) -> 内部キー("legacy"/"final_v1")に変換
     def _pm_key(pm_label: str) -> str:
         return PROMPT_MODES.get(pm_label, "legacy")