Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: streaming TTS in non pulseaudio systems #298

Merged
merged 4 commits into from
Jan 30, 2025
Merged

Conversation

JarbasAl
Copy link
Member

@JarbasAl JarbasAl commented Jan 29, 2025

replaces #238

Summary by CodeRabbit

Summary by CodeRabbit

  • New Features

    • Enhanced audio playback mechanism with dynamic audio player selection
    • Improved system compatibility for text-to-speech streaming
  • Bug Fixes

    • Resolved potential audio player configuration issues
    • Added fallback detection for audio playback methods
  • Documentation

    • Updated docstrings for consistency in method descriptions

Copy link
Contributor

coderabbitai bot commented Jan 29, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

The changes focus on enhancing the audio playback mechanism in the StreamingTTSCallbacks class. The constructor now dynamically determines the appropriate audio player based on the available audio servers on the system. If no specific play arguments are provided, it checks for suitable players like ffplay, paplay, or aplay, raising a RuntimeError if none are found. Additionally, minor adjustments were made to the docstrings and the handling of the message variable in the stream_start and stream_stop methods.

Changes

File Change Summary
ovos_plugin_manager/templates/tts.py - Updated StreamingTTSCallbacks constructor to dynamically select audio players
- Added logic to check for available audio players (ffplay, paplay, aplay)
- Simplified handling of message variable in stream_start and stream_stop methods
- Minor docstring capitalization adjustments

Possibly related PRs

Suggested reviewers

  • goldyfruit
  • j1nx

Poem

🐰 Hop, hop, audio play!
Detecting players with glee today
PipeWire, PulseAudio, FFmpeg in sight
Dynamic selection, our rabbit's delight!
Streaming sounds, no errors in way 🎵


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ec7dd1e and e157e60.

📒 Files selected for processing (1)
  • ovos_plugin_manager/templates/tts.py (5 hunks)
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added fix and removed fix labels Jan 29, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (1)
ovos_plugin_manager/templates/tts.py (1)

1122-1131: Excellent architectural improvements for audio system compatibility.

The changes successfully address the PR objective by:

  1. Adding support for multiple audio servers (PipeWire, PulseAudio, FFmpeg)
  2. Implementing graceful fallbacks
  3. Providing clear error messaging when no suitable player is found

This makes the TTS system more robust and flexible, especially in environments without PulseAudio.

Also applies to: 1141-1141, 1154-1157, 1168-1168

🧰 Tools
🪛 Ruff (0.8.2)

1124-1124: Undefined name shutil

(F821)


1124-1124: Undefined name shutil

(F821)


1124-1124: Undefined name shutil

(F821)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 087da0e and 7ab2d59.

📒 Files selected for processing (1)
  • ovos_plugin_manager/templates/tts.py (4 hunks)
🧰 Additional context used
🪛 Ruff (0.8.2)
ovos_plugin_manager/templates/tts.py

1124-1124: Undefined name shutil

(F821)


1124-1124: Undefined name shutil

(F821)


1124-1124: Undefined name shutil

(F821)

⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: unit_tests (3.11)
  • GitHub Check: unit_tests (3.10)
🔇 Additional comments (2)
ovos_plugin_manager/templates/tts.py (2)

1141-1141: LGTM! Improved message handling readability.

The message handling has been simplified while maintaining the same functionality.

Also applies to: 1168-1168


1154-1157: LGTM! Clear and efficient chunk streaming implementation.

The method correctly handles streaming audio chunks with appropriate debug logging.

ovos_plugin_manager/templates/tts.py Outdated Show resolved Hide resolved
@github-actions github-actions bot added fix and removed fix labels Jan 29, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
ovos_plugin_manager/templates/tts.py (1)

1123-1134: LGTM! Dynamic player selection improves compatibility.

The implementation intelligently selects an appropriate audio player based on the system's available audio servers. The order of preference (ffplay → pw-play → paplay → aplay) is sensible, with ffplay being the preferred choice as it's the most versatile player.

Consider adding a debug log to show which player was selected:

             if not player:
                 raise RuntimeError("No audio player found (please install 'ffmpeg', 'pulseaudio-utils' or 'alsa-utils').")
+            LOG.debug(f"Selected audio player: {player}")
             self.play_args = [player]
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 94fcc6b and ec7dd1e.

📒 Files selected for processing (1)
  • ovos_plugin_manager/templates/tts.py (5 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: unit_tests (3.11)
🔇 Additional comments (5)
ovos_plugin_manager/templates/tts.py (5)

8-8: LGTM! Import added for shutil module.

The shutil module is correctly imported for the which function used in player detection.


1144-1144: LGTM! Message handling simplified.

The message handling is simplified while maintaining the same functionality with a sensible default.


1157-1160: LGTM! Improved logging for stream chunks.

The log message now includes helpful information (class name and chunk size) for debugging streaming issues.


1171-1171: LGTM! Message handling simplified.

The message handling is simplified while maintaining the same functionality with a sensible default.


1123-1134: Verify audio player selection in the codebase.

Let's verify that the audio player selection is used consistently across the codebase.

✅ Verification successful

Audio player selection is correctly implemented

The dynamic audio player selection is properly isolated in the TTS template and doesn't conflict with the rest of the audio system, which uses higher-level abstractions (OCP, MPRIS, Audio Service). No other parts of the codebase directly use these command-line players.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any hardcoded audio player references that might need updating.

# Search for hardcoded player references
echo "Searching for hardcoded player references..."
rg -i "paplay|aplay|ffplay|pw-play" --type py

# Search for potential audio playback implementations
echo "Searching for potential audio playback implementations..."
ast-grep --pattern 'class $name implements StreamingTTSCallbacks {
  $$$
}'

Length of output: 795


Script:

#!/bin/bash
# Search for audio playback related code
echo "Searching for audio playback methods..."
rg -i "play.*audio|audio.*play" --type py -A 2

echo "Searching for subprocess calls that might be related to audio..."
ast-grep --pattern 'subprocess.$_([$$$])'

Length of output: 10379

@JarbasAl JarbasAl merged commit 8ec6604 into dev Jan 30, 2025
7 of 8 checks passed
@JarbasAl JarbasAl deleted the fix_streaming_tts branch January 30, 2025 01:25
@github-actions github-actions bot added fix and removed fix labels Jan 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant