Update gradio_tabs/single.py

gradio_tabs/single.py

@@ -23,6 +23,11 @@ import uuid # 結合ファイルの一意な名前生成のために追加
 
 from typing import Dict, Any, List, Tuple, Optional, Set
 
+# --- ログ設定 ---
+# TrueにするとターミナルとUIに詳細なログが出力されます。
+# Falseにすると、エラーや重要な通知以外のログは抑制されます。
+ENABLE_LOGGING = False
+
 # (TTSModelHolder, MockTTSModelなどのモックやヘルパー関数は変更なしのため省略します)
 # --- タイムゾーン定義 ---
 # グローバルな定数としてJSTを定義
@@ -46,7 +51,10 @@ class TTSModelHolder:
             p.mkdir(parents=True, exist_ok=True)
         # 起動時に一度だけサンプルモデルを作成するロジック
         if not any(p.iterdir()):
-            print("No models found in model_assets. Creating sample models...")
+            # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+            if ENABLE_LOGGING:
+                print("No models found in model_assets. Creating sample models...")
+            # ▲▲▲ 変更 ▲▲▲
             # Sample Model 1
             model1_path = p / "MyModel1"
             model1_path.mkdir(parents=True, exist_ok=True)
@@ -74,7 +82,10 @@ class TTSModelHolder:
                 json.dump(style_settings_data, f, indent=2, ensure_ascii=False)
 
             # FNモデル (FN1-10)
-            print("Creating FN models (FN1-10)...")
+            # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+            if ENABLE_LOGGING:
+                print("Creating FN models (FN1-10)...")
+            # ▲▲▲ 変更 ▲▲▲
             for i in range(1, 11):
                 fn_path = p / f"FN{i}"
                 fn_path.mkdir(exist_ok=True)
@@ -83,7 +94,10 @@ class TTSModelHolder:
                     json.dump({"data": {"style2id": {"Neutral": 0}}}, f)
 
             # whisperモデル (非表示用)
-            print("Creating 'whisper' model...")
+            # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+            if ENABLE_LOGGING:
+                print("Creating 'whisper' model...")
+            # ▲▲▲ 変更 ▲▲▲
             whisper_path = p / "whisper"
             whisper_path.mkdir(exist_ok=True)
             (whisper_path / "G_0.safetensors").touch()
@@ -97,21 +111,33 @@ class TTSModelHolder:
         """
         if self.root_dir.is_dir():
             self.model_names = sorted([d.name for d in self.root_dir.iterdir() if d.is_dir()])
-            print(f"TTSModelHolder model list refreshed. Known models: {self.model_names}")
+            # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+            if ENABLE_LOGGING:
+                print(f"TTSModelHolder model list refreshed. Known models: {self.model_names}")
+            # ▲▲▲ 変更 ▲▲▲
         else:
             self.model_names = []
-            print("TTSModelHolder root directory not found.")
+            # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+            if ENABLE_LOGGING:
+                print("TTSModelHolder root directory not found.")
+            # ▲▲▲ 変更 ▲▲▲
         return self.model_names
 
     def get_model(self, model_name, model_path):
-        print(f"Loading model: {model_name} (file: {Path(model_path).name})")
+        # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+        if ENABLE_LOGGING:
+            print(f"Loading model: {model_name} (file: {Path(model_path).name})")
+        # ▲▲▲ 変更 ▲▲▲
         if model_name not in self.model_names:
             error_msg = (
                 f"Model '{model_name}' is not in the known list of TTSModelHolder. "
                 f"Current list: {self.model_names}. "
                 "Please refresh the model list by toggling the symlink checkbox or clicking the refresh button."
             )
-            print(f"[ERROR] {error_msg}")
+            # ▼▼▼ 変更: printをエラーなので残すか、制御するか検討。ここでは制御対象に含める。▼▼▼
+            if ENABLE_LOGGING:
+                print(f"[ERROR] {error_msg}")
+            # ▲▲▲ 変更 ▲▲▲
             raise ValueError(error_msg)
 
         self.current_model = MockTTSModel()
@@ -123,7 +149,10 @@ class MockTTSModel:
 
     def infer(self, text, **kwargs):
         length_scale = kwargs.get('length', 1.0)
-        print(f"Inferencing with text '{text}' and style: {kwargs.get('style')} and weight: {kwargs.get('style_weight')}, length_scale: {length_scale}")
+        # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+        if ENABLE_LOGGING:
+            print(f"Inferencing with text '{text}' and style: {kwargs.get('style')} and weight: {kwargs.get('style_weight')}, length_scale: {length_scale}")
+        # ▲▲▲ 変更 ▲▲▲
         sampling_rate = 44100
         base_duration = max(1, len(text) // 5)
         duration = base_duration * length_scale
@@ -208,7 +237,10 @@ def sort_models_by_custom_order(model_list: List[str], custom_order: List[str])
 
 def set_random_seed(seed: int):
     if seed >= 0:
-        print(f"Setting random seed to: {seed}")
+        # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+        if ENABLE_LOGGING:
+            print(f"Setting random seed to: {seed}")
+        # ▲▲▲ 変更 ▲▲▲
         torch.manual_seed(seed)
         if torch.cuda.is_available():
             torch.cuda.manual_seed(seed)
@@ -358,7 +390,8 @@ def load_styles_from_model_folder(model_asset_path: Path) -> Dict[str, Any]:
                     for style_name in style2id.keys():
                         final_styles[style_name] = {"display_name": style_name, "weight": DEFAULT_STYLE_WEIGHT}
         except Exception as e:
-            print(f"Warning: Failed to load or parse {config_path}: {e}")
+            if ENABLE_LOGGING:
+                print(f"Warning: Failed to load or parse {config_path}: {e}")
     custom_style_config_path = model_asset_path / STYLE_CONFIG_FILENAME_IN_MODEL_DIR
     if custom_style_config_path.exists():
         try:
@@ -370,7 +403,8 @@ def load_styles_from_model_folder(model_asset_path: Path) -> Dict[str, Any]:
                     final_styles.setdefault(style_key, {})
                     final_styles[style_key].update(style_info)
         except Exception as e:
-            print(f"Warning: Failed to load or parse {custom_style_config_path}: {e}")
+            if ENABLE_LOGGING:
+                print(f"Warning: Failed to load or parse {custom_style_config_path}: {e}")
     if not final_styles or DEFAULT_STYLE not in final_styles:
         final_styles[DEFAULT_STYLE] = {"display_name": DEFAULT_STYLE, "weight": DEFAULT_STYLE_WEIGHT}
     return final_styles
@@ -389,17 +423,22 @@ def process_single_synthesis_webui(
     current_model_file_path = Path(current_model_file_path_str)
     log_messages = []
     set_random_seed(seed_arg)
-    if seed_arg >= 0:
+    # ▼▼▼ 変更: ログ追加をENABLE_LOGGINGで制御 ▼▼▼
+    if seed_arg >= 0 and ENABLE_LOGGING:
         log_messages.append(f"乱数シードを {seed_arg} に固定しました。")
+    # ▲▲▲ 変更 ▲▲▲
     try:
         model_holder_ref.get_model(current_model_name, current_model_file_path)
         if model_holder_ref.current_model is None:
             msg = f"モデルのロード失敗: {current_model_name} (ファイル: {current_model_file_path.name})"
-            log_messages.append(f"[エラー] {msg}"); return False, log_messages, None
-        log_messages.append(f"使用モデル: {current_model_name} (ファイル: {current_model_file_path.name})")
+            log_messages.append(f"❌ [エラー] {msg}"); return False, log_messages, None
+        # ▼▼▼ 変更: ログ追加をENABLE_LOGGINGで制御 ▼▼▼
+        if ENABLE_LOGGING:
+            log_messages.append(f"使用モデル: {current_model_name} (ファイル: {current_model_file_path.name})")
+        # ▲▲▲ 変更 ▲▲▲
     except Exception as e:
         msg = f"モデルロードエラー '{current_model_name}' (ファイル: {current_model_file_path.name}): {e}"
-        log_messages.append(f"[エラー] {msg}"); return False, log_messages, None
+        log_messages.append(f"❌ [エラー] {msg}"); return False, log_messages, None
     speaker_id = 0
     if model_holder_ref.current_model and hasattr(model_holder_ref.current_model, 'spk2id'):
         model_spk2id = model_holder_ref.current_model.spk2id
@@ -407,7 +446,10 @@ def process_single_synthesis_webui(
             speaker_id = model_spk2id[speaker_name_arg]
         elif model_spk2id:
             speaker_id = list(model_spk2id.values())[0]
-    log_messages.append(f"音声合成中...")
+    # ▼▼▼ 変更: ログ追加をENABLE_LOGGINGで制御 ▼▼▼
+    if ENABLE_LOGGING:
+        log_messages.append(f"音声合成中...")
+    # ▲▲▲ 変更 ▲▲▲
     start_time_synth = datetime.datetime.now(JST)
     try:
         length_for_model = 1.0 / length_scale_arg if length_scale_arg != 0 else 1.0
@@ -421,11 +463,14 @@ def process_single_synthesis_webui(
             speaker_id=speaker_id, pitch_scale=pitch_scale_arg, intonation_scale=intonation_scale_arg,
         )
     except (InvalidToneError, ValueError) as e:
-        msg = f"合成エラー: {e}"; log_messages.append(f"[エラー] {msg}"); return False, log_messages, None
+        msg = f"合成エラー: {e}"; log_messages.append(f"❌ [エラー] {msg}"); return False, log_messages, None
     except Exception as e:
-        msg = f"予期せぬエラー: {e}"; log_messages.append(f"[エラー] {msg}"); return False, log_messages, None
+        msg = f"予期せぬエラー: {e}"; log_messages.append(f"❌ [エラー] {msg}"); return False, log_messages, None
     duration_synth = (datetime.datetime.now(JST) - start_time_synth).total_seconds()
-    log_messages.append(f"音声合成成功。音声長: {len(audio_data)/sr:.2f}s, 処理時間: {duration_synth:.2f}s.")
+    # ▼▼▼ 変更: ログ追加をENABLE_LOGGINGで制御 ▼▼▼
+    if ENABLE_LOGGING:
+        log_messages.append(f"音声��成成功。音声長: {len(audio_data)/sr:.2f}s, 処理時間: {duration_synth:.2f}s.")
+    # ▲▲▲ 変更 ▲▲▲
     return True, log_messages, (sr, audio_data)
 
 
@@ -438,11 +483,14 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             MERGER_CACHE_PATH.mkdir(parents=True, exist_ok=True)
             is_merger_cache_available = MERGER_CACHE_PATH.is_dir()
             if is_merger_cache_available:
-                 print(f"Merger cache directory is available at: {MERGER_CACHE_PATH}")
+                if ENABLE_LOGGING:
+                    print(f"Merger cache directory is available at: {MERGER_CACHE_PATH}")
             else:
-                 print(f"Warning: Merger cache path {MERGER_CACHE_PATH} exists but is not a directory.")
+                if ENABLE_LOGGING:
+                    print(f"Warning: Merger cache path {MERGER_CACHE_PATH} exists but is not a directory.")
         except OSError as e:
-            print(f"Warning: Could not create or access merger cache directory {MERGER_CACHE_PATH}: {e}")
+            if ENABLE_LOGGING:
+                print(f"Warning: Could not create or access merger cache directory {MERGER_CACHE_PATH}: {e}")
 
     NORMAL_MODE_MODEL_ORDER = [
         "mikeneko",
@@ -470,9 +518,7 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
         MAX_WORKBENCH_ITEMS = 8
 
         all_styles_data_state = gr.State({})
-        # ▼▼▼ 変更: 生成されたWAVファイルのパスリストを保持するStateを追加 ▼▼▼
         synthesized_wav_files_state = gr.State([])
-        # ▲▲▲ 変更 ▲▲▲
         workbench_state = gr.State([])
         merged_preview_state = gr.State({})
 
@@ -495,27 +541,24 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                             f"**Style:** {item['style']} (Weight: {item['style_weight']:.2f})"
                         )
                     
-                    # ▼▼▼ 変更: プレーヤーにはMP3、ダウンロードにはWAVを割り当て ▼▼▼
                     wav_path = item['audio_path']
                     mp3_path = str(Path(wav_path).with_suffix('.mp3'))
-                    # MP3がなければフォールバックとしてWAVを再生
                     playback_path = mp3_path if Path(mp3_path).exists() else wav_path
 
                     updates.extend([
-                        gr.update(visible=True),                # Container Column
-                        gr.update(value=f"**{i+1}**"),          # Item Number Display
-                        gr.update(value=playback_path),         # Audio (プレーヤー用)
-                        gr.update(value=wav_path, visible=True),# Download Button (ダウンロード用)
-                        gr.update(value=info_text)              # Info Markdown
+                        gr.update(visible=True),
+                        gr.update(value=f"**{i+1}**"),
+                        gr.update(value=playback_path),
+                        gr.update(value=wav_path, visible=True),
+                        gr.update(value=info_text)
                     ])
-                    # ▲▲▲ 変更 ▲▲▲
                 else:
                     updates.extend([
-                        gr.update(visible=False),               # Container Column
-                        gr.update(value=""),                    # Item Number Display
-                        gr.update(value=None),                  # Audio
-                        gr.update(value=None, visible=False),   # Download Button
-                        gr.update(value="")                     # Info
+                        gr.update(visible=False),
+                        gr.update(value=""),
+                        gr.update(value=None),
+                        gr.update(value=None, visible=False),
+                        gr.update(value="")
                     ])
             return tuple(updates)
 
@@ -665,7 +708,8 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                         try:
                             item.unlink()
                         except OSError as e:
-                            print(f"Failed to remove symlink {item}: {e}")
+                            if ENABLE_LOGGING:
+                                print(f"Failed to remove symlink {item}: {e}")
 
             if use_symlink_mode:
                 if MERGER_CACHE_PATH.exists() and MERGER_CACHE_PATH.is_dir():
@@ -676,9 +720,11 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                                 try:
                                     os.symlink(item, target_link)
                                 except OSError as e:
-                                    print(f"Warning: Could not create symlink for {item.name}: {e}")
+                                    if ENABLE_LOGGING:
+                                        print(f"Warning: Could not create symlink for {item.name}: {e}")
                 else:
-                    print(f"Warning: Symlink mode is on, but {MERGER_CACHE_PATH} does not exist or is not a directory.")
+                    if ENABLE_LOGGING:
+                        print(f"Warning: Symlink mode is on, but {MERGER_CACHE_PATH} does not exist or is not a directory.")
 
             model_holder.refresh()
 
@@ -726,7 +772,6 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     return gr.update(value=data.get("weight", DEFAULT_STYLE_WEIGHT))
             return gr.update(value=DEFAULT_STYLE_WEIGHT)
 
-        # ▼▼▼ 変更: 音声合成処理をWAV/MP3両対応に修正 ▼▼▼
         def action_run_synthesis(
             model_name: Optional[str],
             style_display_name: Optional[str], style_weight_for_synth: float,
@@ -744,15 +789,15 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             error_outputs.append(gr.update(visible=False)) # audio_output_area
             for _ in range(MAX_AUDIO_OUTPUTS):
                 error_outputs.extend([
-                    gr.update(visible=False), # audio_item_columns
-                    gr.update(value=None),    # audio_outputs
-                    gr.update(value=None, visible=False), # download_buttons
+                    gr.update(visible=False),
+                    gr.update(value=None),
+                    gr.update(value=None, visible=False),
                 ])
             for _ in range(ITEMS_PER_ROW - 1):
-                error_outputs.append(gr.update(visible=False)) # dummy_audio_item_columns
+                error_outputs.append(gr.update(visible=False))
             for _ in range(MAX_AUDIO_OUTPUTS):
-                error_outputs.append("") # synthesized_text_states
-            error_outputs.append([]) # synthesized_wav_files_state
+                error_outputs.append("")
+            error_outputs.append([])
 
             if re.search(INVALID_FILENAME_CHARS_PATTERN, text):
                 found_chars = "".join(sorted(list(set(re.findall(INVALID_FILENAME_CHARS_PATTERN, text)))))
@@ -783,7 +828,8 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                 return tuple(error_outputs)
             
             actual_model_file_to_load = str(model_path / files[0])
-            all_logs.append(f"[自動選択] 使用モデルファイル: {files[0]}")
+            if ENABLE_LOGGING:
+                all_logs.append(f"[自動選択] 使用モデルファイル: {files[0]}")
 
             batch_count = int(batch_count)
             if batch_count <= 0: batch_count = 1
@@ -792,7 +838,6 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             final_mp3_paths = []
             generated_texts = []
 
-            # 共通のファイル保存ロジック
             def save_audio_files(audio_segment: AudioSegment, base_filename: str) -> Optional[Tuple[str, str]]:
                 try:
                     temp_dir = Path(tempfile.gettempdir())
@@ -809,7 +854,7 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     
                     return str(output_path_wav), str(output_path_mp3)
                 except Exception as e:
-                    all_logs.append(f"[エラー] 一時音声ファイルの保存に失敗: {e}")
+                    all_logs.append(f"❌ [エラー] 一時音声ファイルの保存に失敗: {e}")
                     return None
 
             if generation_mode == "発音ガチャ２":
@@ -817,13 +862,16 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     ratio_list = [float(x.strip()) for x in random_text_ratio_str.split(',') if x.strip()]
                     if not ratio_list:
                         ratio_list = [0.5]
-                        all_logs.append("[警告] カタカナ化の割合に有効な数値が指定されなかったため、0.5 を使用します。")
+                        all_logs.append("⚠️ [警告] カタカナ化の割合に有効な数値が指定されなかったため、0.5 を使用します。")
                 except ValueError:
                     ratio_list = [0.5]
-                    all_logs.append("[警告] カタカナ化の割合の解析に失敗したため、0.5 を使用します。")
-                all_logs.append(f"--- 発音ガチャ２ モード (pyopenjtalk) ---")
-                internal_mode = int(random_text_mode) + 1
-                all_logs.append(f"粒度: {random_text_mode} (内部モード: {internal_mode}), カタカナ化割合候補: {ratio_list}")
+                    all_logs.append("⚠️ [警告] カタカナ化の割合の解析に失敗したため、0.5 を使用します。")
+                
+                if ENABLE_LOGGING:
+                    all_logs.append(f"--- 発音ガチャ２ モード (pyopenjtalk) ---")
+                    internal_mode = int(random_text_mode) + 1
+                    all_logs.append(f"粒度: {random_text_mode} (内部モード: {internal_mode}), カタカナ化割合候補: {ratio_list}")
+                
                 generated_variations: Dict[str, List[str]] = {}
                 max_attempts = batch_count * 20
                 for _ in progress.tqdm(range(max_attempts), desc="テキストバリエーション生成中", total=max_attempts):
@@ -835,12 +883,14 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     if final_text and final_text not in generated_variations:
                         generated_variations[final_text] = processed_blocks_list
                 if len(generated_variations) < batch_count:
-                    all_logs.append(f"[警告] {batch_count}個のユニークなテキストを生成できませんでした。({len(generated_variations)}個のみ生成)")
+                    all_logs.append(f"⚠️ [警告] {batch_count}個のユニークなテキストを生成できませんでした。({len(generated_variations)}個のみ生成)")
 
                 for i, (final_text, processed_blocks_list) in enumerate(progress.tqdm(generated_variations.items(), desc=f"{len(generated_variations)}件の音声を生成中")):
-                    all_logs.append(f"--- 生成 {i+1}/{len(generated_variations)} ---")
-                    all_logs.append(f"  ┠ 分割パターン: {' / '.join(processed_blocks_list)}")
-                    all_logs.append(f"  ┗ 合成テキスト: \"{final_text[:50]}{'...' if len(final_text)>50 else ''}\"")
+                    if ENABLE_LOGGING:
+                        all_logs.append(f"--- 生成 {i+1}/{len(generated_variations)} ---")
+                        all_logs.append(f"  ┠ 分割パターン: {' / '.join(processed_blocks_list)}")
+                        all_logs.append(f"  ┗ 合成テキスト: \"{final_text[:50]}{'...' if len(final_text)>50 else ''}\"")
+                    
                     success, logs, audio_tuple = process_single_synthesis_webui(model_holder, model_name, actual_model_file_to_load, final_text, lang, speaker or None, internal_style_key, style_display_name, style_weight_for_synth, -1, ref_audio or None, length, noise, noise_w, sdp_r, pitch, intonation, use_assist, assist_text or None, assist_w)
                     all_logs.extend([f"    {log}" for log in logs])
                     if success and audio_tuple:
@@ -857,12 +907,15 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                             generated_texts.append(final_text)
 
             else: # 発音ガチャ１ モード
-                all_logs.append("--- 発音ガチャ１ モード ---")
+                if ENABLE_LOGGING:
+                    all_logs.append("--- 発音ガチャ１ モード ---")
                 start_seed = int(seed)
                 for i in progress.tqdm(range(batch_count), desc=f"{batch_count}件の音声を生成中"):
                     current_seed = start_seed + i if start_seed >= 0 else -1
-                    all_logs.append(f"--- 生成 {i+1}/{batch_count} (Seed: {current_seed if current_seed >= 0 else 'Random'}) ---")
-                    all_logs.append(f"  ┗ 合成テキスト: \"{text[:50]}{'...' if len(text)>50 else ''}\"")
+                    if ENABLE_LOGGING:
+                        all_logs.append(f"--- 生成 {i+1}/{batch_count} (Seed: {current_seed if current_seed >= 0 else 'Random'}) ---")
+                        all_logs.append(f"  ┗ 合成テキスト: \"{text[:50]}{'...' if len(text)>50 else ''}\"")
+                    
                     success, logs, audio_tuple = process_single_synthesis_webui(model_holder, model_name, actual_model_file_to_load, text, lang, speaker or None, internal_style_key, style_display_name, style_weight_for_synth, current_seed, ref_audio or None, length, noise, noise_w, sdp_r, pitch, intonation, use_assist, assist_text or None, assist_w)
                     all_logs.extend([f"    {log}" for log in logs])
                     if success and audio_tuple:
@@ -877,13 +930,24 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                             final_wav_paths.append(saved_paths[0])
                             final_mp3_paths.append(saved_paths[1])
                             generated_texts.append(text)
-
-            all_logs.append("--- 全ての生成が完了しました ---")
+            
+            num_generated = len(final_wav_paths)
+            if num_generated > 0:
+                all_logs.append(f"✅ 合計 {num_generated} 件の音声合成が完了しました。")
+            else:
+                all_logs.append("ℹ️ 音声は生成されませんでした。")
 
             final_outputs = []
-            status_message = "\n".join(all_logs)
+            
+            # ▼▼▼ 変更: ログ表示をENABLE_LOGGINGで制御 ▼▼▼
+            if ENABLE_LOGGING:
+                status_message = "\n".join(all_logs)
+            else:
+                essential_logs = [log for log in all_logs if any(prefix in log for prefix in ["✅", "❌", "⚠️", "ℹ️"])]
+                status_message = "\n".join(essential_logs)
             final_outputs.append(status_message)
-            num_generated = len(final_wav_paths)
+            # ▲▲▲ 変更 ▲▲▲
+
             final_outputs.append(gr.update(visible=num_generated > 0))
 
             for i in range(MAX_AUDIO_OUTPUTS):
@@ -891,8 +955,8 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                 mp3_val = final_mp3_paths[i] if is_visible else None
                 wav_val = final_wav_paths[i] if is_visible else None
                 final_outputs.append(gr.update(visible=is_visible))
-                final_outputs.append(gr.update(value=mp3_val)) # Audio (MP3)
-                final_outputs.append(gr.update(value=wav_val, visible=is_visible)) # Download (WAV)
+                final_outputs.append(gr.update(value=mp3_val))
+                final_outputs.append(gr.update(value=wav_val, visible=is_visible))
 
             num_dummies_needed = (ITEMS_PER_ROW - (num_generated % ITEMS_PER_ROW)) % ITEMS_PER_ROW if num_generated > 0 else 0
             for i in range(ITEMS_PER_ROW - 1):
@@ -902,11 +966,9 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                 text_val = generated_texts[i] if i < num_generated else ""
                 final_outputs.append(text_val)
             
-            final_outputs.append(final_wav_paths) # State用
+            final_outputs.append(final_wav_paths)
             return tuple(final_outputs)
-        # ▲▲▲ 変更 ▲▲▲
 
-        # ▼▼▼ 変更: キープ追加処理をState経由のWAVパスで行うように修正 ▼▼▼
         def add_to_workbench(
             current_status: str,
             current_workbench_list: List[Dict],
@@ -917,20 +979,18 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             safe_workbench_list = current_workbench_list or []
             if not wav_audio_path or not Path(wav_audio_path).exists():
                 log_messages.append("⚠️ [キープ追加エラー] 追加する音声ファイル(WAV)が見つかりません。")
-                final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+                final_status = "\n".join(log_messages) if not ENABLE_LOGGING else (current_status + "\n" + "\n".join(log_messages)).strip()
                 return (final_status, safe_workbench_list) + update_workbench_ui(safe_workbench_list)
             
-            # 内部的にはWAVパスで同一性をチェック
             if any(item['audio_path'] == wav_audio_path for item in safe_workbench_list):
                 log_messages.append("ℹ️ この音声はすでにキープに存在します。")
-                final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+                final_status = "\n".join(log_messages) if not ENABLE_LOGGING else (current_status + "\n" + "\n".join(log_messages)).strip()
                 return (final_status, safe_workbench_list) + update_workbench_ui(safe_workbench_list)
             
             display_model_name = model
             parsed_result = parse_merged_model_name(model)
             if parsed_result: display_model_name, _ = parsed_result
             
-            # StateにはWAVパスを保存
             new_item = {"audio_path": wav_audio_path, "text": text, "model": display_model_name, "original_models": [model], "style": style_display_name, "style_weight": style_weight, "timestamp": datetime.datetime.now(JST).isoformat(), "is_merged": False}
             updated_list = safe_workbench_list + [new_item]
             
@@ -941,30 +1001,36 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     path_to_delete_mp3 = path_to_delete_wav.with_suffix('.mp3')
                     if path_to_delete_wav.exists() and str(path_to_delete_wav.parent) == tempfile.gettempdir(): path_to_delete_wav.unlink()
                     if path_to_delete_mp3.exists() and str(path_to_delete_mp3.parent) == tempfile.gettempdir(): path_to_delete_mp3.unlink()
-                except Exception as e: print(f"Warning: Failed to delete old workbench audio file: {e}")
+                except Exception as e:
+                    if ENABLE_LOGGING:
+                        print(f"Warning: Failed to delete old workbench audio file: {e}")
                 log_messages.append(f"ℹ️ キープのアイテムが最大数({MAX_WORKBENCH_ITEMS})に達したため、一番古いアイテムを削除しました。")
             
             ui_updates = update_workbench_ui(updated_list)
             log_messages.append("✅ キープに音声を追加しました。")
-            final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+            # ▼▼▼ 変更: ログ表示をENABLE_LOGGINGで制御 ▼▼▼
+            if ENABLE_LOGGING:
+                final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+            else:
+                essential_logs = [log for log in log_messages if any(prefix in log for prefix in ["✅", "❌", "⚠️", "ℹ️"])]
+                final_status = "\n".join(essential_logs).strip()
+            # ▲▲▲ 変更 ▲▲▲
             return (final_status, updated_list) + ui_updates
-        # ▲▲▲ 変更 ▲▲▲
 
-        # ▼▼▼ 変更: ファイル削除時にMP3も削除 ▼▼▼
         def remove_from_workbench(current_status: str, index_to_remove: int, current_workbench_list: List[Dict]) -> Tuple:
             log_messages = []
             safe_workbench_list = current_workbench_list or []
-            if not (0 <= index_to_remove < len(safe_workbench_list)): return (current_status, safe_workbench_list) + update_workbench_ui(safe_workbench_list)
+            if not (0 <= index_to_remove < len(safe_workbench_list)):
+                final_status = current_status if ENABLE_LOGGING else ""
+                return (final_status, safe_workbench_list) + update_workbench_ui(safe_workbench_list)
             
             item_to_remove = safe_workbench_list[index_to_remove]
             try:
                 path_to_delete_wav = Path(item_to_remove['audio_path'])
                 path_to_delete_mp3 = path_to_delete_wav.with_suffix('.mp3')
                 
-                # WAVファイルの削除
                 if path_to_delete_wav.exists() and str(path_to_delete_wav.parent) == tempfile.gettempdir():
                     path_to_delete_wav.unlink()
-                    # MP3ファイルの削除
                     if path_to_delete_mp3.exists():
                         path_to_delete_mp3.unlink()
                     log_messages.append(f"✅ キープからアイテム #{index_to_remove + 1} を削除し、一時ファイル(WAV/MP3)をクリーンアップしました。")
@@ -972,36 +1038,41 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                      log_messages.append(f"✅ キープからアイテム #{index_to_remove + 1} を削除しました。(ファイルは保持: {path_to_delete_wav.name})")
                 else:
                     log_messages.append(f"✅ キープからアイテム #{index_to_remove + 1} を削除しました。(関連ファイルなし)")
-
             except Exception as e: log_messages.append(f"⚠️ キープのアイテム #{index_to_remove + 1} のファイル削除中にエラー: {e}")
             
             updated_list = [item for i, item in enumerate(safe_workbench_list) if i != index_to_remove]
             ui_updates = update_workbench_ui(updated_list)
-            final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+            # ▼▼▼ 変更: ログ表示をENABLE_LOGGINGで制御 ▼▼▼
+            if ENABLE_LOGGING:
+                final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+            else:
+                essential_logs = [log for log in log_messages if any(prefix in log for prefix in ["✅", "❌", "⚠️", "ℹ️"])]
+                final_status = "\n".join(essential_logs).strip()
+            # ▲▲▲ 変更 ▲▲▲
             return (final_status, updated_list) + ui_updates
-        # ▲▲▲ 変更 ▲▲▲
 
-        # ▼▼▼ 変更: 結合プレビューもWAV/MP3両対応に ▼▼▼
         def action_merge_preview(current_status: str, first_audio_num: int, second_audio_num: int, pause_ms: int, workbench_list: List[Dict], progress=gr.Progress(track_tqdm=True)):
             log_messages = []
-            error_return = (
-                (current_status + "\n" + "\n".join(log_messages)).strip(), 
-                None, 
-                gr.update(value=None, visible=False), 
-                {}
-            )
+            def create_error_return():
+                if ENABLE_LOGGING:
+                    final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+                else:
+                    essential_logs = [log for log in log_messages if any(prefix in log for prefix in ["✅", "❌", "⚠️", "ℹ️"])]
+                    final_status = "\n".join(essential_logs).strip()
+                return (final_status, None, gr.update(value=None, visible=False), {})
+
             if not workbench_list:
                 log_messages.append("⚠️ [結合プレビュー警告] キープに音声がありません。")
-                return error_return
+                return create_error_return()
             idx1, idx2 = int(first_audio_num) - 1, int(second_audio_num) - 1
             if not (0 <= idx1 < len(workbench_list) and 0 <= idx2 < len(workbench_list)):
                 log_messages.append(f"⚠️ [結合プレビュー警告] 指定された番号(#{first_audio_num}, #{second_audio_num})の音声が見つかりません。")
-                return error_return
+                return create_error_return()
             item1, item2 = workbench_list[idx1], workbench_list[idx2]
             audio_path1, audio_path2 = item1.get("audio_path"), item2.get("audio_path")
             if not audio_path1 or not Path(audio_path1).exists() or not audio_path2 or not Path(audio_path2).exists():
                 log_messages.append("❌ [結合プレビューエラー] 音声��ァイル(WAV)が見つかりません。ファイルが削除された可能性があります。")
-                return error_return
+                return create_error_return()
             
             progress(0, desc="結合準備中...")
             try:
@@ -1009,7 +1080,7 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                 pause_duration = int(pause_ms)
                 if pause_duration >= 0:
                     combined_audio = segment1 + AudioSegment.silent(duration=pause_duration) + segment2
-                    log_messages.append(f"✅ 音声 #{first_audio_num} と #{second_audio_num} を {pause_duration}ms のポーズを挟んで結合しました。")
+                    if ENABLE_LOGGING: log_messages.append(f"音声 #{first_audio_num} と #{second_audio_num} を {pause_duration}ms のポーズを挟んで結合しました。")
                 else:
                     overlap_duration = abs(pause_duration)
                     max_possible_overlap = min(len(segment1), len(segment2))
@@ -1018,11 +1089,11 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                         overlap_duration = max_possible_overlap
                     combined_audio = AudioSegment.silent(duration=len(segment1) + len(segment2) - overlap_duration)
                     combined_audio = combined_audio.overlay(segment1, position=0).overlay(segment2, position=len(segment1) - overlap_duration)
-                    log_messages.append(f"✅ 音声 #{first_audio_num} と #{second_audio_num} を {overlap_duration}ms 重ねて（オーバーレイして）結合しました。")
+                    if ENABLE_LOGGING: log_messages.append(f"音声 #{first_audio_num} と #{second_audio_num} を {overlap_duration}ms 重ねて（オーバーレイして）結合しました。")
                 progress(1, desc="結合完了")
             except Exception as e:
                 log_messages.append(f"❌ [結合プレビューエラー] 音声の結合中にエラーが発生しました: {e}")
-                return error_return
+                return create_error_return()
 
             base_filename = f"merged_preview_{uuid.uuid4().hex[:8]}"
             temp_dir = Path(tempfile.gettempdir())
@@ -1037,30 +1108,37 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             original_models1, original_models2 = item1.get('original_models', []), item2.get('original_models', [])
             all_original_models = set(original_models1 + original_models2)
             
-            # StateにはWAVパスを保存
             metadata = {"text": f"{item1.get('text', '')} | {item2.get('text', '')}", "display_models": sorted(list(all_display_models)), "original_models": sorted(list(all_original_models)), "audio_path": str(wav_temp_path), "timestamp": datetime.datetime.now(JST).isoformat()}
             log_messages.append("✅ 結合プレビューが生成されました。")
-            final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
             
-            # プレーヤーにはMP3、ダウンロードボタンにはWAVを渡す
+            if ENABLE_LOGGING:
+                final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+            else:
+                essential_logs = [log for log in log_messages if any(prefix in log for prefix in ["✅", "❌", "⚠️", "ℹ️"])]
+                final_status = "\n".join(essential_logs).strip()
+
             return final_status, str(mp3_temp_path), gr.update(value=str(wav_temp_path), visible=True), metadata
-        # ▲▲▲ 変更 ▲▲▲
 
-        # ▼▼▼ 変更: 元ファイル削除時にMP3も削除 ▼▼▼
         def action_add_merged_to_workbench(current_status: str, preview_data: Dict, current_workbench_list: List[Dict], delete_originals: bool, first_audio_num: int, second_audio_num: int) -> Tuple:
             log_messages = []
             safe_workbench_list = current_workbench_list or []
+
+            def create_error_return():
+                if ENABLE_LOGGING:
+                    final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+                else:
+                    essential_logs = [log for log in log_messages if any(prefix in log for prefix in ["✅", "❌", "⚠️", "ℹ️"])]
+                    final_status = "\n".join(essential_logs).strip()
+                return (final_status, safe_workbench_list) + update_workbench_ui(safe_workbench_list)
+
             if not preview_data or "audio_path" not in preview_data:
                 log_messages.append("⚠️ [キープ追加エラー] 追加する結合済み音声がありません。先にプレビューを生成してください。")
-                final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
-                return (final_status, safe_workbench_list) + update_workbench_ui(safe_workbench_list)
+                return create_error_return()
             
-            # preview_data["audio_path"] はWAVのパス
             src_path = Path(preview_data["audio_path"])
             if not src_path.exists():
                 log_messages.append("⚠️ [キープ追加エラー] 結合済み音声ファイルが見つかりません。")
-                final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
-                return (final_status, safe_workbench_list) + update_workbench_ui(safe_workbench_list)
+                return create_error_return()
             
             new_merged_item = {"audio_path": str(src_path), "text": preview_data.get("text", "N/A"), "model": " | ".join(preview_data.get("display_models", [])), "original_models": preview_data.get("original_models", []), "style": "N/A", "style_weight": 0.0, "timestamp": preview_data.get("timestamp"), "is_merged": True}
             final_workbench_list = []
@@ -1076,10 +1154,8 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     try:
                         path_to_delete_wav = Path(item_to_remove['audio_path'])
                         path_to_delete_mp3 = path_to_delete_wav.with_suffix('.mp3')
-                        if path_to_delete_wav.exists() and str(path_to_delete_wav.parent) == tempfile.gettempdir():
-                            path_to_delete_wav.unlink()
-                        if path_to_delete_mp3.exists() and str(path_to_delete_mp3.parent) == tempfile.gettempdir():
-                            path_to_delete_mp3.unlink()
+                        if path_to_delete_wav.exists() and str(path_to_delete_wav.parent) == tempfile.gettempdir(): path_to_delete_wav.unlink()
+                        if path_to_delete_mp3.exists() and str(path_to_delete_mp3.parent) == tempfile.gettempdir(): path_to_delete_mp3.unlink()
                     except Exception as e: log_messages.append(f"⚠️ 元の音声ファイル削除中にエラー: {e}")
                 
                 final_workbench_list = [new_merged_item] + remaining_list
@@ -1095,16 +1171,23 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     path_to_delete_mp3 = path_to_delete_wav.with_suffix('.mp3')
                     if path_to_delete_wav.exists() and str(path_to_delete_wav.parent) == tempfile.gettempdir(): path_to_delete_wav.unlink()
                     if path_to_delete_mp3.exists() and str(path_to_delete_mp3.parent) == tempfile.gettempdir(): path_to_delete_mp3.unlink()
-                except Exception as e: print(f"Warning: Failed to delete old workbench audio file: {e}")
+                except Exception as e:
+                    if ENABLE_LOGGING:
+                        print(f"Warning: Failed to delete old workbench audio file: {e}")
                 log_messages.append(f"ℹ️ キープが最大数({MAX_WORKBENCH_ITEMS})に達したため一番古いアイテムを削除しました。")
             
             ui_updates = update_workbench_ui(final_workbench_list)
-            final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+            
+            if ENABLE_LOGGING:
+                final_status = (current_status + "\n" + "\n".join(log_messages)).strip()
+            else:
+                essential_logs = [log for log in log_messages if any(prefix in log for prefix in ["✅", "❌", "⚠️", "ℹ️"])]
+                final_status = "\n".join(essential_logs).strip()
+                
             return (final_status, final_workbench_list) + ui_updates
-        # ▲▲▲ 変更 ▲▲▲
 
 
-        # --- イベントリスナー接続 (一部変更あり) ---
+        # --- イベントリスナー接続 (変更なし) ---
         def on_fn_mode_change(is_fn_mode_on: bool) -> gr.Checkbox:
             if is_fn_mode_on: return gr.update(value=False)
             return gr.update()
@@ -1124,14 +1207,12 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
         current_styles_dropdown.change(on_style_dropdown_select, inputs=[current_styles_dropdown, all_styles_data_state], outputs=[style_weight_for_synth_slider])
         use_assist_text_checkbox.change(lambda x: (gr.update(visible=x), gr.update(visible=x)), inputs=[use_assist_text_checkbox], outputs=[assist_text_textbox, assist_text_weight_slider])
 
-        # ▼▼▼ 変更: generate_button の出力に State を追加 ▼▼▼
         generate_outputs = [status_textbox, audio_output_area]
         for i in range(MAX_AUDIO_OUTPUTS):
             generate_outputs.extend([audio_item_columns[i], audio_outputs[i], download_buttons[i]])
         generate_outputs.extend(dummy_audio_item_columns)
         generate_outputs.extend(synthesized_text_states)
-        generate_outputs.append(synthesized_wav_files_state) # Stateを追加
-        # ▲▲▲ 変更 ▲▲▲
+        generate_outputs.append(synthesized_wav_files_state)
 
         generate_button.click(
             fn=action_run_synthesis,
@@ -1150,23 +1231,21 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             outputs=generate_outputs
         )
 
-        # ▼▼▼ 変更: to_workbench_button の入力と呼び出し方を修正 ▼▼▼
         for i in range(MAX_AUDIO_OUTPUTS):
             to_workbench_buttons[i].click(
                 fn=lambda current_status, workbench_list, text, model, style_display, style_weight, all_wavs, idx=i: \
                     add_to_workbench(
                         current_status, workbench_list,
-                        all_wavs[idx] if all_wavs and idx < len(all_wavs) else None, # WAVパスを渡す
+                        all_wavs[idx] if all_wavs and idx < len(all_wavs) else None,
                         text, model, style_display, style_weight
                     ),
                 inputs=[
                     status_textbox, workbench_state, synthesized_text_states[i],
                     selected_model_dropdown, current_styles_dropdown, style_weight_for_synth_slider,
-                    synthesized_wav_files_state # Stateを入力に追加
+                    synthesized_wav_files_state
                 ],
                 outputs=[status_textbox, workbench_state] + all_workbench_ui_components
             )
-        # ▲▲▲ 変更 ▲▲▲
         
         for i, item in enumerate(workbench_items):
             item["delete_btn"].click(
@@ -1210,7 +1289,10 @@ if __name__ == "__main__":
 
     merger_cache_path = Path("/tmp/sbv2_merger_cache")
     mock_model_holder = TTSModelHolder()
-    print(f"Initial models loaded by TTSModelHolder: {mock_model_holder.model_names}")
+    # ▼▼▼ 変更: printをENABLE_LOGGINGで制御 ▼▼▼
+    if ENABLE_LOGGING:
+        print(f"Initial models loaded by TTSModelHolder: {mock_model_holder.model_names}")
+    # ▲▲▲ 変更 ▲▲▲
     
     app = create_synthesis_app(mock_model_holder)