Stop caching root url #7374
Merged
Stop caching root url #7374
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🪼 branch checks and previews
Install Gradio from this PR pip install https://gradio-builds.s3.amazonaws.com/fbfc2ba0f49759a92c639a6ba10ddf9b7c33b648/gradio-4.17.0-py3-none-any.whlInstall Gradio Python Client from this PR pip install "gradio-client @ git+https://github.com/gradio-app/gradio@fbfc2ba0f49759a92c639a6ba10ddf9b7c33b648#subdirectory=client/python" |
🦄 change detectedThis Pull Request includes changes to the following packages.
With the following changelog entry.
Maintainers or the PR author can modify the PR title to modify this entry.
|
abidlabs
requested review from
aliabid94,
aliabd,
dawoodkhan82,
pngwn,
hannahblair and
freddyaboulton
|
Actually wait I think the cached examples are off |
|
Should be ready now! |
abidlabs
commented
Feb 9, 2024
| @@ -571,8 +570,8 @@ async def predict( | |||
| content={"error": str(error) if show_error else None}, | |||
| status_code=500, | |||
| ) | |||
| root_path = app.get_blocks().config.get("root", "") | |||
| output = add_root_url(output, route_utils.strip_url(root_path)) | |||
| root_path = route_utils.get_root_url(request)[: -len(f"/api/{api_name}")] | |||
There was a problem hiding this comment.
Annoying to do this manually, but if you use e.g. request.url.path, it also includes the root url if gradio is mounted within another fastapi app, which we don't want. So I think the most reliable solution is to just remove the suffix manually.
freddyaboulton
approved these changes
Feb 9, 2024
There was a problem hiding this comment.
Looks good to me! Thanks @abidlabs ! Tested several demos and the root was properly set in all of them.
|
Thanks so much for the review @freddyaboulton! |
Merged
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #7372
The issue was that we were caching the "root_url" the first time the Gradio app was launched. I did this to speed things up, but the problem is that the same Gradio app can be launched on different URLs. For example, when you create a share link, you also might launch the Gradio app locally first (which would set the root_url to "localhost:7860") and then when you open the share link, the "root_url" will remain localhost:7860.
Now, we no longer cache the root url. I profiled this change and it adds pretty negligible latency for most demos (e.g.
2 msforkitchen_sink). Does add more latency for very complex apps (150 msfor thetheme_builder) so maybe we should think of a better solution long-term (when we work on reducing the launch time).Also properly handles https & does some minor cleanup of this code.
You can confirm this works by visiting e.g. https://gradio-pr-deploys-pr-7374-all-demos.hf.space/demo/altair_plot/config and checking the "root" propery. Or to test locally, launch a Gradio demo with
share=Trueand visit the/configroute and confirm that the "root" property is what you expect.