style: Complete remaining SIM108 improvements and ruff formatting

- Apply final ternary operator simplification in content_extractor.py
- Include ruff formatter automatic improvements to code style
- Now only 3 ruff errors remain (2 SIM117, 1 SIM108)

These are all minor style improvements that can be addressed if desired.

.pre-commit-hooks/run_staged_tests.py

@@ -11,9 +11,7 @@ import time
 from typing import List, Set
 
 # ロギング設定
-logging.basicConfig(
-    level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-)
+logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 logger = logging.getLogger("run_staged_tests")
 
 
@@ -70,9 +68,7 @@ def get_test_files_to_run(staged_files: List[str]) -> Set[str]:
                             check=True,
                         )
                         for test_file in matching_tests.stdout.strip().split("\n"):
-                            if (
-                                test_file and "test_audio_generator.py" not in test_file
-                            ):  # Skip empty lines and problematic test
+                            if test_file and "test_audio_generator.py" not in test_file:  # Skip empty lines and problematic test
                                 test_files.add(test_file)
                     except subprocess.CalledProcessError:
                         pass
@@ -95,11 +91,7 @@ def run_pytest(test_files: Set[str]) -> bool:
     venv_pytest = "venv/bin/python -m pytest"
 
     # Use venv pytest if available, otherwise try system pytest
-    if os.path.exists("venv/bin/python"):
-        # タイムアウト(秒)を指定して実行
-        cmd = f"{venv_pytest} {' '.join(test_files)} -v --timeout=30"
-    else:
-        cmd = f"python -m pytest {' '.join(test_files)} -v --timeout=30"
+    cmd = f"{venv_pytest} {' '.join(test_files)} -v --timeout=30" if os.path.exists("venv/bin/python") else f"python -m pytest {' '.join(test_files)} -v --timeout=30"
 
     logger.info(f"Running: {cmd}")
 

tests/e2e/conftest.py

@@ -94,10 +94,7 @@ def browser():
         Browser: Playwrightブラウザインスタンス
     """
     with sync_playwright() as playwright:
-        if os.environ.get("HEADLESS", "true").lower() == "true":
-            browser = playwright.chromium.launch(headless=True)
-        else:
-            browser = playwright.chromium.launch(headless=False, slow_mo=100)
+        browser = playwright.chromium.launch(headless=True) if os.environ.get("HEADLESS", "true").lower() == "true" else playwright.chromium.launch(headless=False, slow_mo=100)
 
         yield browser
 
@@ -125,9 +122,7 @@ def pytest_bdd_apply_tag(tag, function):
     return None
 
 
-def pytest_bdd_step_error(
-    request, feature, scenario, step, step_func, step_func_args, exception
-):
+def pytest_bdd_step_error(request, feature, scenario, step, step_func, step_func_args, exception):
     """
     ステップが失敗した場合のフック
 
@@ -146,9 +141,7 @@ def pytest_bdd_step_error(
         step_name = step.name.replace(" ", "_")
         timestamp = int(time.time())
 
-        screenshot_path = os.path.join(
-            screenshot_dir, f"error_{scenario_name}_{step_name}_{timestamp}.png"
-        )
+        screenshot_path = os.path.join(screenshot_dir, f"error_{scenario_name}_{step_name}_{timestamp}.png")
 
         page.screenshot(path=screenshot_path)
         logger.error(f"スクリーンショットが保存されました: {screenshot_path}")

yomitalk/components/audio_generator.py

@@ -70,13 +70,8 @@ class VoicevoxCoreManager:
         self.core_initialized = False
 
         # 1. Check existence of required directories
-        if (
-            not self.VOICEVOX_MODELS_PATH.exists()
-            or not self.VOICEVOX_DICT_PATH.exists()
-        ):
-            logger.warning(
-                "Required VOICEVOX directories not found. Please run 'make download-voicevox-core'"
-            )
+        if not self.VOICEVOX_MODELS_PATH.exists() or not self.VOICEVOX_DICT_PATH.exists():
+            logger.warning("Required VOICEVOX directories not found. Please run 'make download-voicevox-core'")
             return
 
         try:
@@ -84,9 +79,7 @@ class VoicevoxCoreManager:
             open_jtalk = self._initialize_openjtalk()
 
             # 3. Initialize ONNX Runtime
-            runtime_path = str(
-                self.VOICEVOX_LIB_PATH / "libvoicevox_onnxruntime.so.1.17.3"
-            )
+            runtime_path = str(self.VOICEVOX_LIB_PATH / "libvoicevox_onnxruntime.so.1.17.3")
 
             if os.path.exists(runtime_path):
                 logger.info("Loading ONNX runtime from local path")
@@ -102,9 +95,7 @@ class VoicevoxCoreManager:
             loaded_count = self._load_voice_models()
 
             if loaded_count > 0:
-                logger.info(
-                    f"Successfully loaded {loaded_count}/{len(REQUIRED_MODEL_FILES)} voice models"
-                )
+                logger.info(f"Successfully loaded {loaded_count}/{len(REQUIRED_MODEL_FILES)} voice models")
                 self.core_initialized = True
             else:
                 logger.error("No voice models could be loaded")
@@ -229,16 +220,12 @@ class VoicevoxCoreManager:
                 if original_surface != word.surface:
                     self.user_dict_words.add(original_surface)
 
-                logger.debug(
-                    f"Loaded user dict word: {word.surface} (original: {original_surface})"
-                )
+                logger.debug(f"Loaded user dict word: {word.surface} (original: {original_surface})")
 
         except Exception as e:
             logger.warning(f"Failed to load user dictionary words: {e}")
 
-        logger.info(
-            f"Loaded {len(self.user_dict_words)} user dictionary surface forms for conversion checking"
-        )
+        logger.info(f"Loaded {len(self.user_dict_words)} user dictionary surface forms for conversion checking")
 
     def is_word_in_user_dict(self, word: str) -> bool:
         """
@@ -386,12 +373,8 @@ class AudioGenerator:
                 If not provided, defaults to "data/temp/talks"
         """
         # Use session-specific directories if provided
-        self.output_dir = (
-            session_output_dir if session_output_dir else Path("data/output")
-        )
-        self.temp_dir = (
-            session_temp_dir if session_temp_dir else Path("data/temp/talks")
-        )
+        self.output_dir = session_output_dir if session_output_dir else Path("data/output")
+        self.temp_dir = session_temp_dir if session_temp_dir else Path("data/temp/talks")
 
         # Make sure directories exist
         self.output_dir.mkdir(parents=True, exist_ok=True)
@@ -454,9 +437,7 @@ class AudioGenerator:
                     result.extend([uppercase_part, "ズ"])
                 else:
                     # 英単語のパターンに基づいて分割（キャメルケース対応）
-                    segments = re.findall(
-                        r"([A-Z]{2,}(?=[A-Z][a-z]|$)|[A-Z][a-z]*|[a-z]+)", part
-                    )
+                    segments = re.findall(r"([A-Z]{2,}(?=[A-Z][a-z]|$)|[A-Z][a-z]*|[a-z]+)", part)
                     result.extend(segments)
             else:
                 # 英単語以外はそのまま追加
@@ -509,11 +490,7 @@ class AudioGenerator:
                 needs_space = word_count >= 6  # 6単語以上続く
 
                 # 特定の品詞の前後で息継ぎ
-                if (
-                    last_part.lower() in self.BE_VERBS
-                    or part.lower() in self.PREPOSITIONS
-                    or part.lower() in self.CONJUNCTIONS
-                ) and word_count >= 4:
+                if (last_part.lower() in self.BE_VERBS or part.lower() in self.PREPOSITIONS or part.lower() in self.CONJUNCTIONS) and word_count >= 4:
                     needs_space = True
 
                 if needs_space:
@@ -530,9 +507,7 @@ class AudioGenerator:
             elif not is_english_word:
                 # 英単語でない場合はそのまま
                 part_to_add = part
-            elif is_all_uppercase and (
-                len(part) <= 3 or (len(part) <= 6 and not is_romaji_readable(part))
-            ):
+            elif is_all_uppercase and (len(part) <= 3 or (len(part) <= 6 and not is_romaji_readable(part))):
                 # 大文字のみで構成され、字数が少なくてローマ字読みできない場合はアルファベット読みして欲しいためそのまま
                 # （字数が3文字以下なら基本的にアルファベット���みで良く, 駄目であればCONVERSION_OVERRIDEなどで変換する）
                 part_to_add = part
@@ -546,9 +521,7 @@ class AudioGenerator:
 
         return "".join(result)
 
-    def generate_character_conversation(
-        self, podcast_text: str
-    ) -> Generator[Optional[str], None, None]:
+    def generate_character_conversation(self, podcast_text: str) -> Generator[Optional[str], None, None]:
         """
         Generate audio for a character conversation from podcast text with streaming support.
 
@@ -614,10 +587,7 @@ class AudioGenerator:
         conversation_parts = []
 
         # キャラクターパターンを取得
-        character_patterns = {
-            char.display_name: [f"{char.display_name}:", f"{char.display_name}："]
-            for char in Character
-        }
+        character_patterns = {char.display_name: [f"{char.display_name}:", f"{char.display_name}："] for char in Character}
 
         # 複数行のセリフを処理するために現在の話者と発言を記録
         current_speaker = None
@@ -663,9 +633,7 @@ class AudioGenerator:
 
         # 会話部分が見つからない場合はフォーマット修正を試みる
         if not conversation_parts:
-            logger.warning(
-                "No valid conversation parts found. Attempting to fix format..."
-            )
+            logger.warning("No valid conversation parts found. Attempting to fix format...")
             fixed_text = self._fix_conversation_format(podcast_text)
             if fixed_text != podcast_text:
                 return self._extract_conversation_parts(fixed_text)
@@ -801,10 +769,9 @@ class AudioGenerator:
                 # 現在の話者の発言として処理
                 if line_stripped:
                     current_speech.append(line_stripped)
-                elif current_speech:
+                elif current_speech and not current_speech[-1].endswith("\n"):
                     # 段落区切りの空行
-                    if not current_speech[-1].endswith("\n"):
-                        current_speech[-1] += "\n"
+                    current_speech[-1] += "\n"
             elif line_stripped:
                 # 話者が一度も検出されていない場合はデフォルト設定
                 current_speaker = Character.ZUNDAMON.display_name

yomitalk/components/content_extractor.py

@@ -75,9 +75,7 @@ class ContentExtractor:
             return f"URL conversion error: {str(e)}"
 
     @classmethod
-    def extract_file_content(
-        cls, file_obj: Any
-    ) -> Tuple[Optional[str], Optional[bytes]]:
+    def extract_file_content(cls, file_obj: Any) -> Tuple[Optional[str], Optional[bytes]]:
         """
         メモリ上でファイルコンテンツを抽出します。
 
@@ -99,9 +97,7 @@ class ContentExtractor:
             original_extension = ".txt"  # デフォルト拡張子
             if hasattr(file_obj, "name"):
                 # 元のファイルの拡張子を取得
-                original_extension = os.path.splitext(Path(file_obj.name).name)[
-                    1
-                ].lower()
+                original_extension = os.path.splitext(Path(file_obj.name).name)[1].lower()
                 # 拡張子がない場合はデフォルト値を使用
                 if not original_extension:
                     original_extension = ".txt"
@@ -110,10 +106,7 @@ class ContentExtractor:
             file_content = None
             if hasattr(file_obj, "read") and callable(file_obj.read):
                 # 現在位置を記録
-                if hasattr(file_obj, "tell") and callable(file_obj.tell):
-                    pos = file_obj.tell()
-                else:
-                    pos = 0
+                pos = file_obj.tell() if hasattr(file_obj, "tell") and callable(file_obj.tell) else 0
 
                 # コンテンツを読み込み
                 file_content = file_obj.read()
@@ -205,9 +198,7 @@ class ContentExtractor:
 
                 # メモリ上のPDFストリームを直接変換
                 logger.debug("Processing PDF from memory stream")
-                result = _markdown_converter.convert(
-                    pdf_stream, stream_info=stream_info
-                )
+                result = _markdown_converter.convert(pdf_stream, stream_info=stream_info)
 
                 # 変換結果からテキストコンテンツを取得
                 markdown_content = result.text_content
@@ -221,9 +212,7 @@ class ContentExtractor:
             return f"Unsupported file type: {file_ext}. Supported types: {', '.join(cls.SUPPORTED_EXTENSIONS)}"
 
     @classmethod
-    def append_text_with_source(
-        cls, existing_text: str, new_text: str, source: str, add_separator: bool = True
-    ) -> str:
+    def append_text_with_source(cls, existing_text: str, new_text: str, source: str, add_separator: bool = True) -> str:
         """
         Append new text to existing text with source information.
 
@@ -245,18 +234,10 @@ class ContentExtractor:
         if add_separator:
             # Create markdown-style separator with source information
             separator = f"\n\n---\n**Source: {source}**\n\n"
-            if existing_text.strip():
-                # If there's existing text, add separator before new content
-                result = existing_text.rstrip() + separator + content_to_append
-            else:
-                # If no existing text, add source info at the beginning
-                result = f"**Source: {source}**\n\n" + content_to_append
+            result = existing_text.rstrip() + separator + content_to_append if existing_text.strip() else f"**Source: {source}**\n\n" + content_to_append
         else:
             # Just append with minimal spacing
-            if existing_text.strip():
-                result = existing_text.rstrip() + "\n\n" + content_to_append
-            else:
-                result = content_to_append
+            result = existing_text.rstrip() + "\n\n" + content_to_append if existing_text.strip() else content_to_append
 
         return result