Apply proper solution to function name detection from ggml-org#19785; fix Apertus template to require proper OpenAI compatible paths to tools

Author: pwilkin

common/jinja/caps.cpp

@@ -224,7 +224,7 @@ caps caps_get(jinja::program & prog) {
                 },
             });
         },
-        [&](bool success, value & messages, value & tools, const std::string & res) {
+        [&](bool success, value & messages, value & tools, const std::string &/*res*/) {
             if (!success) {
                 result.supports_tool_calls = false;
                 result.supports_tools = false;
@@ -235,9 +235,7 @@ caps caps_get(jinja::program & prog) {
             caps_print_stats(tool_name, "tools[0].function.name");
             caps_print_stats(tools, "tools");
             if (!tool_name->stats.used) {
-                if (!tools->stats.used && res.find(tool_name->as_string().str()) == std::string::npos) {
-                    result.supports_tools = false;
-                }
+                result.supports_tools = false;
             }
 
             auto & tool_calls = messages->at(1)->at("tool_calls");;

models/templates/Apertus-8B-Instruct.jinja

@@ -97,20 +97,20 @@
 
 {%- macro render_tools(tools) -%}
     {%- for tool in tools %}
-        {{- "// " + tool.description + "\n" }}
-        {{- "type "+ tool.name + " = " }}
-        {%- if tool.parameters and tool.parameters.properties %}
+        {{- "// " + tool.function.description + "\n" }}
+        {{- "type "+ tool.function.name + " = " }}
+        {%- if tool.function.parameters and tool.function.parameters.properties %}
             {{- "(_: {\n" }}
-            {%- for param_name, param_spec in tool.parameters.properties.items() %}
+            {%- for param_name, param_spec in tool.function.parameters.properties.items() %}
                 {%- if param_spec.description %}
                     {{- "// " + param_spec.description + "\n" }}
                 {%- endif %}
                 {{- param_name }}
-                {%- if param_name not in (tool.parameters.required or []) -%}
+                {%- if param_name not in (tool.function.parameters.required or []) -%}
                     {{- "?" }}
                 {%- endif -%}
                 {{- ": " }}
-                {{- render_typescript_type(param_spec, tool.parameters.required or []) }}
+                {{- render_typescript_type(param_spec, tool.function.parameters.required or []) }}
                 {%- if param_spec.default is defined -%}
                     {%- if param_spec.enum %}
                         {{- ", // default: " + param_spec.default }}