diff --git a/lib/completions/report.rb b/lib/completions/report.rb index 7290a6d3..22e992db 100644 --- a/lib/completions/report.rb +++ b/lib/completions/report.rb @@ -120,9 +120,6 @@ module DiscourseAi :user_id, "users.username", "users.uploaded_avatar_id", - "llm_models.input_cost", - "llm_models.output_cost", - "llm_models.cached_input_cost", ) .order("usage_count DESC") .limit(USER_LIMIT) @@ -134,9 +131,9 @@ module DiscourseAi "SUM(COALESCE(cached_tokens,0)) as total_cached_tokens", "SUM(COALESCE(request_tokens,0)) as total_request_tokens", "SUM(COALESCE(response_tokens,0)) as total_response_tokens", - "SUM(COALESCE(request_tokens, 0)) * COALESCE(llm_models.input_cost, 0) / 1000000.0 as input_spending", - "SUM(COALESCE(response_tokens, 0)) * COALESCE(llm_models.output_cost, 0) / 1000000.0 as output_spending", - "SUM(COALESCE(cached_tokens, 0)) * COALESCE(llm_models.cached_input_cost, 0) / 1000000.0 as cached_input_spending", + "SUM(COALESCE(request_tokens, 0) * COALESCE(llm_models.input_cost, 0)) / 1000000.0 as input_spending", + "SUM(COALESCE(response_tokens, 0) * COALESCE(llm_models.output_cost, 0)) / 1000000.0 as output_spending", + "SUM(COALESCE(cached_tokens, 0) * COALESCE(llm_models.cached_input_cost, 0)) / 1000000.0 as cached_input_spending", ) end @@ -144,10 +141,7 @@ module DiscourseAi base_query .joins("LEFT JOIN llm_models ON llm_models.name = language_model") .group( - :feature_name, - "llm_models.input_cost", - "llm_models.output_cost", - "llm_models.cached_input_cost", + :feature_name ) .order("usage_count DESC") .select( @@ -157,9 +151,9 @@ module DiscourseAi "SUM(COALESCE(cached_tokens,0)) as total_cached_tokens", "SUM(COALESCE(request_tokens,0)) as total_request_tokens", "SUM(COALESCE(response_tokens,0)) as total_response_tokens", - "SUM(COALESCE(request_tokens, 0)) * COALESCE(llm_models.input_cost, 0) / 1000000.0 as input_spending", - "SUM(COALESCE(response_tokens, 0)) * COALESCE(llm_models.output_cost, 0) / 1000000.0 as output_spending", - "SUM(COALESCE(cached_tokens, 0)) * COALESCE(llm_models.cached_input_cost, 0) / 1000000.0 as cached_input_spending", + "SUM(COALESCE(request_tokens, 0) * COALESCE(llm_models.input_cost, 0)) / 1000000.0 as input_spending", + "SUM(COALESCE(response_tokens, 0) * COALESCE(llm_models.output_cost, 0)) / 1000000.0 as output_spending", + "SUM(COALESCE(cached_tokens, 0) * COALESCE(llm_models.cached_input_cost, 0)) / 1000000.0 as cached_input_spending", ) end