braintrust 0.0.4 → 0.0.6

data/lib/braintrust/trace/tokens.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+module Braintrust
+  module Trace
+    # Parse OpenAI usage tokens into normalized Braintrust metrics.
+    # Handles standard fields and *_tokens_details nested objects.
+    # @param usage [Hash, Object] usage object from OpenAI response
+    # @return [Hash<String, Integer>] normalized metrics
+    def self.parse_openai_usage_tokens(usage)
+      metrics = {}
+      return metrics unless usage
+
+      usage_hash = usage.respond_to?(:to_h) ? usage.to_h : usage
+      return metrics unless usage_hash.is_a?(Hash)
+
+      # Field mappings: OpenAI → Braintrust
+      field_map = {
+        "prompt_tokens" => "prompt_tokens",
+        "completion_tokens" => "completion_tokens",
+        "total_tokens" => "tokens"
+      }
+
+      # Prefix mappings for *_tokens_details
+      prefix_map = {
+        "prompt" => "prompt",
+        "completion" => "completion"
+      }
+
+      usage_hash.each do |key, value|
+        key_str = key.to_s
+
+        if value.is_a?(Numeric)
+          target = field_map[key_str]
+          metrics[target] = value.to_i if target
+        elsif key_str.end_with?("_tokens_details")
+          # Convert to hash if it's an object (OpenAI SDK returns objects)
+          details_hash = value.respond_to?(:to_h) ? value.to_h : value
+          next unless details_hash.is_a?(Hash)
+
+          raw_prefix = key_str.sub(/_tokens_details$/, "")
+          prefix = prefix_map[raw_prefix] || raw_prefix
+          details_hash.each do |detail_key, detail_value|
+            next unless detail_value.is_a?(Numeric)
+            metrics["#{prefix}_#{detail_key}"] = detail_value.to_i
+          end
+        end
+      end
+
+      # Calculate total if missing
+      if !metrics.key?("tokens") && metrics.key?("prompt_tokens") && metrics.key?("completion_tokens")
+        metrics["tokens"] = metrics["prompt_tokens"] + metrics["completion_tokens"]
+      end
+
+      metrics
+    end
+
+    # Parse Anthropic usage tokens into normalized Braintrust metrics.
+    # Accumulates cache tokens into prompt_tokens and calculates total.
+    # @param usage [Hash, Object] usage object from Anthropic response
+    # @return [Hash<String, Integer>] normalized metrics
+    def self.parse_anthropic_usage_tokens(usage)
+      metrics = {}
+      return metrics unless usage
+
+      usage_hash = usage.respond_to?(:to_h) ? usage.to_h : usage
+      return metrics unless usage_hash.is_a?(Hash)
+
+      # Field mappings: Anthropic → Braintrust
+      # Also handles RubyLLM's simplified cache field names
+      field_map = {
+        "input_tokens" => "prompt_tokens",
+        "output_tokens" => "completion_tokens",
+        "cache_read_input_tokens" => "prompt_cached_tokens",
+        "cache_creation_input_tokens" => "prompt_cache_creation_tokens",
+        # RubyLLM uses simplified names
+        "cached_tokens" => "prompt_cached_tokens",
+        "cache_creation_tokens" => "prompt_cache_creation_tokens"
+      }
+
+      usage_hash.each do |key, value|
+        next unless value.is_a?(Numeric)
+        key_str = key.to_s
+        target = field_map[key_str]
+        metrics[target] = value.to_i if target
+      end
+
+      # Accumulate cache tokens into prompt_tokens (matching TS/Python SDKs)
+      prompt_tokens = (metrics["prompt_tokens"] || 0) +
+        (metrics["prompt_cached_tokens"] || 0) +
+        (metrics["prompt_cache_creation_tokens"] || 0)
+      metrics["prompt_tokens"] = prompt_tokens if prompt_tokens > 0
+
+      # Calculate total
+      if metrics.key?("prompt_tokens") && metrics.key?("completion_tokens")
+        metrics["tokens"] = metrics["prompt_tokens"] + metrics["completion_tokens"]
+      end
+
+      metrics
+    end
+  end
+end

data/lib/braintrust/trace.rb

@@ -6,12 +6,30 @@ require_relative "trace/span_processor"
 require_relative "trace/span_filter"
 require_relative "logger"
 
-# OpenAI integration is optional - automatically loaded if openai gem is available
+# OpenAI integrations - both ruby-openai and openai gems use require "openai"
+# so we detect which one actually loaded the code and require the appropriate integration
 begin
   require "openai"
-  require_relative "trace/contrib/openai"
+
+  # Check which OpenAI gem's code is actually loaded by inspecting $LOADED_FEATURES
+  # (both gems can be in Gem.loaded_specs, but only one's code can be loaded)
+  openai_load_path = $LOADED_FEATURES.find { |f| f.end_with?("/openai.rb") }
+
+  if openai_load_path&.include?("ruby-openai")
+    # alexrudall/ruby-openai gem (path contains "ruby-openai-X.Y.Z")
+    require_relative "trace/contrib/github.com/alexrudall/ruby-openai/ruby-openai"
+  elsif openai_load_path&.include?("/openai-")
+    # Official openai gem (path contains "openai-X.Y.Z")
+    require_relative "trace/contrib/openai"
+  elsif Gem.loaded_specs["ruby-openai"]
+    # Fallback: ruby-openai in loaded_specs (for unusual installation paths)
+    require_relative "trace/contrib/github.com/alexrudall/ruby-openai/ruby-openai"
+  elsif Gem.loaded_specs["openai"]
+    # Fallback: official openai in loaded_specs (for unusual installation paths)
+    require_relative "trace/contrib/openai"
+  end
 rescue LoadError
-  # OpenAI gem not installed - integration will not be available
+  # No OpenAI gem installed - integration will not be available
 end
 
 # Anthropic integration is optional - automatically loaded if anthropic gem is available
@@ -22,6 +40,23 @@ rescue LoadError
   # Anthropic gem not installed - integration will not be available
 end
 
+# RubyLLM integration is optional - automatically loaded if ruby_llm gem is available
+#
+# Usage:
+#   # Wrap the class once (affects all instances):
+#   Braintrust::Trace::RubyLLM.wrap
+#
+#   # Or wrap a specific instance:
+#   chat = RubyLLM.chat(model: "gpt-4o-mini")
+#   Braintrust::Trace::RubyLLM.wrap(chat)
+#
+begin
+  require "ruby_llm"
+  require_relative "trace/contrib/github.com/crmne/ruby_llm"
+rescue LoadError
+  # RubyLLM gem not installed - integration will not be available
+end
+
 module Braintrust
   module Trace
     # Set up OpenTelemetry tracing with Braintrust

data/lib/braintrust/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braintrust
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Braintrust
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp
   requirement: !ruby/object:Gem::Requirement
@@ -204,9 +204,12 @@ files:
 - lib/braintrust/trace.rb
 - lib/braintrust/trace/attachment.rb
 - lib/braintrust/trace/contrib/anthropic.rb
+- lib/braintrust/trace/contrib/github.com/alexrudall/ruby-openai/ruby-openai.rb
+- lib/braintrust/trace/contrib/github.com/crmne/ruby_llm.rb
 - lib/braintrust/trace/contrib/openai.rb
 - lib/braintrust/trace/span_filter.rb
 - lib/braintrust/trace/span_processor.rb
+- lib/braintrust/trace/tokens.rb
 - lib/braintrust/version.rb
 homepage: https://github.com/braintrustdata/braintrust-sdk-ruby
 licenses: