RubyGems - llm_cost_tracker - Versions diffs - 0.3.0 → 0.3.2 - Mend

llm_cost_tracker 0.3.0 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (59) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +23 -0
data/CODE_OF_CONDUCT.md +23 -0
data/README.md +86 -8
data/SECURITY.md +36 -0
data/app/assets/llm_cost_tracker/application.css +1 -4
data/app/controllers/llm_cost_tracker/assets_controller.rb +0 -2
data/app/controllers/llm_cost_tracker/calls_controller.rb +9 -13
data/app/controllers/llm_cost_tracker/dashboard_controller.rb +8 -19
data/app/controllers/llm_cost_tracker/data_quality_controller.rb +1 -2
data/app/controllers/llm_cost_tracker/models_controller.rb +5 -2
data/app/controllers/llm_cost_tracker/tags_controller.rb +2 -4
data/app/helpers/llm_cost_tracker/dashboard_filter_options_helper.rb +1 -7
data/app/helpers/llm_cost_tracker/dashboard_query_helper.rb +5 -9
data/app/services/llm_cost_tracker/dashboard/data_quality.rb +10 -10
data/app/services/llm_cost_tracker/dashboard/filter.rb +6 -26
data/app/services/llm_cost_tracker/dashboard/provider_breakdown.rb +0 -3
data/app/services/llm_cost_tracker/dashboard/tag_breakdown.rb +0 -2
data/app/services/llm_cost_tracker/pagination.rb +1 -9
data/app/views/layouts/llm_cost_tracker/application.html.erb +1 -16
data/app/views/llm_cost_tracker/calls/index.html.erb +13 -13
data/app/views/llm_cost_tracker/calls/show.html.erb +8 -3
data/app/views/llm_cost_tracker/dashboard/index.html.erb +1 -1
data/app/views/llm_cost_tracker/data_quality/index.html.erb +36 -14
data/app/views/llm_cost_tracker/models/index.html.erb +10 -9
data/app/views/llm_cost_tracker/shared/_spend_chart.html.erb +0 -1
data/app/views/llm_cost_tracker/shared/_tag_chips.html.erb +0 -1
data/app/views/llm_cost_tracker/tags/index.html.erb +1 -1
data/app/views/llm_cost_tracker/tags/show.html.erb +1 -1
data/lib/llm_cost_tracker/configuration.rb +0 -1
data/lib/llm_cost_tracker/event.rb +1 -0
data/lib/llm_cost_tracker/event_metadata.rb +1 -0
data/lib/llm_cost_tracker/generators/llm_cost_tracker/add_provider_response_id_generator.rb +29 -0
data/lib/llm_cost_tracker/generators/llm_cost_tracker/templates/add_provider_response_id_to_llm_api_calls.rb.erb +15 -0
data/lib/llm_cost_tracker/generators/llm_cost_tracker/templates/create_llm_api_calls.rb.erb +2 -0
data/lib/llm_cost_tracker/llm_api_call.rb +6 -2
data/lib/llm_cost_tracker/middleware/faraday.rb +1 -0
data/lib/llm_cost_tracker/parameter_hash.rb +33 -0
data/lib/llm_cost_tracker/parsed_usage.rb +14 -3
data/lib/llm_cost_tracker/parsers/anthropic.rb +47 -28
data/lib/llm_cost_tracker/parsers/gemini.rb +28 -4
data/lib/llm_cost_tracker/parsers/openai_compatible.rb +5 -6
data/lib/llm_cost_tracker/parsers/openai_usage.rb +14 -0
data/lib/llm_cost_tracker/price_registry.rb +22 -7
data/lib/llm_cost_tracker/price_sync/refresh_plan_builder.rb +162 -0
data/lib/llm_cost_tracker/price_sync/registry_loader.rb +55 -0
data/lib/llm_cost_tracker/price_sync/registry_writer.rb +25 -0
data/lib/llm_cost_tracker/price_sync.rb +16 -184
data/lib/llm_cost_tracker/pricing.rb +0 -11
data/lib/llm_cost_tracker/railtie.rb +2 -1
data/lib/llm_cost_tracker/report.rb +0 -5
data/lib/llm_cost_tracker/storage/active_record_store.rb +10 -11
data/lib/llm_cost_tracker/stream_collector.rb +17 -13
data/lib/llm_cost_tracker/tags_column.rb +4 -0
data/lib/llm_cost_tracker/tracker.rb +10 -2
data/lib/llm_cost_tracker/version.rb +1 -1
data/lib/llm_cost_tracker.rb +6 -14
data/llm_cost_tracker.gemspec +3 -1
metadata +37 -1

data/app/services/llm_cost_tracker/dashboard/provider_breakdown.rb CHANGED Viewed

@@ -4,9 +4,6 @@ module LlmCostTracker
   module Dashboard
     ProviderRow = Data.define(:provider, :calls, :total_cost, :share_percent)
-    # Aggregates cost and call counts per provider for a given scope.
-    # Sorted by total cost descending; providers with zero cost fall to the bottom
-    # but are still returned so users can see calls without pricing.
     class ProviderBreakdown
       def self.call(scope: LlmCostTracker::LlmApiCall.all)
         new(scope: scope).rows

data/app/services/llm_cost_tracker/dashboard/tag_breakdown.rb CHANGED Viewed

@@ -9,8 +9,6 @@ module LlmCostTracker
       :average_cost_per_call
     )
-    # Aggregates calls grouped by the distinct values of a single tag key.
-    # Invalid keys raise InvalidFilterError so controllers can return HTTP 400.
     class TagBreakdown
       class << self
         def call(key:, scope: LlmCostTracker::LlmApiCall.all)

data/app/services/llm_cost_tracker/pagination.rb CHANGED Viewed

@@ -9,21 +9,13 @@ module LlmCostTracker
     attr_reader :page, :per
     def self.call(params)
-      params = normalize_params(params)
+      params = LlmCostTracker::ParameterHash.with_indifferent_access(params)
       new(
         page: integer_param(params, :page, default: MIN_PAGE, min: MIN_PAGE),
         per: integer_param(params, :per, default: DEFAULT_PER, min: 1, max: MAX_PER)
       )
     end
-    def self.normalize_params(params)
-      return {}.with_indifferent_access if params.nil?
-      raw = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params.to_h
-      raw.with_indifferent_access
-    end
-    private_class_method :normalize_params
     def self.integer_param(params, key, default:, min:, max: nil)
       value = Integer(params[key], 10)
       value = [value, min].max

data/app/views/layouts/llm_cost_tracker/application.html.erb CHANGED Viewed

@@ -6,7 +6,7 @@
     <title>LLM Cost Tracker</title>
     <%= stylesheet_link_tag stylesheet_path %>
   </head>
-  <body>
+  <body class="lct-body">
     <div class="lct-app">
       <main class="lct-shell">
         <header class="lct-header">
@@ -25,20 +25,5 @@
         <%= yield %>
       </main>
     </div>
-    <script>
-      document.addEventListener("keydown", function(event) {
-        if (event.key !== "/" || event.defaultPrevented || event.metaKey || event.ctrlKey || event.altKey) return;
-        var target = event.target;
-        if (target && (target.isContentEditable || /^(INPUT|TEXTAREA|SELECT)$/.test(target.tagName))) return;
-        var input = document.querySelector("[data-lct-filter-input]");
-        if (!input) return;
-        event.preventDefault();
-        input.focus();
-        if (typeof input.select === "function") input.select();
-      });
-    </script>
   </body>
 </html>

data/app/views/llm_cost_tracker/calls/index.html.erb CHANGED Viewed

@@ -10,7 +10,7 @@
     <div class="lct-filter-row lct-filter-row-with-sort">
       <div class="lct-field">
         <label for="lct-from">From</label>
-        <input id="lct-from" data-lct-filter-input type="date" name="from" value="<%= params[:from] %>">
+        <input id="lct-from" type="date" name="from" value="<%= params[:from] %>">
       </div>
       <div class="lct-field">
@@ -46,16 +46,17 @@
       <div class="lct-field">
         <label for="lct-sort">Sort</label>
-        <select id="lct-sort" name="sort">
-          <option value=""               <%= "selected" if @sort.blank? %>>Recent first</option>
-          <option value="expensive"      <%= "selected" if @sort == "expensive" %>>Most expensive</option>
-          <option value="input"          <%= "selected" if @sort == "input" %>>Largest input</option>
-          <option value="output"         <%= "selected" if @sort == "output" %>>Largest output</option>
-          <% if @latency_available %>
-            <option value="slow" <%= "selected" if @sort == "slow" %>>Slowest</option>
-          <% end %>
-          <option value="unknown_pricing" <%= "selected" if @sort == "unknown_pricing" %>>Unknown pricing only</option>
-        </select>
+        <%= select_tag :sort,
+                       options_for_select(
+                         [["Recent first", ""],
+                          ["Most expensive", "expensive"],
+                          ["Largest input", "input"],
+                          ["Largest output", "output"]] +
+                         (@latency_available ? [["Slowest", "slow"]] : []) +
+                         [["Unknown pricing only", "unknown_pricing"]],
+                         @sort
+                       ),
+                       id: "lct-sort" %>
       </div>
       <div class="lct-filter-actions">
@@ -112,7 +113,6 @@
         </thead>
         <tbody>
           <% @calls.each do |call| %>
-            <% tags = call.parsed_tags %>
             <tr>
               <td class="lct-nowrap"><%= format_date(call.tracked_at) %></td>
               <td><%= call.provider %></td>
@@ -124,7 +124,7 @@
               <% if @latency_available %>
                 <td class="lct-num<%= ' lct-num-muted' if call.latency_ms.nil? %>"><%= call.latency_ms ? "#{number(call.latency_ms)}ms" : "n/a" %></td>
               <% end %>
-              <td><%= render "llm_cost_tracker/shared/tag_chips", tags: tags %></td>
+              <td><%= render "llm_cost_tracker/shared/tag_chips", tags: call.parsed_tags %></td>
               <td><%= link_to "Details", call_path(call), class: "lct-button lct-button-secondary lct-button-compact" %></td>
             </tr>
           <% end %>

data/app/views/llm_cost_tracker/calls/show.html.erb CHANGED Viewed

@@ -73,6 +73,11 @@
       <dt>Pricing Status</dt>
       <dd><%= pricing_status(@call) %></dd>
+      <% if LlmCostTracker::LlmApiCall.provider_response_id_column? %>
+        <dt>Provider Response ID</dt>
+        <dd><%= @call.provider_response_id.presence || "n/a" %></dd>
+      <% end %>
       <% if @call.has_attribute?("created_at") %>
         <dt>Created At</dt>
         <dd><%= format_date(@call.created_at) %></dd>
@@ -113,12 +118,12 @@
 <section class="lct-panel">
   <h2 class="lct-section-title">Tags</h2>
-  <pre class="lct-pre"><%= safe_json(@tags) %></pre>
+  <pre class="lct-pre"><%= safe_json(@call.parsed_tags) %></pre>
 </section>
-<% if @metadata_available %>
+<% if @call.has_attribute?("metadata") %>
   <section class="lct-panel">
     <h2 class="lct-section-title">Metadata</h2>
-    <pre class="lct-pre"><%= safe_json(@metadata) %></pre>
+    <pre class="lct-pre"><%= safe_json(@call.read_attribute("metadata")) %></pre>
   </section>
 <% end %>

data/app/views/llm_cost_tracker/dashboard/index.html.erb CHANGED Viewed

@@ -5,7 +5,7 @@
     <div class="lct-filter-row lct-filter-row-basic">
       <div class="lct-field">
         <label for="lct-overview-from">From</label>
-        <input id="lct-overview-from" data-lct-filter-input type="date" name="from" value="<%= params[:from] || @from_date.iso8601 %>">
+        <input id="lct-overview-from" type="date" name="from" value="<%= params[:from] || @from_date.iso8601 %>">
       </div>
       <div class="lct-field">

data/app/views/llm_cost_tracker/data_quality/index.html.erb CHANGED Viewed

@@ -1,10 +1,7 @@
 <% total = @stats.total_calls %>
-<% known_pricing_calls = total - @stats.unknown_pricing_count %>
-<% tagged_calls = total - @stats.untagged_calls_count %>
-<% latency_calls = @stats.latency_column_present ? total - @stats.missing_latency_count : nil %>
 <% streaming_count = @stats.streaming_count %>
 <% streaming_missing_usage = @stats.streaming_missing_usage_count %>
-<% streams_with_usage = streaming_count && streaming_missing_usage ? streaming_count - streaming_missing_usage : nil %>
+<% calls_with_provider_response_id = @stats.provider_response_id_column_present ? total - @stats.missing_provider_response_id_count : nil %>
 <section class="lct-panel lct-toolbar">
   <div class="lct-toolbar-head">
@@ -15,7 +12,7 @@
     <div class="lct-filter-row lct-filter-row-basic">
       <div class="lct-field">
         <label for="lct-quality-from">From</label>
-        <input id="lct-quality-from" data-lct-filter-input type="date" name="from" value="<%= params[:from] %>">
+        <input id="lct-quality-from" type="date" name="from" value="<%= params[:from] %>">
       </div>
       <div class="lct-field">
@@ -113,6 +110,14 @@
             </article>
           <% end %>
         <% end %>
+        <% if @stats.provider_response_id_column_present %>
+          <article class="lct-stat">
+            <p class="lct-stat-label">Calls with provider response ID</p>
+            <p class="lct-stat-value"><%= number(calls_with_provider_response_id) %></p>
+            <p class="lct-stat-sub"><%= percent(coverage_percent(calls_with_provider_response_id, total)) %> of calls</p>
+          </article>
+        <% end %>
       </div>
     </div>
   </section>
@@ -136,41 +141,51 @@
           </tr>
         </thead>
         <tbody>
-          <% cost_coverage = coverage_percent(known_pricing_calls, total) %>
+          <% cost_coverage = coverage_percent(total - @stats.unknown_pricing_count, total) %>
           <tr>
             <td>Cost (pricing known)</td>
             <td class="lct-num"><%= percent(cost_coverage) %></td>
-            <td class="lct-num"><%= number(known_pricing_calls) %></td>
+            <td class="lct-num"><%= number(total - @stats.unknown_pricing_count) %></td>
             <td><%= render "llm_cost_tracker/shared/bar", value: cost_coverage, max: 100.0 %></td>
           </tr>
-          <% tag_coverage = coverage_percent(tagged_calls, total) %>
+          <% tag_coverage = coverage_percent(total - @stats.untagged_calls_count, total) %>
           <tr>
             <td>Tags (at least one tag)</td>
             <td class="lct-num"><%= percent(tag_coverage) %></td>
-            <td class="lct-num"><%= number(tagged_calls) %></td>
+            <td class="lct-num"><%= number(total - @stats.untagged_calls_count) %></td>
             <td><%= render "llm_cost_tracker/shared/bar", value: tag_coverage, max: 100.0 %></td>
           </tr>
           <% if @stats.latency_column_present %>
-            <% latency_coverage = coverage_percent(latency_calls, total) %>
+            <% latency_coverage = coverage_percent(total - @stats.missing_latency_count, total) %>
             <tr>
               <td>Latency</td>
               <td class="lct-num"><%= percent(latency_coverage) %></td>
-              <td class="lct-num"><%= number(latency_calls) %></td>
+              <td class="lct-num"><%= number(total - @stats.missing_latency_count) %></td>
               <td><%= render "llm_cost_tracker/shared/bar", value: latency_coverage, max: 100.0 %></td>
             </tr>
           <% end %>
-          <% if @stats.stream_column_present && streams_with_usage && streaming_count.to_i.positive? %>
-            <% stream_coverage = coverage_percent(streams_with_usage, streaming_count) %>
+          <% if @stats.stream_column_present && streaming_count.to_i.positive? && streaming_missing_usage %>
+            <% stream_coverage = coverage_percent(streaming_count - streaming_missing_usage, streaming_count) %>
             <tr>
               <td>Streaming usage captured</td>
               <td class="lct-num"><%= percent(stream_coverage) %></td>
-              <td class="lct-num"><%= number(streams_with_usage) %> / <%= number(streaming_count) %></td>
+              <td class="lct-num"><%= number(streaming_count - streaming_missing_usage) %> / <%= number(streaming_count) %></td>
               <td><%= render "llm_cost_tracker/shared/bar", value: stream_coverage, max: 100.0 %></td>
             </tr>
           <% end %>
+          <% if @stats.provider_response_id_column_present %>
+            <% provider_response_id_coverage = coverage_percent(calls_with_provider_response_id, total) %>
+            <tr>
+              <td>Provider response ID</td>
+              <td class="lct-num"><%= percent(provider_response_id_coverage) %></td>
+              <td class="lct-num"><%= number(calls_with_provider_response_id) %></td>
+              <td><%= render "llm_cost_tracker/shared/bar", value: provider_response_id_coverage, max: 100.0 %></td>
+            </tr>
+          <% end %>
         </tbody>
       </table>
     </section>
@@ -216,6 +231,13 @@
               <td>Send OpenAI requests with <code class="lct-code">stream_options: { include_usage: true }</code>, or wrap custom clients with <code class="lct-code">LlmCostTracker.track_stream</code>.</td>
             </tr>
           <% end %>
+          <% if @stats.provider_response_id_column_present && @stats.missing_provider_response_id_count.to_i.positive? %>
+            <tr>
+              <td>Missing provider response IDs</td>
+              <td>Proof of provider-issued responses is weaker when calls cannot be tied back to provider objects.</td>
+              <td>Upgrade to the latest parser coverage and pass <code class="lct-code">provider_response_id:</code> for custom clients when the provider exposes one.</td>
+            </tr>
+          <% end %>
         </tbody>
       </table>
     </section>

data/app/views/llm_cost_tracker/models/index.html.erb CHANGED Viewed

@@ -7,7 +7,7 @@
     <div class="lct-filter-row lct-filter-row-with-sort">
       <div class="lct-field">
         <label for="lct-models-from">From</label>
-        <input id="lct-models-from" data-lct-filter-input type="date" name="from" value="<%= params[:from] %>">
+        <input id="lct-models-from" type="date" name="from" value="<%= params[:from] %>">
       </div>
       <div class="lct-field">
@@ -33,14 +33,15 @@
       <div class="lct-field">
         <label for="lct-models-sort">Sort</label>
-        <select id="lct-models-sort" name="sort">
-          <option value="cost" <%= "selected" if @sort.blank? || @sort == "cost" %>>Total spend</option>
-          <option value="calls" <%= "selected" if @sort == "calls" %>>Call volume</option>
-          <option value="avg_cost" <%= "selected" if @sort == "avg_cost" %>>Avg cost / call</option>
-          <% if @latency_available %>
-            <option value="latency" <%= "selected" if @sort == "latency" %>>Avg latency</option>
-          <% end %>
-        </select>
+        <%= select_tag :sort,
+                       options_for_select(
+                         [["Total spend", "cost"],
+                          ["Call volume", "calls"],
+                          ["Avg cost / call", "avg_cost"]] +
+                         (@latency_available ? [["Avg latency", "latency"]] : []),
+                         @sort.presence || "cost"
+                       ),
+                       id: "lct-models-sort" %>
       </div>
       <div class="lct-filter-actions">

data/app/views/llm_cost_tracker/shared/_spend_chart.html.erb CHANGED Viewed

@@ -1,4 +1,3 @@
-<%# locals: series: Array[{ label:, cost: }], comparison_series: nil %>
 <% if series.blank? %>
   <div class="lct-chart-empty">No spend in this range.</div>
 <% else %>

data/app/views/llm_cost_tracker/shared/_tag_chips.html.erb CHANGED Viewed

@@ -1,4 +1,3 @@
-<%# locals: tags: Hash, limit: Integer (optional) %>
 <% entries = tag_chip_entries(tags, limit: local_assigns.fetch(:limit, 3)) %>
 <% if entries.empty? %>
   <span class="lct-tag-empty">(untagged)</span>

data/app/views/llm_cost_tracker/tags/index.html.erb CHANGED Viewed

@@ -7,7 +7,7 @@
     <div class="lct-filter-row lct-filter-row-basic">
       <div class="lct-field">
         <label for="lct-tags-from">From</label>
-        <input id="lct-tags-from" data-lct-filter-input type="date" name="from" value="<%= params[:from] %>">
+        <input id="lct-tags-from" type="date" name="from" value="<%= params[:from] %>">
       </div>
       <div class="lct-field">

data/app/views/llm_cost_tracker/tags/show.html.erb CHANGED Viewed

@@ -12,7 +12,7 @@
     <div class="lct-filter-row lct-filter-row-basic">
       <div class="lct-field">
         <label for="lct-tag-show-from">From</label>
-        <input id="lct-tag-show-from" data-lct-filter-input type="date" name="from" value="<%= params[:from] %>">
+        <input id="lct-tag-show-from" type="date" name="from" value="<%= params[:from] %>">
       </div>
       <div class="lct-field">

data/lib/llm_cost_tracker/configuration.rb CHANGED Viewed

@@ -5,7 +5,6 @@ require_relative "value_helpers"
 module LlmCostTracker
   class Configuration
-    # Hostname => provider name for OpenAI-compatible APIs.
     OPENAI_COMPATIBLE_PROVIDERS = {
       "openrouter.ai" => "openrouter",
       "api.deepseek.com" => "deepseek"

data/lib/llm_cost_tracker/event.rb CHANGED Viewed

@@ -12,6 +12,7 @@ module LlmCostTracker
     :latency_ms,
     :stream,
     :usage_source,
+    :provider_response_id,
     :tracked_at
   ) do
     def to_h

data/lib/llm_cost_tracker/event_metadata.rb CHANGED Viewed

@@ -10,6 +10,7 @@ module LlmCostTracker
       cached_input_tokens
       input_tokens
       output_tokens
+      provider_response_id
       reasoning_tokens
       total_tokens
     ].freeze

data/lib/llm_cost_tracker/generators/llm_cost_tracker/add_provider_response_id_generator.rb ADDED Viewed

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+require "rails/generators"
+require "rails/generators/active_record"
+module LlmCostTracker
+  module Generators
+    class AddProviderResponseIdGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+      source_root File.expand_path("templates", __dir__)
+      desc "Creates a migration to add llm_api_calls.provider_response_id"
+      def create_migration_file
+        migration_template(
+          "add_provider_response_id_to_llm_api_calls.rb.erb",
+          "db/migrate/add_provider_response_id_to_llm_api_calls.rb"
+        )
+      end
+      private
+      def migration_version
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+      end
+    end
+  end
+end

data/lib/llm_cost_tracker/generators/llm_cost_tracker/templates/add_provider_response_id_to_llm_api_calls.rb.erb ADDED Viewed

@@ -0,0 +1,15 @@
+class AddProviderResponseIdToLlmApiCalls < ActiveRecord::Migration<%= migration_version %>
+  def up
+    return if column_exists?(:llm_api_calls, :provider_response_id)
+    add_column :llm_api_calls, :provider_response_id, :string
+    add_index :llm_api_calls, :provider_response_id
+  end
+  def down
+    return unless column_exists?(:llm_api_calls, :provider_response_id)
+    remove_index :llm_api_calls, :provider_response_id if index_exists?(:llm_api_calls, :provider_response_id)
+    remove_column :llm_api_calls, :provider_response_id
+  end
+end

data/lib/llm_cost_tracker/generators/llm_cost_tracker/templates/create_llm_api_calls.rb.erb CHANGED Viewed

@@ -12,6 +12,7 @@ class CreateLlmApiCalls < ActiveRecord::Migration<%= migration_version %>
       t.integer :latency_ms
       t.boolean :stream,        null: false, default: false
       t.string  :usage_source
+      t.string  :provider_response_id
       if postgresql?
         t.jsonb :tags, null: false, default: {}
       else
@@ -28,6 +29,7 @@ class CreateLlmApiCalls < ActiveRecord::Migration<%= migration_version %>
     add_index :llm_api_calls, [:provider, :tracked_at]
     add_index :llm_api_calls, :stream
     add_index :llm_api_calls, :usage_source
+    add_index :llm_api_calls, :provider_response_id
     add_index :llm_api_calls, :tags, using: :gin if postgresql?
   end

data/lib/llm_cost_tracker/llm_api_call.rb CHANGED Viewed

@@ -16,7 +16,6 @@ module LlmCostTracker
     self.table_name = "llm_api_calls"
-    # Scopes for querying
     scope :with_cost, -> { where.not(total_cost: nil) }
     scope :without_cost, -> { where(total_cost: nil) }
     scope :unknown_pricing, -> { without_cost }
@@ -24,6 +23,12 @@ module LlmCostTracker
     scope :streaming,     -> { stream_column? ? where(stream: true) : none }
     scope :non_streaming, -> { stream_column? ? where(stream: [false, nil]) : all }
     scope :by_usage_source, ->(source) { usage_source_column? ? where(usage_source: source.to_s) : none }
+    scope :with_provider_response_id, lambda {
+      provider_response_id_column? ? where.not(provider_response_id: [nil, ""]) : none
+    }
+    scope :missing_provider_response_id, lambda {
+      provider_response_id_column? ? where(provider_response_id: [nil, ""]) : none
+    }
     scope :streaming_missing_usage, lambda {
       return none unless stream_column? && usage_source_column?
@@ -51,7 +56,6 @@ module LlmCostTracker
       TagQuery.apply(self, tags)
     end
-    # Aggregations
     def self.total_cost
       sum(:total_cost).to_f
     end

data/lib/llm_cost_tracker/middleware/faraday.rb CHANGED Viewed

@@ -61,6 +61,7 @@ module LlmCostTracker
           latency_ms: latency_ms,
           stream: parsed.stream,
           usage_source: parsed.usage_source,
+          provider_response_id: parsed.provider_response_id,
           metadata: resolved_tags(request_env).merge(parsed.metadata)
         )
       rescue LlmCostTracker::Error

data/lib/llm_cost_tracker/parameter_hash.rb ADDED Viewed

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module LlmCostTracker
+  module ParameterHash
+    class << self
+      def hash_like?(value)
+        value.is_a?(Hash) || action_controller_parameters?(value)
+      end
+      def to_hash(value)
+        return {} if value.nil?
+        return value.to_unsafe_h if action_controller_parameters?(value)
+        return value.to_h if value.is_a?(Hash)
+        return {} unless value.respond_to?(:to_h)
+        hash = value.to_h
+        hash.is_a?(Hash) ? hash : {}
+      rescue ArgumentError, TypeError
+        {}
+      end
+      def with_indifferent_access(value)
+        to_hash(value).with_indifferent_access
+      end
+      private
+      def action_controller_parameters?(value)
+        defined?(ActionController::Parameters) && value.is_a?(ActionController::Parameters)
+      end
+    end
+  end
+end

data/lib/llm_cost_tracker/parsed_usage.rb CHANGED Viewed

@@ -12,11 +12,21 @@ module LlmCostTracker
     :cache_creation_input_tokens,
     :reasoning_tokens,
     :stream,
-    :usage_source
+    :usage_source,
+    :provider_response_id
   )
   class ParsedUsage
-    TRACKING_KEYS = %i[provider model input_tokens output_tokens total_tokens stream usage_source].freeze
+    TRACKING_KEYS = %i[
+      provider
+      model
+      input_tokens
+      output_tokens
+      total_tokens
+      stream
+      usage_source
+      provider_response_id
+    ].freeze
     def self.build(**attributes)
       new(
@@ -30,7 +40,8 @@ module LlmCostTracker
         cache_creation_input_tokens: attributes[:cache_creation_input_tokens],
         reasoning_tokens: attributes[:reasoning_tokens],
         stream: attributes[:stream] || false,
-        usage_source: attributes[:usage_source]
+        usage_source: attributes[:usage_source],
+        provider_response_id: attributes[:provider_response_id]
       )
     end

data/lib/llm_cost_tracker/parsers/anthropic.rb CHANGED Viewed

@@ -31,6 +31,7 @@ module LlmCostTracker
         ParsedUsage.build(
           provider: "anthropic",
+          provider_response_id: response["id"],
           model: response["model"] || request["model"],
           input_tokens: usage["input_tokens"].to_i,
           output_tokens: usage["output_tokens"].to_i,
@@ -48,35 +49,9 @@ module LlmCostTracker
         request = safe_json_parse(request_body)
         model = stream_model(events) || request["model"]
         usage = stream_usage(events)
+        response_id = stream_response_id(events)
-        if usage
-          input = usage["input_tokens"].to_i
-          output = usage["output_tokens"].to_i
-          cache_read = usage["cache_read_input_tokens"].to_i
-          cache_creation = usage["cache_creation_input_tokens"].to_i
-          ParsedUsage.build(
-            provider: "anthropic",
-            model: model,
-            input_tokens: input,
-            output_tokens: output,
-            total_tokens: input + output + cache_read + cache_creation,
-            cache_read_input_tokens: usage["cache_read_input_tokens"],
-            cache_creation_input_tokens: usage["cache_creation_input_tokens"],
-            stream: true,
-            usage_source: :stream_final
-          )
-        else
-          ParsedUsage.build(
-            provider: "anthropic",
-            model: model,
-            input_tokens: 0,
-            output_tokens: 0,
-            total_tokens: 0,
-            stream: true,
-            usage_source: :unknown
-          )
-        end
+        usage ? build_stream_result(model, usage, response_id) : build_unknown_stream_result(model, response_id)
       end
       private
@@ -114,6 +89,50 @@ module LlmCostTracker
         end
         nil
       end
+      def stream_response_id(events)
+        events.each do |event|
+          data = event[:data]
+          next unless data.is_a?(Hash)
+          id = data.dig("message", "id") || data["id"]
+          return id if id && !id.to_s.empty?
+        end
+        nil
+      end
+      def build_stream_result(model, usage, response_id)
+        input = usage["input_tokens"].to_i
+        output = usage["output_tokens"].to_i
+        cache_read = usage["cache_read_input_tokens"].to_i
+        cache_creation = usage["cache_creation_input_tokens"].to_i
+        ParsedUsage.build(
+          provider: "anthropic",
+          provider_response_id: response_id,
+          model: model,
+          input_tokens: input,
+          output_tokens: output,
+          total_tokens: input + output + cache_read + cache_creation,
+          cache_read_input_tokens: usage["cache_read_input_tokens"],
+          cache_creation_input_tokens: usage["cache_creation_input_tokens"],
+          stream: true,
+          usage_source: :stream_final
+        )
+      end
+      def build_unknown_stream_result(model, response_id)
+        ParsedUsage.build(
+          provider: "anthropic",
+          provider_response_id: response_id,
+          model: model,
+          input_tokens: 0,
+          output_tokens: 0,
+          total_tokens: 0,
+          stream: true,
+          usage_source: :unknown
+        )
+      end
     end
   end
 end