diff --git a/backend/backend.proto b/backend/backend.proto index 8e4224789b6e..d8a0cd9fccce 100644 --- a/backend/backend.proto +++ b/backend/backend.proto @@ -472,7 +472,7 @@ message ToolFormatMarkers { string id_field = 16; // e.g., "id" bool fun_name_is_key = 17; bool tools_array_wrapped = 18; - bool uses_python_dicts = 19; + reserved 19; // Reasoning markers string reasoning_start = 20; // e.g., "" diff --git a/backend/cpp/llama-cpp/Makefile b/backend/cpp/llama-cpp/Makefile index 99346c43d9c1..1a03bc66d10d 100644 --- a/backend/cpp/llama-cpp/Makefile +++ b/backend/cpp/llama-cpp/Makefile @@ -1,5 +1,5 @@ -LLAMA_VERSION?=5744d7ec430e2f875a393770195fda530560773f +LLAMA_VERSION?=a0bbcdd9b6b83eeeda6f1216088f42c33d464e38 LLAMA_REPO?=https://github.com/ggerganov/llama.cpp CMAKE_ARGS?= diff --git a/backend/cpp/llama-cpp/grpc-server.cpp b/backend/cpp/llama-cpp/grpc-server.cpp index 5b86ca24b27f..67b5632af7d6 100644 --- a/backend/cpp/llama-cpp/grpc-server.cpp +++ b/backend/cpp/llama-cpp/grpc-server.cpp @@ -2687,7 +2687,6 @@ class BackendServiceImpl final : public backend::Backend::Service { tf->set_id_field(ap.tools.format.id_field); tf->set_fun_name_is_key(ap.tools.format.fun_name_is_key); tf->set_tools_array_wrapped(ap.tools.format.tools_array_wrapped); - tf->set_uses_python_dicts(ap.tools.format.uses_python_dicts); tf->set_function_field(ap.tools.format.function_field); tf->set_gen_id_field(ap.tools.format.gen_id_field); diff --git a/core/config/gguf.go b/core/config/gguf.go index fa4b2bc9476b..ae95d4a13c3f 100644 --- a/core/config/gguf.go +++ b/core/config/gguf.go @@ -143,7 +143,6 @@ func DetectThinkingSupportFromBackend(ctx context.Context, cfg *ModelConfig, bac IDField: tf.IdField, FunNameIsKey: tf.FunNameIsKey, ToolsArrayWrapped: tf.ToolsArrayWrapped, - UsesPythonDicts: tf.UsesPythonDicts, FunctionField: tf.FunctionField, ParameterOrder: tf.ParameterOrder, GenIDField: tf.GenIdField, diff --git a/pkg/functions/parse.go b/pkg/functions/parse.go index 403ec790aa17..2076be3cde74 100644 --- a/pkg/functions/parse.go +++ b/pkg/functions/parse.go @@ -149,7 +149,6 @@ type ToolFormatMarkers struct { IDField string FunNameIsKey bool ToolsArrayWrapped bool - UsesPythonDicts bool FunctionField string ParameterOrder []string