braintrust 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa149154056d58474a362bf2fba5b27a73670208a278aae56abc193971616de3
-  data.tar.gz: 5aeb130d705670e0baab100fa5203782fb3feaa0c39d4b228b54ac77ce581458
+  metadata.gz: 4a4dd86789a3ce80b891b88fb9b125bb7b6d85e86928adeb5fd7c1fec671ff56
+  data.tar.gz: 171fe031f960d0a6f3abbfacbb20094b35bcd9199cf132e30063868807f95f8b
 SHA512:
-  metadata.gz: c1c23282dff68a81cf9fd7f7b8509ee73d7050c9ce00b2184b7b8801941c9099e3aac21fdbba144a5d1fcfe93aa78d3bed25f03bce84ca4fbebb0440f3f524ef
-  data.tar.gz: f64dda4cf4622f791daa91b3b1a35a83dbb2bb1ac5ad201d41038875a9a1e968d9efbf6f258dbb207ab598869b2b7edcbb66415adada3806ad7b56e7fd0b1ebe
+  metadata.gz: 3cf52e457ca5d4cdad2f8873bb45d0eeb0b79b33c5edbcd467e65ce7261caea9bcc86ea9d562835197279105f14f2787bcac6622faad4ec420a5f2fa27a003d2
+  data.tar.gz: 5a7ccc20a3e63840e15c41dd82eaa8653a2f0dce693321e6527ace59c54255524ae1d794d2dce058127b747a514e8777729384cde9c157374039880bb3b01013

data/lib/braintrust/config.rb

@@ -39,7 +39,7 @@ module Braintrust
       end
 
       new(
-        api_key: api_key || ENV["BRAINTRUST_API_KEY"],
+        api_key: api_key || ((ENV["BRAINTRUST_API_KEY"] && ENV["BRAINTRUST_API_KEY"].empty?) ? nil : ENV["BRAINTRUST_API_KEY"]),
         org_name: org_name || ENV["BRAINTRUST_ORG_NAME"],
         default_project: default_project || ENV["BRAINTRUST_DEFAULT_PROJECT"],
         app_url: app_url || ENV["BRAINTRUST_APP_URL"] || "https://www.braintrust.dev",

data/lib/braintrust/internal/encoding.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Braintrust
+  module Internal
+    # Encoding utilities using Ruby's native pack/unpack methods.
+    # Avoids dependency on external gems that became bundled gems in Ruby 3.4.
+    module Encoding
+      # Base64 encoding/decoding using Ruby's native pack/unpack methods.
+      # Drop-in replacement for the base64 gem's strict methods.
+      #
+      # @example Encode binary data
+      #   Encoding::Base64.strict_encode64(image_bytes)
+      #   # => "iVBORw0KGgo..."
+      #
+      # @example Decode base64 string
+      #   Encoding::Base64.strict_decode64("iVBORw0KGgo...")
+      #   # => "\x89PNG..."
+      #
+      module Base64
+        module_function
+
+        # Encodes binary data to base64 without newlines (strict encoding).
+        #
+        # @param data [String] Binary data to encode
+        # @return [String] Base64-encoded string without newlines
+        def strict_encode64(data)
+          [data].pack("m0")
+        end
+
+        # Decodes a base64 string to binary data (strict decoding).
+        #
+        # @param str [String] Base64-encoded string
+        # @return [String] Decoded binary data
+        def strict_decode64(str)
+          str.unpack1("m0")
+        end
+      end
+    end
+  end
+end

data/lib/braintrust/trace/attachment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "base64"
 require "net/http"
+require_relative "../internal/encoding"
 require "uri"
 
 module Braintrust
@@ -110,7 +110,7 @@ module Braintrust
       #   att.to_data_url
       #   # => "data:image/png;base64,iVBORw0KGgo..."
       def to_data_url
-        encoded = Base64.strict_encode64(@data)
+        encoded = Internal::Encoding::Base64.strict_encode64(@data)
         "data:#{@content_type};base64,#{encoded}"
       end
 

data/lib/braintrust/trace/contrib/github.com/crmne/ruby_llm.rb

@@ -4,6 +4,7 @@ require "opentelemetry/sdk"
 require "json"
 require_relative "../../../tokens"
 require_relative "../../../../logger"
+require_relative "../../../../internal/encoding"
 
 module Braintrust
   module Trace
@@ -350,10 +351,15 @@ module Braintrust
               if tool_schema && tool_schema[function_key]
                 tool_params = tool_schema[function_key][:parameters] || tool_schema[function_key]["parameters"]
                 if tool_params.is_a?(Hash)
+                  # Create a mutable copy if the hash is frozen
+                  tool_params = tool_params.dup if tool_params.frozen?
                   tool_params.delete("strict")
                   tool_params.delete(:strict)
                   tool_params.delete("additionalProperties")
                   tool_params.delete(:additionalProperties)
+                  # Assign the modified copy back
+                  params_key = tool_schema[function_key].key?(:parameters) ? :parameters : "parameters"
+                  tool_schema[function_key][params_key] = tool_params
                 end
               end
 
@@ -417,18 +423,14 @@ module Braintrust
 
               # Handle content
               if msg.respond_to?(:content) && msg.content
-                # Convert Ruby hash notation to JSON string for tool results
-                content = msg.content
-                if msg.role.to_s == "tool" && content.is_a?(String) && content.start_with?("{:")
-                  # Ruby hash string like "{:location=>...}" - try to parse and re-serialize as JSON
-                  begin
-                    # Simple conversion: replace Ruby hash syntax with JSON
-                    content = content.gsub(/(?<=\{|, ):(\w+)=>/, '"\1":').gsub("=>", ":")
-                  rescue
-                    # Keep original if conversion fails
-                  end
+                raw_content = msg.content
+
+                # Check if content is a Content object with attachments (issue #71)
+                formatted["content"] = if raw_content.respond_to?(:text) && raw_content.respond_to?(:attachments) && raw_content.attachments&.any?
+                  format_multipart_content(raw_content)
+                else
+                  format_simple_content(raw_content, msg.role.to_s)
                 end
-                formatted["content"] = content
               end
 
               # Handle tool_calls for assistant messages
@@ -445,6 +447,74 @@ module Braintrust
               formatted
             end
 
+            # Format multipart content with text and attachments
+            # @param content_obj [Object] Content object with text and attachments
+            # @return [Array<Hash>] array of content parts
+            def self.format_multipart_content(content_obj)
+              content_parts = []
+
+              # Add text part
+              content_parts << {"type" => "text", "text" => content_obj.text} if content_obj.text
+
+              # Add attachment parts (convert to Braintrust format)
+              content_obj.attachments.each do |attachment|
+                content_parts << format_attachment_for_input(attachment)
+              end
+
+              content_parts
+            end
+
+            # Format simple text content
+            # @param raw_content [Object] String or Content object with text
+            # @param role [String] the message role
+            # @return [String] formatted text content
+            def self.format_simple_content(raw_content, role)
+              content = raw_content
+              content = content.text if content.respond_to?(:text)
+
+              # Convert Ruby hash string to JSON for tool results
+              if role == "tool" && content.is_a?(String) && content.start_with?("{:")
+                begin
+                  content = content.gsub(/(?<=\{|, ):(\w+)=>/, '"\1":').gsub("=>", ":")
+                rescue
+                  # Keep original if conversion fails
+                end
+              end
+
+              content
+            end
+
+            # Format a RubyLLM attachment to OpenAI-compatible format
+            # @param attachment [Object] the RubyLLM attachment
+            # @return [Hash] OpenAI image_url format for consistency with other integrations
+            def self.format_attachment_for_input(attachment)
+              # RubyLLM Attachment has: source (Pathname), filename, mime_type
+              if attachment.respond_to?(:source) && attachment.source
+                begin
+                  data = File.binread(attachment.source.to_s)
+                  encoded = Internal::Encoding::Base64.strict_encode64(data)
+                  mime_type = attachment.respond_to?(:mime_type) ? attachment.mime_type : "application/octet-stream"
+
+                  # Use OpenAI's image_url format for consistency
+                  {
+                    "type" => "image_url",
+                    "image_url" => {
+                      "url" => "data:#{mime_type};base64,#{encoded}"
+                    }
+                  }
+                rescue => e
+                  Log.debug("Failed to read attachment file: #{e.message}")
+                  # Return a placeholder if we can't read the file
+                  {"type" => "text", "text" => "[attachment: #{attachment.respond_to?(:filename) ? attachment.filename : "unknown"}]"}
+                end
+              elsif attachment.respond_to?(:to_h)
+                # Try to use attachment's own serialization
+                attachment.to_h
+              else
+                {"type" => "text", "text" => "[attachment]"}
+              end
+            end
+
             # Capture streaming output and metrics
             # @param span [OpenTelemetry::Trace::Span] the span
             # @param aggregated_chunks [Array] the aggregated chunks
@@ -453,8 +523,11 @@ module Braintrust
               return if aggregated_chunks.empty?
 
               # Aggregate content from chunks
+              # Extract text from Content objects if present (issue #71)
               aggregated_content = aggregated_chunks.map { |c|
-                c.respond_to?(:content) ? c.content : c.to_s
+                content = c.respond_to?(:content) ? c.content : c.to_s
+                content = content.text if content.respond_to?(:text)
+                content
               }.join
 
               output = [{
@@ -485,8 +558,11 @@ module Braintrust
               }
 
               # Add content if it's a simple text response
+              # Extract text from Content objects if present (issue #71)
               if response.respond_to?(:content) && response.content && !response.content.empty?
-                message["content"] = response.content
+                content = response.content
+                content = content.text if content.respond_to?(:text)
+                message["content"] = content
               end
 
               # Check if there are tool calls in the messages history

data/lib/braintrust/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Braintrust
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braintrust
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Braintrust
@@ -201,6 +201,7 @@ files:
 - lib/braintrust/eval/runner.rb
 - lib/braintrust/eval/scorer.rb
 - lib/braintrust/eval/summary.rb
+- lib/braintrust/internal/encoding.rb
 - lib/braintrust/internal/experiments.rb
 - lib/braintrust/internal/thread_pool.rb
 - lib/braintrust/logger.rb