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.

Sign up for GitHub

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

Jump to bottom

server : add loading html page while model is loading #9468

Merged
merged 19 commits into from
Sep 13, 2024
Merged

server : add loading html page while model is loading #9468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dfe31e0
Adding loading page for '/' server requests
VJHack Sep 10, 2024
dab4b49
set content when model is loading
VJHack Sep 11, 2024
19bc863
removed loading html file
VJHack Sep 11, 2024
125737a
updated cmakelist
VJHack Sep 11, 2024
3dd73ca
updated makefile
VJHack Sep 11, 2024
1ff1aa7
cleaned up whitespace
VJHack Sep 11, 2024
9d3424a
cleanup for PR removed error
VJHack Sep 11, 2024
5ca179c
updated server test to handle 503 HTML
VJHack Sep 12, 2024
161bf22
updated server test to handle 503 HTML
VJHack Sep 12, 2024
8b7daaa
ca†ch 503 before parsing json
VJHack Sep 13, 2024
daf64fc
revert test
VJHack Sep 13, 2024
cb13382
account for both api and web browser requests
VJHack Sep 13, 2024
42abdd0
precommit corrections
VJHack Sep 13, 2024
69c97bb
Merge branch 'ggerganov:master' into master
VJHack Sep 13, 2024
cd80fce
eol fix
VJHack Sep 13, 2024
e51eb59
revert changes to pre-commit
VJHack Sep 13, 2024
df9f167
removed print statement
VJHack Sep 13, 2024
739ea75
made loading message more descriptive
VJHack Sep 13, 2024
a7feae7
also support .html files
ngxson Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,6 +1440,7 @@ llama-server: \
examples/server/system-prompts.js.hpp \
examples/server/prompt-formats.js.hpp \
examples/server/json-schema-to-grammar.mjs.hpp \
examples/server/loading.html.hpp \
common/json.hpp \
common/stb_image.h \
$(OBJ_ALL)
Expand Down
1 change: 1 addition & 0 deletions examples/server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ set(PUBLIC_ASSETS
system-prompts.js
prompt-formats.js
json-schema-to-grammar.mjs
loading.html
)

foreach(asset ${PUBLIC_ASSETS})
Expand Down
12 changes: 12 additions & 0 deletions examples/server/public/loading.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="refresh" content="5">
</head>
<body>
<div id="loading">
The model is loading. Please wait.<br/>
The user interface will appear soon.
</div>
</body>
</html>
11 changes: 9 additions & 2 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "system-prompts.js.hpp"
#include "prompt-formats.js.hpp"
#include "json-schema-to-grammar.mjs.hpp"
#include "loading.html.hpp"

#include <atomic>
#include <chrono>
Expand Down Expand Up @@ -2592,10 +2593,16 @@ int main(int argc, char ** argv) {
return false;
};

auto middleware_server_state = [&res_error, &state](const httplib::Request &, httplib::Response & res) {
auto middleware_server_state = [&res_error, &state](const httplib::Request & req, httplib::Response & res) {
server_state current_state = state.load();
if (current_state == SERVER_STATE_LOADING_MODEL) {
res_error(res, format_error_response("Loading model", ERROR_TYPE_UNAVAILABLE));
auto tmp = string_split(req.path, '.');
if (req.path == "/" || tmp.back() == "html") {
res.set_content(reinterpret_cast<const char*>(loading_html), loading_html_len, "text/html; charset=utf-8");
res.status = 503;
} else {
res_error(res, format_error_response("Loading model", ERROR_TYPE_UNAVAILABLE));
}
return false;
}
return true;
Expand Down
Loading