Skip to content

server : add missing return after validation errors in /infill endpoint #22146

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

Open
JoongHyuk-Shin wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −0
Open

server : add missing return after validation errors in /infill endpoint #22146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions tools/server/server-context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3710,14 +3710,17 @@ void server_routes::init_routes() {
if (data.contains("prompt") && !data.at("prompt").is_string()) {
// prompt is optional
res->error(format_error_response("\"prompt\" must be a string", ERROR_TYPE_INVALID_REQUEST));
return res;
}

if (!data.contains("input_prefix")) {
res->error(format_error_response("\"input_prefix\" is required", ERROR_TYPE_INVALID_REQUEST));
return res;
}

if (!data.contains("input_suffix")) {
res->error(format_error_response("\"input_suffix\" is required", ERROR_TYPE_INVALID_REQUEST));
return res;
}

if (data.contains("input_extra") && !data.at("input_extra").is_array()) {
Expand Down
13 changes: 13 additions & 0 deletions tools/server/tests/unit/test_infill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,19 @@ def test_invalid_input_extra_req(input_extra):
assert "error" in res.body


@pytest.mark.parametrize("data,expected_msg", [
({"input_suffix": "}\n"}, "input_prefix"),
({"input_prefix": "#include <cstdio>\n"}, "input_suffix"),
({"prompt": 123, "input_prefix": "a", "input_suffix": "b"}, "prompt"),
])
def test_infill_missing_required_field(data, expected_msg):
global server
server.start()
res = server.make_request("POST", "/infill", data=data)
assert res.status_code == 400
assert expected_msg in res.body["error"]["message"]


@pytest.mark.skipif(not is_slow_test_allowed(), reason="skipping slow test")
def test_with_qwen_model():
global server
Expand Down