Skip to content

server: use relative routes for static files in new UI#8552

Merged
ngxson merged 2 commits intoggml-org:masterfrom
EZForever:server-new-relurl
Jul 18, 2024
Merged

server: use relative routes for static files in new UI#8552
ngxson merged 2 commits intoggml-org:masterfrom
EZForever:server-new-relurl

Conversation

@EZForever
Copy link
Copy Markdown
Contributor

This is essentially #6325 but for the new UI (index-new.html); not much to explain.

For non-index pages (new UI being the case), both document.baseURI and location.pathname would contain the file name, thus the current way of setting api_url would produce wrong results. This issue is also fixed.

@ggerganov ggerganov requested a review from ngxson July 18, 2024 06:35
@ngxson ngxson merged commit 0d2c732 into ggml-org:master Jul 18, 2024
@ScarletEmerald
Copy link
Copy Markdown

This seems to break both the old and new web UI in Firefox on Linux (see #8631) . Clicking Start or Send in the UI does not cause inferencing to begin. The web UI continues to work in Chromium on Linux.

@EZForever
Copy link
Copy Markdown
Contributor Author

@ScarletEmerald I'm not familiar with the difference between Firefox and Chromium... Are there any network log or console output showing the failed request in Firefox?

@ScarletEmerald
Copy link
Copy Markdown

ScarletEmerald commented Jul 23, 2024

I can confirm this is fixed by #8646 :)

arthw pushed a commit to arthw/llama.cpp that referenced this pull request Jul 27, 2024
* server: public: fix api_url on non-index pages

* server: public: use relative routes for static files in new UI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants