Merge pull request #43 from robdmac/v2

Fix auto-skip-tts flag and filter log lines

Author: robdmac

talkito/cli.py

@@ -361,6 +361,7 @@ async def run_claude_wrapper(args) -> int:
         'verbosity': args.verbose,
         'asr_mode': args.asr_mode,
         'record_file': args.record,
+        'auto_skip_tts': args.auto_skip_tts,  # Pass auto-skip-tts flag
     }
 
     # Add other configurations...
@@ -579,6 +580,9 @@ def run_mcp_server():
 
             if args.log_file:
                 config['log_file_path'] = args.log_file
+                
+            if args.auto_skip_tts:
+                config['auto_skip_tts'] = True
 
             # Apply configuration
             mcp.configure_mcp_server(**config)
@@ -751,6 +755,7 @@ async def run_talkito_command(args) -> int:
         'verbosity': args.verbose,
         'asr_mode': args.asr_mode,
         'record_file': args.record,
+        'auto_skip_tts': args.auto_skip_tts,  # Pass auto-skip-tts flag
     }
 
     # Add log file if specified

talkito/mcp.py

@@ -98,9 +98,12 @@ def log_message(level: str, message: str):
 # Track if we're running for Claude (to mask certain tools)
 _running_for_claude = False
 
-def configure_mcp_server(cors_enabled=None, running_for_claude=None, log_file_path=None):
+# Track if auto-skip TTS is enabled
+_auto_skip_tts = False
+
+def configure_mcp_server(cors_enabled=None, running_for_claude=None, log_file_path=None, auto_skip_tts=None):
     """Configure MCP server settings through a public interface"""
-    global _cors_enabled, _running_for_claude, _log_file_path
+    global _cors_enabled, _running_for_claude, _log_file_path, _auto_skip_tts
 
     if cors_enabled is not None:
         _cors_enabled = cors_enabled
@@ -111,6 +114,9 @@ def configure_mcp_server(cors_enabled=None, running_for_claude=None, log_file_pa
     if log_file_path is not None:
         _log_file_path = log_file_path
         setup_logging(log_file_path)
+    
+    if auto_skip_tts is not None:
+        _auto_skip_tts = auto_skip_tts
 
 def add_cors_headers(headers):
     """Add CORS headers to response"""
@@ -277,7 +283,7 @@ def _ensure_initialization():
             engine = tts.detect_tts_engine()
             if engine == "none":
                 raise RuntimeError("No TTS engine found. Please install espeak, festival, flite (Linux) or use macOS")
-            tts.start_tts_worker(engine, auto_skip_tts=False)
+            tts.start_tts_worker(engine, auto_skip_tts=_auto_skip_tts)
         else:
             # Configure and use the selected provider
             tts_config = {'provider': best_provider}
@@ -287,9 +293,9 @@ def _ensure_initialization():
                 engine = tts.detect_tts_engine()
                 if engine == "none":
                     raise RuntimeError("No TTS engine found")
-                tts.start_tts_worker(engine, auto_skip_tts=False)
+                tts.start_tts_worker(engine, auto_skip_tts=_auto_skip_tts)
             else:
-                tts.start_tts_worker(best_provider, auto_skip_tts=False)
+                tts.start_tts_worker(best_provider, auto_skip_tts=_auto_skip_tts)
 
         shared_state.set_tts_initialized(True, provider=best_provider)
         log_message("INFO", f"TTS initialized with provider: {tts.tts_provider}")
@@ -868,7 +874,7 @@ async def _change_tts_internal(provider: str = "system", voice: str = None, regi
             tts.shutdown_tts()
 
         engine = provider if provider != 'system' else tts.detect_tts_engine()
-        tts.start_tts_worker(engine, auto_skip_tts=False)
+        tts.start_tts_worker(engine, auto_skip_tts=_auto_skip_tts)
 
         config_parts = [f"provider={provider}"]
         if voice: config_parts.append(f"voice={voice}")

talkito/profiles.py

@@ -216,6 +216,16 @@ def strip_symbols_from(self, text: str) -> str:
         return text.strip()
 
 
+# Common patterns that should be applied to all profiles
+COMMON_SKIP_PATTERNS = [
+    # Timestamp patterns - filter log lines with timestamps in first 20 chars
+    (2, r'^.{0,20}\[\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}'),  # [YYYY-MM-DD HH:MM:SS format
+    (2, r'^.{0,20}\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}'),    # YYYY-MM-DD HH:MM:SS format (no brackets)
+    (2, r'^.{0,20}\d{2}:\d{2}:\d{2}'),                         # HH:MM:SS format in first 20 chars
+    (2, r'^.{0,20}\d{4}/\d{2}/\d{2}\s+\d{2}:\d{2}:\d{2}'),    # YYYY/MM/DD HH:MM:SS format
+    (2, r'^.{0,20}\d{2}/\d{2}/\d{4}\s+\d{2}:\d{2}:\d{2}'),    # MM/DD/YYYY HH:MM:SS format
+]
+
 # Profile definitions
 CLAUDE_PROFILE = Profile(
     name='claude',
@@ -231,7 +241,7 @@ def strip_symbols_from(self, text: str) -> str:
         (1, r'\s*✻'),                         # Interim thinking
         (0, r'│ Do'),
     ],
-    skip_patterns=[
+    skip_patterns=COMMON_SKIP_PATTERNS + [
         # Level 1: Filter unless -v (tips, hints, usage info, single-word status)
         (1, r'[A-Z][a-z]+…'),                 # Single words like "Sparkling.", "Running."
         (1, r'Tip:'),                         # Tips
@@ -293,7 +303,7 @@ def strip_symbols_from(self, text: str) -> str:
 
 AIDER_PROFILE = Profile(
     name='aider',
-    skip_patterns=[
+    skip_patterns=COMMON_SKIP_PATTERNS + [
         (1, r'^Main model:'),
         (1, r'^Editor model:'),
         (1, r'^Weak model:'),
@@ -308,7 +318,7 @@ def strip_symbols_from(self, text: str) -> str:
 
 PIPET_PROFILE = Profile(
     name='pipet',
-    skip_patterns=[
+    skip_patterns=COMMON_SKIP_PATTERNS + [
         (1, r'^Analyzing package'),
         (1, r'^Package:'),
         (1, r'^Version:'),
@@ -319,6 +329,7 @@ def strip_symbols_from(self, text: str) -> str:
 
 PYTHON_PROFILE = Profile(
     name='python',
+    skip_patterns=COMMON_SKIP_PATTERNS,
     prompt_patterns=[
         r'^>>>\s*',  # Python REPL prompt
         r'^\.\.\.\s*',  # Python continuation prompt
@@ -328,6 +339,7 @@ def strip_symbols_from(self, text: str) -> str:
 
 MYSQL_PROFILE = Profile(
     name='mysql',
+    skip_patterns=COMMON_SKIP_PATTERNS,
     prompt_patterns=[
         r'^mysql>\s*',  # MySQL prompt
         r'^->\s*',  # MySQL continuation
@@ -337,6 +349,7 @@ def strip_symbols_from(self, text: str) -> str:
 
 PSQL_PROFILE = Profile(
     name='psql',
+    skip_patterns=COMMON_SKIP_PATTERNS,
     prompt_patterns=[
         r'^\w+=#\s*',  # PostgreSQL prompt (database=#)
         r'^\w+=-#\s*',  # PostgreSQL continuation
@@ -349,7 +362,7 @@ def strip_symbols_from(self, text: str) -> str:
     name='default',
     response_prefix='',
     raw_skip_patterns=[],
-    skip_patterns=[],
+    skip_patterns=COMMON_SKIP_PATTERNS,
     speak_patterns=[],
     prompt_patterns=[],
     skip_progress=[],

talkito/tts.py

@@ -1317,8 +1317,9 @@ def queue_for_speech(text: str, line_number: Optional[int] = None, source: str =
                 tts_queue.get_nowait()
             except:
                 break
-        # Also skip current item if playing
-        playback_control.skip_current_item()
+        # Only skip current item if something is actually playing
+        if playback_control.current_process is not None:
+            playback_control.skip_current_item()
 
     # Debounce rapidly changing text
     current_time = time.time()
@@ -1363,6 +1364,7 @@ def start_tts_worker(engine: str, auto_skip_tts: bool = False) -> threading.Thre
     """Start the TTS worker thread"""
     global tts_worker_thread, auto_skip_tts_enabled
     auto_skip_tts_enabled = auto_skip_tts
+    log_message("INFO", f"TTS worker started with auto_skip_tts={auto_skip_tts}")
     # Clear the shutdown event in case it was set from a previous shutdown
     shutdown_event.clear()
     tts_worker_thread = threading.Thread(target=tts_worker, args=(engine,), daemon=True)