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: handling SIGINT correctly in reload.py, single entrance of block_thread in blocks.py #8158

Merged
merged 3 commits into from May 2, 2024

Conversation

Tiger3018
Copy link
Contributor

Description

  • Handle SIGINT correctly in reload.py, to prevent gradio-cli exit when subprocess running
  • Make sure there is only a single entrance of block_thread in blocks.py

Closes: #8157

@gradio-pr-bot
Copy link
Contributor

gradio-pr-bot commented Apr 28, 2024

🪼 branch checks and previews

Name Status URL
Spaces ready! Spaces preview
Website ready! Website preview
🦄 Changes detecting...

Install Gradio from this PR

pip install https://gradio-builds.s3.amazonaws.com/b4df5fb40974197d5d41277e2627b559de7d6a77/gradio-4.28.3-py3-none-any.whl

Install Gradio Python Client from this PR

pip install "gradio-client @ git+https://github.com/gradio-app/gradio@b4df5fb40974197d5d41277e2627b559de7d6a77#subdirectory=client/python"

try:
popen.wait()
except (KeyboardInterrupt, OSError):
print("gradio-cli: Waiting gradio main thread cleaning.")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hi @Tiger3018 ! This contribution looks good to me but I don't think we need print statement here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In the original implementation, the typer module will print Aborted! (See this line in typer module) and silently exit. This PR will remove the Aborted! echo and I don't know if an alternative text should be there.

Maybe we should just follow the implementation of gradio module, and use pass in this line instead?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, pass is what I had in mind

Copy link
Collaborator

Choose a reason for hiding this comment

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

Pushed that up so we can merge this in. Thanks!

@freddyaboulton freddyaboulton enabled auto-merge (squash) May 2, 2024 17:48
@gradio-pr-bot
Copy link
Contributor

🦄 change detected

This Pull Request includes changes to the following packages.

Package Version
gradio patch
  • Maintainers can select this checkbox to manually select packages to update.

With the following changelog entry.

fix: handling SIGINT correctly in reload.py, single entrance of block_thread in blocks.py

Maintainers or the PR author can modify the PR title to modify this entry.

Something isn't right?

  • Maintainers can change the version label to modify the version bump.
  • If the bot has failed to detect any changes, or if this pull request needs to update multiple packages to different versions or requires a more comprehensive changelog entry, maintainers can update the changelog file directly.

@freddyaboulton freddyaboulton merged commit 5671ff1 into gradio-app:main May 2, 2024
7 checks passed
@pngwn pngwn mentioned this pull request May 3, 2024
dawoodkhan82 pushed a commit that referenced this pull request May 6, 2024
…_thread in blocks.py (#8158)

* fix: handling SIGINT, single block_thread and fix popen

* Use pass

---------

Co-authored-by: freddyaboulton <alfonsoboulton@gmail.com>
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.

gradio-cli accept SIGINT only once, leaving the subprocess running
3 participants