Skip to content

feat: monitoring demand endpoint decoupled from completion windows #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fergusfinn wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: monitoring demand endpoint decoupled from completion windows #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e37416
feat: monitoring demand endpoint decoupled from completion windows
fergusfinn Apr 14, 2026
a751b86
review: match fusillade's Option<i64> start-bound signature
fergusfinn Apr 14, 2026
2330bf4
chore: bump fusillade to 16.0.0, drop local patch
fergusfinn Apr 14, 2026
81926ed
review: strict parser + 400s for malformed demand windows
fergusfinn Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dwctl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ embedded-db = ["dep:postgresql_embedded"]

[dependencies]
axum = { version = "0.8", features = ["multipart"] }
fusillade = { version = "15.1.1" }
fusillade = { version = "16.0.0" }
tokio = { version = "1.0", features = ["full"] }
tokio-stream = { version = "0.1", features = ["sync"] }
tokio-util = "0.7"
Expand Down
16 changes: 8 additions & 8 deletions dwctl/src/api/handlers/batches.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ pub async fn create_batch<P: PoolProvider>(
}
}

let windows = vec![(req.completion_window.clone(), parse_window_to_seconds(&req.completion_window))];
let windows = vec![(req.completion_window.clone(), None, parse_window_to_seconds(&req.completion_window))];
let states = vec!["pending".to_string(), "claimed".to_string(), "processing".to_string()];

let model_throughputs = batch_model_info.throughputs;
Expand Down Expand Up @@ -689,7 +689,7 @@ async fn reserve_capacity_for_batch<P: PoolProvider>(
file_model_counts: &HashMap<String, i64>,
model_throughputs: &HashMap<String, f32>,
model_ids_by_alias: &HashMap<String, Uuid>,
windows: &[(String, i64)],
windows: &[(String, Option<i64>, i64)],
states: &[String],
model_filter: &[String],
relaxation_factor: f32,
Expand Down Expand Up @@ -733,7 +733,7 @@ async fn reserve_capacity_for_batch<P: PoolProvider>(
// Fetch pending counts AFTER locks to avoid stale snapshots
let pending_counts = state
.request_manager
.get_pending_request_counts_by_model_and_completion_window(windows, states, model_filter, true)
.get_pending_request_counts_by_model_and_window(windows, states, model_filter, true)
.await
.map_err(|e| Error::Internal {
operation: format!("get pending counts: {}", e),
Expand Down Expand Up @@ -2796,7 +2796,7 @@ mod tests {
let model_throughputs = HashMap::from([(alias.clone(), 1000.0_f32)]);
let model_ids_by_alias = HashMap::from([(alias.clone(), model_id)]);

let windows = vec![("24h".to_string(), super::parse_window_to_seconds("24h"))];
let windows = vec![("1h".to_string(), None, super::parse_window_to_seconds("24h"))];
let states = vec!["pending".to_string(), "claimed".to_string(), "processing".to_string()];
let model_filter = vec![alias.clone()];

Expand Down Expand Up @@ -2858,7 +2858,7 @@ mod tests {
let model_throughputs = HashMap::from([(alias.clone(), 0.0_f32)]);
let model_ids_by_alias = HashMap::from([(alias.clone(), model_id)]);

let windows = vec![("1h".to_string(), super::parse_window_to_seconds("1h"))];
let windows = vec![("1h".to_string(), None, super::parse_window_to_seconds("1h"))];
let states = vec!["pending".to_string(), "claimed".to_string(), "processing".to_string()];
let model_filter = vec![alias.clone()];

Expand Down Expand Up @@ -3219,7 +3219,7 @@ mod tests {
let file_model_counts = HashMap::from([(alias.clone(), 5_i64)]);
let model_throughputs = HashMap::from([(alias.clone(), 0.001_f32)]);
let model_ids_by_alias = HashMap::from([(alias.clone(), model_id)]);
let windows = vec![("1h".to_string(), super::parse_window_to_seconds("1h"))];
let windows = vec![("1h".to_string(), None, super::parse_window_to_seconds("1h"))];
let states = vec!["pending".to_string(), "claimed".to_string(), "processing".to_string()];
let model_filter = vec![alias.clone()];

Expand Down Expand Up @@ -3286,7 +3286,7 @@ mod tests {
let model_filter = vec![alias.clone()];

// 1h window — strict (factor defaults to 1.0), 5 > 3.6, rejected
let windows_1h = vec![("1h".to_string(), super::parse_window_to_seconds("1h"))];
let windows_1h = vec![("1h".to_string(), None, super::parse_window_to_seconds("1h"))];
let err = super::reserve_capacity_for_batch(
&state,
"1h",
Expand All @@ -3303,7 +3303,7 @@ mod tests {
assert!(matches!(err, Error::TooManyRequests { .. }), "1h should be rejected — not relaxed");

// 24h window — factor=10.0, effective capacity = 86400 * 0.001 * 10 = 864, accepted
let windows_24h = vec![("24h".to_string(), super::parse_window_to_seconds("24h"))];
let windows_24h = vec![("1h".to_string(), None, super::parse_window_to_seconds("24h"))];
let reservation_ids = super::reserve_capacity_for_batch(
&state,
"24h",
Expand Down
Loading
Loading