cleaner chain breaker for last tool call (works in thinking)

remove unused code

Author: SamSaffron

lib/completions/dialects/dialect.rb

@@ -46,10 +46,6 @@ def initialize(generic_prompt, llm_model, opts: {})
 
         VALID_ID_REGEX = /\A[a-zA-Z0-9_]+\z/
 
-        def can_end_with_assistant_msg?
-          false
-        end
-
         def native_tool_support?
           false
         end
@@ -71,34 +67,51 @@ def self.no_more_tool_calls_text
           "I WILL NOT USE TOOLS IN THIS REPLY, user expressed they wanted to stop using tool calls.\nHere is the best, complete, answer I can come up with given the information I have."
         end
 
+        def self.no_more_tool_calls_text_user
+          "DO NOT USE TOOLS IN YOUR REPLY. Return the best answer you can given the information I supplied you."
+        end
+
         def no_more_tool_calls_text
           self.class.no_more_tool_calls_text
         end
 
+        def no_more_tool_calls_text_user
+          self.class.no_more_tool_calls_text_user
+        end
+
         def translate
-          messages = prompt.messages
+          messages = trim_messages(prompt.messages)
+          last_message = messages.last
+          inject_done_on_last_tool_call = false
 
-          # Some models use an assistant msg to improve long-context responses.
-          if messages.last[:type] == :model && can_end_with_assistant_msg?
-            messages = messages.dup
-            messages.pop
+          if !native_tool_support? && last_message && last_message[:type].to_sym == :tool &&
+               prompt.tool_choice == :none
+            inject_done_on_last_tool_call = true
           end
 
-          translated = trim_messages(messages).map { |msg| send("#{msg[:type]}_msg", msg) }.compact
-
-          if !native_tool_support?
-            if prompt.tools.present? && prompt.tool_choice.present?
-              if prompt.tool_choice == :none
-                translated << model_msg(role: "assistant", content: no_more_tool_calls_text)
-              else
-                translated << model_msg(
-                  role: "assistant",
-                  content:
-                    "User required I call the tool: #{prompt.tool_choice} I will make sure I use it now:",
-                )
+          translated =
+            messages
+              .map do |msg|
+                case msg[:type].to_sym
+                when :system
+                  system_msg(msg)
+                when :user
+                  user_msg(msg)
+                when :model
+                  model_msg(msg)
+                when :tool
+                  if inject_done_on_last_tool_call && msg == last_message
+                    tools_dialect.inject_done { tool_msg(msg) }
+                  else
+                    tool_msg(msg)
+                  end
+                when :tool_call
+                  tool_call_msg(msg)
+                else
+                  raise ArgumentError, "Unknown message type: #{msg[:type]}"
+                end
               end
-            end
-          end
+              .compact
 
           translated
         end

lib/completions/dialects/xml_tools.rb

@@ -55,7 +55,7 @@ def instructions
         end
 
         def from_raw_tool(raw_message)
-          (<<~TEXT).strip
+          result = (<<~TEXT).strip
             <function_results>
             <result>
             <tool_name>#{raw_message[:name] || raw_message[:id]}</tool_name>
@@ -65,6 +65,13 @@ def from_raw_tool(raw_message)
             </result>
             </function_results>
           TEXT
+
+          if @injecting_done
+            result +
+              "\n\nRegardless of what you think, REPLY IMMEDIATELY, WITHOUT MAKING ANY FURTHER TOOL CALLS, YOU ARE OUT OF TOOL CALL QUOTA!"
+          else
+            result
+          end
         end
 
         def from_raw_tool_call(raw_message)
@@ -86,6 +93,13 @@ def from_raw_tool_call(raw_message)
           TEXT
         end
 
+        def inject_done(&blk)
+          @injecting_done = true
+          blk.call
+        ensure
+          @injecting_done = false
+        end
+
         private
 
         attr_reader :raw_tools