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

Trigger WSClient Disconnect When WS Connection Closed #480

Merged

Conversation

dvonthenen
Copy link
Contributor

@dvonthenen dvonthenen commented Nov 4, 2024

Proposed changes

Addresses: #477

Should close websocket when server forces disconnect (when not using keepalive and not sending audio).

Types of changes

What types of changes does your code introduce to the community Python SDK?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update or tests (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING doc
  • I have lint'ed all of my code using repo standards
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Further comments

NA

Summary by CodeRabbit

  • New Features
    • Introduced a new method for handling graceful WebSocket connection closures.
  • Bug Fixes
    • Enhanced error handling for WebSocket connection closures, ensuring consistent exit signaling.
  • Refactor
    • Improved control flow and logging mechanisms related to connection closure processes.

Copy link
Contributor

coderabbitai bot commented Nov 4, 2024

Walkthrough

The changes involve modifications to the AbstractAsyncWebSocketClient and AbstractSyncWebSocketClient classes in their respective files. A new method, _signal_exit, is introduced to handle WebSocket connection closures and manage the exit of listening threads. The _listening method in both classes is updated to call _signal_exit upon encountering specific connection closure exceptions. Additionally, the finish method in the async client is adjusted to always return True after handling a CancelledError, streamlining its return logic.

Changes

File Path Change Summary
deepgram/clients/common/v1/abstract_async_websocket.py Added _signal_exit method for handling WebSocket closure; updated _listening to call _signal_exit on connection closure exceptions; modified finish to always return True after handling CancelledError.
deepgram/clients/common/v1/abstract_sync_websocket.py Enhanced _listening method to call _signal_exit on ConnectionClosedOK and ConnectionClosed exceptions for improved error handling during connection closures.

Sequence Diagram(s)

sequenceDiagram
    participant Client as WebSocket Client
    participant Server as WebSocket Server
    participant Exit as Exit Handler

    Client->>Server: Establish Connection
    Client->>Client: Start Listening
    alt Connection Closed
        Client->>Exit: _signal_exit()
        Exit->>Server: Close Connection
        Exit->>Client: Cleanup Resources
    end
Loading

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 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.

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

🧹 Outside diff range and nitpick comments (1)
deepgram/clients/common/v1/abstract_sync_websocket.py (1)

268-270: LGTM: Proper cleanup for specific close codes

The addition of _signal_exit() for close codes 1000 (normal closure) and 1001 (going away) ensures proper cleanup in these specific scenarios. This is consistent with the ConnectionClosedOK handling and properly addresses the case where the connection is hanging on recv().

Consider enhancing the code comments to document the meaning of these specific close codes:

             if e.code in [1000, 1001]:
+                # 1000: Normal closure, meaning the purpose for which the connection was established has been fulfilled
+                # 1001: Going away, meaning the server is going down or the client is navigating away
                 # signal exit and close
                 self._signal_exit()
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between a840467 and 25fa3bd.

📒 Files selected for processing (2)
  • deepgram/clients/common/v1/abstract_async_websocket.py (2 hunks)
  • deepgram/clients/common/v1/abstract_sync_websocket.py (1 hunks)
🔇 Additional comments (4)
deepgram/clients/common/v1/abstract_sync_websocket.py (1)

259-261: LGTM: Proper cleanup on normal connection closure

The addition of _signal_exit() ensures proper cleanup of resources when the WebSocket connection is closed normally. This change aligns with the PR objective and follows consistent error handling patterns.

deepgram/clients/common/v1/abstract_async_websocket.py (3)

257-259: Properly signaling exit on ConnectionClosedOK exceptions

Adding await self._signal_exit() in the ConnectionClosedOK exception handler ensures that the WebSocket client gracefully handles normal closure events by signaling the exit and cleaning up resources appropriately.


266-268: Graceful shutdown on ConnectionClosed exceptions with codes 1000 and 1001

Including await self._signal_exit() when handling ConnectionClosed exceptions with codes 1000 and 1001 ensures that the client exits gracefully during expected disconnections, releasing resources as intended.


475-475: Consistent return value in finish method after handling CancelledError

Returning True after handling asyncio.CancelledError provides a consistent success indicator from the finish method, even when tasks are cancelled, aligning with the method's purpose.

@dvonthenen dvonthenen merged commit aff6110 into deepgram:main Nov 4, 2024
5 checks passed
@dvonthenen dvonthenen deleted the close-socket-on-server-termination branch November 4, 2024 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants