Merge commit '451ef08432d1f7d3d6071d4006cbbeda21dcfbec' into concedo_experimental

# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	docs/ops.md
#	docs/ops/Vulkan.csv
#	src/llama-model-loader.cpp
#	src/llama-model.cpp
#	src/llama.cpp
#	tests/CMakeLists.txt
#	tests/peg-parser/test-basic.cpp
#	tests/peg-parser/test-json-parser.cpp
#	tests/peg-parser/test-python-dict-parser.cpp
#	tests/peg-parser/test-unicode.cpp
#	tests/test-chat-auto-parser.cpp
#	tests/test-chat-peg-parser.cpp
#	tests/test-chat.cpp
#	tools/CMakeLists.txt
This commit is contained in:
Concedo
2026-03-13 23:33:37 +08:00
36 changed files with 1001 additions and 725 deletions
+2 -2
View File
@@ -827,7 +827,7 @@ json server_task_result_cmpl_final::to_json_oaicompat_chat_stream() {
{"choices", json::array({
json {
{"finish_reason", nullptr},
{"index", 0},
{"index", index},
{"delta", common_chat_msg_diff_to_json_oaicompat(diff)},
},
})},
@@ -843,7 +843,7 @@ json server_task_result_cmpl_final::to_json_oaicompat_chat_stream() {
{"choices", json::array({
json {
{"finish_reason", finish_reason},
{"index", 0},
{"index", index},
{"delta", json::object()},
},
})},