brute 6.1.3 → 6.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ecf8ae2bc514e6cb9cb6cefb1a06476ab68d13b459446ed0c398effcf334a86
-  data.tar.gz: 612dde127eee6f42a4aeb8f6c1fae039d74aaad8c9ed8481de22c0ec6b6cc2ce
+  metadata.gz: fe1e1cc4c5d064aba3ae09ac3cce887a9b116b7ebd52ccefedb6a1e8287050c2
+  data.tar.gz: af8a28e3643305f90f59eef3878e8ac1618ccad54b15cdafed63f33773d4d717
 SHA512:
-  metadata.gz: fe3ee53f5b02b310397b959f307b5ddf8639ab4cedb6d747264a1b49756e65ef93bee312a609898fe03f896a27775b5adabbb30f9e278c71df9ec68a80547e81
-  data.tar.gz: d0cba57fc257001c634474596f82b1b55517ba9f9410106b34a142df1ab8ee6db29d580016dee6db354e181741dcbad0b6be507e048dc6240193ff1cdbedba4f
+  metadata.gz: 29b0f666931c9891647bf88a1d8ebf6e750c75d94782e53b73d404fd36401a70273dd0fcf9d156e34b6ac5fda952b49f851e1b3f8e29f291d544c1614680a9d6
+  data.tar.gz: 5babc3e4185d9d68ca6f86613cbe03116adb5af0483d16f04f6a5b517d4233b46f6a458df3b67b985d038852619865dc36ecf695e9b3bf379503cd7ddb6585a9

data/lib/brute/completion/open_router.rb

@@ -47,8 +47,10 @@ module Brute
           env.emit(LLM_START_EVENT)
 
           messages = Brute::MessageTransport::OpenRouter.dump_all(env[:messages], model: options(env).model)
+          raw = nil
 
           ::OpenRouter::Client.new(**@config).then do |client|
+            client.on(:on_error) { |error| raw = error }
             response = nil
             env.emit(LLM_DURATION_EVENT) { response = client.complete(messages, options(env)) }
 
@@ -76,13 +78,13 @@ module Brute
         # kind of failure. The classes are looked up defensively — the provider
         # gem is only a dependency of the app that uses this middleware.
         rescue => error
-          env.emit(LLM_FAILURE_EVENT)
+          env.emit(LLM_FAILURE_EVENT, raw || error)
 
           if defined?(::Faraday::Error) && error.is_a?(::Faraday::Error)
             env.emit(FARADAY_ERROR_EVENT, error)
 
           elsif defined?(::OpenRouter::ServerError) && error.is_a?(::OpenRouter::ServerError)
-            env.emit(OPEN_ROUTER_SERVER_ERROR_EVENT, error)
+            env.emit(OPEN_ROUTER_SERVER_ERROR_EVENT, raw || error)
 
           else
             env.emit(STANDARD_ERROR_EVENT, error)
@@ -147,6 +149,7 @@ describe "brute/completion/open_router" do
   # Run one turn against a stubbed OpenRouter::Client and hand back the env.
   with_fake_client = lambda do |completion, response|
     fake_client = Object.new
+    fake_client.define_singleton_method(:on) { |_event, &_block| self }
     fake_client.define_singleton_method(:complete) { |_messages, _options| response }
     original = OpenRouter::Client.method(:new)
     OpenRouter::Client.define_singleton_method(:new) { |**_config| fake_client }
@@ -180,6 +183,7 @@ describe "brute/completion/open_router" do
   it "advertises env[:tools] to the provider, and lets a tools: option win" do
     captured = []
     fake_client = Object.new
+    fake_client.define_singleton_method(:on) { |_event, &_block| self }
     fake_client.define_singleton_method(:complete) { |_messages, options| captured << options; FakeUsageResponse.new(nil) }
     original = OpenRouter::Client.method(:new)
     OpenRouter::Client.define_singleton_method(:new) { |**_config| fake_client }
@@ -226,6 +230,7 @@ describe "brute/completion/open_router" do
   it "takes the model from env[:model], and lets a model: option win" do
     captured = []
     fake_client = Object.new
+    fake_client.define_singleton_method(:on) { |_event, &_block| self }
     fake_client.define_singleton_method(:complete) { |_messages, options| captured << options; FakeUsageResponse.new(nil) }
     original = OpenRouter::Client.method(:new)
     OpenRouter::Client.define_singleton_method(:new) { |**_config| fake_client }
@@ -260,6 +265,7 @@ describe "brute/completion/open_router" do
 
     boom = RuntimeError.new("no route to host")
     fake_client = Object.new
+    fake_client.define_singleton_method(:on) { |_event, &_block| self }
     fake_client.define_singleton_method(:complete) { |_messages, _options| raise boom }
     original = OpenRouter::Client.method(:new)
     OpenRouter::Client.define_singleton_method(:new) { |**_config| fake_client }

data/lib/brute/message_transport/open_router.rb

@@ -37,6 +37,10 @@ module Brute
           # wire's: whatever goes out under these keys is put there here.
           hash.delete(:reasoning)
 
+          if message.tool_call?
+            hash[:tool_calls] = message.tool_calls.map { |call| call_block(call) }
+          end
+
           reasoning = message.reasoning
 
           if reasoning&.detailed?
@@ -47,6 +51,16 @@ module Brute
         end
       end
 
+      # The inverse of wrap_tool_call: the wire keeps the name and the
+      # arguments under `function`, and the arguments as a JSON string.
+      def self.call_block(call)
+        {
+          id:       call.id,
+          type:     "function",
+          function: { name: call.name, arguments: JSON.generate(call.arguments) },
+        }
+      end
+
       # Each type names its own payload: reasoning text carries `text` and the
       # `signature` that verifies it, a summary carries `summary`, and an
       # encrypted item carries `data`. Written under the wrong key the payload
@@ -170,6 +184,30 @@ describe "brute/message_transport/open_router" do
     Brute::MessageTransport::OpenRouter.dump(m).should == { role: :user, content: "hi" }
   end
 
+  it "dumps a tool call as the wire wants it, and reads its own output back" do
+    call = Brute::ToolCall.new(id: "call_1", name: "search", arguments: { "query" => "cheese" })
+    dumped = Brute::MessageTransport::OpenRouter.dump(
+      Brute::Message.new(role: :assistant, content: "", tool_calls: [call]),
+    )
+
+    dumped[:tool_calls].should == [
+      { id: "call_1", type: "function", function: { name: "search", arguments: '{"query":"cheese"}' } },
+    ]
+
+    echoed = Struct.new(:choices).new([{ "message" => {
+      "role" => "assistant", "content" => "", "tool_calls" => dumped[:tool_calls],
+    } }])
+    back = Brute::MessageTransport::OpenRouter.new(echoed).wrap_each.to_a.first.tool_calls.first
+
+    back.id.should == "call_1"
+    back.name.should == "search"
+    back.arguments.should == { "query" => "cheese" }
+
+    Brute::MessageTransport::OpenRouter.dump(
+      Brute::Message.new(role: :user, content: "hi"),
+    ).key?(:tool_calls).should.be.false
+  end
+
   it "wraps a response's choice messages with symbolised roles, dropping provider extras" do
     fake_response = Struct.new(:choices).new([
       { "message" => { "role" => "assistant", "content" => "hi there",

data/lib/brute/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Brute
-  VERSION = "6.1.3"
+  VERSION = "6.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brute
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.5
 platform: ruby
 authors:
 - Brute Contributors