Update gradio_tabs/single.py

gradio_tabs/single.py

@@ -51,10 +51,8 @@ class TTSModelHolder:
             p.mkdir(parents=True, exist_ok=True)
         # 起動時に一度だけサンプルモデルを作成するロジック
         if not any(p.iterdir()):
-            # ▼▼▼ 変更: 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)
@@ -82,10 +80,8 @@ class TTSModelHolder:
                 json.dump(style_settings_data, f, indent=2, ensure_ascii=False)
 
             # FNモデル (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)
@@ -94,10 +90,8 @@ class TTSModelHolder:
                     json.dump({"data": {"style2id": {"Neutral": 0}}}, f)
 
             # whisperモデル (非表示用)
-            # ▼▼▼ 変更: 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()
@@ -111,33 +105,25 @@ 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をENABLE_LOGGINGで制御 ▼▼▼
             if ENABLE_LOGGING:
                 print(f"TTSModelHolder model list refreshed. Known models: {self.model_names}")
-            # ▲▲▲ 変更 ▲▲▲
         else:
             self.model_names = []
-            # ▼▼▼ 変更: 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を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をエラーなので残すか、制御するか検討。ここでは制御対象に含める。▼▼▼
             if ENABLE_LOGGING:
                 print(f"[ERROR] {error_msg}")
-            # ▲▲▲ 変更 ▲▲▲
             raise ValueError(error_msg)
 
         self.current_model = MockTTSModel()
@@ -149,10 +135,8 @@ class MockTTSModel:
 
     def infer(self, text, **kwargs):
         length_scale = kwargs.get('length', 1.0)
-        # ▼▼▼ 変更: 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
@@ -237,10 +221,8 @@ def sort_models_by_custom_order(model_list: List[str], custom_order: List[str])
 
 def set_random_seed(seed: int):
     if seed >= 0:
-        # ▼▼▼ 変更: 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)
@@ -423,19 +405,15 @@ def process_single_synthesis_webui(
     current_model_file_path = Path(current_model_file_path_str)
     log_messages = []
     set_random_seed(seed_arg)
-    # ▼▼▼ 変更: ログ追加を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
-        # ▼▼▼ 変更: ログ追加を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
@@ -446,10 +424,8 @@ def process_single_synthesis_webui(
             speaker_id = model_spk2id[speaker_name_arg]
         elif model_spk2id:
             speaker_id = list(model_spk2id.values())[0]
-    # ▼▼▼ 変更: ログ追加を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
@@ -467,10 +443,8 @@ def process_single_synthesis_webui(
     except Exception as e:
         msg = f"予期せぬエラー: {e}"; log_messages.append(f"❌ [エラー] {msg}"); return False, log_messages, None
     duration_synth = (datetime.datetime.now(JST) - start_time_synth).total_seconds()
-    # ▼▼▼ 変更: ログ追加を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)
 
 
@@ -679,7 +653,7 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     all_workbench_ui_components.extend([item["container"], item["item_num_display"], item["audio"], item["download"], item["info"]])
 
 
-        # --- UIイベントハンドラ関数 (一部変更あり) ---
+        # --- UIイベントハンドラ関数 (action_refresh_model_list を修正) ---
         def load_styles_for_ui(selected_model_name: Optional[str]):
             if not selected_model_name: return gr.update(choices=[], value=None), gr.update(value=DEFAULT_STYLE_WEIGHT), {}
             model_path = assets_root_path / selected_model_name
@@ -695,6 +669,7 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                 default_weight = styles_map[first_key].get("weight", DEFAULT_STYLE_WEIGHT)
             return gr.update(choices=display_names, value=default_display_name), gr.update(value=default_weight), styles_map
 
+        # ▼▼▼ 修正: この関数を堅牢化してエラーを防ぐ ▼▼▼
         def action_refresh_model_list(use_fn_model_mode: bool, use_symlink_mode: bool):
             """モデルリストを再読み込みし、UIとバックエンドの状態を同期させる。"""
             MERGER_CACHE_PATH = Path("/tmp/sbv2_merger_cache")
@@ -731,20 +706,16 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             fn_model_pattern = re.compile(r'^FN([1-9]|10)$')
             current_available_models = model_holder.model_names
             
-            model_dropdown_update = None
-            value = None
+            final_choices = []
+            final_value_for_style_load = None
 
             if use_fn_model_mode:
                 ui_model_list = [name for name in current_available_models if fn_model_pattern.match(name)]
-                sorted_list = sort_models_by_custom_order(ui_model_list, FN_MODE_MODEL_ORDER)
-                value = sorted_list[0] if sorted_list else None
-                model_dropdown_update = gr.update(choices=sorted_list, value=value)
+                final_choices = sort_models_by_custom_order(ui_model_list, FN_MODE_MODEL_ORDER)
             
             elif use_symlink_mode:
                 ui_model_list_names = [p.name for p in assets_root_path.iterdir() if p.is_symlink()]
-                formatted_choices = format_and_sort_model_names(ui_model_list_names)
-                value = formatted_choices[0][1] if formatted_choices else None
-                model_dropdown_update = gr.update(choices=formatted_choices, value=value)
+                final_choices = format_and_sort_model_names(ui_model_list_names)
 
             else:
                 ui_model_list = [
@@ -753,13 +724,32 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     and not fn_model_pattern.match(name) 
                     and not (assets_root_path / name).is_symlink()
                 ]
-                sorted_list = sort_models_by_custom_order(ui_model_list, NORMAL_MODE_MODEL_ORDER)
-                value = sorted_list[0] if sorted_list else None
-                model_dropdown_update = gr.update(choices=sorted_list, value=value)
-
-            style_dropdown_update, style_weight_update, styles_data_state_update = load_styles_for_ui(value)
+                final_choices = sort_models_by_custom_order(ui_model_list, NORMAL_MODE_MODEL_ORDER)
+            
+            if not final_choices:
+                # 選択肢が空の場���、エラーを防ぐためにダミー項目を設定し、ドロップダウンを無効化
+                model_dropdown_update = gr.update(
+                    choices=["(利用可能なモデルがありません)"],
+                    value="(利用可能なモデルがありません)",
+                    interactive=False
+                )
+                final_value_for_style_load = None
+            else:
+                # 選択肢がある場合、通常通り設定
+                is_tuple_choices = isinstance(final_choices[0], tuple)
+                actual_value = final_choices[0][1] if is_tuple_choices else final_choices[0]
+                
+                model_dropdown_update = gr.update(
+                    choices=final_choices,
+                    value=actual_value,
+                    interactive=True
+                )
+                final_value_for_style_load = actual_value
+
+            style_dropdown_update, style_weight_update, styles_data_state_update = load_styles_for_ui(final_value_for_style_load)
             
             return model_dropdown_update, style_dropdown_update, style_weight_update, styles_data_state_update
+        # ▲▲▲ 修正 ▲▲▲
 
         def on_model_select_change(selected_model_name: Optional[str]):
             style_dropdown_update, style_weight_update, styles_data_state_update = load_styles_for_ui(selected_model_name)
@@ -803,8 +793,8 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                 found_chars = "".join(sorted(list(set(re.findall(INVALID_FILENAME_CHARS_PATTERN, text)))))
                 error_outputs[0] = f"❌ [エラー] テキストに使用できない文字が含まれています: {found_chars}"
                 return tuple(error_outputs)
-            if not model_name:
-                error_outputs[0] = "❌ [エラー] モデルフォルダが選択されていません。"
+            if not model_name or model_name == "(利用可能なモデルがありません)": # ダミー項目もチェック
+                error_outputs[0] = "❌ [エラー] モデルが選択されていません。"
                 return tuple(error_outputs)
             if not text.strip():
                 error_outputs[0] = "❌ [エラー] テキストが入力されていません。"
@@ -867,9 +857,9 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
                     ratio_list = [0.5]
                     all_logs.append("⚠️ [警告] カタカナ化の割合の解析に失敗したため、0.5 を使用します。")
                 
+                internal_mode = int(random_text_mode) + 1
                 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]] = {}
@@ -939,14 +929,12 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
 
             final_outputs = []
             
-            # ▼▼▼ 変更: ログ表示を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)
-            # ▲▲▲ 変更 ▲▲▲
 
             final_outputs.append(gr.update(visible=num_generated > 0))
 
@@ -1008,13 +996,11 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             
             ui_updates = update_workbench_ui(updated_list)
             log_messages.append("✅ キープに音声を追加しました。")
-            # ▼▼▼ 変更: ログ表示を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
 
         def remove_from_workbench(current_status: str, index_to_remove: int, current_workbench_list: List[Dict]) -> Tuple:
@@ -1042,13 +1028,11 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             
             updated_list = [item for i, item in enumerate(safe_workbench_list) if i != index_to_remove]
             ui_updates = update_workbench_ui(updated_list)
-            # ▼▼▼ 変更: ログ表示を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
 
         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)):
@@ -1187,7 +1171,7 @@ def create_synthesis_app(model_holder: TTSModelHolder) -> gr.Blocks:
             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()
@@ -1289,10 +1273,8 @@ if __name__ == "__main__":
 
     merger_cache_path = Path("/tmp/sbv2_merger_cache")
     mock_model_holder = TTSModelHolder()
-    # ▼▼▼ 変更: 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)