llm_cost_tracker 0.3.0 → 0.3.2

data/lib/llm_cost_tracker/pricing.rb

@@ -3,21 +3,11 @@
 require "monitor"
 
 module LlmCostTracker
-  # Calculates costs from price entries expressed in USD per 1M tokens.
   module Pricing
     PRICES = PriceRegistry.builtin_prices
     MUTEX = Monitor.new
 
     class << self
-      # Estimate model cost from token counts.
-      #
-      # @param model [String] Provider model identifier.
-      # @param input_tokens [Integer] Input token count, including cached tokens if reported that way.
-      # @param output_tokens [Integer] Output token count.
-      # @param cached_input_tokens [Integer] OpenAI-style cached input tokens.
-      # @param cache_read_input_tokens [Integer] Anthropic-style cache read tokens.
-      # @param cache_creation_input_tokens [Integer] Anthropic-style cache creation tokens.
-      # @return [LlmCostTracker::Cost, nil] nil when no price is configured for the model.
       def cost_for(model:, input_tokens:, output_tokens:, cached_input_tokens: 0,
                    cache_read_input_tokens: 0, cache_creation_input_tokens: 0)
         prices = lookup(model)
@@ -111,7 +101,6 @@ module LlmCostTracker
         model.to_s.split("/").last
       end
 
-      # Try to match model names like "gpt-4o-2024-08-06" to "gpt-4o".
       def fuzzy_match(model, normalized_model, table)
         sorted_price_keys(table).each do |key|
           return table[key] if model.start_with?(key) || normalized_model.start_with?(key)

data/lib/llm_cost_tracker/railtie.rb

@@ -4,6 +4,8 @@ module LlmCostTracker
   class Railtie < Rails::Railtie
     generators do
       require_relative "generators/llm_cost_tracker/add_latency_ms_generator"
+      require_relative "generators/llm_cost_tracker/add_provider_response_id_generator"
+      require_relative "generators/llm_cost_tracker/add_streaming_generator"
       require_relative "generators/llm_cost_tracker/install_generator"
       require_relative "generators/llm_cost_tracker/prices_generator"
       require_relative "generators/llm_cost_tracker/upgrade_cost_precision_generator"
@@ -15,7 +17,6 @@ module LlmCostTracker
     end
 
     initializer "llm_cost_tracker.configure" do
-      # Auto-require ActiveRecord storage if configured
       ActiveSupport.on_load(:active_record) do
         if LlmCostTracker.configuration.active_record?
           require_relative "llm_api_call"

data/lib/llm_cost_tracker/report.rb

@@ -8,11 +8,6 @@ module LlmCostTracker
     DEFAULT_DAYS = ReportData::DEFAULT_DAYS
 
     class << self
-      # Render a terminal-friendly cost report from ActiveRecord storage.
-      #
-      # @param days [Integer] Number of trailing days to include.
-      # @param now [Time] Report end time.
-      # @return [String]
       def generate(days: DEFAULT_DAYS, now: Time.now.utc, tag_breakdowns: nil)
         ReportFormatter.new(data(days: days, now: now, tag_breakdowns: tag_breakdowns)).to_s
       rescue LoadError => e

data/lib/llm_cost_tracker/storage/active_record_store.rb

@@ -19,24 +19,23 @@ module LlmCostTracker
             tags:          tags_for_storage(tags),
             tracked_at:    event.tracked_at
           }
-          attributes[:latency_ms]   = event.latency_ms   if model_class.latency_column?
-          attributes[:stream]       = event.stream       if model_class.stream_column?
-          attributes[:usage_source] = event.usage_source if model_class.usage_source_column?
-
-          model_class.create!(attributes)
+          attributes[:latency_ms] = event.latency_ms if LlmCostTracker::LlmApiCall.latency_column?
+          attributes[:stream] = event.stream if LlmCostTracker::LlmApiCall.stream_column?
+          attributes[:usage_source] = event.usage_source if LlmCostTracker::LlmApiCall.usage_source_column?
+          if LlmCostTracker::LlmApiCall.provider_response_id_column?
+            attributes[:provider_response_id] = event.provider_response_id
+          end
+
+          LlmCostTracker::LlmApiCall.create!(attributes)
         end
 
         def monthly_total(time: Time.now.utc)
-          model_class
+          LlmCostTracker::LlmApiCall
             .where(tracked_at: time.beginning_of_month..time)
             .sum(:total_cost)
             .to_f
         end
 
-        def model_class
-          LlmCostTracker::LlmApiCall
-        end
-
         private
 
         def stringify_tags(tags)
@@ -44,7 +43,7 @@ module LlmCostTracker
         end
 
         def tags_for_storage(tags)
-          model_class.tags_json_column? ? tags : tags.to_json
+          LlmCostTracker::LlmApiCall.tags_json_column? ? tags : tags.to_json
         end
 
         def stringify_tag_value(value)

data/lib/llm_cost_tracker/stream_collector.rb

@@ -8,10 +8,11 @@ module LlmCostTracker
   class StreamCollector
     attr_reader :provider
 
-    def initialize(provider:, model:, latency_ms: nil, metadata: {})
+    def initialize(provider:, model:, latency_ms: nil, provider_response_id: nil, metadata: {})
       @provider = provider.to_s
       @model = model
       @latency_ms = latency_ms
+      @provider_response_id = provider_response_id
       @metadata = ValueHelpers.deep_dup(metadata || {})
       @events = []
       @explicit_usage = nil
@@ -20,13 +21,11 @@ module LlmCostTracker
       @monitor = Monitor.new
     end
 
-    def model
-      @monitor.synchronize { @model }
-    end
+    def model = @monitor.synchronize { @model }
 
-    def metadata
-      @monitor.synchronize { ValueHelpers.deep_dup(@metadata) }
-    end
+    def metadata = @monitor.synchronize { ValueHelpers.deep_dup(@metadata) }
+
+    def provider_response_id = @monitor.synchronize { @provider_response_id }
 
     def model=(value)
       @monitor.synchronize do
@@ -35,6 +34,13 @@ module LlmCostTracker
       end
     end
 
+    def provider_response_id=(value)
+      @monitor.synchronize do
+        ensure_open!
+        @provider_response_id = value
+      end
+    end
+
     def event(data, type: nil)
       @monitor.synchronize do
         ensure_open!
@@ -67,6 +73,7 @@ module LlmCostTracker
           explicit_usage: ValueHelpers.deep_dup(@explicit_usage),
           model: @model,
           latency_ms: @latency_ms,
+          provider_response_id: @provider_response_id,
           metadata: ValueHelpers.deep_dup(@metadata)
         }
       end
@@ -80,6 +87,7 @@ module LlmCostTracker
         latency_ms: snapshot[:latency_ms] || elapsed_ms,
         stream: true,
         usage_source: parsed.usage_source,
+        provider_response_id: parsed.provider_response_id || snapshot[:provider_response_id],
         metadata: error_metadata(errored).merge(snapshot[:metadata]).merge(parsed.metadata)
       )
     end
@@ -147,12 +155,8 @@ module LlmCostTracker
       )
     end
 
-    def error_metadata(errored)
-      errored ? { stream_errored: true } : {}
-    end
+    def error_metadata(errored) = errored ? { stream_errored: true } : {}
 
-    def elapsed_ms
-      ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - @started_at) * 1000).round
-    end
+    def elapsed_ms = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - @started_at) * 1000).round
   end
 end

data/lib/llm_cost_tracker/tags_column.rb

@@ -32,5 +32,9 @@ module LlmCostTracker
     def usage_source_column?
       columns_hash.key?("usage_source")
     end
+
+    def provider_response_id_column?
+      columns_hash.key?("provider_response_id")
+    end
   end
 end

data/lib/llm_cost_tracker/tracker.rb

@@ -13,8 +13,8 @@ module LlmCostTracker
         Budget.enforce!
       end
 
-      def record(provider:, model:, input_tokens:, output_tokens:,
-                 metadata: {}, latency_ms: nil, stream: false, usage_source: nil)
+      def record(provider:, model:, input_tokens:, output_tokens:, latency_ms: nil, stream: false,
+                 usage_source: nil, provider_response_id: nil, metadata: {})
         usage = EventMetadata.usage_data(input_tokens, output_tokens, metadata)
 
         cost_data = Pricing.cost_for(
@@ -39,6 +39,7 @@ module LlmCostTracker
           latency_ms: normalized_latency_ms(latency_ms),
           stream: stream ? true : false,
           usage_source: normalized_usage_source(usage_source),
+          provider_response_id: normalized_provider_response_id(provider_response_id),
           tracked_at: Time.now.utc
         )
 
@@ -122,6 +123,13 @@ module LlmCostTracker
         symbol = value.to_sym
         USAGE_SOURCES.include?(symbol) ? symbol.to_s : nil
       end
+
+      def normalized_provider_response_id(value)
+        return nil if value.nil?
+
+        string = value.to_s
+        string.empty? ? nil : string
+      end
     end
   end
 end

data/lib/llm_cost_tracker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LlmCostTracker
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/lib/llm_cost_tracker.rb

@@ -8,6 +8,7 @@ require_relative "llm_cost_tracker/version"
 require_relative "llm_cost_tracker/configuration"
 require_relative "llm_cost_tracker/errors"
 require_relative "llm_cost_tracker/logging"
+require_relative "llm_cost_tracker/parameter_hash"
 require_relative "llm_cost_tracker/cost"
 require_relative "llm_cost_tracker/event"
 require_relative "llm_cost_tracker/parsed_usage"
@@ -44,10 +45,6 @@ module LlmCostTracker
       CONFIGURATION_MUTEX.synchronize { @configuration ||= Configuration.new }
     end
 
-    # Configure the gem once during application boot.
-    #
-    # @yieldparam configuration [LlmCostTracker::Configuration]
-    # @return [void]
     def configure
       config = CONFIGURATION_MUTEX.synchronize do
         current = @configuration || Configuration.new
@@ -69,13 +66,8 @@ module LlmCostTracker
       Tracker.enforce_budget!
     end
 
-    def track(provider:, model:, input_tokens:, output_tokens:, **options)
-      latency_ms = options.delete(:latency_ms)
-      stream = options.key?(:stream) ? options.delete(:stream) : false
-      usage_source = options.key?(:usage_source) ? options.delete(:usage_source) : :manual
-      enforce_budget = options.key?(:enforce_budget) ? options.delete(:enforce_budget) : false
-      metadata = options
-
+    def track(provider:, model:, input_tokens:, output_tokens:, latency_ms: nil, stream: false, usage_source: :manual,
+              enforce_budget: false, provider_response_id: nil, **metadata)
       enforce_budget! if enforce_budget
       Tracker.record(
         provider: provider.to_s,
@@ -85,17 +77,19 @@ module LlmCostTracker
         latency_ms: latency_ms,
         stream: stream,
         usage_source: usage_source,
+        provider_response_id: provider_response_id,
         metadata: metadata
       )
     end
 
-    def track_stream(provider:, model:, latency_ms: nil, enforce_budget: false, **metadata)
+    def track_stream(provider:, model:, latency_ms: nil, enforce_budget: false, provider_response_id: nil, **metadata)
       require_relative "llm_cost_tracker/stream_collector"
       enforce_budget! if enforce_budget
       collector = StreamCollector.new(
         provider: provider.to_s,
         model: model,
         latency_ms: latency_ms,
+        provider_response_id: provider_response_id,
         metadata: metadata
       )
       yield collector
@@ -116,10 +110,8 @@ module LlmCostTracker
   end
 end
 
-# Load Railtie if Rails is present
 require_relative "llm_cost_tracker/railtie" if defined?(Rails::Railtie)
 
-# Auto-register Faraday middleware
 if defined?(Faraday)
   Faraday::Middleware.register_middleware(
     llm_cost_tracker: LlmCostTracker::Middleware::Faraday

data/llm_cost_tracker.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
       (File.expand_path(f) == __FILE__) ||
-        f.start_with?("bin/", "test/", "spec/", ".git", ".github", "gemfiles/", ".rubocop", "Gemfile")
+        f.start_with?("bin/", "docs/", "test/", "spec/", ".git", ".github", "gemfiles/", ".rubocop", "Gemfile")
     end
   end
 
@@ -43,6 +43,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 1.0"
+  spec.add_development_dependency "simplecov", "~> 0.22"
+  spec.add_development_dependency "simplecov-lcov", "~> 0.8"
   spec.add_development_dependency "sqlite3", ">= 1.4", "< 3.0"
   spec.add_development_dependency "webmock", "~> 3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm_cost_tracker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Sergii Khomenko
@@ -146,6 +146,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -192,9 +220,11 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - app/assets/llm_cost_tracker/application.css
 - app/controllers/llm_cost_tracker/application_controller.rb
 - app/controllers/llm_cost_tracker/assets_controller.rb
@@ -248,10 +278,12 @@ files:
 - lib/llm_cost_tracker/event.rb
 - lib/llm_cost_tracker/event_metadata.rb
 - lib/llm_cost_tracker/generators/llm_cost_tracker/add_latency_ms_generator.rb
+- lib/llm_cost_tracker/generators/llm_cost_tracker/add_provider_response_id_generator.rb
 - lib/llm_cost_tracker/generators/llm_cost_tracker/add_streaming_generator.rb
 - lib/llm_cost_tracker/generators/llm_cost_tracker/install_generator.rb
 - lib/llm_cost_tracker/generators/llm_cost_tracker/prices_generator.rb
 - lib/llm_cost_tracker/generators/llm_cost_tracker/templates/add_latency_ms_to_llm_api_calls.rb.erb
+- lib/llm_cost_tracker/generators/llm_cost_tracker/templates/add_provider_response_id_to_llm_api_calls.rb.erb
 - lib/llm_cost_tracker/generators/llm_cost_tracker/templates/add_streaming_to_llm_api_calls.rb.erb
 - lib/llm_cost_tracker/generators/llm_cost_tracker/templates/create_llm_api_calls.rb.erb
 - lib/llm_cost_tracker/generators/llm_cost_tracker/templates/initializer.rb.erb
@@ -263,6 +295,7 @@ files:
 - lib/llm_cost_tracker/llm_api_call.rb
 - lib/llm_cost_tracker/logging.rb
 - lib/llm_cost_tracker/middleware/faraday.rb
+- lib/llm_cost_tracker/parameter_hash.rb
 - lib/llm_cost_tracker/parsed_usage.rb
 - lib/llm_cost_tracker/parsers/anthropic.rb
 - lib/llm_cost_tracker/parsers/base.rb
@@ -279,6 +312,9 @@ files:
 - lib/llm_cost_tracker/price_sync/merger.rb
 - lib/llm_cost_tracker/price_sync/model_catalog.rb
 - lib/llm_cost_tracker/price_sync/raw_price.rb
+- lib/llm_cost_tracker/price_sync/refresh_plan_builder.rb
+- lib/llm_cost_tracker/price_sync/registry_loader.rb
+- lib/llm_cost_tracker/price_sync/registry_writer.rb
 - lib/llm_cost_tracker/price_sync/source.rb
 - lib/llm_cost_tracker/price_sync/source_result.rb
 - lib/llm_cost_tracker/price_sync/sources/litellm.rb