vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix compiler warning about parens

Browse source
This commit is contained in:
Olivier Chafik 2025-02-05 13:05:27 +00:00
parent f3e9f8b62a
commit 3841a163ef
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
common/chat.cpp
View file

@ -279,18 +279,17 @@ static common_chat_params common_chat_params_init_generic(const common_chat_temp
/*
This kind of turns any model into a thinking model by requiring the output to be (in TypeScript notation):
// ResponseSchema is json_schema if set, otherwisestring
// ResponseSchema is json_schema if set, otherwise string
Schema = ({thoughts: string} & ToolCallSchema) | {thoughts: string, response: ResponseSchema}
SchemaToolRequired = {thoughts: string} & ToolCallSchema
type SchemaToolRequired = {thoughts: string} & ToolCallSchema
type Schema = ({thoughts: string} & ToolCallSchema) | {thoughts: string, response: ResponseSchema}
type ToolCallSchema = SingleToolCallSchema | ParallelToolCallSchema
type SingleToolCallSchema = {tool_call: ToolCall}
type ParallelToolCallSchema = {tool_calls: ToolCall[]} // If parallel_tool_calls is true
ToolCallSchema = SingleToolCallSchema | ParallelToolCallSchema
SingleToolCallSchema = {tool_call: ToolCall}
ParallelToolCallSchema = {tool_calls: ToolCall[]} // If parallel_tool_calls is true
ToolCall = {name: string, arguments: ParametersSchema, id?: string} // id only if parallel_tool_calls is true
ParametersSchema = tool1_params | tool2_params | ...
type ToolCall = {name: string, arguments: ParametersSchema, id?: string} // id only if parallel_tool_calls is true
type ParametersSchema = tool1_params | tool2_params | ...
*/
// TODO(ochafik): make the prompts configurable (jinja template?).
@ -1041,7 +1040,7 @@ common_chat_params common_chat_params_init(const common_chat_template & tmpl, co
// Use generic handler when forcing thoughts or JSON schema for final output
// TODO: support thinking mode and/or JSON schema in handlers below this.
if (inputs.think || !inputs.tools.is_null() && inputs.json_schema.is_object()) {
if (inputs.think || (!inputs.tools.is_null() && inputs.json_schema.is_object())) {
return common_chat_params_init_generic(tmpl, inputs);
}