Public/koboldcpp
1
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-09-19 01:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream' into concedo_experimental

Browse Source 
# Conflicts:
#	.github/actions/ccache-clear/action.yml
#	.github/workflows/build-apple.yml
#	.github/workflows/build-cpu.yml
#	.github/workflows/build-cuda-ubuntu.yml
#	.github/workflows/build-opencl.yml
#	.github/workflows/build-openvino.yml
#	.github/workflows/build-sycl.yml
#	.github/workflows/build-vulkan.yml
#	.github/workflows/build-wasm.yml
#	.github/workflows/build-webgpu.yml
#	.github/workflows/hip-quality-check.yml
#	.github/workflows/server.yml
#	CONTRIBUTING.md
#	README.md
#	ci/run.sh
#	common/CMakeLists.txt
#	common/chat.cpp
#	docs/autoparser.md
#	ggml/src/ggml-webgpu/wgsl-shaders/flash_attn.wgsl
#	ggml/src/ggml-webgpu/wgsl-shaders/flash_attn_tile.wgsl
#	ggml/src/ggml-webgpu/wgsl-shaders/flash_attn_vec_split.wgsl
#	scripts/sync_vendor.py
#	tests/CMakeLists.txt
#	tests/peg-parser/test-json-serialization.cpp
#	tests/peg-parser/tests.h
#	tests/test-chat-auto-parser.cpp
#	tests/test-chat-peg-parser.cpp
#	tests/test-chat-template.cpp
#	tests/test-chat.cpp
#	tests/test-grammar-integration.cpp
#	tests/test-jinja.cpp
#	tests/test-json-schema-to-grammar.cpp
#	tests/test-llama-archs.cpp
#	tests/test-model-resolution.cpp
#	tests/test-recurrent-state-rollback.cpp
#	tools/CMakeLists.txt
This commit is contained in:
Concedo
2026-08-25 20:44:34 +08:00
parent 3265983620 7584430716
commit 4447017602
124 changed files with 3564 additions and 1659 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpttype_adapter.cpp
+3 -3
View File
@@ -5107,7 +5107,7 @@ std::string gpttype_parse_chat_tool_calls(const std::string & generated_text,
return "";
}
json tools = json::parse(tools_json);
common_json tools = common_json::parse(tools_json);
if(!tools.is_array() || tools.empty())
{
return "";
@@ -5135,7 +5135,7 @@ std::string gpttype_parse_chat_tool_calls(const std::string & generated_text,
if(!chat_template_kwargs_json.empty())
{
json kwargs = json::parse(chat_template_kwargs_json);
common_json kwargs = common_json::parse(chat_template_kwargs_json);
if(kwargs.is_object())
{
for(const auto & item : kwargs.items())
@@ -5181,7 +5181,7 @@ std::string gpttype_parse_chat_tool_calls(const std::string & generated_text,
return "";
}
json tool_calls = parsed.to_json_oaicompat().value("tool_calls", json::array());
common_json tool_calls = parsed.to_json_oaicompat().value("tool_calls", common_json::array());
return tool_calls.dump();
}
catch(const std::exception & e)