brute 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3375f62e8d019bd4a1dd45d2407112ef421c7ce437f604addb0fac51586c5ec
-  data.tar.gz: 15fbc6ed0dce515a143f2424957de3c120ff4f68e5b097d732b418f9fe43aecc
+  metadata.gz: fd242366b30cf384cb0326b8fa006f43883f1cf117d410b830288164a4d13582
+  data.tar.gz: 3d4973d9a6fa69e6fd04d464343d8d2d85fb8455236e9d03f32df17888182e1f
 SHA512:
-  metadata.gz: f2ea1006786ddbb531aaa2bf708f60a362422acf87159f731d7ed459bf409d89103ea48a6530953eb31382eb6ca44ea314afdfb4b61bf870a6153b8128f498cd
-  data.tar.gz: 4ba3e5a9822d3c50b498cab1f33730decc3d3298eb289bd0a450c52e681eaa06fdc002cca73bf0c45b353283e95a0f12ec9cc8605a2623a0f43e1df7eb064789
+  metadata.gz: f0659b341410c0cb87db3cefe95e3c8c99bbf5ea9c88ba974d6b8f1adc5835919e256a577435748d652e1e229b30fb6cbaac321d297688fc9fac0812a028e369
+  data.tar.gz: 5f693c1c49b4bd74ce901e78bcd459f04c6316fe044bb871a04142b09154cb04767a1166dd64d02d2332fb9fac63572a6d13b28fbef40520c18737b1a11f98f4

data/lib/brute/message_transport/open_router.rb

@@ -3,28 +3,102 @@
 require "bundler/setup"
 require "brute"
 require "brute/message_transport"
+require "json"
 
 module Brute
   class MessageTransport
+    # MessageTransport for the open_router_enhanced gem
+    # (https://github.com/estiens/open_router_enhanced). Brute does not
+    # require it — you do:
+    #
+    #   require "open_router"
     class OpenRouter < MessageTransport
       def self.dump(message)
         message.to_h
       end
 
+      # An OpenRouter::Response's messages (one per choice; in practice
+      # OpenRouter returns exactly one).
+      def messages
+        return @result.choices.map { |choice| choice["message"] || choice[:message] } if @result.respond_to?(:choices)
+
+        super
+      end
+
       private
 
         def wrap(message)
           # Coerce string keys to symbol keys if necessary
           hash = message.to_h.transform_keys(&:to_sym)
-        
+          hash[:role] = hash[:role].to_sym if hash.key?(:role)
+          hash[:tool_calls] = hash[:tool_calls].map { |tc| wrap_tool_call(tc) } if hash[:tool_calls]
+
           case hash
           in { role: (:system | :user | :assistant | :tool) }
-            # Message#initialize handles converting tool_calls & symbolising role!
-            Brute::Message.new(**hash)
+            # Slice away provider extras (refusal, reasoning, model, ...)
+            # that Brute::Message doesn't know.
+            Brute::Message.new(**hash.slice(:role, :content, :tool_calls, :tool_call_id))
           else
             raise "Unrecognised message format #{message.inspect}"
           end
         end
+
+        # An OpenAI-wire tool call ({ id:, type:, function: { name:, arguments: JSON } })
+        # -> the flat { id:, name:, arguments: Hash } Brute::Message understands.
+        def wrap_tool_call(tool_call)
+          tc = tool_call.to_h.transform_keys(&:to_sym)
+          return tc unless tc[:function] # already flat { id:, name:, arguments: }
+
+          function = tc[:function].to_h.transform_keys(&:to_sym)
+          arguments = function[:arguments].to_s
+
+          {
+            id: tc[:id],
+            name: function[:name],
+            arguments: JSON.parse(arguments.empty? ? "{}" : arguments),
+          }
+        end
     end
   end
 end
+
+__END__
+
+describe "brute/message_transport/open_router" do
+  require "brute/messages"
+
+  it "dumps a message to the wire format" do
+    m = Brute::Message.new(role: :user, content: "hi")
+    Brute::MessageTransport::OpenRouter.dump(m).should == { role: :user, content: "hi" }
+  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",
+                       "refusal" => nil, "reasoning" => nil, "model" => "openrouter/auto" } },
+    ])
+
+    out = Brute::MessageTransport::OpenRouter.new(fake_response).wrap_each.to_a
+
+    out.size.should == 1
+    out.first.role.should == :assistant
+    out.first.content.should == "hi there"
+  end
+
+  it "unwraps OpenAI-wire tool calls and parses their JSON arguments" do
+    fake_response = Struct.new(:choices).new([
+      { "message" => {
+        "role" => "assistant", "content" => nil,
+        "tool_calls" => [{ "id" => "tc1", "type" => "function",
+                           "function" => { "name" => "shell", "arguments" => '{"command":"ls"}' } }],
+      } },
+    ])
+
+    out = Brute::MessageTransport::OpenRouter.new(fake_response).wrap_each.to_a.first
+
+    out.tool_call?.should.be.true
+    out.tool_calls.first.id.should == "tc1"
+    out.tool_calls.first.name.should == "shell"
+    out.tool_calls.first.arguments.should == { "command" => "ls" }
+  end
+end

data/lib/brute/middleware/open_router.rb

@@ -4,20 +4,25 @@ module Brute
   module Middleware
     module OpenRouter
       class Completion
+        # config:   keyword arguments for OpenRouter::Client.new
+        #           (access_token:, request_timeout:, uri_base:, extra_headers:).
+        #           Defaults to OpenRouter.configuration's global settings.
+        # options:  keyword arguments for OpenRouter::CompletionOptions.new
+        #           (model:, temperature:, tools:, ...).
         def initialize(app, config: {}, **options)
           @app = app
-          @config = ::OpenRouter::Configuration.new(config)
-          @options = ::OpenRouter::CompletionOptions.new(options)
+          @config = config
+          @options = ::OpenRouter::CompletionOptions.new(**options)
         end
 
         def call(env)
           messages = Brute::MessageTransport::OpenRouter.dump_all(env[:messages])
 
-          ::OpenRouter::Client.new(@config).then do |client|
+          ::OpenRouter::Client.new(**@config).then do |client|
             client.complete(messages, @options).then do |response|
 
               # OpenRouter in fact only returns a single message...
-              # https://github.com/estiens/open_router_enhanced/blob/main/lib/open_router/response.rb#L66
+              # https://github.com/estiens/open_router_enhanced/blob/main/lib/open_router/response.rb
               Brute::MessageTransport::OpenRouter.wrap_each(response) do |message|
                 env[:messages] << message
               end

data/lib/brute/version.rb

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

metadata

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