diff --git a/Cargo.lock b/Cargo.lock index 74ae443..769df63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1063,7 +1063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2685,16 +2685,16 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.14" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +checksum = "af66907df18639dcf4db56ca65490cabc4b27a97dbadd96f2926cca73298f016" dependencies = [ "cfg_aliases", "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.52.0", ] [[package]] @@ -2922,7 +2922,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2980,7 +2980,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3490,7 +3490,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4147,7 +4147,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4162,16 +4162,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -4189,31 +4180,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -4222,96 +4196,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" version = "1.0.3" diff --git a/crates/openplotva-app/src/dialog_jobs/tests.rs b/crates/openplotva-app/src/dialog_jobs/tests.rs index 56715f8..bda40e4 100644 --- a/crates/openplotva-app/src/dialog_jobs/tests.rs +++ b/crates/openplotva-app/src/dialog_jobs/tests.rs @@ -1319,6 +1319,11 @@ async fn dialog_worker_fails_when_answer_sanitizes_to_empty_after_attempts_exhau }); let effects = EffectsStub::default(); + let reporter = crate::runtime_routing::RoutingEventReporter::new( + crate::runtime_routing::RoutingEventBuffer::new(8), + None, + None, + ); let outcomes = crate::dialog_turn::DialogTurnObserver::new( crate::dialog_turn::RuntimeTurnOutcomeBuffer::new(8), None, @@ -1338,7 +1343,7 @@ async fn dialog_worker_fails_when_answer_sanitizes_to_empty_after_attempts_exhau terminal_signal: crate::dialog_turn::TurnSignalPolicy::default(), obligations: None, now, - routing_events: None, + routing_events: Some(&reporter), turn_outcomes: Some(&outcomes), session: leaked_session_wiring(), llm_runs: None, @@ -1362,6 +1367,7 @@ async fn dialog_worker_fails_when_answer_sanitizes_to_empty_after_attempts_exhau assert_eq!(rows[0].outcome, "terminal_failed"); assert_eq!(rows[0].reason.as_deref(), Some("sanitized_empty_exhausted")); assert_eq!(rows[0].user_signal.as_deref(), Some("none")); + assert_validator_exhaustion_routing_event(&reporter, job_id); Ok(()) } @@ -1691,6 +1697,11 @@ async fn dialog_worker_retries_provider_empty_output_and_fails_on_exhaustion() ); let provider = ProviderStub::returning(DialogOutput::default()); let effects = EffectsStub::default(); + let reporter = crate::runtime_routing::RoutingEventReporter::new( + crate::runtime_routing::RoutingEventBuffer::new(8), + None, + None, + ); let outcomes = crate::dialog_turn::DialogTurnObserver::new( crate::dialog_turn::RuntimeTurnOutcomeBuffer::new(8), None, @@ -1704,7 +1715,7 @@ async fn dialog_worker_retries_provider_empty_output_and_fails_on_exhaustion() terminal_signal: crate::dialog_turn::TurnSignalPolicy::default(), obligations: None, now, - routing_events: None, + routing_events: Some(&reporter), turn_outcomes: Some(&outcomes), session: leaked_session_wiring(), llm_runs: None, @@ -1750,6 +1761,7 @@ async fn dialog_worker_retries_provider_empty_output_and_fails_on_exhaustion() assert_eq!(rows[0].outcome, "terminal_failed"); assert_eq!(rows[0].reason.as_deref(), Some("provider_empty_exhausted")); assert_eq!(rows[0].attempt, 2); + assert_validator_exhaustion_routing_event(&reporter, job_id); Ok(()) } @@ -1768,6 +1780,11 @@ async fn dialog_worker_requeues_undeliverable_answer_instead_of_failing_at_send( ..DialogOutput::default() }); let effects = EffectsStub::default(); + let reporter = crate::runtime_routing::RoutingEventReporter::new( + crate::runtime_routing::RoutingEventBuffer::new(8), + None, + None, + ); let outcomes = crate::dialog_turn::DialogTurnObserver::new( crate::dialog_turn::RuntimeTurnOutcomeBuffer::new(8), None, @@ -1781,7 +1798,7 @@ async fn dialog_worker_requeues_undeliverable_answer_instead_of_failing_at_send( terminal_signal: crate::dialog_turn::TurnSignalPolicy::default(), obligations: None, now, - routing_events: None, + routing_events: Some(&reporter), turn_outcomes: Some(&outcomes), session: leaked_session_wiring(), llm_runs: None, @@ -1829,6 +1846,7 @@ async fn dialog_worker_requeues_undeliverable_answer_instead_of_failing_at_send( rows[0].reason.as_deref(), Some("undeliverable_answer_exhausted") ); + assert_validator_exhaustion_routing_event(&reporter, job_id); Ok(()) } @@ -7651,3 +7669,21 @@ async fn random_finish_keeps_tool_history_and_report() -> Result<(), Box Result AifarmHttpResponse { AifarmHttpResponse { status_code: 200,