collab: Count active users based on the tokens per minute measure (#16911)

Marshall Bowers created 1 year ago

This PR fixes an issue where active user counts were being computed
across _all_ measures instead of the per-minute measures.

We now compute them using the tokens per minute measure, as we're
concerned with usage in recent minutes.

Release Notes:

- N/A

Change summary

crates/collab/src/llm/db/queries/usages.rs | 4 ++++
1 file changed, 4 insertions(+)

Detailed changes

crates/collab/src/llm/db/queries/usages.rs

@@ -359,10 +359,13 @@ impl LlmDatabase {
                 .get(&(provider, model_name.to_string()))
                 .ok_or_else(|| anyhow!("unknown model {provider}:{model_name}"))?;
 
+            let tokens_per_minute = self.usage_measure_ids[&UsageMeasure::TokensPerMinute];
+
             let users_in_recent_minutes = usage::Entity::find()
                 .filter(
                     usage::Column::ModelId
                         .eq(model.id)
+                        .and(usage::Column::MeasureId.eq(tokens_per_minute))
                         .and(usage::Column::Timestamp.gte(minute_since.naive_utc()))
                         .and(usage::Column::IsStaff.eq(false)),
                 )
@@ -376,6 +379,7 @@ impl LlmDatabase {
                 .filter(
                     usage::Column::ModelId
                         .eq(model.id)
+                        .and(usage::Column::MeasureId.eq(tokens_per_minute))
                         .and(usage::Column::Timestamp.gte(day_since.naive_utc()))
                         .and(usage::Column::IsStaff.eq(false)),
                 )