support XML tools which work better for Google

Author: SamSaffron

app/models/llm_model.rb

@@ -27,6 +27,9 @@ def self.provider_params
       open_ai: {
         organization: :text,
       },
+      google: {
+        disable_native_tools: :checkbox,
+      },
       hugging_face: {
         disable_system_prompt: :checkbox,
       },

lib/completions/dialects/gemini.rb

@@ -11,7 +11,7 @@ def can_translate?(model_provider)
         end
 
         def native_tool_support?
-          true
+          !llm_model.lookup_custom_param("disable_native_tools")
         end
 
         def translate
@@ -84,10 +84,16 @@ def beta_api?
         end
 
         def system_msg(msg)
+          content = msg[:content]
+
+          if !native_tool_support? && tools_dialect.instructions.present?
+            content = content.to_s + "\n\n#{tools_dialect.instructions}"
+          end
+
           if beta_api?
-            { role: "system", content: msg[:content] }
+            { role: "system", content: content }
           else
-            { role: "user", parts: { text: msg[:content] } }
+            { role: "user", parts: { text: content } }
           end
         end
 
@@ -125,35 +131,43 @@ def uploaded_parts(message)
         end
 
         def tool_call_msg(msg)
-          call_details = JSON.parse(msg[:content], symbolize_names: true)
-          part = {
-            functionCall: {
-              name: msg[:name] || call_details[:name],
-              args: call_details[:arguments],
-            },
-          }
+          if native_tool_support?
+            call_details = JSON.parse(msg[:content], symbolize_names: true)
+            part = {
+              functionCall: {
+                name: msg[:name] || call_details[:name],
+                args: call_details[:arguments],
+              },
+            }
 
-          if beta_api?
-            { role: "model", parts: [part] }
+            if beta_api?
+              { role: "model", parts: [part] }
+            else
+              { role: "model", parts: part }
+            end
           else
-            { role: "model", parts: part }
+            super
           end
         end
 
         def tool_msg(msg)
-          part = {
-            functionResponse: {
-              name: msg[:name] || msg[:id],
-              response: {
-                content: msg[:content],
+          if native_tool_support?
+            part = {
+              functionResponse: {
+                name: msg[:name] || msg[:id],
+                response: {
+                  content: msg[:content],
+                },
               },
-            },
-          }
+            }
 
-          if beta_api?
-            { role: "function", parts: [part] }
+            if beta_api?
+              { role: "function", parts: [part] }
+            else
+              { role: "function", parts: part }
+            end
           else
-            { role: "function", parts: part }
+            super
           end
         end
       end

lib/completions/endpoints/gemini.rb

@@ -58,7 +58,9 @@ def model_uri
         end
 
         def prepare_payload(prompt, model_params, dialect)
-          tools = dialect.tools
+          @native_tool_support = dialect.native_tool_support?
+
+          tools = dialect.tools if @native_tool_support
 
           payload = default_options.merge(contents: prompt[:messages])
           payload[:systemInstruction] = {
@@ -222,7 +224,7 @@ def extract_prompt_for_tokenizer(prompt)
         end
 
         def xml_tools_enabled?
-          false
+          !@native_tool_support
         end
       end
     end