llm_cost_tracker 0.7.3 → 0.8.0

data/app/services/llm_cost_tracker/dashboard/top_models.rb

@@ -8,7 +8,7 @@ module LlmCostTracker
       DEFAULT_SORT = "cost"
 
       class << self
-        def call(scope: LlmCostTracker::Ledger::Call.all, limit: DEFAULT_LIMIT, sort: DEFAULT_SORT)
+        def call(scope: LlmCostTracker::Call.all, limit: DEFAULT_LIMIT, sort: DEFAULT_SORT)
           new(scope: scope, limit: limit, sort: sort).rows
         end
       end

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

@@ -2,83 +2,16 @@
   <div class="lct-toolbar-head">
     <h2 class="lct-section-title">Calls</h2>
     <div class="lct-toolbar-actions">
-      <%= link_to "Export CSV", calls_path(current_query(format: :csv)), class: "lct-button lct-button-secondary" %>
+      <%= link_to "Export CSV",
+                  calls_path(current_query(format: :csv)),
+                  class: "lct-button lct-button-secondary",
+                  title: "Capped at #{number(LlmCostTracker::CallsController::CSV_EXPORT_LIMIT)} rows per request — narrow the date range to export larger slices." %>
     </div>
   </div>
 
-  <form class="lct-filters" action="<%= calls_path %>" method="get">
-    <div class="lct-filter-row lct-filter-row-with-sort">
-      <div class="lct-field">
-        <label for="lct-from">From</label>
-        <input id="lct-from" type="date" name="from" value="<%= params[:from] %>">
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-to">To</label>
-        <input id="lct-to" type="date" name="to" value="<%= params[:to] %>">
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-provider">Provider</label>
-        <%= select_tag :provider,
-                       options_for_select(provider_filter_options, params[:provider]),
-                       include_blank: "All providers",
-                       id: "lct-provider" %>
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-model">Model</label>
-        <%= select_tag :model,
-                       options_for_select(model_filter_options, params[:model]),
-                       include_blank: "All models",
-                       id: "lct-model" %>
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-stream">Stream</label>
-        <%= select_tag :stream,
-                       options_for_select(LlmCostTracker::DashboardFilterHelper::STREAM_FILTER_OPTIONS, params[:stream]),
-                       include_blank: "All calls",
-                       id: "lct-stream" %>
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-sort">Sort</label>
-        <%= select_tag :sort,
-                       options_for_select(
-                         [["Recent first", ""],
-                          ["Most expensive", "expensive"],
-                          ["Largest input", "input"],
-                          ["Largest output", "output"],
-                          ["Slowest", "slow"],
-                          ["Unknown pricing only", "unknown_pricing"]],
-                         @sort
-                       ),
-                       id: "lct-sort" %>
-      </div>
-
-      <div class="lct-filter-actions">
-        <button class="lct-button" type="submit">Apply</button>
-        <%= link_to("Reset", calls_path, class: "lct-button lct-button-secondary") if any_filter_applied? %>
-      </div>
-    </div>
-  </form>
+  <%= render "llm_cost_tracker/shared/filters", path: calls_path %>
 
   <%= render "llm_cost_tracker/shared/active_filters", chips: active_tag_filters, clear_path: calls_path %>
-
-  <p class="lct-summary-row">
-    <span class="lct-pagination-per">
-      <span class="lct-pagination-per-label">Per page:</span>
-      <% LlmCostTracker::PaginationHelper::PER_PAGE_CHOICES.each do |choice| %>
-        <% if choice == @page.per %>
-          <span class="lct-pagination-per-option is-active" aria-current="true"><%= choice %></span>
-        <% else %>
-          <%= link_to choice, calls_path(current_query(per: choice, page: 1)), class: "lct-pagination-per-option" %>
-        <% end %>
-      <% end %>
-    </span>
-  </p>
-  <p class="lct-toolbar-note">CSV export is capped at <%= number(LlmCostTracker::CallsController::CSV_EXPORT_LIMIT) %> rows per request — narrow the date range to export larger slices.</p>
 </section>
 
 <% if @calls_count.zero? %>
@@ -91,6 +24,31 @@
   </section>
 <% else %>
   <section class="lct-panel">
+    <div class="lct-results-toolbar">
+      <span class="lct-pagination-per">
+        <span class="lct-pagination-per-label">Per page:</span>
+        <% LlmCostTracker::PaginationHelper::PER_PAGE_CHOICES.each do |choice| %>
+          <% if choice == @page.per %>
+            <span class="lct-pagination-per-option is-active" aria-current="true"><%= choice %></span>
+          <% else %>
+            <%= link_to choice, calls_path(current_query(per: choice, page: 1)), class: "lct-pagination-per-option" %>
+          <% end %>
+        <% end %>
+      </span>
+
+      <%= render "llm_cost_tracker/shared/sort",
+                 current: @sort,
+                 options: [
+                   ["Recent", ""],
+                   ["Most expensive", "expensive"],
+                   ["Largest input", "input"],
+                   ["Largest output", "output"],
+                   ["Slowest", "slow"],
+                   ["Unknown pricing", "unknown_pricing"]
+                 ],
+                 path_for_sort: ->(value) { calls_path(current_query(sort: value.presence, page: nil)) } %>
+    </div>
+
     <div class="lct-table-wrap">
       <table class="lct-table lct-table-compact lct-calls-table">
         <thead>
@@ -113,9 +71,9 @@
               <td class="lct-nowrap"><%= format_date(call.tracked_at) %></td>
               <td><%= call.provider %></td>
               <td><code class="lct-code"><%= call.model %></code></td>
-              <td class="lct-num"><%= format_tokens(call.input_tokens) %></td>
-              <td class="lct-num"><%= format_tokens(call.output_tokens) %></td>
-              <td class="lct-num"><%= format_tokens(call.total_tokens) %></td>
+              <td class="lct-num"><%= number(call.input_tokens) %></td>
+              <td class="lct-num"><%= number(call.output_tokens) %></td>
+              <td class="lct-num"><%= number(call.total_tokens) %></td>
               <td class="lct-num<%= ' lct-num-muted' if call.total_cost.nil? %>"><%= optional_money(call.total_cost) %></td>
               <td class="lct-num<%= ' lct-num-muted' if call.latency_ms.nil? %>"><%= call.latency_ms ? "#{number(call.latency_ms)}ms" : "n/a" %></td>
               <td><%= render "llm_cost_tracker/shared/tag_chips", tags: call.parsed_tags %></td>

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

@@ -1,14 +1,14 @@
 <% priced_components = token_usage_stack_components %>
+<% line_item_costs_by_component = call_line_item_costs_by_component(@call) %>
 <% token_segments = priced_components.map do |component|
   token_key = component.fetch(:token_key)
   value = @call.has_attribute?(token_key) ? @call[token_key] : 0
-  { label: component.fetch(:label), value: value, formatted_value: format_tokens(value), css_class: component.fetch(:css_class) }
+  { label: component.fetch(:label), value: value, formatted_value: number(value), css_class: component.fetch(:css_class) }
 end %>
 <% cost_segments = [] %>
 <% unless @call.total_cost.nil? %>
   <% cost_segments = priced_components.map do |component|
-    cost_key = component.fetch(:cost_key)
-    value = @call.has_attribute?(cost_key) ? @call[cost_key] : nil
+    value = line_item_costs_by_component[component.fetch(:price_key)]
     { label: component.fetch(:label), value: value, formatted_value: optional_money(value), css_class: component.fetch(:css_class) }
   end %>
 <% end %>
@@ -38,7 +38,7 @@ end %>
       </div>
       <div class="lct-call-summary-item">
         <span class="lct-call-summary-label">Total tokens</span>
-        <strong><%= format_tokens(@call.total_tokens) %></strong>
+        <strong><%= number(@call.total_tokens) %></strong>
       </div>
       <div class="lct-call-summary-item">
         <span class="lct-call-summary-label">Latency</span>
@@ -77,9 +77,24 @@ end %>
       <dt>Pricing Status</dt>
       <dd><%= pricing_status(@call) %></dd>
 
+      <dt>Cost Status</dt>
+      <dd><%= @call.cost_status.presence || "n/a" %></dd>
+
       <dt>Provider Response ID</dt>
       <dd><%= @call.provider_response_id.presence || "n/a" %></dd>
 
+      <dt>Provider Project ID</dt>
+      <dd><%= @call.provider_project_id.presence || "n/a" %></dd>
+
+      <dt>Provider API Key ID</dt>
+      <dd><%= @call.provider_api_key_id.presence || "n/a" %></dd>
+
+      <dt>Provider Workspace ID</dt>
+      <dd><%= @call.provider_workspace_id.presence || "n/a" %></dd>
+
+      <dt>Batch</dt>
+      <dd><%= @call.batch? ? "yes" : "no" %></dd>
+
       <% if @call.has_attribute?("created_at") %>
         <dt>Created At</dt>
         <dd><%= format_date(@call.created_at) %></dd>
@@ -94,15 +109,15 @@ end %>
     <dl class="lct-dl">
       <% priced_components.each do |component| %>
         <dt><%= component.fetch(:label).titleize %> Tokens</dt>
-        <dd><%= format_tokens(@call[component.fetch(:token_key)]) %></dd>
+        <dd><%= number(@call[component.fetch(:token_key)]) %></dd>
       <% end %>
 
       <dt>Total Tokens</dt>
-      <dd><%= format_tokens(@call.total_tokens) %></dd>
+      <dd><%= number(@call.total_tokens) %></dd>
 
       <% priced_components.each do |component| %>
         <dt><%= component.fetch(:label).titleize %> Cost</dt>
-        <dd><%= optional_money(@call[component.fetch(:cost_key)]) %></dd>
+        <dd><%= optional_money(line_item_costs_by_component[component.fetch(:price_key)]) %></dd>
       <% end %>
 
       <dt>Total Cost</dt>
@@ -114,6 +129,46 @@ end %>
   </div>
 </section>
 
+<% service_line_items = @call.line_items.where.not(unit: "token").order(:position).to_a %>
+<% if service_line_items.any? %>
+  <section class="lct-panel">
+    <h2 class="lct-section-title">Service Charges</h2>
+    <div class="lct-table-wrap">
+      <table class="lct-table lct-table-compact">
+        <thead>
+          <tr>
+            <th>Component</th>
+            <th>Unit</th>
+            <th class="lct-num">Quantity</th>
+            <th class="lct-num">Rate</th>
+            <th class="lct-num">Cost</th>
+            <th>Status</th>
+          </tr>
+        </thead>
+        <tbody>
+          <% service_line_items.each do |line_item| %>
+            <tr>
+              <td><code class="lct-code"><%= line_item.kind %></code></td>
+              <td><%= line_item.unit %></td>
+              <td class="lct-num"><%= line_item.quantity %></td>
+              <td class="lct-num"><%= line_item.rate_amount ? "#{optional_money(line_item.rate_amount)} / #{line_item.rate_quantity}" : "n/a" %></td>
+              <td class="lct-num<%= ' lct-num-muted' if line_item.cost.nil? %>"><%= optional_money(line_item.cost) %></td>
+              <td><%= line_item.cost_status %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </section>
+<% end %>
+
+<% if @call.pricing_snapshot.present? %>
+  <section class="lct-panel">
+    <h2 class="lct-section-title">Pricing Snapshot</h2>
+    <pre class="lct-pre"><%= safe_json(@call.pricing_snapshot) %></pre>
+  </section>
+<% end %>
+
 <section class="lct-panel">
   <h2 class="lct-section-title">Tags</h2>
   <pre class="lct-pre"><%= safe_json(@call.parsed_tags) %></pre>

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

@@ -1,48 +1,10 @@
 <% overview_filter_scope = current_query(from: @from_date.iso8601, to: @to_date.iso8601) %>
 
 <section class="lct-panel lct-toolbar">
-  <form class="lct-filters" action="<%= root_path %>" method="get">
-    <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" type="date" name="from" value="<%= params[:from] || @from_date.iso8601 %>">
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-overview-to">To</label>
-        <input id="lct-overview-to" type="date" name="to" value="<%= params[:to] || @to_date.iso8601 %>">
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-overview-provider">Provider</label>
-        <%= select_tag :provider,
-                       options_for_select(provider_filter_options(filter_params: overview_filter_scope), params[:provider]),
-                       include_blank: "All providers",
-                       id: "lct-overview-provider" %>
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-overview-model">Model</label>
-        <%= select_tag :model,
-                       options_for_select(model_filter_options(filter_params: overview_filter_scope), params[:model]),
-                       include_blank: "All models",
-                       id: "lct-overview-model" %>
-      </div>
-
-      <div class="lct-field">
-        <label for="lct-overview-stream">Stream</label>
-        <%= select_tag :stream,
-                       options_for_select(LlmCostTracker::DashboardFilterHelper::STREAM_FILTER_OPTIONS, params[:stream]),
-                       include_blank: "All calls",
-                       id: "lct-overview-stream" %>
-      </div>
-
-      <div class="lct-filter-actions">
-        <button class="lct-button" type="submit">Apply</button>
-        <%= link_to("Reset", root_path, class: "lct-button lct-button-secondary") if any_filter_applied? %>
-      </div>
-    </div>
-  </form>
+  <%= render "llm_cost_tracker/shared/filters",
+             path: root_path,
+             filter_scope: overview_filter_scope,
+             defaults: { from: @from_date.iso8601, to: @to_date.iso8601 } %>
 
   <%= render "llm_cost_tracker/shared/active_filters", chips: active_tag_filters, clear_path: root_path %>
 </section>
@@ -125,9 +87,6 @@
 
       <% if @monthly_budget_status %>
         <% budget = @monthly_budget_status %>
-        <% fill_mod = budget_fill_modifier(budget[:percent_used]) %>
-        <% projected_marker = [[budget[:projected_percent_used].to_f, 0.0].max, 100.0].min %>
-        <% projected_delta = budget[:projected_delta].to_f %>
         <section class="lct-panel lct-panel-tight">
           <div class="lct-section-head">
             <div>
@@ -143,16 +102,16 @@
               </span>
               <span class="lct-budget-percent"><%= percent(budget[:percent_used]) %></span>
             </div>
-            <div class="lct-budget-track" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="<%= [budget[:percent_used].to_f, 100.0].min.round %>">
-              <div class="lct-budget-fill <%= fill_mod %>" style="width: <%= [budget[:percent_used].to_f, 100.0].min %>%"></div>
+            <div class="lct-budget-track" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="<%= budget[:progress_percent].round %>">
+              <div class="lct-budget-fill <%= budget[:fill_modifier] %>" style="width: <%= budget[:progress_percent] %>%"></div>
               <% if budget[:projected_spent].positive? %>
-                <span class="lct-budget-marker" aria-hidden="true" style="left: calc(<%= projected_marker %>% - 1px)"></span>
+                <span class="lct-budget-marker" aria-hidden="true" style="left: calc(<%= budget[:projected_marker_percent] %>% - 1px)"></span>
               <% end %>
             </div>
             <p class="lct-budget-projection">
               <span>Projected <strong><%= money(budget[:projected_spent]) %></strong> by <%= budget[:projection_end_label] %></span>
-              <span class="lct-budget-projection-status <%= projected_delta.positive? ? "lct-budget-projection-status--over" : "lct-budget-projection-status--under" %>">
-                <%= money(projected_delta.abs) %> <%= projected_delta.positive? ? "over" : "under" %> budget
+              <span class="lct-budget-projection-status <%= budget[:projected_delta_status_class] %>">
+                <%= money(budget[:projected_delta_amount]) %> <%= budget[:projected_delta_direction] %> budget
               </span>
             </p>
             <p class="lct-budget-meta">Soft limit: blocking is not atomic under concurrency.</p>