diff --git a/Cargo.lock b/Cargo.lock index bbc8d3d1c..26949d75d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2603,7 +2603,7 @@ dependencies = [ [[package]] name = "tinychannels" -version = "0.2.0" +version = "0.2.1" dependencies = [ "anyhow", "async-imap", @@ -2662,7 +2662,7 @@ dependencies = [ [[package]] name = "tinychannels-bus" -version = "0.2.0" +version = "0.2.1" dependencies = [ "base64 0.23.1", "schemars", @@ -2674,7 +2674,7 @@ dependencies = [ [[package]] name = "tinychannels-client" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "serde", @@ -2686,7 +2686,7 @@ dependencies = [ [[package]] name = "tinychannels-conformance" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "serde_json", @@ -2697,7 +2697,7 @@ dependencies = [ [[package]] name = "tinychannels-module" -version = "0.2.0" +version = "0.2.1" dependencies = [ "anyhow", "async-trait", @@ -2730,7 +2730,7 @@ dependencies = [ [[package]] name = "tinychannels-runtime" -version = "0.2.0" +version = "0.2.1" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index f4b9ff24f..527fe14c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ tinybus-module = { path = "vendor/tinybus/crates/tinybus-module" } [workspace.package] # Releases update this sole workspace version before packaging every crate. -version = "0.2.0" +version = "0.2.1" [workspace.dependencies] tinybus = { version = "=0.3.12", git = "https://github.com/senamakel/tinybus", tag = "v0.3.12", default-features = false } diff --git a/crates/tinychannels-client/test-fixture/Cargo.lock b/crates/tinychannels-client/test-fixture/Cargo.lock index b07d7a347..1351c88fc 100644 --- a/crates/tinychannels-client/test-fixture/Cargo.lock +++ b/crates/tinychannels-client/test-fixture/Cargo.lock @@ -752,7 +752,7 @@ dependencies = [ [[package]] name = "tinychannels-bus" -version = "0.2.0" +version = "0.2.1" dependencies = [ "base64", "schemars", diff --git a/crates/tinychannels-module/src/service_tests.rs b/crates/tinychannels-module/src/service_tests.rs index c791086bb..ac5ea81a2 100644 --- a/crates/tinychannels-module/src/service_tests.rs +++ b/crates/tinychannels-module/src/service_tests.rs @@ -3847,3 +3847,92 @@ fn rich_typed_intent_keeps_its_parts_in_the_provider_message() { assert_eq!(message.idempotency_key, "rich-key"); } } + +#[tokio::test] +async fn route_commands_cover_listings_unknown_providers_empty_models_and_oversized_requests() { + use tinychannels_bus::module_control::{ + ChannelControlRequest as Request, ChannelControlResult as Response, ProviderDescriptor, + }; + use tinychannels_bus::module_remote::RemoteRoute; + let service = inbound_preparation_service().await; + enable_remote_providers(&service).await; + let request = |content: &str| { + Request::Route { + workspace_dir: ".".into(), + message: serde_json::from_value(serde_json::json!({"id":"fixture","sender":"sender","reply_target":"chat","content":content,"channel":"telegram","timestamp":1})).unwrap(), + capabilities: None, + route: RemoteRoute { provider: "approved".into(), model: "model".into() }, + history_len: 0, + session_scope: None, + configured_channel: None, + providers: vec![ProviderDescriptor { name: "approved".into(), aliases: vec![] }], + } + }; + let reply = |response: Response| match response { + Response::Route { + reply, + next_route, + clear_history, + } => (reply, next_route, clear_history), + other => panic!("expected a route, got {other:?}"), + }; + + let (unknown, next, clear) = reply( + service + .prepare_channel_control(request("/models nowhere")) + .await + .unwrap(), + ); + assert!(unknown.unwrap().starts_with("Unknown provider `nowhere`")); + assert_eq!((next, clear), (None, false)); + + let (same, next, clear) = reply( + service + .prepare_channel_control(request("/models approved")) + .await + .unwrap(), + ); + assert!(same.unwrap().starts_with("Provider switched to `approved`")); + assert_eq!( + (next, clear), + (None, false), + "the current provider is not a switch" + ); + + let (empty, next, clear) = reply( + service + .prepare_channel_control(request("/model ``")) + .await + .unwrap(), + ); + assert_eq!( + empty.as_deref(), + Some("Model ID cannot be empty. Use `/model `.") + ); + assert_eq!((next, clear), (None, false)); + + for listing in ["/models", "/model"] { + let (text, next, clear) = reply( + service + .prepare_channel_control(request(listing)) + .await + .unwrap(), + ); + assert!( + text.is_some_and(|text| !text.is_empty()), + "{listing} lists something" + ); + assert_eq!((next, clear), (None, false)); + } + + let oversized = service + .prepare_channel_control(Request::Overflow { + message: "x".repeat(tinychannels_bus::module_runtime::PREPARATION_MESSAGE_BYTES), + }) + .await; + assert!( + oversized.is_err(), + "a request over the byte limit is refused" + ); + service.shutdown().await.unwrap(); +} diff --git a/proofs/storage-needs-consumer/Cargo.lock b/proofs/storage-needs-consumer/Cargo.lock index 26ab0d906..1f2abf5cc 100644 --- a/proofs/storage-needs-consumer/Cargo.lock +++ b/proofs/storage-needs-consumer/Cargo.lock @@ -176,7 +176,7 @@ dependencies = [ [[package]] name = "tinychannels-bus" -version = "0.2.0" +version = "0.2.1" dependencies = [ "base64", "schemars",