server: support reverse proxy setup with custom route#6325
Merged
phymbert merged 1 commit intoggml-org:masterfrom Mar 27, 2024
Merged
server: support reverse proxy setup with custom route#6325phymbert merged 1 commit intoggml-org:masterfrom
phymbert merged 1 commit intoggml-org:masterfrom
Conversation
server: public: support custom `api_url`, default to relative base path
Collaborator
|
Thanks for looking into this. This will work but this is annoying we need to rebuild cpp static files in binary format each time, unable to identify changes you have done there, so I cannot approve alone. |
ngxson
approved these changes
Mar 26, 2024
Contributor
|
LGTM, let's wait to see if the CI pass then we can merge. |
Contributor
Author
|
These failed tests don't make sense; I don't think a UI code change could cause the Metal backend to fail or make a Nix build last for 6 hours. |
Collaborator
Yes, we are facing a lack of resources on the macOS github runners randomly. |
hodlen
pushed a commit
to hodlen/llama.cpp
that referenced
this pull request
Apr 3, 2024
server: public: support custom `api_url`, default to relative base path
4 tasks
This file contains hidden or 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
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.
As of b2536, the server's builtin UI uses absolute routes for API and static files, which works fine, but will break if the server is behind a reverse proxy (e.g. nginx) under custom route.
This PR modifies UI code to use relative routes instead. API URL is also made configurable in
chat.js, allowing it to be used independently.